Merge pull request #72 from SentryMan/main

rbygrave · web-flow · commit 6c135f08b489 · 2023-03-09T10:11:34.000+13:00
Sonar Fixes
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/AdapterName.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/AdapterName.java
@@ -19,7 +19,7 @@ final class AdapterName {
     } else {
       shortName = name;
     }
-    this.adapterPackage = originPackage.equals("") ? "jsonb" : originPackage + ".jsonb";
+    this.adapterPackage = "".equals(originPackage) ? "jsonb" : originPackage + ".jsonb";
     this.fullName = adapterPackage + "." + shortName + "JsonAdapter";
   }
 
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/BeanReader.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/BeanReader.java
@@ -61,14 +61,17 @@ public BeanReader(TypeElement beanType, TypeElement mixInElement) {
     this.isRecord = isRecord(beanType);
   }
 
+  @SuppressWarnings("unchecked")
   boolean isRecord(TypeElement beanType) {
     try {
-      final List<? extends Element> recordComponents =
-        (List<? extends Element>) TypeElement.class
-          .getMethod("getRecordComponents")
-          .invoke(beanType);
+      final var recordComponents =
+          (List<? extends Element>)
+              TypeElement.class.getMethod("getRecordComponents").invoke(beanType);
       return !recordComponents.isEmpty();
-    } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+    } catch (IllegalAccessException
+        | InvocationTargetException
+        | NoSuchMethodException
+        | SecurityException e) {
       return false;
     }
   }
@@ -173,10 +176,8 @@ void writeFields(Append writer) {
     }
     Set<String> uniqueTypes = new HashSet<>();
     for (FieldReader allField : allFields) {
-      if (allField.include() && !allField.isRaw()) {
-        if (uniqueTypes.add(allField.adapterShortType())) {
-          allField.writeField(writer);
-        }
+      if (allField.include() && !allField.isRaw() && uniqueTypes.add(allField.adapterShortType())) {
+        allField.writeField(writer);
       }
     }
     writer.append("  private final PropertyNames names;").eol();
@@ -189,10 +190,8 @@ void writeConstructor(Append writer) {
     }
     Set<String> uniqueTypes = new HashSet<>();
     for (FieldReader allField : allFields) {
-      if (allField.include() && !allField.isRaw()) {
-        if (uniqueTypes.add(allField.adapterShortType())) {
-          allField.writeConstructor(writer);
-        }
+      if (allField.include() && !allField.isRaw() && uniqueTypes.add(allField.adapterShortType())) {
+        allField.writeConstructor(writer);
       }
     }
     writer.append("    this.names = jsonb.properties(");
@@ -318,11 +317,9 @@ void writeFromJson(Append writer) {
     }
     if (!directLoad) {
       writeJsonBuildResult(writer, varName);
-    } else {
-      if (unmappedField != null) {
-        writer.append("   // unmappedField... ", varName).eol();
-        unmappedField.writeFromJsonUnmapped(writer, varName);
-      }
+    } else if (unmappedField != null) {
+      writer.append("   // unmappedField... ", varName).eol();
+      unmappedField.writeFromJsonUnmapped(writer, varName);
     }
     writer.append("    return _$%s;", varName).eol();
     writer.append("  }").eol();
@@ -358,10 +355,8 @@ private void writeFromJsonWithSubTypes(Append writer, String varName) {
   }
 
   String constructorParamName(String name) {
-    if (unmappedField != null) {
-      if (unmappedField.fieldName().equals(name)) {
-        return "unmapped";
-      }
+    if ((unmappedField != null) && unmappedField.fieldName().equals(name)) {
+      return "unmapped";
     }
     return "_val$" + name;
   }
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
@@ -134,11 +134,11 @@ String propertyName() {
   }
 
   boolean typeObjectBooleanWithIsPrefix() {
-    return nameHasIsPrefix() && genericType.topType().equals("java.lang.Boolean");
+    return nameHasIsPrefix() && "java.lang.Boolean".equals(genericType.topType());
   }
 
   boolean typeBooleanWithIsPrefix() {
-    return nameHasIsPrefix() && (genericType.topType().equals("boolean") || genericType.topType().equals("java.lang.Boolean"));
+    return nameHasIsPrefix() && ("boolean".equals(genericType.topType()) || "java.lang.Boolean".equals(genericType.topType()));
   }
 
   private boolean nameHasIsPrefix() {
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
@@ -175,14 +175,16 @@ private void matchFieldsToSetterOrConstructor() {
   }
 
   private void matchFieldToSetter(FieldReader field) {
-    if (!matchFieldToSetter2(field, false)) {
-      if (!matchFieldToSetter2(field, true)) {
-        if (!matchFieldToSetterByParam(field)) {
-          if (!field.isPublicField()) {
-            logError("Non public field " + baseType + " " + field.fieldName() + " with no matching setter or constructor?");
-          }
-        }
-      }
+    if (!matchFieldToSetter2(field, false)
+        && !matchFieldToSetter2(field, true)
+        && !matchFieldToSetterByParam(field)
+        && !field.isPublicField()) {
+      logError(
+          "Non public field "
+              + baseType
+              + " "
+              + field.fieldName()
+              + " with no matching setter or constructor?");
     }
   }
 
@@ -238,16 +240,19 @@ private void matchFieldsToGetter() {
   }
 
   private void matchFieldToGetter(FieldReader field) {
-    if (!matchFieldToGetter2(field, false)) {
-      if (!matchFieldToGetter2(field, true)) {
-        if (!field.isPublicField()) {
-          nonAccessibleField = true;
-          if (hasJsonAnnotation) {
-            logError("Non accessible field " + baseType + " " + field.fieldName() + " with no matching getter?");
-          } else {
-            logDebug("Non accessible field " + baseType + " " + field.fieldName());
-          }
-        }
+    if (!matchFieldToGetter2(field, false)
+        && !matchFieldToGetter2(field, true)
+        && !field.isPublicField()) {
+      nonAccessibleField = true;
+      if (hasJsonAnnotation) {
+        logError(
+            "Non accessible field "
+                + baseType
+                + " "
+                + field.fieldName()
+                + " with no matching getter?");
+      } else {
+        logDebug("Non accessible field " + baseType + " " + field.fieldName());
       }
     }
   }
@@ -398,11 +403,9 @@ private void setFieldPositions() {
 
   private void addSuperType(TypeElement element, TypeElement matchType) {
     String type = element.getQualifiedName().toString();
-    if (!type.equals(JAVA_LANG_OBJECT)) {
-      if (!GenericType.isGeneric(type)) {
-        read(element);
-        addSuperType(superOf(element), matchType);
-      }
+    if (!JAVA_LANG_OBJECT.equals(type) && !GenericType.isGeneric(type)) {
+      read(element);
+      addSuperType(superOf(element), matchType);
     }
   }
 
diff --git a/jsonb-generator/src/main/java/io/avaje/jsonb/generator/package-info.java b/jsonb-generator/src/main/java/io/avaje/jsonb/generator/package-info.java
@@ -1,18 +1,16 @@
-@io.avaje.prism.GeneratePrisms({
-  @GeneratePrism(value = io.avaje.jsonb.Json.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.Import.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.JsonAlias.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.Ignore.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.Property.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.MixIn.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.Raw.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.SubTypes.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.SubType.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.Unmapped.class),
-  @GeneratePrism(value = io.avaje.jsonb.Json.Value.class),
-  @GeneratePrism(value = io.avaje.jsonb.spi.MetaData.class),
-  @GeneratePrism(value = io.avaje.jsonb.spi.MetaData.Factory.class),
-})
+@GeneratePrism(value = io.avaje.jsonb.Json.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.Import.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.JsonAlias.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.Ignore.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.Property.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.MixIn.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.Raw.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.SubTypes.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.SubType.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.Unmapped.class)
+@GeneratePrism(value = io.avaje.jsonb.Json.Value.class)
+@GeneratePrism(value = io.avaje.jsonb.spi.MetaData.class)
+@GeneratePrism(value = io.avaje.jsonb.spi.MetaData.Factory.class)
 package io.avaje.jsonb.generator;
 
 import io.avaje.prism.GeneratePrism;
diff --git a/jsonb/src/main/java/io/avaje/jsonb/core/CollectionAdapter.java b/jsonb/src/main/java/io/avaje/jsonb/core/CollectionAdapter.java
@@ -19,7 +19,6 @@
 import io.avaje.jsonb.spi.ViewBuilder;
 import io.avaje.jsonb.spi.ViewBuilderAware;
 
-import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Type;
 import java.util.*;
diff --git a/jsonb/src/main/java/io/avaje/jsonb/core/Util.java b/jsonb/src/main/java/io/avaje/jsonb/core/Util.java
@@ -26,7 +26,7 @@
  */
 public final class Util {
 
-  static final Type[] EMPTY_TYPE_ARRAY = new Type[]{};
+  static final Type[] EMPTY_TYPE_ARRAY = {};
 
   private Util() {
   }
diff --git a/jsonb/src/main/java/io/avaje/jsonb/stream/Base64.java b/jsonb/src/main/java/io/avaje/jsonb/stream/Base64.java
@@ -129,7 +129,7 @@ static int findEnd(final byte[] sArr, final int start) {
     return sArr.length;
   }
 
-  private final static byte[] EMPTY_ARRAY = new byte[0];
+  private final static byte[] EMPTY_ARRAY = {};
 
   static byte[] decodeFast(final byte[] sArr, final int start, final int end) {
     // Check special case
diff --git a/jsonb/src/main/java/io/avaje/jsonb/stream/WriterOutputStream.java b/jsonb/src/main/java/io/avaje/jsonb/stream/WriterOutputStream.java
@@ -24,7 +24,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
-import java.nio.charset.CodingErrorAction;
 
 /**
  * {@link OutputStream} implementation that transforms a byte stream to a

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class AdapterName {`
`19`	`19`	`} else {`
`20`	`20`	`shortName = name;`
`21`	`21`	`}`
`22`		`- this.adapterPackage = originPackage.equals("") ? "jsonb" : originPackage + ".jsonb";`
	`22`	`+ this.adapterPackage = "".equals(originPackage) ? "jsonb" : originPackage + ".jsonb";`
`23`	`23`	`this.fullName = adapterPackage + "." + shortName + "JsonAdapter";`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,17 @@ public BeanReader(TypeElement beanType, TypeElement mixInElement) {`
`61`	`61`	`this.isRecord = isRecord(beanType);`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ @SuppressWarnings("unchecked")`
`64`	`65`	`boolean isRecord(TypeElement beanType) {`
`65`	`66`	`try {`
`66`		`- final List<? extends Element> recordComponents =`
`67`		`- (List<? extends Element>) TypeElement.class`
`68`		`- .getMethod("getRecordComponents")`
`69`		`- .invoke(beanType);`
	`67`	`+ final var recordComponents =`
	`68`	`+ (List<? extends Element>)`
	`69`	`+ TypeElement.class.getMethod("getRecordComponents").invoke(beanType);`
`70`	`70`	`return !recordComponents.isEmpty();`
`71`		`- } catch (IllegalAccessException \| InvocationTargetException \| NoSuchMethodException \| SecurityException e) {`
	`71`	`+ } catch (IllegalAccessException`
	`72`	`+ \| InvocationTargetException`
	`73`	`+ \| NoSuchMethodException`
	`74`	`+ \| SecurityException e) {`
`72`	`75`	`return false;`
`73`	`76`	`}`
`74`	`77`	`}`
`@@ -173,10 +176,8 @@ void writeFields(Append writer) {`
`173`	`176`	`}`
`174`	`177`	`Set<String> uniqueTypes = new HashSet<>();`
`175`	`178`	`for (FieldReader allField : allFields) {`
`176`		`- if (allField.include() && !allField.isRaw()) {`
`177`		`- if (uniqueTypes.add(allField.adapterShortType())) {`
`178`		`- allField.writeField(writer);`
`179`		`- }`
	`179`	`+ if (allField.include() && !allField.isRaw() && uniqueTypes.add(allField.adapterShortType())) {`
	`180`	`+ allField.writeField(writer);`
`180`	`181`	`}`
`181`	`182`	`}`
`182`	`183`	`writer.append(" private final PropertyNames names;").eol();`
`@@ -189,10 +190,8 @@ void writeConstructor(Append writer) {`
`189`	`190`	`}`
`190`	`191`	`Set<String> uniqueTypes = new HashSet<>();`
`191`	`192`	`for (FieldReader allField : allFields) {`
`192`		`- if (allField.include() && !allField.isRaw()) {`
`193`		`- if (uniqueTypes.add(allField.adapterShortType())) {`
`194`		`- allField.writeConstructor(writer);`
`195`		`- }`
	`193`	`+ if (allField.include() && !allField.isRaw() && uniqueTypes.add(allField.adapterShortType())) {`
	`194`	`+ allField.writeConstructor(writer);`
`196`	`195`	`}`
`197`	`196`	`}`
`198`	`197`	`writer.append(" this.names = jsonb.properties(");`
`@@ -318,11 +317,9 @@ void writeFromJson(Append writer) {`
`318`	`317`	`}`
`319`	`318`	`if (!directLoad) {`
`320`	`319`	`writeJsonBuildResult(writer, varName);`
`321`		`- } else {`
`322`		`- if (unmappedField != null) {`
`323`		`- writer.append(" // unmappedField... ", varName).eol();`
`324`		`- unmappedField.writeFromJsonUnmapped(writer, varName);`
`325`		`- }`
	`320`	`+ } else if (unmappedField != null) {`
	`321`	`+ writer.append(" // unmappedField... ", varName).eol();`
	`322`	`+ unmappedField.writeFromJsonUnmapped(writer, varName);`
`326`	`323`	`}`
`327`	`324`	`writer.append(" return _$%s;", varName).eol();`
`328`	`325`	`writer.append(" }").eol();`
`@@ -358,10 +355,8 @@ private void writeFromJsonWithSubTypes(Append writer, String varName) {`
`358`	`355`	`}`
`359`	`356`
`360`	`357`	`String constructorParamName(String name) {`
`361`		`- if (unmappedField != null) {`
`362`		`- if (unmappedField.fieldName().equals(name)) {`
`363`		`- return "unmapped";`
`364`		`- }`
	`358`	`+ if ((unmappedField != null) && unmappedField.fieldName().equals(name)) {`
	`359`	`+ return "unmapped";`
`365`	`360`	`}`
`366`	`361`	`return "_val$" + name;`
`367`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,11 @@ String propertyName() {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`boolean typeObjectBooleanWithIsPrefix() {`
`137`		`- return nameHasIsPrefix() && genericType.topType().equals("java.lang.Boolean");`
	`137`	`+ return nameHasIsPrefix() && "java.lang.Boolean".equals(genericType.topType());`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`boolean typeBooleanWithIsPrefix() {`
`141`		`- return nameHasIsPrefix() && (genericType.topType().equals("boolean") \|\| genericType.topType().equals("java.lang.Boolean"));`
	`141`	`+ return nameHasIsPrefix() && ("boolean".equals(genericType.topType()) \|\| "java.lang.Boolean".equals(genericType.topType()));`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private boolean nameHasIsPrefix() {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`	`public final class Util {`
`28`	`28`
`29`		`- static final Type[] EMPTY_TYPE_ARRAY = new Type[]{};`
	`29`	`+ static final Type[] EMPTY_TYPE_ARRAY = {};`
`30`	`30`
`31`	`31`	`private Util() {`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ static int findEnd(final byte[] sArr, final int start) {`
`129`	`129`	`return sArr.length;`
`130`	`130`	`}`
`131`	`131`
`132`		`- private final static byte[] EMPTY_ARRAY = new byte[0];`
	`132`	`+ private final static byte[] EMPTY_ARRAY = {};`
`133`	`133`
`134`	`134`	`static byte[] decodeFast(final byte[] sArr, final int start, final int end) {`
`135`	`135`	`// Check special case`