Merge pull request #6444 from vespa-engine/bratseth/java-model-inference

Bratseth/java model inference

3 files changed, 10 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 3a2e922f9e0..f6894439ddc 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -131,7 +131,7 @@ public class FastHit extends Hit {
     /** Returns the index of the node this hit originated at */
     public int getDistributionKey() { return distributionKey; }
 
-    /** Returns the index of the node this hit originated at */
+    /** Sets the index of the node this hit originated at */
     public void setDistributionKey(int distributionKey) { this.distributionKey = distributionKey; }
 
     /**
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 dd3cc853742..cbc8b15eff9 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -511,11 +511,15 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
      * Get the appropriate timeout for the query.
      *
      * @return timeout in milliseconds
-     **/
+     */
     public long getTimeLeft() {
         return getTimeout() - getDurationTime();
     }
 
+    /**
+     * @deprecated do not use
+     */
+    @Deprecated // TODO: Remove on Vespa 7
     public boolean requestHasProperty(String name) {
         return httpRequest.hasProperty(name);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java
index dc7a61344cb..167bb312f61 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Model.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Model.java
@@ -78,11 +78,11 @@ public class Model implements Cloneable {
     private String defaultIndex = null;
     private Query.Type type = Query.Type.ALL;
     private Query parent;
-    private Set<String> sources=new LinkedHashSet<>();
-    private Set<String> restrict=new LinkedHashSet<>();
+    private Set<String> sources = new LinkedHashSet<>();
+    private Set<String> restrict = new LinkedHashSet<>();
     private String searchPath;
     private String documentDbName = null;
-    private Execution execution=new Execution(new Execution.Context(null, null, null, null, null));
+    private Execution execution = new Execution(new Execution.Context(null, null, null, null, null));
 
     public Model(Query query) {
         setParent(query);
@@ -101,7 +101,7 @@ public class Model implements Cloneable {
      */
     @Deprecated
     public void traceLanguage() {
-        if (getParent().getTraceLevel()<2) return;
+        if (getParent().getTraceLevel() < 2) return;
         if (language != null) {
             getParent().trace("Language " + getLanguage() + " specified directly as a parameter", false, 2);
         }