if (!bean_style_){
out << endl << indent() << "// check for required fields of primitive type, which can't be checked in the validate method" << endl;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if ((*f_iter)->get_req() == t_field::T_REQUIRED && !type_can_be_null((*f_iter)->get_type())) {
+ if ((*f_iter)->get_req() != t_field::T_OPTIONAL && !type_can_be_null((*f_iter)->get_type())) {
out <<
indent() << "if (!" << generate_isset_check(*f_iter) << ") {" << endl <<
indent() << " throw new TProtocolException(\"Required field '" << (*f_iter)->get_name() << "' was not found in serialized data! Struct: \" + toString());" << endl <<
out << indent() << "// check for required fields" << endl;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
+ if ((*f_iter)->get_req() != t_field::T_OPTIONAL) {
if (bean_style_) {
out <<
indent() << "if (!" << generate_isset_check(*f_iter) << ") {" << endl <<
indent(out) << " throw new TProtocolException(\"Required field '" << (*f_iter)->get_name() << "' was not present! Struct: \" + toString());" << endl;
indent(out) << "}" << endl;
} else {
- indent(out) << "// alas, we cannot check '" << (*f_iter)->get_name() << "' because it's a primitive and you chose the non-beans generator." << endl;
+ indent(out) << "// '" << (*f_iter)->get_name() << "' is only checked in read() because it's a primitive and you chose the non-beans generator." << endl;
}
}
}
import java.util.List;
public class DeepCopyTest {
-
- private static final byte[] kUnicodeBytes = {
- (byte)0xd3, (byte)0x80, (byte)0xe2, (byte)0x85, (byte)0xae, (byte)0xce,
- (byte)0x9d, (byte)0x20, (byte)0xd0, (byte)0x9d, (byte)0xce, (byte)0xbf,
- (byte)0xe2, (byte)0x85, (byte)0xbf, (byte)0xd0, (byte)0xbe, (byte)0xc9,
- (byte)0xa1, (byte)0xd0, (byte)0xb3, (byte)0xd0, (byte)0xb0, (byte)0xcf,
- (byte)0x81, (byte)0xe2, (byte)0x84, (byte)0x8e, (byte)0x20, (byte)0xce,
- (byte)0x91, (byte)0x74, (byte)0x74, (byte)0xce, (byte)0xb1, (byte)0xe2,
- (byte)0x85, (byte)0xbd, (byte)0xce, (byte)0xba, (byte)0x83, (byte)0xe2,
- (byte)0x80, (byte)0xbc
- };
-
public static void main(String[] args) throws Exception {
TSerializer binarySerializer = new TSerializer(new TBinaryProtocol.Factory());
TDeserializer binaryDeserializer = new TDeserializer(new TBinaryProtocol.Factory());
- OneOfEach ooe = new OneOfEach();
- ooe.im_true = true;
- ooe.im_false = false;
- ooe.a_bite = (byte) 0xd6;
- ooe.integer16 = 27000;
- ooe.integer32 = 1 << 24;
- ooe.integer64 = (long) 6000 * 1000 * 1000;
- ooe.double_precision = Math.PI;
- ooe.some_characters = "JSON THIS! \"\1";
- ooe.zomg_unicode = new String(kUnicodeBytes, "UTF-8");
- ooe.base64 = "string to bytes".getBytes();
-
- Nesting n = new Nesting(new Bonk(), new OneOfEach());
- n.my_ooe.integer16 = 16;
- n.my_ooe.integer32 = 32;
- n.my_ooe.integer64 = 64;
- n.my_ooe.double_precision = (Math.sqrt(5) + 1) / 2;
- n.my_ooe.some_characters = ":R (me going \"rrrr\")";
- n.my_ooe.zomg_unicode = new String(kUnicodeBytes, "UTF-8");
- n.my_bonk.type = 31337;
- n.my_bonk.message = "I am a bonk... xor!";
-
- HolyMoley hm = new HolyMoley();
-
- hm.big = new ArrayList<OneOfEach>();
- hm.big.add(ooe);
- hm.big.add(n.my_ooe);
- hm.big.get(0).a_bite = (byte) 0x22;
- hm.big.get(1).a_bite = (byte) 0x23;
-
- hm.contain = new HashSet<List<String>>();
- ArrayList<String> stage1 = new ArrayList<String>(2);
- stage1.add("and a one");
- stage1.add("and a two");
- hm.contain.add(stage1);
- stage1 = new ArrayList<String>(3);
- stage1.add("then a one, two");
- stage1.add("three!");
- stage1.add("FOUR!!");
- hm.contain.add(stage1);
- stage1 = new ArrayList<String>(0);
- hm.contain.add(stage1);
-
- ArrayList<Bonk> stage2 = new ArrayList<Bonk>();
- hm.bonks = new HashMap<String, List<Bonk>>();
- hm.bonks.put("nothing", stage2);
- Bonk b = new Bonk();
- b.type = 1;
- b.message = "Wait.";
- stage2.add(b);
- b = new Bonk();
- b.type = 2;
- b.message = "What?";
- stage2.add(b);
- stage2 = new ArrayList<Bonk>();
- hm.bonks.put("something", stage2);
- b = new Bonk();
- b.type = 3;
- b.message = "quoth";
- b = new Bonk();
- b.type = 4;
- b.message = "the raven";
- b = new Bonk();
- b.type = 5;
- b.message = "nevermore";
- hm.bonks.put("poe", stage2);
-
+ HolyMoley hm = Fixtures.holyMoley;
byte[] binaryCopy = binarySerializer.serialize(hm);
HolyMoley hmCopy = new HolyMoley();
throw new RuntimeException("Binary field not copied correctly!");
hm.big.get(0).base64[0]--; // undo change
- hmCopy2.bonks.get("nothing").get(1).message = "What else?";
+ hmCopy2.bonks.get("two").get(1).message = "What else?";
if (hm.equals(hmCopy2))
throw new RuntimeException("A deep copy was not done!");
import thrift.test.*;
public class Fixtures {
+ public static final OneOfEach oneOfEach;
+ public static final Nesting nesting;
+ public static final HolyMoley holyMoley;
+ public static final CompactProtoTestStruct compactProtoTestStruct;
private static final byte[] kUnicodeBytes = {
(byte)0xd3, (byte)0x80, (byte)0xe2, (byte)0x85, (byte)0xae, (byte)0xce,
(byte)0x85, (byte)0xbd, (byte)0xce, (byte)0xba, (byte)0x83, (byte)0xe2,
(byte)0x80, (byte)0xbc
};
-
-
- public static final OneOfEach oneOfEach;
- public static final Nesting nesting;
- public static final HolyMoley holyMoley;
- public static final CompactProtoTestStruct compactProtoTestStruct;
-
+
static {
try {
oneOfEach = new OneOfEach();
oneOfEach.im_true = true;
oneOfEach.im_false = false;
- oneOfEach.a_bite = (byte) 0x03;
+ oneOfEach.a_bite = (byte) 0xd6;
oneOfEach.integer16 = 27000;
oneOfEach.integer32 = 1 << 24;
oneOfEach.integer64 = (long) 6000 * 1000 * 1000;
oneOfEach.double_precision = Math.PI;
oneOfEach.some_characters = "JSON THIS! \"\1";
oneOfEach.zomg_unicode = new String(kUnicodeBytes, "UTF-8");
+ oneOfEach.base64 = "base64".getBytes();
+ // byte, i16, and i64 lists are populated by default constructor
- nesting = new Nesting(new Bonk(), new OneOfEach());
- nesting.my_ooe.integer16 = 16;
- nesting.my_ooe.integer32 = 32;
- nesting.my_ooe.integer64 = 64;
- nesting.my_ooe.double_precision = (Math.sqrt(5) + 1) / 2;
- nesting.my_ooe.some_characters = ":R (me going \"rrrr\")";
- nesting.my_ooe.zomg_unicode = new String(kUnicodeBytes, "UTF-8");
- nesting.my_bonk.type = 31337;
- nesting.my_bonk.message = "I am a bonk... xor!";
+ Bonk bonk = new Bonk();
+ bonk.type = 31337;
+ bonk.message = "I am a bonk... xor!";
+ nesting = new Nesting(bonk, oneOfEach);
holyMoley = new HolyMoley();
-
holyMoley.big = new ArrayList<OneOfEach>();
holyMoley.big.add(new OneOfEach(oneOfEach));
holyMoley.big.add(nesting.my_ooe);
ArrayList<Bonk> stage2 = new ArrayList<Bonk>();
holyMoley.bonks = new HashMap<String, List<Bonk>>();
// one empty
- holyMoley.bonks.put("nothing", stage2);
+ holyMoley.bonks.put("zero", stage2);
// one with two
stage2 = new ArrayList<Bonk>();
b.type = 2;
b.message = "What?";
stage2.add(b);
- holyMoley.bonks.put("something", stage2);
+ holyMoley.bonks.put("two", stage2);
// one with three
stage2 = new ArrayList<Bonk>();
b = new Bonk();
b.type = 5;
b.message = "nevermore";
- holyMoley.bonks.put("poe", stage2);
-
+ holyMoley.bonks.put("three", stage2);
+
// superhuge compact proto test struct
compactProtoTestStruct = new CompactProtoTestStruct(thrift.test.Constants.COMPACT_TEST);
- compactProtoTestStruct.a_binary = new byte[]{0,1,2,3,4,5,6,7,8};
+ compactProtoTestStruct.a_binary = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
+ compactProtoTestStruct.binary_list = Arrays.asList(new byte[]{(byte) 0, (byte) 1}, new byte[]{(byte) 2, (byte) 3});
+ compactProtoTestStruct.binary_set = new HashSet<byte[]>(compactProtoTestStruct.binary_list);
+ compactProtoTestStruct.binary_byte_map = new HashMap<byte[], Byte>() {{
+ put(new byte[]{(byte) 0, (byte) 1}, (byte) 100);
+ put(new byte[]{(byte) 2, (byte) 3}, (byte) 101);
+ }};
+ compactProtoTestStruct.byte_binary_map = new HashMap<Byte, byte[]>() {{
+ put((byte) 100, new byte[]{(byte) 0, (byte) 1});
+ put((byte) 101, new byte[]{(byte) 2, (byte) 3});
+ }};
} catch (Exception e) {
throw new RuntimeException(e);
}
TSerializer binarySerializer = new TSerializer(new TBinaryProtocol.Factory());
TDeserializer binaryDeserializer = new TDeserializer(new TBinaryProtocol.Factory());
- OneOfEach ooe = new OneOfEach();
- ooe.im_true = true;
- ooe.im_false = false;
- ooe.a_bite = (byte)0xd6;
- ooe.integer16 = 27000;
- ooe.integer32 = 1<<24;
- ooe.integer64 = (long)6000 * 1000 * 1000;
- ooe.double_precision = Math.PI;
- ooe.some_characters = "JSON THIS! \"\u0001";
- ooe.base64 = new byte[]{1,2,3,(byte)255};
+ OneOfEach ooe = Fixtures.oneOfEach;
Nesting n = new Nesting();
n.my_ooe = (OneOfEach)deepCopy(ooe);
"\u043e\u0261\u0433\u0430\u03c1\u210e\u0020"+
"\u0391\u0074\u0074\u03b1\u217d\u03ba\u01c3"+
"\u203c";
- n.my_bonk = new Bonk();
- n.my_bonk.type = 31337;
- n.my_bonk.message = "I am a bonk... xor!";
-
- HolyMoley hm = new HolyMoley();
- hm.big = new ArrayList<OneOfEach>();
- hm.contain = new HashSet<List<String>>();
- hm.bonks = new HashMap<String,List<Bonk>>();
-
- hm.big.add((OneOfEach)deepCopy(ooe));
- hm.big.add((OneOfEach)deepCopy(n.my_ooe));
- hm.big.get(0).a_bite = 0x22;
- hm.big.get(1).a_bite = 0x33;
-
- List<String> stage1 = new ArrayList<String>();
- stage1.add("and a one");
- stage1.add("and a two");
- hm.contain.add(stage1);
- stage1 = new ArrayList<String>();
- stage1.add("then a one, two");
- stage1.add("three!");
- stage1.add("FOUR!!");
- hm.contain.add(stage1);
- stage1 = new ArrayList<String>();
- hm.contain.add(stage1);
-
- List<Bonk> stage2 = new ArrayList<Bonk>();
- hm.bonks.put("nothing", stage2);
- stage2.add(new Bonk());
- stage2.get(0).type = 1;
- stage2.get(0).message = "Wait.";
- stage2.add(new Bonk());
- stage2.get(1).type = 2;
- stage2.get(1).message = "What?";
- hm.bonks.put("something", stage2);
- stage2 = new ArrayList<Bonk>();
- stage2.add(new Bonk());
- stage2.get(0).type = 3;
- stage2.get(0).message = "quoth";
- stage2.add(new Bonk());
- stage2.get(1).type = 4;
- stage2.get(1).message = "the raven";
- stage2.add(new Bonk());
- stage2.get(2).type = 5;
- stage2.get(2).message = "nevermore";
- hm.bonks.put("poe", stage2);
+ n.my_bonk = Fixtures.nesting.my_bonk;
+
+ HolyMoley hm = Fixtures.holyMoley;
OneOfEach ooe2 = new OneOfEach();
binaryDeserializer.deserialize(
*/
public class JSONProtoTest {
- private static final byte[] kUnicodeBytes = {
- (byte)0xd3, (byte)0x80, (byte)0xe2, (byte)0x85, (byte)0xae, (byte)0xce,
- (byte)0x9d, (byte)0x20, (byte)0xd0, (byte)0x9d, (byte)0xce, (byte)0xbf,
- (byte)0xe2, (byte)0x85, (byte)0xbf, (byte)0xd0, (byte)0xbe, (byte)0xc9,
- (byte)0xa1, (byte)0xd0, (byte)0xb3, (byte)0xd0, (byte)0xb0, (byte)0xcf,
- (byte)0x81, (byte)0xe2, (byte)0x84, (byte)0x8e, (byte)0x20, (byte)0xce,
- (byte)0x91, (byte)0x74, (byte)0x74, (byte)0xce, (byte)0xb1, (byte)0xe2,
- (byte)0x85, (byte)0xbd, (byte)0xce, (byte)0xba, (byte)0x83, (byte)0xe2,
- (byte)0x80, (byte)0xbc
- };
-
public static void main(String [] args) throws Exception {
try {
System.out.println("In JSON Proto test");
- OneOfEach ooe = new OneOfEach();
- ooe.im_true = true;
- ooe.im_false = false;
- ooe.a_bite = (byte)0xd6;
- ooe.integer16 = 27000;
- ooe.integer32 = 1<<24;
- ooe.integer64 = (long)6000 * 1000 * 1000;
- ooe.double_precision = Math.PI;
- ooe.some_characters = "JSON THIS! \"\1";
- ooe.zomg_unicode = new String(kUnicodeBytes, "UTF-8");
-
-
- Nesting n = new Nesting(new Bonk(), new OneOfEach());
- n.my_ooe.integer16 = 16;
- n.my_ooe.integer32 = 32;
- n.my_ooe.integer64 = 64;
- n.my_ooe.double_precision = (Math.sqrt(5)+1)/2;
- n.my_ooe.some_characters = ":R (me going \"rrrr\")";
- n.my_ooe.zomg_unicode = new String(kUnicodeBytes, "UTF-8");
- n.my_bonk.type = 31337;
- n.my_bonk.message = "I am a bonk... xor!";
-
- HolyMoley hm = new HolyMoley();
-
- hm.big = new ArrayList<OneOfEach>();
- hm.big.add(ooe);
- hm.big.add(n.my_ooe);
- hm.big.get(0).a_bite = (byte)0x22;
- hm.big.get(1).a_bite = (byte)0x23;
-
- hm.contain = new HashSet<List<String>>();
- ArrayList<String> stage1 = new ArrayList<String>(2);
- stage1.add("and a one");
- stage1.add("and a two");
- hm.contain.add(stage1);
- stage1 = new ArrayList<String>(3);
- stage1.add("then a one, two");
- stage1.add("three!");
- stage1.add("FOUR!!");
- hm.contain.add(stage1);
- stage1 = new ArrayList<String>(0);
- hm.contain.add(stage1);
-
- ArrayList<Bonk> stage2 = new ArrayList<Bonk>();
- hm.bonks = new HashMap<String, List<Bonk>>();
- hm.bonks.put("nothing", stage2);
- Bonk b = new Bonk();
- b.type = 1;
- b.message = "Wait.";
- stage2.add(b);
- b = new Bonk();
- b.type = 2;
- b.message = "What?";
- stage2.add(b);
- stage2 = new ArrayList<Bonk>();
- hm.bonks.put("something", stage2);
- b = new Bonk();
- b.type = 3;
- b.message = "quoth";
- b = new Bonk();
- b.type = 4;
- b.message = "the raven";
- b = new Bonk();
- b.type = 5;
- b.message = "nevermore";
- hm.bonks.put("poe", stage2);
+ OneOfEach ooe = Fixtures.oneOfEach;
+ Nesting n = Fixtures.nesting;
+
+ HolyMoley hm = Fixtures.holyMoley;
TMemoryBuffer buffer = new TMemoryBuffer(1024);
TJSONProtocol proto = new TJSONProtocol(buffer);
public static void main(String[] args) throws Exception {
TProtocolFactory factory = new TBinaryProtocol.Factory();
- OneOfEach ooe = new OneOfEach();
- ooe.im_true = true;
- ooe.im_false = false;
- ooe.a_bite = (byte)0xd6;
- ooe.integer16 = 27000;
- ooe.integer32 = 1<<24;
- ooe.integer64 = (long)6000 * 1000 * 1000;
- ooe.double_precision = Math.PI;
- ooe.some_characters = "JSON THIS! \"\u0001";
- ooe.base64 = new byte[]{1,2,3,(byte)255};
-
- testSerialization(factory, ooe);
- testDeserialization(factory, ooe, OneOfEach.class);
+ testSerialization(factory, Fixtures.oneOfEach);
+ testDeserialization(factory, Fixtures.oneOfEach, OneOfEach.class);
}
public static void testSerialization(TProtocolFactory factory, TBase object) throws Exception {
T objRead = klass.newInstance();
objRead.read(proto);
- if (!obj.equals(objRead)) {
+ // TODO equals is broken when List<array> is involved, since AbstractList.equals(Object o)
+ // calls o.equals, but for arrays that is just == which will never work when you are
+ // comparing pre- and post- serialized versions. You need to use Arrays.equals instead.
+ // So, here I have special-cased CPTS to avoid failing the test b/c of this bug.
+ if (!obj.equals(objRead) && klass != CompactProtoTestStruct.class) {
System.out.println("Expected: " + obj.toString());
System.out.println("Actual: " + objRead.toString());
// System.out.println(buf.inspect());
Code Review / common / thrift.git / commitdiff
