Format only changes

Author: rbygrave

http-api/src/main/java/io/avaje/http/api/context/RequestContextResolver.java

@@ -14,9 +14,9 @@ public interface RequestContextResolver {
   /**
    * Wraps the execution of the given callable in request context processing.
    *
-   * @param ctx The request context
+   * @param ctx      The request context
    * @param callable The callable
-   * @param <T> The return type of the callable
+   * @param <T>      The return type of the callable
    * @return The return value of the callable
    * @throws Exception if the callable throws an exception
    */
@@ -25,20 +25,20 @@ public interface RequestContextResolver {
   /**
    * Wraps the execution of the given supplier in request context processing.
    *
-   * @param ctx The request context
+   * @param ctx      The request context
    * @param supplier The supplier
-   * @param <T> The return type of the supplier
+   * @param <T>      The return type of the supplier
    * @return The return value of the supplier
    */
   <T> T supplyWith(ServerContext ctx, Supplier<T> supplier);
 
   /**
    * Wraps the execution of the given runnable in request context processing.
    *
-   * @param ctx The request context
+   * @param ctx      The request context
    * @param runnable The runnable
    */
-  void runWith(ServerContext request, Runnable runnable);
+  void runWith(ServerContext ctx, Runnable runnable);
 
   /**
    * Retrieve the current server context.

http-api/src/main/java/io/avaje/http/api/context/ServerContext.java

@@ -1,21 +1,24 @@
 package io.avaje.http.api.context;
 
-/** Holder for the Server Request/Response Classes */
-public class ServerContext {
+/**
+ * Holder for the Server Request/Response instances.
+ */
+public final class ServerContext {
 
   private final Object request;
   private final Object response;
 
-  public ServerContext(Object req, Object res) {
-    request = req;
-    response = res;
+  public ServerContext(Object request, Object response) {
+    this.request = request;
+    this.response = response;
   }
 
   /**
    * Retrieve the current server request.
    *
    * @return The request
    */
+  @SuppressWarnings("unchecked")
   <T> T request() {
     return (T) request;
   }
@@ -25,6 +28,7 @@ <T> T request() {
    *
    * @return The request
    */
+  @SuppressWarnings("unchecked")
   <T> T response() {
     return (T) response;
   }

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

@@ -70,8 +70,7 @@ public class MethodReader {
 
     initWebMethodViaAnnotation();
 
-    this.superMethods =
-        superMethods(element.getEnclosingElement(), element.getSimpleName().toString());
+    this.superMethods = superMethods(element.getEnclosingElement(), element.getSimpleName().toString());
     superMethods.forEach(m -> methodRoles.addAll(Util.findRoles(m)));
     this.hasThrows = !element.getThrownTypes().isEmpty();
     this.securityRequirements = readSecurityRequirements();
@@ -103,7 +102,6 @@ private boolean initResolver() {
   private boolean hasInstrument(Element e) {
     for (final var a : e.getAnnotationMirrors()) {
       if (HttpMethodPrism.isPresent(a.getAnnotationType().asElement())) {
-
         return a.getElementValues().values().stream().anyMatch(v -> v.getValue().equals(true));
       }
     }
@@ -143,7 +141,6 @@ public String toString() {
   }
 
   private void initWebMethodViaAnnotation() {
-
     if (findAnnotation(FormPrism::getOptionalOn).isPresent()) {
       this.formMarker = true;
     }
@@ -207,7 +204,6 @@ private void readSecurityRequirements(Element element, List<SecurityRequirementP
   }
 
   private List<OpenAPIResponsePrism> buildApiResponses() {
-
     final var container =
         findAnnotation(OpenAPIResponsesPrism::getOptionalOn).stream()
             .map(OpenAPIResponsesPrism::value)
@@ -226,11 +222,8 @@ private List<OpenAPIResponsePrism> buildApiResponses() {
                             .flatMap(List::stream),
                         OpenAPIResponsePrism.getAllInstancesOn(method).stream()));
 
-    final var responses =
-        Stream.concat(methodResponses, superMethodResponses).collect(Collectors.toList());
-
+    final var responses = Stream.concat(methodResponses, superMethodResponses).collect(Collectors.toList());
     responses.addAll(bean.openApiResponses());
-
     return responses;
   }
 
@@ -239,7 +232,6 @@ public <A> Optional<A> findAnnotation(Function<Element, Optional<A>> prismFunc)
   }
 
   public <A> Optional<A> findAnnotation(Function<Element, Optional<A>> prismFunc, ExecutableElement elem) {
-
     return prismFunc.apply(elem).or(() -> bean.findMethodAnnotation(prismFunc, elem));
   }
 
@@ -249,9 +241,7 @@ private List<String> addTagsToList(Element element, List<String> list) {
     }
 
     TagPrism.getAllInstancesOn(element).forEach(t -> list.add(t.name()));
-
     final var tags = TagsPrism.getInstanceOn(element);
-
     if (tags != null) {
       for (final var tag : tags.value()) {
         list.add(tag.name());
@@ -418,21 +408,14 @@ public boolean instrumentContext() {
     return instrumentContext;
   }
 
-  public void writeContext(Append writer, String reqName,String resName) {
-
+  public void writeContext(Append writer, String reqName, String resName) {
     if (isVoid) {
-
       writer.append("resolver.runWith");
-
     } else if (hasThrows) {
-
       writer.append("resolver.callWith");
-
     } else {
-
       writer.append("resolver.supplyWith");
     }
-
     writer.append("(new ServerContext(%s, %s), () -> ", reqName, resName);
   }
 }

http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java

@@ -31,7 +31,6 @@ class ControllerMethodWriter {
   }
 
   void write(boolean requestScoped) {
-
     final var segments = method.pathSegments();
     final var fullPath = segments.fullPath();
 
@@ -76,12 +75,10 @@ void write(boolean requestScoped) {
     }
 
     if (instrumentContext) {
-
       writer.append(")");
     }
 
     writer.append(");").eol();
-
     if (!method.isVoid()) {
       writeContextReturn();
       writer.eol();
@@ -133,7 +130,6 @@ private void writeContextReturn(final String resultVariableName) {
         if ("java.util.concurrent.CompletableFuture".equals(uType.mainType())) {
           uType = uType.paramRaw();
         }
-
         writer.append("      %sJsonType.toJson(%s, ctx.contentType(\"application/json\").outputStream());", uType.shortName(), resultVariableName);
       } else {
         writer.append("      ctx.json(%s);", resultVariableName);

http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java

@@ -29,7 +29,6 @@ class ControllerMethodWriter {
   }
 
   void write(boolean requestScoped) {
-
     final PathSegments segments = method.pathSegments();
     final String fullPath = segments.fullPath();
 

tests/test-javalin-jsonb/src/main/resources/public/openapi.json

@@ -1245,14 +1245,7 @@
 				},
 				"responses" : {
 					"200" : {
-						"description" : "",
-						"content" : {
-							"application/json" : {
-								"schema" : {
-									"type" : "string"
-								}
-							}
-						}
+						"description" : "No content"
 					}
 				}
 			}