Nonfunctional changes only

8 files changed, 51 insertions, 52 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 661f96d7dc3..e1f8005eeed 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * A HTTP request.
  *
- * @author <a href="mailto:anirudha@yahoo-inc.com">Anirudha Khanna</a>
+ * @author Anirudha Khanna
  * @author Einar M R Rosenvinge
  */
 public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpResponse.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpResponse.java
index cf54c546eb7..a4c19becb49 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpResponse.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpResponse.java
@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * A HTTP response.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class HttpResponse extends Response implements ServletOrJdiscHttpResponse {
 
@@ -27,7 +27,6 @@ public class HttpResponse extends Response implements ServletOrJdiscHttpResponse
     private String message;
 
     public interface Status extends Response.Status {
-
         int REQUEST_ENTITY_TOO_LARGE = REQUEST_TOO_LONG;
         int REQUEST_RANGE_NOT_SATISFIABLE = REQUESTED_RANGE_NOT_SATISFIABLE;
     }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java
index 8202ef0e693..c4e5f5878ee 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/RequestFilter.java
@@ -5,9 +5,10 @@ import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.HttpRequest;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public interface RequestFilter extends com.yahoo.jdisc.SharedResource, RequestFilterBase {
 
-    public void filter(HttpRequest request, ResponseHandler handler);
+    void filter(HttpRequest request, ResponseHandler handler);
+
 }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
index 52e05484afc..2bcb1635dfb 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityFilterInvoker.java
@@ -92,4 +92,5 @@ public class SecurityFilterInvoker implements FilterInvoker {
             return uri;
         }
     }
+
 }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java
index 77ee10111be..63dd1037aed 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilter.java
@@ -4,7 +4,7 @@ package com.yahoo.jdisc.http.filter;
 import com.yahoo.jdisc.handler.ResponseHandler;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public interface SecurityRequestFilter extends RequestFilterBase {
 
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
index d6c5629d6c1..daed3792ee8 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java
@@ -17,11 +17,10 @@ import java.util.List;
  * Implementation of TypedFilterChain for DiscFilterRequest
  *
  * @author tejalk
- *
  */
 public final class SecurityRequestFilterChain extends AbstractResource implements RequestFilter {
 
-    private final List<SecurityRequestFilter> filters = new ArrayList<SecurityRequestFilter>();
+    private final List<SecurityRequestFilter> filters = new ArrayList<>();
 
     private SecurityRequestFilterChain(Iterable<? extends SecurityRequestFilter> filters) {
         for (SecurityRequestFilter filter : filters) {
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java
index 190408c88b8..b554f98ebd7 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/FilteringRequestHandler.java
@@ -24,49 +24,50 @@ import java.util.concurrent.atomic.AtomicBoolean;
 /**
  * Request handler that invokes request and response filters in addition to the bound request handler.
  *
- * @author bakksjo
- * $Id$
+ * @author Øyvind Bakksjø
  */
 class FilteringRequestHandler extends AbstractRequestHandler {
+
     private static final ContentChannel COMPLETING_CONTENT_CHANNEL = new ContentChannel() {
+
         @Override
-        public void write(final ByteBuffer buf, final CompletionHandler handler) {
+        public void write(ByteBuffer buf, CompletionHandler handler) {
             CompletionHandlers.tryComplete(handler);
         }
 
         @Override
-        public void close(final CompletionHandler handler) {
+        public void close(CompletionHandler handler) {
             CompletionHandlers.tryComplete(handler);
         }
+
     };
 
     private final BindingSet<RequestFilter> requestFilters;
     private final BindingSet<ResponseFilter> responseFilters;
 
-    public FilteringRequestHandler(
-            final BindingSet<RequestFilter> requestFilters,
-            final BindingSet<ResponseFilter> responseFilters) {
+    public FilteringRequestHandler(BindingSet<RequestFilter> requestFilters, 
+                                   BindingSet<ResponseFilter> responseFilters) {
         this.requestFilters = requestFilters;
         this.responseFilters = responseFilters;
     }
 
     @Override
-    public ContentChannel handleRequest(final Request request, final ResponseHandler originalResponseHandler) {
+    public ContentChannel handleRequest(Request request, ResponseHandler originalResponseHandler) {
         Preconditions.checkArgument(request instanceof HttpRequest, "Expected HttpRequest, got " + request);
         Objects.requireNonNull(originalResponseHandler, "responseHandler");
 
-        final RequestFilter requestFilter = requestFilters.resolve(request.getUri());
-        final ResponseFilter responseFilter = responseFilters.resolve(request.getUri());
+        RequestFilter requestFilter = requestFilters.resolve(request.getUri());
+        ResponseFilter responseFilter = responseFilters.resolve(request.getUri());
         // Not using request.connect() here - it adds logic for error handling that we'd rather leave to the framework.
-        final RequestHandler resolvedRequestHandler = request.container().resolveHandler(request);
+        RequestHandler resolvedRequestHandler = request.container().resolveHandler(request);
 
         if (resolvedRequestHandler == null) {
             throw new BindingNotFoundException(request.getUri());
         }
 
-        final RequestHandler requestHandler = new ReferenceCountingRequestHandler(resolvedRequestHandler);
+        RequestHandler requestHandler = new ReferenceCountingRequestHandler(resolvedRequestHandler);
 
-        final ResponseHandler responseHandler;
+        ResponseHandler responseHandler;
         if (responseFilter != null) {
             responseHandler = new FilteringResponseHandler(originalResponseHandler, responseFilter, request);
         } else {
@@ -74,15 +75,14 @@ class FilteringRequestHandler extends AbstractRequestHandler {
         }
 
         if (requestFilter != null) {
-            final InterceptingResponseHandler interceptingResponseHandler
-                    = new InterceptingResponseHandler(responseHandler);
+            InterceptingResponseHandler interceptingResponseHandler = new InterceptingResponseHandler(responseHandler);
             requestFilter.filter(HttpRequest.class.cast(request), interceptingResponseHandler);
             if (interceptingResponseHandler.hasProducedResponse()) {
                 return COMPLETING_CONTENT_CHANNEL;
             }
         }
 
-        final ContentChannel contentChannel = requestHandler.handleRequest(request, responseHandler);
+        ContentChannel contentChannel = requestHandler.handleRequest(request, responseHandler);
         if (contentChannel == null) {
             throw new RequestDeniedException(request);
         }
@@ -90,37 +90,37 @@ class FilteringRequestHandler extends AbstractRequestHandler {
     }
 
     private static class FilteringResponseHandler implements ResponseHandler {
+
         private final ResponseHandler delegate;
         private final ResponseFilter responseFilter;
         private final Request request;
 
-        public FilteringResponseHandler(
-                final ResponseHandler delegate,
-                final ResponseFilter responseFilter,
-                final Request request) {
+        public FilteringResponseHandler(ResponseHandler delegate, ResponseFilter responseFilter, Request request) {
             this.delegate = Objects.requireNonNull(delegate);
             this.responseFilter = Objects.requireNonNull(responseFilter);
             this.request = request;
         }
 
         @Override
-        public ContentChannel handleResponse(final Response response) {
+        public ContentChannel handleResponse(Response response) {
             responseFilter.filter(response, request);
             return delegate.handleResponse(response);
         }
+
     }
 
     private static class InterceptingResponseHandler implements ResponseHandler {
+
         private final ResponseHandler delegate;
         private AtomicBoolean hasResponded = new AtomicBoolean(false);
 
-        public InterceptingResponseHandler(final ResponseHandler delegate) {
+        public InterceptingResponseHandler(ResponseHandler delegate) {
             this.delegate = Objects.requireNonNull(delegate);
         }
 
         @Override
-        public ContentChannel handleResponse(final Response response) {
-            final ContentChannel content = delegate.handleResponse(response);
+        public ContentChannel handleResponse(Response response) {
+            ContentChannel content = delegate.handleResponse(response);
             hasResponded.set(true);
             return content;
         }
@@ -129,4 +129,5 @@ class FilteringRequestHandler extends AbstractRequestHandler {
             return hasResponded.get();
         }
     }
+
 }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
index f41e44b0a73..57e5ba0cf03 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
@@ -32,9 +32,10 @@ import static com.yahoo.jdisc.http.HttpHeaders.Values.APPLICATION_X_WWW_FORM_URL
 import static com.yahoo.jdisc.http.server.jetty.Exceptions.throwUnchecked;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
  */
 class HttpRequestDispatch {
+
     private static final Logger log = Logger.getLogger(HttpRequestDispatch.class.getName());
 
     private final static String CHARSET_ANNOTATION = ";charset=";
@@ -47,12 +48,11 @@ class HttpRequestDispatch {
     private final RequestHandler requestHandler;
     private final MetricReporter metricReporter;
 
-    public HttpRequestDispatch(
-            final JDiscContext jDiscContext,
-            final AccessLogEntry accessLogEntry,
-            final Context metricContext,
-            final HttpServletRequest servletRequest,
-            final HttpServletResponse servletResponse) throws IOException {
+    public HttpRequestDispatch(JDiscContext jDiscContext,
+                               AccessLogEntry accessLogEntry,
+                               Context metricContext,
+                               HttpServletRequest servletRequest,
+                               HttpServletResponse servletResponse) throws IOException {
         this.jDiscContext = jDiscContext;
 
         requestHandler = newRequestHandler(jDiscContext, accessLogEntry, servletRequest);
@@ -73,7 +73,7 @@ class HttpRequestDispatch {
     }
 
     public void dispatch() throws IOException {
-        final ServletRequestReader servletRequestReader;
+        ServletRequestReader servletRequestReader;
         try {
             servletRequestReader = handleRequest();
         } catch (Throwable throwable) {
@@ -145,7 +145,7 @@ class HttpRequestDispatch {
     private ServletRequestReader handleRequest() throws IOException {
         servletResponseController.registerWriteListener();
         HttpRequest jdiscRequest = HttpRequestFactory.newJDiscRequest(jDiscContext.container, servletRequest);
-        final ContentChannel requestContentChannel;
+        ContentChannel requestContentChannel;
 
         try (ResourceReference ref = References.fromResource(jdiscRequest)) {
             HttpRequestFactory.copyHeaders(servletRequest, jdiscRequest);
@@ -186,25 +186,23 @@ class HttpRequestDispatch {
     }
 
 
-    private static RequestHandler newRequestHandler(
-            final JDiscContext context,
-            final AccessLogEntry accessLogEntry,
-            final HttpServletRequest servletRequest) {
-        final RequestHandler requestHandler = wrapHandlerIfFormPost(
+    private static RequestHandler newRequestHandler(JDiscContext context,
+                                                    AccessLogEntry accessLogEntry,
+                                                    HttpServletRequest servletRequest) {
+        RequestHandler requestHandler = wrapHandlerIfFormPost(
                 new FilteringRequestHandler(context.requestFilters, context.responseFilters),
                 servletRequest, context.serverConfig.removeRawPostBodyForWwwUrlEncodedPost());
 
         return new AccessLoggingRequestHandler(requestHandler, accessLogEntry);
     }
 
-    private static RequestHandler wrapHandlerIfFormPost(
-            final RequestHandler requestHandler,
-            final HttpServletRequest servletRequest,
-            final boolean removeBodyForFormPost) {
+    private static RequestHandler wrapHandlerIfFormPost(RequestHandler requestHandler,
+                                                        HttpServletRequest servletRequest,
+                                                        boolean removeBodyForFormPost) {
         if (!servletRequest.getMethod().equals("POST")) {
             return requestHandler;
         }
-        final String contentType = servletRequest.getHeader(HttpHeaders.Names.CONTENT_TYPE);
+        String contentType = servletRequest.getHeader(HttpHeaders.Names.CONTENT_TYPE);
         if (contentType == null) {
             return requestHandler;
         }
@@ -214,7 +212,7 @@ class HttpRequestDispatch {
         return new FormPostRequestHandler(requestHandler, getCharsetName(contentType), removeBodyForFormPost);
     }
 
-    private static String getCharsetName(final String contentType) {
+    private static String getCharsetName(String contentType) {
         if (!contentType.startsWith(CHARSET_ANNOTATION, APPLICATION_X_WWW_FORM_URLENCODED.length())) {
             return StandardCharsets.UTF_8.name();
         }