GC unused imports + final

4 files changed, 13 insertions, 11 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentIdResponse.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentIdResponse.java
index 939879c5448..1f70cfdaaf0 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentIdResponse.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentIdResponse.java
@@ -12,11 +12,12 @@ import com.yahoo.document.DocumentId;
 public class DocumentIdResponse extends Response {
 
     /** The document id of this response, if any */
-    private DocumentId documentId = null;
+    private final DocumentId documentId;
 
     /** Creates a successful response */
     public DocumentIdResponse(long requestId) {
         super(requestId);
+        documentId = null;
     }
 
     /**
@@ -37,6 +38,7 @@ public class DocumentIdResponse extends Response {
      */
     public DocumentIdResponse(long requestId, String textMessage, boolean success) {
         super(requestId, textMessage, success);
+        documentId = null;
     }
 
     /**
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentResponse.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentResponse.java
index dab4f2e7855..983b4a0d5b2 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentResponse.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentResponse.java
@@ -2,7 +2,6 @@
 package com.yahoo.documentapi;
 
 import com.yahoo.document.Document;
-import com.yahoo.component.Version;
 
 /**
  * The asynchronous response to a document put or get operation.
@@ -13,11 +12,12 @@ import com.yahoo.component.Version;
 public class DocumentResponse extends Response {
 
     /** The document of this response, if any */
-    private Document document = null;
+    private final Document document;
 
     /** Creates a successful response */
     public DocumentResponse(long requestId) {
         super(requestId);
+        document = null;
     }
 
     /**
@@ -38,6 +38,7 @@ public class DocumentResponse extends Response {
      */
     public DocumentResponse(long requestId, String textMessage, boolean success) {
         super(requestId, textMessage, success);
+        document = null;
     }
 
     /**
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java
index 39b77c40e1d..4d8cb93d1d0 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java
@@ -11,9 +11,9 @@ package com.yahoo.documentapi;
  */
 public class Response {
 
-    private long requestId;
-    private String textMessage = null;
-    private boolean success = true;
+    private final long requestId;
+    private final String textMessage;
+    private final boolean success;
 
     /** Creates a successful response containing no information */
     public Response(long requestId) {
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java
index bdac2112263..bb84b6f0104 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java
@@ -2,7 +2,10 @@
 package com.yahoo.documentapi.messagebus.test;
 
 import com.yahoo.document.select.parser.ParseException;
-import com.yahoo.documentapi.*;
+import com.yahoo.documentapi.DocumentAccess;
+import com.yahoo.documentapi.ProgressToken;
+import com.yahoo.documentapi.VisitorParameters;
+import com.yahoo.documentapi.VisitorSession;
 import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess;
 import com.yahoo.documentapi.messagebus.MessageBusParams;
 import com.yahoo.documentapi.messagebus.protocol.CreateVisitorReply;
@@ -19,10 +22,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**