Don't use raw type - specify type arguments

2 files changed, 12 insertions, 13 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
index d636d3bc925..949b42c7613 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/HttpSearchResponse.java
@@ -1,17 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.handler;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.collections.ListMap;
-import com.yahoo.container.jdisc.ExtendedResponse;
 import com.yahoo.container.handler.Coverage;
 import com.yahoo.container.handler.Timing;
+import com.yahoo.container.jdisc.ExtendedResponse;
 import com.yahoo.container.logging.AccessLogEntry;
 import com.yahoo.container.logging.HitCounts;
 import com.yahoo.jdisc.HeaderFields;
@@ -25,6 +19,12 @@ import com.yahoo.search.Result;
 import com.yahoo.search.query.context.QueryContext;
 import com.yahoo.yolean.trace.TraceNode;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Wrap the result of a query as an HTTP response.
  *
@@ -39,11 +39,11 @@ public class HttpSearchResponse extends ExtendedResponse {
     private final HitCounts hitCounts;
     private final TraceNode trace;
 
-    public HttpSearchResponse(int status, Result result, Query query, Renderer renderer) {
+    public HttpSearchResponse(int status, Result result, Query query, Renderer<Result> renderer) {
         this(status, result, query, renderer, null);
     }
 
-    HttpSearchResponse(int status, Result result, Query query, Renderer renderer, TraceNode trace) {
+    HttpSearchResponse(int status, Result result, Query query, Renderer<Result> renderer, TraceNode trace) {
         super(status);
         this.query = query;
         this.result = result;
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index e2c15b6e35b..a0c5bfbe0cf 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -11,6 +11,7 @@ import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.core.ContainerHttpConfig;
 import com.yahoo.container.handler.threadpool.ContainerThreadPool;
+import com.yahoo.container.jdisc.AclMapping;
 import com.yahoo.container.jdisc.HttpMethodAclMapping;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -21,8 +22,6 @@ import com.yahoo.container.logging.AccessLog;
 import com.yahoo.io.IOUtils;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.Request;
-import com.yahoo.container.jdisc.AclMapping;
-import com.yahoo.container.jdisc.RequestView;
 import com.yahoo.language.Linguistics;
 import com.yahoo.net.HostName;
 import com.yahoo.net.UriTools;
@@ -273,7 +272,7 @@ public class SearchHandler extends LoggingRequestHandler {
     private HttpResponse errorResponse(HttpRequest request, ErrorMessage errorMessage) {
         Query query = new Query();
         Result result = new Result(query, errorMessage);
-        Renderer renderer = getRendererCopy(ComponentSpecification.fromString(request.getProperty("format")));
+        Renderer<Result> renderer = getRendererCopy(ComponentSpecification.fromString(request.getProperty("format")));
 
         return new HttpSearchResponse(getHttpResponseStatus(request, result), result, query, renderer);
     }
@@ -328,7 +327,7 @@ public class SearchHandler extends LoggingRequestHandler {
         }
 
         // Transform result to response
-        Renderer renderer = toRendererCopy(query.getPresentation().getRenderer());
+        Renderer<Result> renderer = toRendererCopy(query.getPresentation().getRenderer());
         HttpSearchResponse response = new HttpSearchResponse(getHttpResponseStatus(request, result),
                                                              result, query, renderer,
                                                              extractTraceNode(query));