summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-29 13:42:46 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-05-29 13:42:46 +0200
commitdcd1ebe58813ebe833aee8063c72bfd18c03ec89 (patch)
treead1eaa266f058744042a6db68269c2a1240a8482 /container-core
parent2337a46f5dd77130cb8af1efc82f98ef9621914e (diff)
Simplify method
Diffstat (limited to 'container-core')
-rwxr-xr-xcontainer-core/src/main/java/com/yahoo/container/Container.java22
1 files changed, 8 insertions, 14 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java
index 2005b1343bc..ee6da8f92b2 100755
--- a/container-core/src/main/java/com/yahoo/container/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/Container.java
@@ -3,7 +3,6 @@ package com.yahoo.container;
import com.yahoo.component.AbstractComponent;
import com.yahoo.component.provider.ComponentRegistry;
-import com.yahoo.config.FileReference;
import com.yahoo.container.core.config.BundleLoader;
import com.yahoo.container.osgi.AbstractRpcAdaptor;
import com.yahoo.container.osgi.ContainerRpcAdaptor;
@@ -14,9 +13,7 @@ import com.yahoo.jdisc.service.ClientProvider;
import com.yahoo.jdisc.service.ServerProvider;
import com.yahoo.osgi.Osgi;
import com.yahoo.vespa.config.ConfigTransformer;
-import com.yahoo.vespa.config.ConfigTransformer.PathAcquirer;
-import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
@@ -144,7 +141,7 @@ public class Container {
setPathAcquirer(fileAcquirer);
}
-
+
/**
* Only for internal use.
*/
@@ -158,16 +155,13 @@ public class Container {
setPathAcquirer(fileAcquirer);
}
- private void setPathAcquirer(final FileAcquirer fileAcquirer) {
- ConfigTransformer.setPathAcquirer(new PathAcquirer() {
- @Override
- public Path getPath(FileReference fileReference) {
- try {
- return fileAcquirer.waitFor(fileReference, 15, TimeUnit.MINUTES).toPath();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new RuntimeException(e);
- }
+ private static void setPathAcquirer(final FileAcquirer fileAcquirer) {
+ ConfigTransformer.setPathAcquirer(fileReference -> {
+ try {
+ return fileAcquirer.waitFor(fileReference, 15, TimeUnit.MINUTES).toPath();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeException(e);
}
});
}