(#706) : Default value for property of "integer enum" type caused POJ…

…O compilation error
joelittlejohn · Mar 20, 2017 · f673fc5 · f673fc5
1 parent fc5fe25
commit f673fc5
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 19 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DefaultRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DefaultRule.java
@@ -26,6 +26,8 @@
 import com.sun.codemodel.JExpression;
 import com.sun.codemodel.JFieldVar;
 import com.sun.codemodel.JInvocation;
+import com.sun.codemodel.JMethod;
+import com.sun.codemodel.JMod;
 import com.sun.codemodel.JType;
 
 import java.math.BigDecimal;
@@ -38,11 +40,12 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalTime;
 import org.jsonschema2pojo.Schema;
+import org.jsonschema2pojo.exception.GenerationException;
 
 /**
  * Applies the "enum" schema rule.
@@ -152,7 +155,7 @@ private JExpression getDefaultValue(JType fieldType, JsonNode node) {
 
         } else if (fieldType instanceof JDefinedClass && ((JDefinedClass) fieldType).getClassType().equals(ClassType.ENUM)) {
 
-            return getDefaultEnum(fieldType, node);
+            return getDefaultEnum((JDefinedClass)fieldType, node);
 
         } else {
             return JExpr._null();
@@ -243,11 +246,25 @@ private JExpression getDefaultSet(JType fieldType, JsonNode node) {
 
     }
 
-    private JExpression getDefaultEnum(JType fieldType, JsonNode node) {
+    private boolean isIntegerEnumValue(JDefinedClass fieldType){
 
-        JInvocation invokeFromValue = ((JClass) fieldType).staticInvoke("fromValue");
-        invokeFromValue.arg(node.asText());
+        for(JMethod method : fieldType.methods()){
+            if (EnumRule.FROM_VALUE_METHOD_NAME.equals(method.name())
+                    && (method.mods().getValue() & JMod.PUBLIC) == JMod.PUBLIC
+                    && (method.mods().getValue() & JMod.STATIC) == JMod.STATIC ){
+                final JType type = method.listParamTypes()[0];
+                return type.unboxify() == type.owner().INT;
+            }
+        }
+        throw new GenerationException("Factory method '" + EnumRule.FROM_VALUE_METHOD_NAME + "' is not found in "+ fieldType);
+
+    }
+
+    private JExpression getDefaultEnum(JDefinedClass fieldType, JsonNode node) {
 
+        JInvocation invokeFromValue = fieldType.staticInvoke(EnumRule.FROM_VALUE_METHOD_NAME);
+        invokeFromValue.arg(isIntegerEnumValue(fieldType) ?
+                JExpr.lit(node.asInt()) : JExpr.lit(node.asText()));
         return invokeFromValue;
 
     }

diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/EnumRule.java
@@ -62,6 +62,7 @@
 public class EnumRule implements Rule<JClassContainer, JType> {
 
     private static final String VALUE_FIELD_NAME = "value";
+    public static final String FROM_VALUE_METHOD_NAME = "fromValue";
 
     private final RuleFactory ruleFactory;
 
@@ -166,8 +167,8 @@ private JDefinedClass createEnum(JsonNode node, String nodeName, JClassContainer
     private void addFactoryMethod(JDefinedClass _enum, JType backingType) {
         JFieldVar quickLookupMap = addQuickLookupMap(_enum, backingType);
 
-        JMethod fromValue = _enum.method(JMod.PUBLIC | JMod.STATIC, _enum, "fromValue");
-        JVar valueParam = fromValue.param(backingType, "value");
+        JMethod fromValue = _enum.method(JMod.PUBLIC | JMod.STATIC, _enum, FROM_VALUE_METHOD_NAME);
+        JVar valueParam = fromValue.param(backingType, VALUE_FIELD_NAME);
 
         JBlock body = fromValue.body();
         JVar constant = body.decl(_enum, "constant");
@@ -200,7 +201,7 @@ private JFieldVar addQuickLookupMap(JDefinedClass _enum, JType backingType) {
 
         JForEach forEach = _enum.init().forEach(_enum, "c", JExpr.invoke("values"));
         JInvocation put = forEach.body().invoke(lookupMap, "put");
-        put.arg(forEach.var().ref("value"));
+        put.arg(forEach.var().ref(VALUE_FIELD_NAME));
         put.arg(forEach.var());
 
         return lookupMap;
@@ -232,7 +233,7 @@ private void addToString(JDefinedClass _enum, JFieldVar valueField) {
     }
 
     private void addValueMethod(JDefinedClass _enum, JFieldVar valueField) {
-        JMethod fromValue = _enum.method(JMod.PUBLIC, valueField.type(), "value");
+        JMethod fromValue = _enum.method(JMod.PUBLIC, valueField.type(), VALUE_FIELD_NAME);
 
         JBlock body = fromValue.body();
         body._return(JExpr._this().ref(valueField));

diff --git a/jsonschema2pojo-gradle-plugin/pom.xml b/jsonschema2pojo-gradle-plugin/pom.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>com.bluetrainsoftware.maven</groupId>
                 <artifactId>groovydoc-maven-plugin</artifactId>
-                <version>1.2</version>
+                <version>1.3</version>
                 <executions>
                     <execution>
                         <id>attach-docs</id>
@@ -90,7 +90,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.19.1</version>
                 <configuration>
                     <useFile>false</useFile>
                     <includes>

diff --git a/jsonschema2pojo-integration-tests/pom.xml b/jsonschema2pojo-integration-tests/pom.xml
@@ -24,15 +24,15 @@
                 <!-- switch off surefire, there's no unit tests in this module -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.7.2</version>
+                <version>2.19.1</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.7.2</version>
+                <version>2.19.1</version>
                 <executions>
                     <execution>
                         <id>integration-test</id>
@@ -147,6 +147,40 @@
            <groupId>org.robolectric</groupId>
            <artifactId>robolectric</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.robolectric</groupId>
+            <artifactId>android-base</artifactId>
+            <classifier>real</classifier>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.robolectric</groupId>
+            <artifactId>android-kxml2</artifactId>
+            <classifier>real</classifier>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.robolectric</groupId>
+            <artifactId>android-policy</artifactId>
+            <classifier>real</classifier>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.robolectric</groupId>
+            <artifactId>android-luni</artifactId>
+            <classifier>real</classifier>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.robolectric</groupId>
+            <artifactId>android-res</artifactId>
+            <classifier>real</classifier>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.ccil.cowan.tagsoup</groupId>
+            <artifactId>tagsoup</artifactId>
+        </dependency>
         <dependency>
             <groupId>qdox</groupId>
             <artifactId>qdox</artifactId>

diff --git a/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/EnumIT.java b/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/EnumIT.java
@@ -27,6 +27,7 @@
 
 import org.hamcrest.core.IsInstanceOf;
 import org.jsonschema2pojo.integration.util.Jsonschema2PojoRule;
+import org.jsonschema2pojo.rules.EnumRule;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -95,7 +96,7 @@ public void enumContainsWorkingAnnotatedSerializationMethod() throws NoSuchMetho
     @Test
     public void enumContainsWorkingAnnotatedDeserializationMethod() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 
-        Method fromValue = enumClass.getMethod("fromValue", String.class);
+        Method fromValue = enumClass.getMethod(EnumRule.FROM_VALUE_METHOD_NAME, String.class);
 
         assertThat((Enum) fromValue.invoke(enumClass, "one"), is(sameInstance(enumClass.getEnumConstants()[0])));
         assertThat((Enum) fromValue.invoke(enumClass, "secondOne"), is(sameInstance(enumClass.getEnumConstants()[1])));
@@ -108,7 +109,7 @@ public void enumContainsWorkingAnnotatedDeserializationMethod() throws NoSuchMet
     @Test
     public void enumDeserializationMethodRejectsInvalidValues() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 
-        Method fromValue = enumClass.getMethod("fromValue", String.class);
+        Method fromValue = enumClass.getMethod(EnumRule.FROM_VALUE_METHOD_NAME, String.class);
 
         try {
             fromValue.invoke(enumClass, "something invalid");
@@ -141,7 +142,7 @@ public void intEnumAtRootCreatesIntBackedEnum() throws ClassNotFoundException, N
         Class<Enum> rootEnumClass = (Class<Enum>) resultsClassLoader.loadClass("com.example.enums.IntegerEnumAsRoot");
 
         assertThat(rootEnumClass.isEnum(), is(true));
-        assertThat(rootEnumClass.getDeclaredMethod("fromValue", Integer.class), is(notNullValue()));
+        assertThat(rootEnumClass.getDeclaredMethod(EnumRule.FROM_VALUE_METHOD_NAME, Integer.class), is(notNullValue()));
         assertThat(isPublic(rootEnumClass.getModifiers()), is(true));
     }
 
@@ -154,7 +155,7 @@ public void doubleEnumAtRootCreatesIntBackedEnum() throws ClassNotFoundException
         Class<Enum> rootEnumClass = (Class<Enum>) resultsClassLoader.loadClass("com.example.enums.DoubleEnumAsRoot");
 
         assertThat(rootEnumClass.isEnum(), is(true));
-        assertThat(rootEnumClass.getDeclaredMethod("fromValue", Double.class), is(notNullValue()));
+        assertThat(rootEnumClass.getDeclaredMethod(EnumRule.FROM_VALUE_METHOD_NAME, Double.class), is(notNullValue()));
         assertThat(isPublic(rootEnumClass.getModifiers()), is(true));
     }
 

diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/enum/integerEnumAsRoot.json b/jsonschema2pojo-integration-tests/src/test/resources/schema/enum/integerEnumAsRoot.json
@@ -2,5 +2,6 @@
     "javaType" : "com.example.enums.IntegerEnumAsRoot",
     "type" : "integer",
     "enum" : [1, 2, 3],
-    "javaEnumNames" : ["One", "Two", "Three"]
+    "javaEnumNames" : ["One", "Two", "Three"],
+    "default": 1
 }
diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/enum/integerEnumToSerialize.json b/jsonschema2pojo-integration-tests/src/test/resources/schema/enum/integerEnumToSerialize.json
@@ -4,7 +4,8 @@
        "testEnum" : { 
           "type" : "integer",
           "enum" : [1, 2, 3],
-          "javaEnumNames" : ["One", "Two", "Three"]
+          "javaEnumNames" : ["One", "Two", "Three"],
+          "default": 3
       }
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -443,6 +443,52 @@
                <version>2.2</version>
                <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.robolectric</groupId>
+                <artifactId>android-base</artifactId>
+                <version>4.1.2_r1_rc</version>
+                <classifier>real</classifier>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.robolectric</groupId>
+                <artifactId>android-kxml2</artifactId>
+                <version>4.1.2_r1_rc</version>
+                <classifier>real</classifier>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.robolectric</groupId>
+                <artifactId>android-policy</artifactId>
+                <version>4.1.2_r1_rc</version>
+                <classifier>real</classifier>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.robolectric</groupId>
+                <artifactId>android-luni</artifactId>
+                <version>4.1.2_r1_rc</version>
+                <classifier>real</classifier>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.robolectric</groupId>
+                <artifactId>android-res</artifactId>
+                <version>4.1.2_r1_rc</version>
+                <classifier>real</classifier>
+                <type>jar</type>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ccil.cowan.tagsoup</groupId>
+                <artifactId>tagsoup</artifactId>
+                <version>1.2</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.skyscreamer</groupId>
                 <artifactId>jsonassert</artifactId>