MirroredTypeException Fix

apikey-config/src/main/resources/config/apikey.json

@@ -31,4 +31,4 @@
       }
     }
   }
-}
+}

audit-config/src/main/resources/config/audit.json

@@ -60,4 +60,4 @@
       "default" : true
     }
   }
-}
+}

config/src/main/java/com/networknt/config/schema/BooleanField.java

@@ -31,6 +31,3 @@
      */
     boolean externalized() default ConfigSchema.DEFAULT_BOOLEAN;
 }
-
-
-

config/src/main/java/com/networknt/config/schema/IntegerField.java

@@ -65,5 +65,3 @@
      */
     Format format() default Format.int32;
 }
-
-

config/src/main/java/com/networknt/config/schema/MetadataParser.java

@@ -7,6 +7,7 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
+import javax.lang.model.type.MirroredTypeException;
 import java.lang.annotation.Annotation;
 import java.util.LinkedHashMap;
 import java.util.Optional;
@@ -165,7 +166,13 @@ private static Optional<LinkedHashMap<String, Object>> getObjectPropertyMetadata
      * @return A LinkedHashMap containing the metadata.
      */
     private static LinkedHashMap<String, Object> parseArrayMetadata(final ArrayField field, final ProcessingEnvironment processingEnvironment) {
-        final var itemElement = ReflectionUtils.safeGetElement(field.items().getCanonicalName(), processingEnvironment);
+        String canonicalName;
+        try {
+            canonicalName = field.items().getCanonicalName();
+        } catch (MirroredTypeException e) {
+            canonicalName = e.getTypeMirrors().get(0).toString();
+        }
+        final var itemElement = ReflectionUtils.safeGetElement(canonicalName, processingEnvironment);
         final var itemMetadata = new LinkedHashMap<String, Object>();
         gatherObjectSchemaData(itemElement, itemMetadata, processingEnvironment);
 
@@ -257,7 +264,13 @@ private static LinkedHashMap<String, Object> parseStringMetadata(final StringFie
      * @return A LinkedHashMap containing the metadata.
      */
     private static LinkedHashMap<String, Object> parseObjectMetadata(final ObjectField field, final ProcessingEnvironment processingEnvironment) {
-        final var refElement = ReflectionUtils.safeGetElement(field.ref().getCanonicalName(), processingEnvironment);
+        String canonicalName;
+        try {
+            canonicalName = field.ref().getCanonicalName();
+        } catch (MirroredTypeException e) {
+            canonicalName = e.getTypeMirrors().get(0).toString();
+        }
+        final var refElement = ReflectionUtils.safeGetElement(canonicalName, processingEnvironment);
         final var refMetadata = new LinkedHashMap<String, Object>();
         gatherObjectSchemaData(refElement, refMetadata, processingEnvironment);
         final var metadata = new LinkedHashMap<String, Object>();

config/src/main/java/com/networknt/config/schema/NullField.java

@@ -31,5 +31,3 @@
      */
     boolean externalized() default ConfigSchema.DEFAULT_BOOLEAN;
 }
-
-

config/src/main/java/com/networknt/config/schema/NumberField.java

@@ -64,4 +64,3 @@
      */
     Format format() default Format.float32;
 }
-

config/src/main/java/com/networknt/config/schema/ObjectField.java

@@ -62,5 +62,3 @@
      */
     Class<?>[] oneOf() default {};
 }
-
-

config/src/main/java/com/networknt/config/schema/StringField.java

@@ -51,5 +51,3 @@
      */
     Format format() default Format.none;
 }
-
-

config/src/main/java/com/networknt/config/schema/generator/YamlGenerator.java

@@ -236,4 +236,3 @@ private void addCommentsToNode(final Mark start, final Mark end, final String de
     }
 
 }
-

config/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1 +1 @@
-com.networknt.config.schema.ConfigAnnotationParser
+com.networknt.config.schema.ConfigAnnotationParser

config/src/test/java/com/networknt/config/JsonSchemaGeneratorTest.java

@@ -216,4 +216,4 @@ public void writeYamlSchemaToFile() throws IOException {
         assertTrue(Arrays.equals(Files.readAllBytes(file1.toPath()), Files.readAllBytes(file2.toPath())));
     }
 
-}
+}

config/src/test/resources/config/apikey-compare.json

@@ -31,4 +31,4 @@
       "description" : "If API key hash is enabled. The API key will be hashed with PBKDF2WithHmacSHA1 before it is\nstored in the config file. It is more secure than put the encrypted key into the config file.\nThe default value is false. If you want to enable it, you need to use the following repo\nhttps://github.com/networknt/light-hash command line tool to hash the clear text key."
     }
   }
-}
+}

config/src/test/resources/config/apikey-test.json

@@ -31,4 +31,4 @@
       "description" : "If API key hash is enabled. The API key will be hashed with PBKDF2WithHmacSHA1 before it is\nstored in the config file. It is more secure than put the encrypted key into the config file.\nThe default value is false. If you want to enable it, you need to use the following repo\nhttps://github.com/networknt/light-hash command line tool to hash the clear text key."
     }
   }
-}
+}