No functional change, refactor tidy ControllerReader and MethodReader

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java

@@ -141,17 +141,18 @@ private boolean initDocHidden() {
   }
 
   private boolean initHasValid() {
-    Annotation jakarta = null;
+    Annotation jakartaValidAnnotation = null;
     try {
-      var anno =
-          (Class<Annotation>)
-              Class.forName(Valid.class.getCanonicalName().replace("javax", "jakarta"));
-      jakarta = findAnnotation(anno);
+      jakartaValidAnnotation = findAnnotation(jakarataValidAnnotation());
     } catch (final ClassNotFoundException e) {
-
+      // ignore
     }
+    return findAnnotation(Valid.class) != null || jakartaValidAnnotation != null;
+  }
 
-    return findAnnotation(Valid.class) != null || jakarta != null;
+  @SuppressWarnings("unchecked")
+  private static Class<Annotation> jakarataValidAnnotation() throws ClassNotFoundException {
+    return (Class<Annotation>)Class.forName(Valid.class.getCanonicalName().replace("javax", "jakarta"));
   }
 
   String produces() {

http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java

@@ -61,11 +61,7 @@ public class MethodReader {
   private final PathSegments pathSegments;
   private final boolean hasValid;
 
-  MethodReader(
-      ControllerReader bean,
-      ExecutableElement element,
-      ExecutableType actualExecutable,
-      ProcessingContext ctx) {
+  MethodReader(ControllerReader bean, ExecutableElement element, ExecutableType actualExecutable, ProcessingContext ctx) {
     this.ctx = ctx;
     this.bean = bean;
     this.element = element;
@@ -78,25 +74,25 @@ public class MethodReader {
     this.apiResponses = getApiResponses();
     initWebMethodViaAnnotation();
     if (isWebMethod()) {
-
-      Annotation jakarta = null;
+      Annotation jakartaValidAnnotation = null;
       try {
-        final var anno =
-            (Class<Annotation>)
-                Class.forName(Valid.class.getCanonicalName().replace("javax", "jakarta"));
-        jakarta = findAnnotation(anno);
+        jakartaValidAnnotation = findAnnotation(jakartaValidAnnotation());
       } catch (final ClassNotFoundException e) {
-
+        // ignore
       }
-
-      this.hasValid = findAnnotation(Valid.class) != null || jakarta != null;
+      this.hasValid = findAnnotation(Valid.class) != null || jakartaValidAnnotation != null;
       this.pathSegments = PathSegments.parse(Util.combinePath(bean.path(), webMethodPath));
     } else {
       this.hasValid = false;
       this.pathSegments = null;
     }
   }
 
+  @SuppressWarnings("unchecked")
+  private static Class<Annotation> jakartaValidAnnotation() throws ClassNotFoundException {
+    return (Class<Annotation>) Class.forName(Valid.class.getCanonicalName().replace("javax", "jakarta"));
+  }
+
   @Override
   public String toString() {
     return element.toString();