Merge pull request #1670 from sigpwned/bug/1669/validation-annotations-minlength-and-maxlength-not-being-generated-for-array-types

Fix missing JSR303 size annotations on array types

Author: joelittlejohn

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/model/JAnnotatedClass.java

@@ -31,6 +31,7 @@
 import com.sun.codemodel.JFormatter;
 import com.sun.codemodel.JPackage;
 import com.sun.codemodel.JPrimitiveType;
+import com.sun.codemodel.JType;
 import com.sun.codemodel.JTypeVar;
 
 /**
@@ -128,6 +129,11 @@ public JAnnotatedClass annotated(Class<? extends Annotation> clazz) {
         return annotated(owner().ref(clazz));
     }
 
+    @Override
+    public JType elementType() {
+        return basis.elementType();
+    }
+
     /**
      * Returns a new JAnnotatedClass with the given annotation added.
      *

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/MinItemsMaxItemsRule.java

@@ -63,21 +63,21 @@ && isApplicableType(field)) {
     }
 
     private boolean isApplicableType(JFieldVar field) {
+        // Per https://github.com/joelittlejohn/jsonschema2pojo/issues/1669
+        // Need to check arrays first, because JType.fullName() returns names like byte[] or java.lang.String[]
+        // but Class.forName needs names like "[B" or "[Ljava.lang.String;" and will throw ClassNotFoundException.
+        if (field.type().isArray()) {
+            return true;
+        }
+
         try {
-            String typeName = field.type().boxify().fullName();
-            // For collections, the full name will be something like 'java.util.List<String>' and we
-            // need just 'java.util.List'.
-            int genericsPos = typeName.indexOf('<');
-            if (genericsPos > -1) {
-                typeName = typeName.substring(0, genericsPos);
-            }
+            String typeName = field.type().boxify().erasure().fullName();
 
             Class<?> fieldClass = Class.forName(typeName);
             return String.class.isAssignableFrom(fieldClass)
                     || Collection.class.isAssignableFrom(fieldClass)
                     || Map.class.isAssignableFrom(fieldClass)
-                    || Array.class.isAssignableFrom(fieldClass)
-                    || field.type().isArray();
+                    || fieldClass.isArray();
         } catch (ClassNotFoundException ignore) {
             return false;
         }

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/MinLengthMaxLengthRule.java

@@ -63,21 +63,21 @@ && isApplicableType(field)) {
     }
 
     private boolean isApplicableType(JFieldVar field) {
+        // Per https://github.com/joelittlejohn/jsonschema2pojo/issues/1669
+        // Need to check arrays first, because JType.fullName() returns names like byte[] or java.lang.String[]
+        // but Class.forName needs names like "[B" or "[Ljava.lang.String;" and will throw ClassNotFoundException.
+        if (field.type().isArray()) {
+            return true;
+        }
+
         try {
-            String typeName = field.type().boxify().fullName();
-            // For collections, the full name will be something like 'java.util.List<String>' and we
-            // need just 'java.util.List'.
-            int genericsPos = typeName.indexOf('<');
-            if (genericsPos > -1) {
-                typeName = typeName.substring(0, genericsPos);
-            }
+            String typeName = field.type().boxify().erasure().fullName();
 
             Class<?> fieldClass = Class.forName(typeName);
             return String.class.isAssignableFrom(fieldClass)
                     || Collection.class.isAssignableFrom(fieldClass)
                     || Map.class.isAssignableFrom(fieldClass)
-                    || Array.class.isAssignableFrom(fieldClass)
-                    || field.type().isArray();
+                    || fieldClass.isArray();
         } catch (ClassNotFoundException ignore) {
             return false;
         }

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/MinimumMaximumRule.java

@@ -65,7 +65,7 @@ public JFieldVar apply(String nodeName, JsonNode node, JsonNode parent, JFieldVa
 
     private boolean isApplicableType(JFieldVar field) {
         try {
-            Class<?> fieldClass = Class.forName(field.type().boxify().fullName());
+            Class<?> fieldClass = Class.forName(field.type().boxify().erasure().fullName());
             // Support Strings and most number types except Double and Float, per docs on DecimalMax/Min annotations
             return String.class.isAssignableFrom(fieldClass) ||
                     (Number.class.isAssignableFrom(fieldClass) &&