Format whitespace, remove unnecessary public modifiers

Author: rbygrave

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

@@ -1,5 +1,11 @@
 package io.avaje.jsonb.generator;
 
+import javax.annotation.processing.FilerException;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
 import java.io.FileNotFoundException;
 import java.io.LineNumberReader;
 import java.io.Reader;
@@ -9,13 +15,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.annotation.processing.FilerException;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.FileObject;
-import javax.tools.StandardLocation;
-
 final class ComponentReader {
 
   private final ProcessingContext ctx;
@@ -47,20 +46,18 @@ private void readMetaData(TypeElement moduleType) {
       final FactoryPrism metaDataFactory = FactoryPrism.getInstance(annotationMirror);
 
       if (metaData != null) {
-
         Optional.ofNullable(metaData.value()).stream()
-            .flatMap(List::stream)
-            .map(TypeMirror::toString)
-            .map(this::adapterNameFromEntry)
-            .forEach(componentMetaData::add);
+          .flatMap(List::stream)
+          .map(TypeMirror::toString)
+          .map(this::adapterNameFromEntry)
+          .forEach(componentMetaData::add);
 
       } else if (metaDataFactory != null) {
-
         Optional.ofNullable(metaDataFactory.value()).stream()
-            .flatMap(List::stream)
-            .map(TypeMirror::toString)
-            .map(this::adapterNameFromEntry)
-            .forEach(componentMetaData::add);
+          .flatMap(List::stream)
+          .map(TypeMirror::toString)
+          .map(this::adapterNameFromEntry)
+          .forEach(componentMetaData::add);
       }
     }
   }

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

@@ -1,15 +1,9 @@
 package io.avaje.jsonb.generator;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import javax.lang.model.element.Element;
 import javax.lang.model.element.Modifier;
+import java.util.*;
+import java.util.stream.Collectors;
 
 final class FieldReader {
 
@@ -37,11 +31,7 @@ final class FieldReader {
   private int genericTypeParamPosition;
   private final List<String> aliases;
 
-  FieldReader(
-      Element element,
-      NamingConvention namingConvention,
-      TypeSubTypeMeta subType,
-      List<String> genericTypeParams) {
+  FieldReader(Element element, NamingConvention namingConvention, TypeSubTypeMeta subType, List<String> genericTypeParams) {
     addSubType(subType);
     this.genericTypeParams = genericTypeParams;
     this.fieldName = element.getSimpleName().toString();
@@ -56,19 +46,19 @@ final class FieldReader {
     this.deserialize = ignoreReader.deserialize();
 
     this.propertyName =
-        Optional.ofNullable(PropertyPrism.getInstanceOn(element))
-            .map(PropertyPrism::value)
-            .filter(Objects::nonNull)
-            .map(Util::escapeQuotes)
-            .orElse(namingConvention.from(fieldName));
+      Optional.ofNullable(PropertyPrism.getInstanceOn(element))
+        .map(PropertyPrism::value)
+        .filter(Objects::nonNull)
+        .map(Util::escapeQuotes)
+        .orElse(namingConvention.from(fieldName));
     this.aliases =
-        Optional.ofNullable(JsonAliasPrism.getInstanceOn(element))
-            .map(JsonAliasPrism::value)
-            .filter(Objects::nonNull)
-            .stream()
-            .flatMap(List::stream)
-            .map(Util::escapeQuotes)
-            .collect(Collectors.toList());
+      Optional.ofNullable(JsonAliasPrism.getInstanceOn(element))
+        .map(JsonAliasPrism::value)
+        .filter(Objects::nonNull)
+        .stream()
+        .flatMap(List::stream)
+        .map(Util::escapeQuotes)
+        .collect(Collectors.toList());
 
     if (raw) {
       genericType = GenericType.parse("java.lang.String");
@@ -96,7 +86,7 @@ private String initAdapterShortType(String shortType) {
     String typeWrapped = "JsonAdapter<" + PrimitiveUtil.wrap(shortType) + ">";
     for (int i = 0; i < genericTypeParams.size(); i++) {
       String typeParam = genericTypeParams.get(i);
-      if (typeWrapped.contains("<" + typeParam + ">") ) {
+      if (typeWrapped.contains("<" + typeParam + ">")) {
         genericTypeParameter = true;
         genericTypeParamPosition = i;
         typeWrapped = typeWrapped.replace("<" + typeParam + ">", "<Object>");

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

@@ -9,12 +9,10 @@ final class NamingConventionReader {
   private final NamingConvention namingConvention;
 
   NamingConventionReader(TypeElement element) {
-
     final JsonPrism jsonAnnotation = JsonPrism.getInstanceOn(element);
     if (jsonAnnotation == null) {
       typeProperty = null;
       namingConvention = null;
-
       caseInsensitiveKeys = false;
       return;
     }

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

@@ -1,16 +1,5 @@
 package io.avaje.jsonb.generator;
 
-import static io.avaje.jsonb.generator.Constants.JSON;
-import static io.avaje.jsonb.generator.Constants.JSON_IMPORT;
-import static io.avaje.jsonb.generator.Constants.JSON_MIXIN;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
@@ -20,6 +9,10 @@
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
+import java.io.IOException;
+import java.util.*;
+
+import static io.avaje.jsonb.generator.Constants.*;
 
 @SupportedAnnotationTypes({JSON, JSON_IMPORT, JSON_MIXIN})
 public final class Processor extends AbstractProcessor {
@@ -103,16 +96,16 @@ private String adapterName(TypeElement element) {
 
   private boolean ignoreType(String type) {
     return type.indexOf('.') == -1
-        || type.startsWith("java.")
-        || type.startsWith("javax.")
-        || sourceTypes.contains(type);
+      || type.startsWith("java.")
+      || type.startsWith("javax.")
+      || sourceTypes.contains(type);
   }
 
-  /** Elements that have a {@code @Json.MixIn} annotation. */
+  /**
+   * Elements that have a {@code @Json.MixIn} annotation.
+   */
   private void writeAdaptersForMixInTypes(Set<? extends Element> mixInElements) {
-
     for (final Element mixin : mixInElements) {
-
       final TypeMirror mirror = MixInPrism.getInstanceOn(mixin).value();
       final String importType = mirror.toString();
       final TypeElement element = (TypeElement) context.asElement(mirror);
@@ -122,19 +115,17 @@ private void writeAdaptersForMixInTypes(Set<? extends Element> mixInElements) {
     }
   }
 
-  /** Elements that have a {@code @Json.Import} annotation. */
+  /**
+   * Elements that have a {@code @Json.Import} annotation.
+   */
   private void writeAdaptersForImported(Set<? extends Element> importedElements) {
-
     for (final Element importedElement : importedElements) {
       for (final TypeMirror importType : ImportPrism.getInstanceOn(importedElement).value()) {
         // if imported by mixin annotation skip
         if (mixInImports.contains(importType.toString())) {
           continue;
         }
-
-        final TypeElement element = (TypeElement) context.asElement(importType);
-
-        writeAdapterForType(element);
+        writeAdapterForType((TypeElement) context.asElement(importType));
       }
     }
   }

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

@@ -10,12 +10,10 @@ final class PropertyIgnoreReader {
   private boolean ignoreDeserialize;
 
   PropertyIgnoreReader(Element element) {
-
     unmapped = UnmappedPrism.getInstanceOn(element) != null;
     raw = RawPrism.getInstanceOn(element) != null;
 
     final IgnorePrism ignored = IgnorePrism.getInstanceOn(element);
-
     if (ignored != null) {
       ignoreDeserialize = !ignored.deserialize();
       ignoreSerialize = !ignored.serialize();

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

@@ -44,7 +44,7 @@ final class TypeReader {
     this.subTypes = new TypeSubTypeReader(baseType);
   }
 
-  public TypeReader(TypeElement baseType, TypeElement mixInType, ProcessingContext context, NamingConvention namingConvention) {
+  TypeReader(TypeElement baseType, TypeElement mixInType, ProcessingContext context, NamingConvention namingConvention) {
     this.baseType = baseType;
     this.genericTypeParams = initTypeParams(baseType);
     this.mixInFields =

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

@@ -1,12 +1,7 @@
 package io.avaje.jsonb.generator;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import javax.lang.model.element.TypeElement;
+import java.util.*;
 
 final class TypeSubTypeMeta {
 
@@ -21,7 +16,7 @@ public String toString() {
     return type;
   }
 
-  public TypeSubTypeMeta(SubTypePrism prism) {
+  TypeSubTypeMeta(SubTypePrism prism) {
     type = prism.type().toString();
     name = Optional.of(Util.escapeQuotes(prism.name())).filter(s -> s.length() > 0).orElse(null);
   }

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

@@ -1,12 +1,13 @@
 package io.avaje.jsonb.generator;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.TypeElement;
+import java.util.ArrayList;
+import java.util.List;
 
-/** Read the @Json.SubType annotations. */
+/**
+ * Read the @Json.SubType annotations.
+ */
 final class TypeSubTypeReader {
 
   private final TypeElement baseType;
@@ -26,16 +27,13 @@ boolean hasSubTypes() {
   }
 
   void read() {
-
     for (final AnnotationMirror mirror : baseType.getAnnotationMirrors()) {
-
       final SubTypePrism subtypePrism = SubTypePrism.getInstance(mirror);
       final SubTypesPrism subtypesPrism = SubTypesPrism.getInstance(mirror);
 
       if (subtypePrism != null) {
         subTypes.add(new TypeSubTypeMeta(subtypePrism));
       } else if (subtypesPrism != null) {
-
         subtypesPrism.value().stream().map(TypeSubTypeMeta::new).forEach(subTypes::add);
       }
     }

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

@@ -51,7 +51,7 @@ static String initCap(String input) {
     }
   }
 
-  public static String escapeQuotes(String input) {
+  static String escapeQuotes(String input) {
     return input.replaceAll("^\"|\"$", "\\\\\"");
   }