Update comments and imports.

3 files changed, 8 insertions, 7 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 555044f66d0..1ce88502a51 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -24,7 +24,6 @@ import com.yahoo.search.query.properties.DefaultProperties;
 import com.yahoo.search.query.properties.QueryProperties;
 import com.yahoo.search.query.properties.QueryPropertyAliases;
 import com.yahoo.search.query.properties.RequestContextProperties;
-import com.yahoo.text.Utf8String;
 import com.yahoo.yolean.Exceptions;
 import com.yahoo.search.federation.FederationSearcher;
 import com.yahoo.search.query.Sorting.AttributeSorter;
@@ -34,7 +33,6 @@ import com.yahoo.search.query.context.QueryContext;
 import com.yahoo.search.query.profile.ModelObjectMap;
 import com.yahoo.search.query.profile.QueryProfileProperties;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfile;
-import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.yql.NullItemException;
 import com.yahoo.search.yql.VespaSerializer;
 import com.yahoo.search.yql.YqlParser;
diff --git a/container-search/src/main/java/com/yahoo/search/query/SessionId.java b/container-search/src/main/java/com/yahoo/search/query/SessionId.java
index 38fdadd7c59..c6e34e7e430 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SessionId.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SessionId.java
@@ -3,13 +3,10 @@ package com.yahoo.search.query;
 
 import com.yahoo.text.Utf8String;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
- * A query id which is unique across this cluster - consisting of
- * container runtime id + timestamp + serial.
+ * A id which is unique across this cluster + the extra differentiator.
  *
- * @author bratseth
+ * @author baldersheim
  */
 public class SessionId {
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java b/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java
index 2d29edb818d..11ed03a24d2 100644
--- a/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java
+++ b/container-search/src/main/java/com/yahoo/search/query/UniqueRequestId.java
@@ -4,6 +4,12 @@ import com.yahoo.container.Server;
 
 import java.util.concurrent.atomic.AtomicLong;
 
+/**
+ * A query id which is unique across this cluster - consisting of
+ * container runtime id + timestamp + serial.
+ *
+ * @author bratseth
+ */
 public class UniqueRequestId {
 
     private static final String serverId = Server.get().getServerDiscriminator();