summaryrefslogtreecommitdiffstats
path: root/application/src
diff options
context:
space:
mode:
authorOlli Virtanen <olli.virtanen@oath.com>2018-05-31 10:58:25 +0200
committerOlli Virtanen <olli.virtanen@oath.com>2018-05-31 10:58:25 +0200
commit3eefb81679eb3b3da6b782583b060166b39befd7 (patch)
tree77ec82f306f8d5bf6289e460b2adf621e0ad2f16 /application/src
parent41fafa8edf8c7dda56b30050d5233b17f03babe1 (diff)
Scala code in standalone-container converted to Java
Diffstat (limited to 'application/src')
-rw-r--r--application/src/main/java/com/yahoo/application/container/JDisc.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java
index ed0c29a3917..5554ae6a159 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.java
@@ -15,7 +15,6 @@ import com.yahoo.component.provider.ComponentRegistry;
import com.yahoo.config.model.ConfigModelRepo;
import com.yahoo.container.Container;
import com.yahoo.container.standalone.StandaloneContainerApplication;
-import com.yahoo.container.standalone.StandaloneContainerApplication$;
import com.yahoo.docproc.jdisc.DocumentProcessingHandler;
import com.yahoo.io.IOUtils;
import com.yahoo.jdisc.handler.RequestHandler;
@@ -58,10 +57,10 @@ public final class JDisc implements AutoCloseable {
return new AbstractModule() {
@Override
protected void configure() {
- bind(Path.class).annotatedWith(StandaloneContainerApplication.applicationPathName()).toInstance(path);
- bind(ConfigModelRepo.class).annotatedWith(StandaloneContainerApplication.configModelRepoName()).toInstance(configModelRepo);
+ bind(Path.class).annotatedWith(StandaloneContainerApplication.APPLICATION_PATH_NAME).toInstance(path);
+ bind(ConfigModelRepo.class).annotatedWith(StandaloneContainerApplication.CONFIG_MODEL_REPO_NAME).toInstance(configModelRepo);
bind(Boolean.class).annotatedWith( // below is an ugly hack to access fields from a scala object.
- Names.named(StandaloneContainerApplication$.MODULE$.disableNetworkingAnnotation())).toInstance(
+ Names.named(StandaloneContainerApplication.DISABLE_NETWORKING_ANNOTATION)).toInstance(
networking == Networking.disable);
}
};