admin/msgpack-msgpack-c
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c synced 2026-06-08 16:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

java: MessagePackOptional -> Optional, MessagePackNullable -> Nullable

Browse Source
This commit is contained in:
frsyuki
2010-11-10 00:16:23 +09:00
parent 1135976225
commit c283842563
8 changed files with 147 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/test/java/org/msgpack/TestAnnotations.java
+5 -5
View File
@@ -20,7 +20,7 @@ public class TestAnnotations extends TestCase {
public String name;
// required and nullable field.
@MessagePackNullable
@Nullable
public String nickname;
}
@@ -29,11 +29,11 @@ public class TestAnnotations extends TestCase {
public static class MyClassVersion2 {
public String name;
@MessagePackNullable
@Nullable
public String nickname;
// adds an optional field on version 2.
@MessagePackOptional
@Optional
public int age = -1;
}
@@ -42,7 +42,7 @@ public class TestAnnotations extends TestCase {
public static class MyClassVersion3 {
public String name;
@MessagePackNullable
@Nullable
public String nickname;
// adds required fields on version 3, then
@@ -50,7 +50,7 @@ public class TestAnnotations extends TestCase {
public int age;
// optional field is nullable.
@MessagePackOptional
@Optional
public String school;
}
java/src/test/java/org/msgpack/util/codegen/TestPackConvert.java
+47 -47
View File
@@ -27,8 +27,8 @@ import org.msgpack.Packer;
import org.msgpack.Template;
import org.msgpack.Unpacker;
import org.msgpack.annotation.MessagePackMessage;
import org.msgpack.annotation.MessagePackOptional;
import org.msgpack.annotation.MessagePackOrdinalEnum;
import org.msgpack.annotation.Optional;
import org.msgpack.packer.OptionalPacker;
import org.msgpack.template.NullableTemplate;
@@ -179,19 +179,19 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalPrimitiveTypeFieldsClass {
@MessagePackOptional
@Optional
public byte f0;
@MessagePackOptional
@Optional
public short f1;
@MessagePackOptional
@Optional
public int f2;
@MessagePackOptional
@Optional
public long f3;
@MessagePackOptional
@Optional
public float f4;
@MessagePackOptional
@Optional
public double f5;
@MessagePackOptional
@Optional
public boolean f6;
public OptionalPrimitiveTypeFieldsClass() {
@@ -384,27 +384,27 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalGeneralReferenceTypeFieldsClass {
@MessagePackOptional
@Optional
public Byte f0;
@MessagePackOptional
@Optional
public Short f1;
@MessagePackOptional
@Optional
public Integer f2;
@MessagePackOptional
@Optional
public Long f3;
@MessagePackOptional
@Optional
public Float f4;
@MessagePackOptional
@Optional
public Double f5;
@MessagePackOptional
@Optional
public Boolean f6;
@MessagePackOptional
@Optional
public BigInteger f7;
@MessagePackOptional
@Optional
public String f8;
@MessagePackOptional
@Optional
public byte[] f9;
@MessagePackOptional
@Optional
public ByteBuffer f10;
public OptionalGeneralReferenceTypeFieldsClass() {
@@ -640,17 +640,17 @@ public class TestPackConvert extends TestCase {
}
public static class SampleOptionalListTypes {
@MessagePackOptional
@Optional
public List<Integer> f0;
@MessagePackOptional
@Optional
public List<Integer> f1;
@MessagePackOptional
@Optional
public List<String> f2;
@MessagePackOptional
@Optional
public List<List<String>> f3;
@MessagePackOptional
@Optional
public List<SampleOptionalListNestedType> f4;
@MessagePackOptional
@Optional
public List<ByteBuffer> f5;
public SampleOptionalListTypes() {
@@ -659,9 +659,9 @@ public class TestPackConvert extends TestCase {
@MessagePackMessage
public static class SampleOptionalListNestedType {
@MessagePackOptional
@Optional
public byte[] f0;
@MessagePackOptional
@Optional
public String f1;
public SampleOptionalListNestedType() {
@@ -828,11 +828,11 @@ public class TestPackConvert extends TestCase {
}
public static class SampleOptionalMapTypes {
@MessagePackOptional
@Optional
public Map<Integer, Integer> f0;
@MessagePackOptional
@Optional
public Map<Integer, Integer> f1;
@MessagePackOptional
@Optional
public Map<String, Integer> f2;
public SampleOptionalMapTypes() {
@@ -1176,9 +1176,9 @@ public class TestPackConvert extends TestCase {
}
public static class SampleOptionalEnumFieldClass {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public SampleOptionalEnum f1;
public SampleOptionalEnumFieldClass() {
@@ -1255,9 +1255,9 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalFieldModifiersClass {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public final int f1 = 1;
private int f2;
protected int f3;
@@ -1396,9 +1396,9 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalBaseClass {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public OptionalNestedClass f1;
public OptionalBaseClass() {
@@ -1406,7 +1406,7 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalNestedClass {
@MessagePackOptional
@Optional
public int f2;
public OptionalNestedClass() {
@@ -1530,9 +1530,9 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalBaseClass2 {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public OptionalMessagePackMessageClass2 f1;
public OptionalBaseClass2() {
@@ -1541,7 +1541,7 @@ public class TestPackConvert extends TestCase {
@MessagePackMessage
public static class OptionalMessagePackMessageClass2 {
@MessagePackOptional
@Optional
public int f2;
public OptionalMessagePackMessageClass2() {
@@ -1675,7 +1675,7 @@ public class TestPackConvert extends TestCase {
}
public static class SampleOptionalSubClass extends SampleOptionalSuperClass {
@MessagePackOptional
@Optional
public int f0;
public final int f1 = 1;
private int f2;
@@ -1687,7 +1687,7 @@ public class TestPackConvert extends TestCase {
}
public static class SampleOptionalSuperClass {
@MessagePackOptional
@Optional
public int f5;
public final int f6 = 2;
@SuppressWarnings("unused")
@@ -1867,12 +1867,12 @@ public class TestPackConvert extends TestCase {
}
public static class OptionalBaseMessagePackableConvertableClass {
@MessagePackOptional
@Optional
public OptionalMessagePackableConvertableClass f0;
@MessagePackOptional
@Optional
public int f1;
@MessagePackOptional
@Optional
public List<OptionalMessagePackableConvertableClass> f2;
public OptionalBaseMessagePackableConvertableClass() {
@@ -1881,9 +1881,9 @@ public class TestPackConvert extends TestCase {
public static class OptionalMessagePackableConvertableClass implements
MessagePackable, MessageConvertable {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public int f1;
public OptionalMessagePackableConvertableClass() {
java/src/test/java/org/msgpack/util/codegen/TestPackUnpack.java
+47 -47
View File
@@ -21,8 +21,8 @@ import org.msgpack.Packer;
import org.msgpack.Template;
import org.msgpack.Unpacker;
import org.msgpack.annotation.MessagePackMessage;
import org.msgpack.annotation.MessagePackOptional;
import org.msgpack.annotation.MessagePackOrdinalEnum;
import org.msgpack.annotation.Optional;
import org.msgpack.packer.OptionalPacker;
import org.msgpack.template.NullableTemplate;
@@ -170,19 +170,19 @@ public class TestPackUnpack extends TestCase {
}
public static class OptionalPrimitiveTypeFieldsClass {
@MessagePackOptional
@Optional
public byte f0;
@MessagePackOptional
@Optional
public short f1;
@MessagePackOptional
@Optional
public int f2;
@MessagePackOptional
@Optional
public long f3;
@MessagePackOptional
@Optional
public float f4;
@MessagePackOptional
@Optional
public double f5;
@MessagePackOptional
@Optional
public boolean f6;
public OptionalPrimitiveTypeFieldsClass() {
@@ -350,27 +350,27 @@ public class TestPackUnpack extends TestCase {
}
public static class GeneralOptionalReferenceTypeFieldsClass {
@MessagePackOptional
@Optional
public Byte f0;
@MessagePackOptional
@Optional
public Short f1;
@MessagePackOptional
@Optional
public Integer f2;
@MessagePackOptional
@Optional
public Long f3;
@MessagePackOptional
@Optional
public Float f4;
@MessagePackOptional
@Optional
public Double f5;
@MessagePackOptional
@Optional
public Boolean f6;
@MessagePackOptional
@Optional
public BigInteger f7;
@MessagePackOptional
@Optional
public String f8;
@MessagePackOptional
@Optional
public byte[] f9;
@MessagePackOptional
@Optional
public ByteBuffer f10;
public GeneralOptionalReferenceTypeFieldsClass() {
@@ -580,17 +580,17 @@ public class TestPackUnpack extends TestCase {
}
public static class SampleOptionalListTypes {
@MessagePackOptional
@Optional
public List<Integer> f0;
@MessagePackOptional
@Optional
public List<Integer> f1;
@MessagePackOptional
@Optional
public List<String> f2;
@MessagePackOptional
@Optional
public List<List<String>> f3;
@MessagePackOptional
@Optional
public List<SampleOptionalListNestedType> f4;
@MessagePackOptional
@Optional
public List<ByteBuffer> f5;
public SampleOptionalListTypes() {
@@ -599,9 +599,9 @@ public class TestPackUnpack extends TestCase {
@MessagePackMessage
public static class SampleOptionalListNestedType {
@MessagePackOptional
@Optional
public byte[] f0;
@MessagePackOptional
@Optional
public String f1;
public SampleOptionalListNestedType() {
@@ -746,11 +746,11 @@ public class TestPackUnpack extends TestCase {
}
public static class SampleOptionalMapTypes {
@MessagePackOptional
@Optional
public Map<Integer, Integer> f0;
@MessagePackOptional
@Optional
public Map<Integer, Integer> f1;
@MessagePackOptional
@Optional
public Map<String, Integer> f2;
public SampleOptionalMapTypes() {
@@ -1065,10 +1065,10 @@ public class TestPackUnpack extends TestCase {
}
public static class SampleOptionalEnumFieldClass {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public SampleOptionalEnum f1;
public SampleOptionalEnumFieldClass() {
@@ -1136,9 +1136,9 @@ public class TestPackUnpack extends TestCase {
}
public static class OptionalFieldModifiersClass {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public final int f1 = 1;
private int f2;
protected int f3;
@@ -1245,9 +1245,9 @@ public class TestPackUnpack extends TestCase {
}
public static class OptionalBaseClass {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public OptionalNestedClass f1;
public OptionalBaseClass() {
@@ -1255,7 +1255,7 @@ public class TestPackUnpack extends TestCase {
}
public static class OptionalNestedClass {
@MessagePackOptional
@Optional
public int f2;
public OptionalNestedClass() {
@@ -1355,9 +1355,9 @@ public class TestPackUnpack extends TestCase {
}
public static class OptionalBaseClass2 {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public OptionalMessagePackMessageClass2 f1;
public OptionalBaseClass2() {
@@ -1366,7 +1366,7 @@ public class TestPackUnpack extends TestCase {
@MessagePackMessage
public static class OptionalMessagePackMessageClass2 {
@MessagePackOptional
@Optional
public int f2;
public OptionalMessagePackMessageClass2() {
@@ -1482,7 +1482,7 @@ public class TestPackUnpack extends TestCase {
}
public static class SampleOptionalSubClass extends SampleOptionalSuperClass {
@MessagePackOptional
@Optional
public int f0;
public final int f1 = 1;
private int f2;
@@ -1494,7 +1494,7 @@ public class TestPackUnpack extends TestCase {
}
public static class SampleOptionalSuperClass {
@MessagePackOptional
@Optional
public int f5;
public final int f6 = 2;
@SuppressWarnings("unused")
@@ -1649,11 +1649,11 @@ public class TestPackUnpack extends TestCase {
}
public static class OptionalBaseMessagePackableUnpackableClass {
@MessagePackOptional
@Optional
public OptionalMessagePackableUnpackableClass f0;
@MessagePackOptional
@Optional
public int f1;
@MessagePackOptional
@Optional
public List<OptionalMessagePackableUnpackableClass> f2;
public OptionalBaseMessagePackableUnpackableClass() {
@@ -1662,9 +1662,9 @@ public class TestPackUnpack extends TestCase {
public static class OptionalMessagePackableUnpackableClass implements
MessagePackable, MessageUnpackable {
@MessagePackOptional
@Optional
public int f0;
@MessagePackOptional
@Optional
public int f1;
public OptionalMessagePackableUnpackableClass() {