Remove unused matchType from addSuperType() + reformat

Author: rbygrave

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

@@ -68,10 +68,7 @@ boolean isRecord(TypeElement beanType) {
           (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;
     }
   }

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

@@ -179,12 +179,7 @@ private void matchFieldToSetter(FieldReader field) {
         && !matchFieldToSetter2(field, true)
         && !matchFieldToSetterByParam(field)
         && !field.isPublicField()) {
-      logError(
-          "Non public field "
-              + baseType
-              + " "
-              + field.fieldName()
-              + " with no matching setter or constructor?");
+      logError("Non public field " + baseType + " " + field.fieldName() + " with no matching setter or constructor?");
     }
   }
 
@@ -245,12 +240,7 @@ private void matchFieldToGetter(FieldReader field) {
         && !field.isPublicField()) {
       nonAccessibleField = true;
       if (hasJsonAnnotation) {
-        logError(
-            "Non accessible field "
-                + baseType
-                + " "
-                + field.fieldName()
-                + " with no matching getter?");
+        logError("Non accessible field " + baseType + " " + field.fieldName() + " with no matching getter?");
       } else {
         logDebug("Non accessible field " + baseType + " " + field.fieldName());
       }
@@ -357,7 +347,7 @@ void process() {
     }
     TypeElement superElement = superOf(baseType);
     if (superElement != null) {
-      addSuperType(superElement, null);
+      addSuperType(superElement);
     }
     readSubTypes();
     processCompleted();
@@ -369,7 +359,7 @@ private void readSubTypes() {
         currentSubType = subType;
         TypeElement element = element(subType.type());
         currentSubType.setElement(element);
-        addSuperType(element, baseType);
+        addSuperType(element);
       }
     }
   }
@@ -401,11 +391,11 @@ private void setFieldPositions() {
     }
   }
 
-  private void addSuperType(TypeElement element, TypeElement matchType) {
+  private void addSuperType(TypeElement element) {
     String type = element.getQualifiedName().toString();
     if (!JAVA_LANG_OBJECT.equals(type) && !GenericType.isGeneric(type)) {
       read(element);
-      addSuperType(superOf(element), matchType);
+      addSuperType(superOf(element));
     }
   }