summaryrefslogtreecommitdiffstats
path: root/application/src/main
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-28 12:22:26 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-28 12:22:26 +0200
commit321194bbe4a36d100d92188644d90c6cf4d373c7 (patch)
treedc2056158a3412aad0fda352496d86e6318d8959 /application/src/main
parentcc406b3dacac9de80d16ed4f56998defce33556f (diff)
Run Application with VespaModel instead of MockRoot
Diffstat (limited to 'application/src/main')
-rw-r--r--application/src/main/java/com/yahoo/application/container/JDisc.java5
1 files changed, 3 insertions, 2 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 0c6caf9fdf9..dba16a0e3fe 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.java
@@ -23,6 +23,7 @@ import com.yahoo.jdisc.test.TestDriver;
import com.yahoo.processing.handler.ProcessingHandler;
import com.yahoo.search.handler.SearchHandler;
+import java.io.File;
import java.nio.file.Path;
/**
@@ -97,7 +98,7 @@ public final class JDisc implements AutoCloseable {
* @param networking enabled or disabled
* @return a new JDisc instance
*/
- public static JDisc fromPath(final Path path, Networking networking) {
+ public static JDisc fromPath(Path path, Networking networking) {
return new JDisc(path, false, networking, new ConfigModelRepo());
}
@@ -105,7 +106,7 @@ public final class JDisc implements AutoCloseable {
* Create a jDisc instance which is given a config model repo (in which (mock) content clusters
* can be looked up).
*/
- public static JDisc fromPath(final Path path, Networking networking, ConfigModelRepo configModelRepo) {
+ public static JDisc fromPath(Path path, Networking networking, ConfigModelRepo configModelRepo) {
return new JDisc(path, false, networking, configModelRepo);
}