diff options
Diffstat (limited to 'jdisc_core')
7 files changed, 21 insertions, 38 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java index 19bb4a64a01..6edc4d105f0 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/ProxyRequestHandler.java @@ -31,9 +31,9 @@ class ProxyRequestHandler implements DelegatedRequestHandler { @Override public ContentChannel handleRequest(Request request, ResponseHandler responseHandler) { - try (final ResourceReference requestReference = request.refer()) { + try (ResourceReference requestReference = request.refer()) { ContentChannel contentChannel; - final ResponseHandler proxyResponseHandler = new ProxyResponseHandler( + ResponseHandler proxyResponseHandler = new ProxyResponseHandler( request, new NullContentResponseHandler(responseHandler)); try { contentChannel = delegate.handleRequest(request, proxyResponseHandler); diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/References.java b/jdisc_core/src/main/java/com/yahoo/jdisc/References.java index 5b845754d3d..6cae0c48c56 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/References.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/References.java @@ -7,27 +7,22 @@ package com.yahoo.jdisc; * @author bakksjo */ public class References { - // Prevents instantiation. - private References() { - } + + private References() { } /** * A {@link ResourceReference} that does nothing. * Useful for e.g. testing of resource types when reference counting is not the focus. */ - public static final ResourceReference NOOP_REFERENCE = new ResourceReference() { - @Override - public void close() { - } - }; + public static final ResourceReference NOOP_REFERENCE = () -> { }; /** * <p>Returns a {@link ResourceReference} that invokes {@link SharedResource#release()} on * {@link ResourceReference#close() close}. Useful for treating the "main" reference of a {@link SharedResource} * just as any other reference obtained by calling {@link SharedResource#refer()}. Example:</p> * <pre> - * final Request request = new Request(...); - * try (final ResourceReference ref = References.fromResource(request)) { + * Request request = new Request(...); + * try (ResourceReference ref = References.fromResource(request)) { * .... * } * // The request will be released on exit from the try block. @@ -36,12 +31,8 @@ public class References { * @param resource The resource to create a ResourceReference for. * @return a ResourceReference whose close() method will call release() on the given resource. */ - public static ResourceReference fromResource(final SharedResource resource) { - return new ResourceReference() { - @Override - public void close() { - resource.release(); - } - }; + public static ResourceReference fromResource(SharedResource resource) { + return resource::release; } + } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java index 61f7c04ec9a..0c7b9c2d76d 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java @@ -140,7 +140,7 @@ public class Request extends AbstractResource { public URI getUri() { return uri; } /** - * Returns whether or not this Request was created by a {@link ServerProvider}. The value of this is used by + * Returns whether this Request was created by a {@link ServerProvider}. The value of this is used by * {@link Container#resolveHandler(Request)} to decide whether to match against server- or client-bindings. * * @return true, if this is a server request diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java b/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java index 6209c74374e..449c597bdc7 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/ResourceReference.java @@ -6,8 +6,8 @@ package com.yahoo.jdisc; * * <p>Implements {@link AutoCloseable} so that it can be used in try-with-resources statements. Example</p> * <pre> - * void doSomethingWithRequest(final Request request) { - * try (final ResourceReference ref = request.refer()) { + * void doSomethingWithRequest(Request request) { + * try (ResourceReference ref = request.refer()) { * // Do something with request * } * // ref.close() will be called automatically on exit from the try block, releasing the reference on 'request'. diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java index e172b5d1f64..e2cf4574a75 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java @@ -35,9 +35,7 @@ public class ContainerBuilder { public ContainerBuilder(Iterable<Module> guiceModules) { this.guiceModules.installAll(guiceModules); this.guiceModules.install(new AbstractModule() { - - @Override - public void configure() { + @Override public void configure() { bind(ContainerBuilder.class).toInstance(ContainerBuilder.this); } }); diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureResponse.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureResponse.java index d5eda23a8d6..4730535640c 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureResponse.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureResponse.java @@ -30,18 +30,10 @@ public final class FutureResponse extends CompletableFuture<Response> implements * * @param content The content channel for the Response. */ - public FutureResponse(final ContentChannel content) { - this(new ResponseHandler() { - - @Override - public ContentChannel handleResponse(Response response) { - return content; - } - }); + public FutureResponse(ContentChannel content) { + this(response -> content); } - public void addListener(Runnable r, Executor e) { whenCompleteAsync((__, ___) -> r.run(), e); } - /** * <p>Constructs a new FutureResponse that calls the given {@link ResponseHandler} when {@link * #handleResponse(Response)} is invoked.</p> @@ -52,6 +44,8 @@ public final class FutureResponse extends CompletableFuture<Response> implements this.handler = handler; } + public void addListener(Runnable r, Executor e) { whenCompleteAsync((__, ___) -> r.run(), e); } + @Override public ContentChannel handleResponse(Response response) { complete(response); diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java index b60b62e3f86..ef420d69f16 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeoutException; * * <p>The following is a simple example on how to use this class:</p> * <pre> - * public void handleRequest(final Request parent, final ResponseHandler handler) { + * public void handleRequest(Request parent, ResponseHandler handler) { * new RequestDispatch() { * @Override * protected Request newRequest() { @@ -80,8 +80,8 @@ public abstract class RequestDispatch implements Future<Response>, ResponseHandl * @return The ContentChannel to write the Request's content to. */ public final ContentChannel connect() { - final Request request = newRequest(); - try (final ResourceReference ref = References.fromResource(request)) { + Request request = newRequest(); + try (ResourceReference ref = References.fromResource(request)) { return request.connect(futureResponse); } } |