Merge remote-tracking branch 'upstream/main' into interface-adapter

Author: SentryMan

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [19]
+        java_version: [19,20]
         os: [ubuntu-latest]
 
     steps:

blackbox-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-jsonb-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5-RC1</version>
   </parent>
 
   <artifactId>blackbox-test</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>1.5-SNAPSHOT</version>
+      <version>1.5-RC1</version>
     </dependency>
 
 <!--    <dependency>-->
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb-generator</artifactId>
-      <version>1.5-SNAPSHOT</version>
+      <version>1.5-RC1</version>
       <scope>provided</scope>
     </dependency>
 

jsonb-generator/pom.xml

@@ -4,14 +4,14 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-jsonb-parent</artifactId>
-    <version>1.5-SNAPSHOT</version>
+    <version>1.5-RC1</version>
   </parent>
 
   <artifactId>avaje-jsonb-generator</artifactId>
   <name>jsonb generator</name>
   <description>annotation processor generating json adapters</description>
   <properties>
-    <avaje.prisms.version>1.6</avaje.prisms.version>
+    <avaje.prisms.version>1.8</avaje.prisms.version>
   </properties>
 
   <dependencies>

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

@@ -1,14 +1,12 @@
 package io.avaje.jsonb.generator;
 
 import static io.avaje.jsonb.generator.ProcessingContext.jdkVersion;
+import static io.avaje.jsonb.generator.ProcessingContext.previewEnabled;
 import static io.avaje.jsonb.generator.ProcessingContext.useEnhancedSwitch;
+import static java.util.stream.Collectors.toList;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -34,8 +32,10 @@ final class ClassReader implements BeanReader {
   private final boolean isRecord;
   private final boolean usesTypeProperty;
   private final boolean useEnum;
-  private final boolean useInstanceofPattern = jdkVersion() >= 17;
-  private final boolean nullSwitch = jdkVersion() >= 21;
+  private static final boolean useInstanceofPattern = jdkVersion() >= 17;
+  private static final boolean nullSwitch = jdkVersion() >= 21 || (jdkVersion() >= 17 && previewEnabled());
+  private final Map<String, Integer> frequencyMap = new HashMap<>();
+  private final Map<String, Boolean> isCommonFieldMap = new HashMap<>();
 
   ClassReader(TypeElement beanType) {
     this(beanType, null);
@@ -66,7 +66,6 @@ final class ClassReader implements BeanReader {
         .map(FieldReader::type)
         .map(GenericType::topType)
         .map(ProcessingContext::element)
-        .filter(Objects::nonNull)
         .filter(e -> e.getKind() == ElementKind.ENUM)
         .isPresent();
   }
@@ -200,6 +199,13 @@ public void writeConstructor(Append writer) {
     final Set<String> uniqueTypes = new HashSet<>();
     for (final FieldReader allField : allFields) {
       if (allField.include() && !allField.isRaw() && uniqueTypes.add(allField.adapterShortType())) {
+        if (hasSubTypes) {
+          final var isCommonDiffType =
+              allFields.stream()
+                  .filter(s -> s.fieldName().equals(allField.fieldName()))
+                  .anyMatch(f -> !allField.adapterShortType().equals(f.adapterShortType()));
+          isCommonFieldMap.put(allField.fieldName(), isCommonDiffType);
+        }
         allField.writeConstructor(writer);
       }
     }
@@ -208,8 +214,14 @@ public void writeConstructor(Append writer) {
       writer.append("\"").append(typeProperty).append("\", ");
     }
     final StringBuilder builder = new StringBuilder();
+
+    //set to prevent writing same key twice
+    final var seen = new HashSet<String>();
     for (int i = 0, size = allFields.size(); i < size; i++) {
       final FieldReader fieldReader = allFields.get(i);
+      if (!seen.add(fieldReader.fieldName())) {
+        continue;
+      }
       if (i > 0) {
         builder.append(", ");
       }
@@ -358,11 +370,16 @@ private void writeJsonBuildResult(Append writer, String varName) {
       if (i > 0) {
         writer.append(", ");
       }
-      writer.append(constructorParamName(params.get(i).name())); // assuming name matches field here?
+      final var name = params.get(i).name();
+      // append increasing numbers to constructor params sharing names with other subtypes
+      final var frequency = frequencyMap.compute(name, (k, v) -> v == null ? 0 : v + 1);
+      // assuming name matches field here?
+      writer.append(constructorParamName(name + (frequency == 0 ? "" : frequency.toString())));
     }
     writer.append(");").eol();
     for (final FieldReader allField : allFields) {
       if (allField.includeFromJson()) {
+        frequencyMap.compute(allField.fieldName(), (k, v) -> v == null ? 0 : v + 1);
         allField.writeFromJsonSetter(writer, varName, "");
       }
     }
@@ -387,10 +404,12 @@ private void writeFromJsonWithSubTypes(Append writer) {
         writer.append("      case null -> ").append("throw new IllegalStateException(\"Missing Required %s property that determines deserialization type\");", typeProperty).eol();
       }
     }
+    // another frequency map to append numbers to the subtype constructor params
+    final Map<String, Integer> frequencyMap2 = new HashMap<>();
 
     for (final TypeSubTypeMeta subTypeMeta : typeReader.subTypes()) {
       final var varName = Util.initLower(Util.shortName(subTypeMeta.type()));
-      subTypeMeta.writeFromJsonBuild(writer, typeVar, varName, this, useSwitch, useEnum);
+         subTypeMeta.writeFromJsonBuild(writer, typeVar, varName, this, useSwitch, useEnum, frequencyMap2, isCommonFieldMap);
     }
     if (useSwitch) {
       writer.append("      default").appendSwitchCase().eol().append("    ");
@@ -431,8 +450,38 @@ private void writeFromJsonSwitch(Append writer, boolean defaultConstructor, Stri
       writer.append("          type = stringJsonAdapter.fromJson(reader);").eol();
       writer.append("          break;").eol();
     }
+    // don't write same switch case twice
+    final var seen = new HashSet<>();
     for (final FieldReader allField : allFields) {
-      allField.writeFromJsonSwitch(writer, defaultConstructor, varName, caseInsensitiveKeys);
+      final var name = allField.fieldName();
+      if (!seen.add(name)) {
+        continue;
+      }
+      if (hasSubTypes) {
+        final var isCommonFieldDiffType = isCommonFieldMap.get(name);
+        if (isCommonFieldDiffType == null || !isCommonFieldDiffType) {
+          allField.writeFromJsonSwitch(
+              writer,
+              defaultConstructor,
+              varName,
+              caseInsensitiveKeys,
+              allFields.stream()
+                  .filter(x -> x.fieldName().equals(name))
+                  .flatMap(f -> f.getAliases().stream())
+                  .collect(toList()));
+        } else {
+          // if subclass shares a field name with another subclass
+          // write a special case statement
+          writeSubTypeCase(
+              name,
+              writer,
+              allFields.stream().filter(x -> x.fieldName().equals(name)).collect(toList()),
+              defaultConstructor,
+              varName);
+        }
+
+      } else
+        allField.writeFromJsonSwitch(writer, defaultConstructor, varName, caseInsensitiveKeys, List.of());
     }
     writer.append("        default:").eol();
     final String unmappedFieldName = caseInsensitiveKeys ? "origFieldName" : "fieldName";
@@ -448,6 +497,50 @@ private void writeFromJsonSwitch(Append writer, boolean defaultConstructor, Stri
     writer.append("    reader.endObject();").eol();
   }
 
+  private void writeSubTypeCase(String name, Append writer, List<FieldReader> commonFields, boolean defaultConstructor, String varName) {
+    writer.append("        case \"%s\":", name).eol();
+    // get all possible aliases of this field from the subtypes
+    for (final String alias :
+        commonFields.stream().map(FieldReader::getAliases).findFirst().orElseGet(List::of)) {
+      final String propertyKey = caseInsensitiveKeys ? alias.toLowerCase() : alias;
+      writer.append("        case \"%s\":", propertyKey).eol();
+    }
+    var elseIf = false;
+    // write the case statements with subtypeCheck
+    for (final FieldReader fieldReader : commonFields) {
+      final var subtype = new ArrayList<>(fieldReader.getSubTypes().values()).get(0);
+      final var setter = fieldReader.getSetter();
+      final var adapterFieldName = fieldReader.getAdapterFieldName();
+      final var fieldName = fieldReader.getFieldNameWithNum();
+      if (useEnum) {
+        writer.append("          %sif (%s.equals(%s)) {", elseIf ? "else " : "", subtype.name(), "type").eol();
+      } else {
+        writer.append("          %sif (\"%s\".equals(%s)) {", elseIf ? "else " : "", subtype.name(), "type").eol();
+      }
+      elseIf = true;
+      if (!fieldReader.isDeserialize()) {
+        writer.append("            reader.skipValue();");
+      } else if (defaultConstructor) {
+        if (setter != null) {
+          writer.append("            _$%s.%s(%s.fromJson(reader));", varName, setter.getName(), adapterFieldName);
+        } else if (fieldReader.isPublicField()) {
+          writer.append("            _$%s.%s = %s.fromJson(reader);", varName, fieldName, adapterFieldName);
+        }
+      } else {
+        writer.append("            _val$%s = %s.fromJson(reader);", fieldName, adapterFieldName);
+        if (!fieldReader.isConstructorParam()) {
+          writer.eol().append("            _set$%s = true;", fieldName);
+        }
+      }
+      writer.eol().append("          }").eol();
+    }
+    writer
+        .append("          else {").eol()
+        .append("            throw new IllegalStateException(\"Missing Required type3 property that determines deserialization type\");").eol()
+        .append("          }").eol()
+        .append("          break;").eol().eol();
+  }
+
   private String typePropertyKey() {
     return caseInsensitiveKeys ? typeProperty.toLowerCase() : typeProperty;
   }