generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-21 23:56:55 +02:00
Code Issues Projects Releases Wiki Activity

java: JavassistTemplateBuilder: fixes comments

Browse Source
This commit is contained in:
FURUHASHI Sadayuki
2010-12-01 23:15:55 +09:00
parent 44be714f65
commit 33d8faa35d
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/main/java/org/msgpack/template/JavassistTemplateBuilder.java
View File

@@ -332,7 +332,7 @@ public class JavassistTemplateBuilder extends TemplateBuilder {
buildString("if($1.tryUnpackNull()) {"); buildString("if($1.tryUnpackNull()) {");
if(e.isRequired()) { if(e.isRequired()) {
// Requred + nil => exception // Required + nil => exception
buildString("throw new %s();", MessageTypeException.class.getName()); buildString("throw new %s();", MessageTypeException.class.getName());
} else if(e.isOptional()) { } else if(e.isOptional()) {
// Optional + nil => keep default value // Optional + nil => keep default value
@@ -360,6 +360,8 @@ public class JavassistTemplateBuilder extends TemplateBuilder {
} }
buildString("if($1.tryUnpackNull()) {"); buildString("if($1.tryUnpackNull()) {");
// this is Optional field becaue i >= minimumArrayLength
// Optional + nil => keep default value
buildString("} else {"); buildString("} else {");
Class<?> type = e.getType(); Class<?> type = e.getType();
if(type.isPrimitive()) { if(type.isPrimitive()) {
@@ -370,6 +372,8 @@ public class JavassistTemplateBuilder extends TemplateBuilder {
buildString("}"); buildString("}");
} }
// latter entries are all Optional + nil => keep default value
buildString("for(int i=%d; i < length; i++) {", i); buildString("for(int i=%d; i < length; i++) {", i);
buildString(" $1.unpackObject();"); buildString(" $1.unpackObject();");
buildString("}"); buildString("}");
@@ -409,7 +413,7 @@ public class JavassistTemplateBuilder extends TemplateBuilder {
buildString("obj = array[%d];", i); buildString("obj = array[%d];", i);
buildString("if(obj.isNil()) {"); buildString("if(obj.isNil()) {");
if(e.isRequired()) { if(e.isRequired()) {
// Requred + nil => exception // Required + nil => exception
buildString("throw new %s();", MessageTypeException.class.getName()); buildString("throw new %s();", MessageTypeException.class.getName());
} else if(e.isOptional()) { } else if(e.isOptional()) {
// Optional + nil => keep default value // Optional + nil => keep default value
@@ -437,6 +441,8 @@ public class JavassistTemplateBuilder extends TemplateBuilder {
buildString("obj = array[%d];", i); buildString("obj = array[%d];", i);
buildString("if(obj.isNil()) {"); buildString("if(obj.isNil()) {");
// this is Optional field becaue i >= minimumArrayLength
// Optional + nil => keep default value
buildString("} else {"); buildString("} else {");
Class<?> type = e.getType(); Class<?> type = e.getType();
if(type.isPrimitive()) { if(type.isPrimitive()) {
@@ -447,6 +453,8 @@ public class JavassistTemplateBuilder extends TemplateBuilder {
buildString("}"); buildString("}");
} }
// latter entries are all Optional + nil => keep default value
buildString("return _$$_t;"); buildString("return _$$_t;");
buildString("}"); buildString("}");

4
java/src/main/java/org/msgpack/template/ReflectionTemplateBuilder.java
View File

@@ -255,7 +255,7 @@ public class ReflectionTemplateBuilder extends TemplateBuilder {
if(pac.tryUnpackNull()) { if(pac.tryUnpackNull()) {
if(e.isRequired()) { if(e.isRequired()) {
// Requred + nil => exception // Required + nil => exception
throw new MessageTypeException(); throw new MessageTypeException();
} else if(e.isOptional()) { } else if(e.isOptional()) {
// Optional + nil => keep default value // Optional + nil => keep default value
@@ -323,7 +323,7 @@ public class ReflectionTemplateBuilder extends TemplateBuilder {
MessagePackObject obj = array[i]; MessagePackObject obj = array[i];
if(obj.isNil()) { if(obj.isNil()) {
if(e.isRequired()) { if(e.isRequired()) {
// Requred + nil => exception // Required + nil => exception
throw new MessageTypeException(); throw new MessageTypeException();
} else if(e.isOptional()) { } else if(e.isOptional()) {
// Optional + nil => keep default value // Optional + nil => keep default value