Remove further looping state for server responses.

noboomu · Sep 15, 2020 · 487d57c · 487d57c
1 parent 2621026
commit 487d57c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Proteus Changelog.
 ## Unreleased
 ### No issue
 
+**Expose socket timeouts.**
+
+
+[2621026ce02933c](https://github.com/noboomu/proteus/commit/2621026ce02933c) Joshua Bauer *2020-09-14 20:13:41*
+
 **Fix for looping requests when response wrapped in completable future.**
 
 

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/server/ServerResponse.java b/proteus-core/src/main/java/io/sinistral/proteus/server/ServerResponse.java
@@ -709,6 +709,10 @@ public static ServerResponse<ByteBuffer> response(String body)
 
     public static <T> ServerResponse<T> response(T entity)
     {
+        if(entity == null)
+        {
+            return new ServerResponse<T>().notFound();
+        }
         return new ServerResponse<T>().entity(entity);
     }
 

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java b/proteus-core/src/main/java/io/sinistral/proteus/server/handlers/HandlerGenerator.java
@@ -677,7 +677,7 @@ protected void addClassMethodHandlers(TypeSpec.Builder typeBuilder, Class<?> cla
 
 
                 if (m.getReturnType().equals(ServerResponse.class)) {
-                    methodBuilder.addStatement("$L.send(this,$L)", "response", "exchange");
+                    methodBuilder.addStatement("$L.send($L)", "response", "exchange");
 
                 } else if ((m.getGenericReturnType().toString().contains("java.util.concurrent.CompletionStage") && m.getGenericReturnType().toString().contains("ServerResponse"))
                         || (m.getGenericReturnType().toString().contains("java.util.concurrent.CompletableFuture") && m.getGenericReturnType().toString().contains("ServerResponse")))
@@ -720,7 +720,7 @@ else if (m.getReturnType().getTypeName().contains("java.util.concurrent.Completi
 
 
                         methodBuilder.addCode(
-                                "$L.thenAccept( r -> io.sinistral.proteus.server.ServerResponse.response(r)" + postProcess + "send(this,$L) )\n\t.exceptionally( ex -> ",
+                                "$L.thenAccept( r -> io.sinistral.proteus.server.ServerResponse.response(r)" + postProcess + "send($L) )\n\t.exceptionally( ex -> ",
                                 "response", "exchange");
                         methodBuilder.beginControlFlow("", "");
                         methodBuilder.addCode("\t\tthrow new java.util.concurrent.CompletionException(ex);\n\t");