#189 - Format and refactor extract methods only

rbygrave · rbygrave · commit 26ebafe6d4f0 · 2023-11-30T23:45:39.000+13:00
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/ClassReader.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/ClassReader.java
@@ -139,14 +139,11 @@ public boolean hasJsonAnnotation() {
 
   @Override
   public void read() {
-
     Optional.ofNullable(constructor)
-        .ifPresent(
-            c -> {
-              var enclosing = (TypeElement) c.element().getEnclosingElement();
-
-              importTypes.add(enclosing.getQualifiedName().toString());
-            });
+      .ifPresent(c -> {
+        var enclosing = (TypeElement) c.element().getEnclosingElement();
+        importTypes.add(enclosing.getQualifiedName().toString());
+      });
 
     importTypes.add(Util.shortName(type));
     for (final FieldReader field : allFields) {
@@ -467,24 +464,23 @@ private void writeFromJsonImplementation(Append writer, String varName) {
 
   private void writeJsonBuildResult(Append writer, String varName) {
     writer.append("    // build and return %s", shortName).eol();
-    if (constructor != null) {
-      writer.append("    %s _$%s = " + constructor.creationString(), shortName, varName);
-
-      final List<MethodReader.MethodParam> params = constructor.getParams();
-      for (int i = 0, size = params.size(); i < size; i++) {
-        if (i > 0) {
-          writer.append(", ");
+      if (constructor == null) {
+        writer.append("    %s _$%s = new %s(", shortName, varName, shortName);
+      } else {
+        writer.append("    %s _$%s = " + constructor.creationString(), shortName, varName);
+        final List<MethodReader.MethodParam> params = constructor.getParams();
+        for (int i = 0, size = params.size(); i < size; i++) {
+          if (i > 0) {
+            writer.append(", ");
+          }
+          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())));
         }
-        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())));
       }
-    } else {
-      writer.append("    %s _$%s = new %s(", shortName, varName, shortName);
-    }
-    writer.append(");").eol();
+      writer.append(");").eol();
     for (final FieldReader allField : allFields) {
       if (allField.includeFromJson()) {
         frequencyMap.compute(allField.fieldName(), (k, v) -> v == null ? 0 : v + 1);
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/FieldReader.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/FieldReader.java
@@ -4,7 +4,6 @@
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.VariableElement;
-
 import java.util.*;
 
 final class FieldReader {
@@ -24,22 +23,23 @@ final class FieldReader {
   private boolean isCreatorParam;
 
   FieldReader(
-      Element element,
-      NamingConvention namingConvention,
-      TypeSubTypeMeta subType,
-      List<String> genericTypeParams,
-      Integer frequency) {
+    Element element,
+    NamingConvention namingConvention,
+    TypeSubTypeMeta subType,
+    List<String> genericTypeParams,
+    Integer frequency) {
 
     this(element, namingConvention, subType, genericTypeParams, frequency, false);
   }
 
   FieldReader(
-      Element element,
-      NamingConvention namingConvention,
-      TypeSubTypeMeta subType,
-      List<String> genericTypeParams,
-      Integer frequency,
-      boolean jsonCreatorPresent) {
+    Element element,
+    NamingConvention namingConvention,
+    TypeSubTypeMeta subType,
+    List<String> genericTypeParams,
+    Integer frequency,
+    boolean jsonCreatorPresent) {
+
     num = frequency == 0 ? "" : frequency.toString();
     addSubType(subType);
     final PropertyIgnoreReader ignoreReader = new PropertyIgnoreReader(element);
@@ -51,17 +51,15 @@ final class FieldReader {
     this.deserialize = isParam || !jsonCreatorPresent && !isMethod && ignoreReader.deserialize();
 
     final var fieldName = element.getSimpleName().toString();
-    final var publicField =
-        !isMethod && !isParam && element.getModifiers().contains(Modifier.PUBLIC);
+    final var publicField = !isMethod && !isParam && element.getModifiers().contains(Modifier.PUBLIC);
     final var type = isMethod ? ((ExecutableElement) element).getReturnType() : element.asType();
 
-    this.property =
-        new FieldProperty(type, raw, unmapped, genericTypeParams, publicField, fieldName);
+    this.property = new FieldProperty(type, raw, unmapped, genericTypeParams, publicField, fieldName);
     this.propertyName =
-        PropertyPrism.getOptionalOn(element)
-            .map(PropertyPrism::value)
-            .map(Util::escapeQuotes)
-            .orElse(namingConvention.from(fieldName));
+      PropertyPrism.getOptionalOn(element)
+        .map(PropertyPrism::value)
+        .map(Util::escapeQuotes)
+        .orElse(namingConvention.from(fieldName));
 
     initAliases(element);
   }
@@ -74,12 +72,12 @@ public void readParam(VariableElement element) {
 
   private void initAliases(Element element) {
     var alias =
-        AliasPrism.getOptionalOn(element)
+      AliasPrism.getOptionalOn(element)
+        .map(a -> Util.escapeQuotes(a.value()))
+        .orElse(
+          JsonAliasPrism.getOptionalOn(element)
             .map(a -> Util.escapeQuotes(a.value()))
-            .orElse(
-                JsonAliasPrism.getOptionalOn(element)
-                    .map(a -> Util.escapeQuotes(a.value()))
-                    .orElse(Collections.emptyList()));
+            .orElse(Collections.emptyList()));
 
     aliases.addAll(alias);
   }
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/MethodReader.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/MethodReader.java
@@ -54,13 +54,10 @@ public boolean isProtected() {
   }
 
   public String creationString() {
-    var shortName =
-        Util.shortName(((TypeElement) element.getEnclosingElement()).getQualifiedName().toString());
-
+    var shortName = Util.shortName(((TypeElement) element.getEnclosingElement()).getQualifiedName().toString());
     if (element.getKind() == ElementKind.CONSTRUCTOR) {
       return String.format("new %s(", shortName);
     }
-
     return String.format("%s.%s(", shortName, element.getSimpleName());
   }
 
@@ -92,8 +89,5 @@ public VariableElement element() {
       return element;
     }
 
-    public VariableElement getElement() {
-      return element;
-    }
   }
 }
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/TypeReader.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/TypeReader.java
@@ -3,10 +3,8 @@
 import javax.lang.model.element.*;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
-
-import io.avaje.jsonb.generator.MethodReader.MethodParam;
-
 import java.util.*;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static io.avaje.jsonb.generator.APContext.*;
@@ -51,64 +49,58 @@ final class TypeReader {
 
   private boolean optional;
 
-  /** Set when the type is known to extend Throwable */
+  /**
+   * Set when the type is known to extend Throwable
+   */
   private boolean extendsThrowable;
 
   private final boolean hasJsonCreator;
 
-  TypeReader(
-      TypeElement baseType,
-      TypeElement mixInType,
-      NamingConvention namingConvention,
-      String typePropertyKey) {
+  TypeReader(TypeElement baseType, TypeElement mixInType, NamingConvention namingConvention, String typePropertyKey) {
     this.baseType = baseType;
     this.genericTypeParams = initTypeParams(baseType);
     Optional<ExecutableElement> jsonCreator = Optional.empty();
     if (mixInType == null) {
-
       this.mixInFields = new HashMap<>();
     } else {
-
       jsonCreator =
-          ElementFilter.methodsIn(mixInType.getEnclosedElements()).stream()
-              .filter(CreatorPrism::isPresent)
-              .findFirst();
+        ElementFilter.methodsIn(mixInType.getEnclosedElements()).stream()
+          .filter(CreatorPrism::isPresent)
+          .findFirst();
       this.mixInFields =
-          mixInType.getEnclosedElements().stream()
-              .filter(e -> e.getKind() == ElementKind.FIELD)
-              .collect(Collectors.toMap(e -> e.getSimpleName().toString(), e -> e));
+        mixInType.getEnclosedElements().stream()
+          .filter(e -> e.getKind() == ElementKind.FIELD)
+          .collect(Collectors.toMap(e -> e.getSimpleName().toString(), e -> e));
     }
     this.namingConvention = namingConvention;
     this.hasJsonAnnotation = JsonPrism.isPresent(baseType) || importedJson(baseType).isPresent();
     this.subTypes = new TypeSubTypeReader(baseType);
     this.typePropertyKey = typePropertyKey;
 
-    jsonCreator =
-        jsonCreator.or(
-            () ->
-                baseType.getEnclosedElements().stream()
-                    .filter(CreatorPrism::isPresent)
-                    .map(ExecutableElement.class::cast)
-                    .findFirst());
-
-    constructor =
-        jsonCreator
-            .map(
-                ex -> {
-                  var mods = ex.getModifiers();
-                  if (ex.getKind() != ElementKind.CONSTRUCTOR
-                      && !mods.contains(Modifier.STATIC)
-                      && !mods.contains(Modifier.PUBLIC))
-                    logError(
-                        ex,
-                        "@Json.Creator can only be placed on contructors and static factory methods");
-                  return new MethodReader(ex).read();
-                })
-            .orElse(null);
+    jsonCreator = jsonCreator.or(baseJsonCreator(baseType));
+    constructor = jsonCreator
+      .map(TypeReader::readJsonCreator)
+      .orElse(null);
 
     this.hasJsonCreator = jsonCreator.isPresent();
   }
 
+  private static MethodReader readJsonCreator(ExecutableElement ex) {
+    var mods = ex.getModifiers();
+    if (ex.getKind() != ElementKind.CONSTRUCTOR && !mods.contains(Modifier.STATIC) && !mods.contains(Modifier.PUBLIC)) {
+      logError(ex, "@Json.Creator can only be placed on contructors and static factory methods");
+    }
+    return new MethodReader(ex).read();
+  }
+
+  private static Supplier<Optional<? extends ExecutableElement>> baseJsonCreator(TypeElement baseType) {
+    return () ->
+      baseType.getEnclosedElements().stream()
+        .filter(CreatorPrism::isPresent)
+        .map(ExecutableElement.class::cast)
+        .findFirst();
+  }
+
   private List<String> initTypeParams(TypeElement beanType) {
     if (beanType.getTypeParameters().isEmpty()) {
       return Collections.emptyList();
@@ -142,14 +134,12 @@ void read(TypeElement type) {
 
     if (hasJsonCreator) {
       for (var param : constructor.getParams()) {
-
         var name = param.name();
         var element = param.element();
-        var matchingField =
-            localFields.stream().filter(f -> f.propertyName().equals(name)).findFirst();
-
-        matchingField.ifPresentOrElse(
-            f -> f.readParam(element), () -> readField(element, localFields));
+        var matchingField = localFields.stream()
+          .filter(f -> f.propertyName().equals(name))
+          .findFirst();
+        matchingField.ifPresentOrElse(f -> f.readParam(element), () -> readField(element, localFields));
       }
     }
 
@@ -186,13 +176,13 @@ private void readField(Element element, List<FieldReader> localFields) {
     if (includeField(element)) {
       final var frequency = frequency(element.getSimpleName().toString());
       localFields.add(
-          new FieldReader(
-              element,
-              namingConvention,
-              currentSubType,
-              genericTypeParams,
-              frequency,
-              hasJsonCreator));
+        new FieldReader(
+          element,
+          namingConvention,
+          currentSubType,
+          genericTypeParams,
+          frequency,
+          hasJsonCreator));
     }
   }
 
diff --git a/jsonb-inject-plugin/src/main/java/io/avaje/jsonb/inject/DefaultJsonbProvider.java b/jsonb-inject-plugin/src/main/java/io/avaje/jsonb/inject/DefaultJsonbProvider.java
@@ -4,33 +4,32 @@
 import io.avaje.jsonb.Jsonb;
 import io.avaje.jsonb.stream.BufferRecycleStrategy;
 
-/** Plugin for avaje inject that provides a default Jsonb instance. */
+/**
+ * Plugin for avaje inject that provides a default Jsonb instance.
+ */
 public final class DefaultJsonbProvider implements io.avaje.inject.spi.Plugin {
 
   @Override
   public Class<?>[] provides() {
-    return new Class<?>[] {Jsonb.class};
+    return new Class<?>[]{Jsonb.class};
   }
 
   @Override
   public void apply(BeanScopeBuilder builder) {
-    builder.provideDefault(
-        null,
-        Jsonb.class,
-        () -> {
-          var props = builder.propertyPlugin();
+    builder.provideDefault(null, Jsonb.class, () -> {
+      var props = builder.propertyPlugin();
 
-          return Jsonb.builder()
-              .failOnUnknown(props.equalTo("jsonb.deserialize.failOnUnknown", "true"))
-              .mathTypesAsString(props.equalTo("jsonb.serialize.mathTypesAsString", "true"))
-              .serializeEmpty(props.notEqualTo("jsonb.serialize.empty", "false"))
-              .serializeNulls(props.equalTo("jsonb.serialize.nulls", "true"))
-              .bufferRecycling(
-                  props
-                      .get("jsonb.bufferRecycling")
-                      .map(BufferRecycleStrategy::valueOf)
-                      .orElse(BufferRecycleStrategy.HYBRID_POOL))
-              .build();
-        });
+      return Jsonb.builder()
+        .failOnUnknown(props.equalTo("jsonb.deserialize.failOnUnknown", "true"))
+        .mathTypesAsString(props.equalTo("jsonb.serialize.mathTypesAsString", "true"))
+        .serializeEmpty(props.notEqualTo("jsonb.serialize.empty", "false"))
+        .serializeNulls(props.equalTo("jsonb.serialize.nulls", "true"))
+        .bufferRecycling(
+          props
+            .get("jsonb.bufferRecycling")
+            .map(BufferRecycleStrategy::valueOf)
+            .orElse(BufferRecycleStrategy.HYBRID_POOL))
+        .build();
+    });
   }
 }
diff --git a/jsonb/src/main/java/io/avaje/jsonb/Json.java b/jsonb/src/main/java/io/avaje/jsonb/Json.java
diff --git a/jsonb/src/main/java/io/avaje/jsonb/stream/HybridBufferRecycler.java b/jsonb/src/main/java/io/avaje/jsonb/stream/HybridBufferRecycler.java

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,10 @@ public boolean isProtected() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public String creationString() {`
`57`		`- var shortName =`
`58`		`- Util.shortName(((TypeElement) element.getEnclosingElement()).getQualifiedName().toString());`
`59`		`-`
	`57`	`+ var shortName = Util.shortName(((TypeElement) element.getEnclosingElement()).getQualifiedName().toString());`
`60`	`58`	`if (element.getKind() == ElementKind.CONSTRUCTOR) {`
`61`	`59`	`return String.format("new %s(", shortName);`
`62`	`60`	`}`
`63`		`-`
`64`	`61`	`return String.format("%s.%s(", shortName, element.getSimpleName());`
`65`	`62`	`}`
`66`	`63`
`@@ -92,8 +89,5 @@ public VariableElement element() {`
`92`	`89`	`return element;`
`93`	`90`	`}`
`94`	`91`
`95`		`- public VariableElement getElement() {`
`96`		`- return element;`
`97`		`- }`
`98`	`92`	`}`
`99`	`93`	`}`