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

Bratseth/java model inference

5 files changed, 10 insertions, 18 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java b/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java
index 1e5c22f4023..e0b6392b64a 100644
--- a/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/config/StatisticsRequestHandler.java
@@ -20,8 +20,8 @@ import java.util.concurrent.Executor;
  * Handler of statistics http requests. Temporary hack as a step towards a more
  * general network interface.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Steinar Knutsen
+ * @author Einar M R Rosenvinge
  */
 public class StatisticsRequestHandler extends ThreadedHttpRequestHandler {
 
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index e2c6da6fab8..55d7de90f33 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -86,11 +86,7 @@ public class HandlersConfigurerDi {
         osgiWrapper = new OsgiWrapper(osgiFramework, vespaContainer.getBundleLoader());
 
         container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper);
-        try {
-            getNewComponentGraph(discInjector, false);
-        } catch (InterruptedException e) {
-            throw new RuntimeException("Interrupted while setting up handlers for the first time.");
-        }
+        getNewComponentGraph(discInjector, false);
     }
 
     private static class OsgiWrapper extends OsgiImpl implements com.yahoo.container.di.Osgi {
@@ -139,10 +135,10 @@ public class HandlersConfigurerDi {
     /**
      * Wait for new config to arrive and produce the new graph
      */
-    public void getNewComponentGraph(Injector discInjector, boolean restartOnRedeploy) throws InterruptedException {
-        currentGraph = container.getNewComponentGraph(currentGraph, createFallbackInjector(vespaContainer, discInjector), restartOnRedeploy);
-
-        assert (currentGraph.getInstance(RegistriesHack.class) != null); // TODO: Remove, seems quite pointless?
+    public void getNewComponentGraph(Injector discInjector, boolean restartOnRedeploy) {
+        currentGraph = container.getNewComponentGraph(currentGraph,
+                                                      createFallbackInjector(vespaContainer, discInjector),
+                                                      restartOnRedeploy);
     }
 
     @SuppressWarnings("deprecation")
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index 033a5819585..42780f75a6c 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -111,11 +111,7 @@ public class HandlersConfigurerTestWrapper {
 
     public void reloadConfig() {
         configurer.reloadConfig(++lastGeneration);
-        try {
-            configurer.getNewComponentGraph(Guice.createInjector(), false);
-        } catch (InterruptedException e) {
-           throw new RuntimeException(e);
-        }
+        configurer.getNewComponentGraph(Guice.createInjector(), false);
     }
 
     public void shutdown() {
diff --git a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java
index 241ae269fc9..c50dee43eaf 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java
@@ -22,6 +22,7 @@ import java.util.concurrent.Executor;
  * @author dybis
  */
 public class AccessLogRequestHandler extends ThreadedHttpRequestHandler {
+
     private final CircularArrayAccessLogKeeper circularArrayAccessLogKeeper;
     private final JsonFactory jsonFactory = new JsonFactory();
 
@@ -53,4 +54,5 @@ public class AccessLogRequestHandler extends ThreadedHttpRequestHandler {
             }
         };
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java
index 99d28b9bcf1..7bd18c519eb 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java
@@ -39,12 +39,10 @@ import java.util.logging.Logger;
  * for descriptions of the format.
  *
  * @author lulf
- * @since 5.1.21
  */
 @Beta
 public class MockService extends LoggingRequestHandler {
 
-    private final static Logger log = Logger.getLogger(MockService.class.getName());
     private MockServiceHandler handler;
 
     /**