Format and extract helper methods

Author: rbygrave

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

@@ -265,50 +265,50 @@ private void readMethod(Element element, List<FieldReader> localFields) {
     }
     // for getter/accessor methods only, not setters
     PropertyPrism.getOptionalOn(methodElement)
-        .filter(p -> !hasRecordPropertyAnnotation(methodElement))
-        .ifPresent(
-            propertyPrism -> {
-              if (!methodElement.getParameters().isEmpty()) {
-                logError(
-                    errorContext
-                        + baseType
-                        + ", @Json.Property can only be placed on Getter Methods, but on %s",
-                    methodElement);
-                return;
-              }
-
-              // getter property as simulated read-only field with getter method
-              final var frequency = frequency(propertyPrism.value());
-              final var reader =
-                  new FieldReader(
-                      element, namingConvention, currentSubType, genericTypeParams, frequency);
-              reader.getterMethod(new MethodReader(methodElement));
-              localFields.add(reader);
-            });
-  }
-  
-  private boolean hasRecordPropertyAnnotation(ExecutableElement methodElement) {
+      .filter(p -> !hasRecordPropertyAnnotation(methodElement))
+      .ifPresent(propertyPrism -> {
+        if (!methodElement.getParameters().isEmpty()) {
+          logError(errorContext + baseType + ", @Json.Property can only be placed on Getter Methods, but on %s", methodElement);
+          return;
+        }
+
+        // getter property as simulated read-only field with getter method
+        final var frequency = frequency(propertyPrism.value());
+        final var reader = new FieldReader(element, namingConvention, currentSubType, genericTypeParams, frequency);
+        reader.getterMethod(new MethodReader(methodElement));
+        localFields.add(reader);
+      });
+  }
 
+  private boolean hasRecordPropertyAnnotation(ExecutableElement methodElement) {
     try {
       return APContext.jdkVersion() >= 16
-          && Optional.ofNullable(
-                  Elements.class
-                      .getMethod("recordComponentFor", ExecutableElement.class)
-                      .invoke(APContext.elements(), methodElement))
-              .map(Element.class::cast)
-              .flatMap(
-                  e -> // e is a RecordComponentElement that doesn't have the annotation 
-                       //so we look up the field by name to see if the annotation is present
-                      ElementFilter.fieldsIn(e.getEnclosingElement().getEnclosedElements()).stream()
-                          .filter(f -> f.getSimpleName().contentEquals(e.getSimpleName()))
-                          .findAny())
-              .filter(PropertyPrism::isPresent)
-              .isPresent();
+        && Optional.ofNullable(recordComponentFor(methodElement))
+        .map(Element.class::cast)
+        .flatMap(TypeReader::matchingField)
+        .filter(PropertyPrism::isPresent)
+        .isPresent();
     } catch (Exception e) {
       return false;
     }
   }
 
+  /**
+   * e is a RecordComponentElement that doesn't have the annotation
+   * look up the field by name to see if the annotation is present
+   */
+  private static Optional<VariableElement> matchingField(Element e) {
+    return ElementFilter.fieldsIn(e.getEnclosingElement().getEnclosedElements()).stream()
+      .filter(f -> f.getSimpleName().contentEquals(e.getSimpleName()))
+      .findAny();
+  }
+
+  private static Object recordComponentFor(ExecutableElement methodElement) throws Exception {
+    return Elements.class
+      .getMethod("recordComponentFor", ExecutableElement.class)
+      .invoke(APContext.elements(), methodElement);
+  }
+
   private boolean checkMethod2(ExecutableElement methodElement) {
     if (!Util.isPublic(methodElement)) {
       return false;