diff options
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/core')
6 files changed, 18 insertions, 9 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index 6ecb6c75f90..5bb506fbd6a 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -21,9 +21,11 @@ import java.util.stream.Collectors; * @author Tony Vaagenes */ public class ApplicationBundleLoader { + private static final Logger log = Logger.getLogger(ApplicationBundleLoader.class.getName()); - /* Map of file refs of active bundles (not scheduled for uninstall) to the installed bundle. + /** + * Map of file refs of active bundles (not scheduled for uninstall) to the installed bundle. * * Used to: * 1. Avoid installing already installed bundles. Just an optimization, installing the same bundle location is a NOP diff --git a/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java b/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java index 51d77462652..97a11ce7507 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/FileAcquirerBundleInstaller.java @@ -18,7 +18,8 @@ import java.util.logging.Logger; * @author gjoranv */ public class FileAcquirerBundleInstaller { - private static Logger log = Logger.getLogger(FileAcquirerBundleInstaller.class.getName()); + + private static final Logger log = Logger.getLogger(FileAcquirerBundleInstaller.class.getName()); private final FileAcquirer fileAcquirer; @@ -39,8 +40,8 @@ public class FileAcquirerBundleInstaller { retries++; } if (notReadable(file)) { - com.yahoo.protect.Process.logAndDie("Shutting down - unable to read bundle file with reference '" + reference - + "' and path " + file.getAbsolutePath()); + com.yahoo.protect.Process.logAndDie("Shutting down - unable to read bundle file with reference '" + + reference + "' and path " + file.getAbsolutePath()); } } 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 9c0951c1c95..af163e88fee 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 @@ -37,7 +37,6 @@ import java.util.logging.Logger; import static com.yahoo.collections.CollectionUtil.first; - /** * For internal use only. * diff --git a/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java index 0ab89e223f6..3951e656736 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/PlatformBundleLoader.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; * @author gjoranv */ public class PlatformBundleLoader { + private static final Logger log = Logger.getLogger(PlatformBundleLoader.class.getName()); private final Osgi osgi; 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 2ae33347408..f36e0031ec8 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 @@ -35,12 +35,13 @@ import java.util.concurrent.Executors; * */ public class HandlersConfigurerTestWrapper { - private ConfigSourceSet configSources = + + private final ConfigSourceSet configSources = new ConfigSourceSet(this.getClass().getSimpleName() + ": " + new Random().nextLong()); - private HandlersConfigurerDi configurer; + private final HandlersConfigurerDi configurer; // TODO: Remove once tests use ConfigSet rather than dir: - private final static String testFiles[] = { + private final static String[] testFiles = { "components.cfg", "handlers.cfg", "platform-bundles.cfg", @@ -143,8 +144,12 @@ public class HandlersConfigurerTestWrapper { } private static class SimpleContainerThreadpool implements ContainerThreadPool { + private final Executor executor = Executors.newCachedThreadPool(); - @Override public Executor executor() { return executor; } + + @Override + public Executor executor() { return executor; } + } } diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java index 98c927b8efd..356f302f7c0 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/MockOsgiWrapper.java @@ -37,4 +37,5 @@ public class MockOsgiWrapper implements OsgiWrapper { @Override public void allowDuplicateBundles(Collection<Bundle> bundles) { } + } |