Merge pull request #149 from SentryMan/log

Slightly Improve Logging

Author: rbygrave

jsonb-generator/src/main/java/io/avaje/jsonb/generator/ProcessingContext.java

@@ -54,7 +54,8 @@ static void init(ProcessingEnvironment processingEnv) {
 
   private static boolean initPreviewEnabled(ProcessingEnvironment processingEnv) {
     try {
-      return (boolean) ProcessingEnvironment.class.getDeclaredMethod("isPreviewEnabled").invoke(processingEnv);
+      return (boolean)
+          ProcessingEnvironment.class.getDeclaredMethod("isPreviewEnabled").invoke(processingEnv);
     } catch (final Throwable e) {
       return false;
     }
@@ -123,20 +124,22 @@ static ProcessingEnvironment env() {
     return CTX.get().env;
   }
 
-  static void addImportedPrism(ImportPrism prism) {
+  static void addImportedPrism(ImportPrism prism, Element element) {
     if (!prism.subtypes().isEmpty() && prism.value().size() > 1) {
-      throw new IllegalStateException("subtypes cannot be used when an import annotation imports more than one class");
+      logError(
+          element, "subtypes cannot be used when an import annotation imports more than one class");
+      return;
     }
     final var json = CTX.get().importedJsonMap;
     final var subtypes = CTX.get().importedSubtypeMap;
     prism
-      .value()
-      .forEach(
-        m -> {
-          final var type = m.toString();
-          json.put(type, prism.jsonSettings());
-          subtypes.put(type, prism.subtypes());
-        });
+        .value()
+        .forEach(
+            m -> {
+              final var type = m.toString();
+              json.put(type, prism.jsonSettings());
+              subtypes.put(type, prism.subtypes());
+            });
   }
 
   static Optional<JsonPrism> importedJson(TypeElement type) {

jsonb-generator/src/main/java/io/avaje/jsonb/generator/Processor.java

@@ -177,13 +177,12 @@ private void writeAdaptersForImportedList(Set<? extends Element> imported) {
    */
   private void writeAdaptersForImported(Set<? extends Element> importedElements) {
     importedElements.stream()
-      .flatMap(e -> ImportPrism.getAllInstancesOn(e).stream())
-      .forEach(this::addImported);
+        .flatMap(e -> ImportPrism.getAllInstancesOn(e).stream().peek(p -> addImportedPrism(p, e)))
+        .forEach(this::addImported);
   }
 
   private void addImported(ImportPrism importPrism) {
-    addImportedPrism(importPrism);
-    for (TypeMirror importType : importPrism.value()) {
+    for (final TypeMirror importType : importPrism.value()) {
       // if imported by mixin annotation skip
       if (mixInImports.contains(importType.toString())) {
         return;
@@ -193,7 +192,7 @@ private void addImported(ImportPrism importPrism) {
   }
 
   private static TypeElement implementationType(ImportPrism importPrism) {
-    TypeMirror implementationType = importPrism.implementation();
+    final TypeMirror implementationType = importPrism.implementation();
     if (!"java.lang.Void".equals(implementationType.toString())) {
       return asTypeElement(implementationType);
     }

jsonb-spring-adapter/pom.xml

@@ -17,7 +17,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.0.4</version>
+        <version>3.1.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>