diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-01 12:29:32 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-01 12:29:32 -0800 |
commit | b7b4dd2481e80e3afe24a3c77f7bcc242b6cd7f4 (patch) | |
tree | b7237df951072a75d3d527b757f11e6b08214c3d /standalone-container/src/main/java/com/yahoo | |
parent | c2af67b3d11da53655a0750d2e288b584c7b938c (diff) |
Revert "Bratseth/remove unused rpc server take 2"
Diffstat (limited to 'standalone-container/src/main/java/com/yahoo')
4 files changed, 1 insertions, 12 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java b/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java index 08a70db7562..8d4126a01e3 100644 --- a/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java +++ b/standalone-container/src/main/java/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.java @@ -50,7 +50,6 @@ import java.util.jar.JarFile; * @author ollivir */ public final class ClassLoaderOsgiFramework implements OsgiFramework { - private BundleContextImpl bundleContextImpl = new BundleContextImpl(); private SystemBundleImpl systemBundleImpl = new SystemBundleImpl(); private BundleWiringImpl bundleWiringImpl = new BundleWiringImpl(); @@ -567,5 +566,4 @@ public final class ClassLoaderOsgiFramework implements OsgiFramework { throw new UnsupportedOperationException(); } } - } diff --git a/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java b/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java index 8b07a4d4ef8..a0fee3265df 100644 --- a/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java +++ b/standalone-container/src/main/java/com/yahoo/application/container/impl/StandaloneContainerRunner.java @@ -12,7 +12,6 @@ import java.nio.file.Path; * @author ollivir */ public class StandaloneContainerRunner { - public static Path createApplicationPackage(String servicesXml) { try { return createApplicationDirectory(servicesXml); @@ -32,5 +31,4 @@ public class StandaloneContainerRunner { Files.write(servicesXmlFile, Utf8.toBytes(content)); return applicationDir; } - } diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java index 4d968914dfa..4bbe9986d90 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/LocalFileDb.java @@ -24,7 +24,6 @@ import java.util.stream.Collectors; * @author ollivir */ public class LocalFileDb implements FileAcquirer, FileRegistry { - private static final Constructor<FileReference> fileReferenceConstructor = createFileReferenceConstructor(); private final Map<FileReference, File> fileReferenceToFile = new HashMap<>(); @@ -95,5 +94,4 @@ public class LocalFileDb implements FileAcquirer, FileRegistry { throw new IllegalStateException(ex); } } - } diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java index c632b9e154c..c1550abcf1a 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java @@ -9,7 +9,6 @@ import com.google.inject.Key; import com.google.inject.ProvisionException; import com.google.inject.name.Named; import com.google.inject.name.Names; -import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.collections.Pair; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; @@ -24,7 +23,6 @@ import com.yahoo.config.model.builder.xml.XmlHelper; import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.Zone; -import com.yahoo.container.QrConfig; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.jdisc.ConfiguredApplication; import com.yahoo.io.IOUtils; @@ -59,7 +57,6 @@ import static com.yahoo.collections.CollectionUtil.first; * @author ollivir */ public class StandaloneContainerApplication implements Application { - public static final String PACKAGE_NAME = "standalone_jdisc_container"; public static final String APPLICATION_LOCATION_INSTALL_VARIABLE = PACKAGE_NAME + ".app_location"; public static final String DEPLOYMENT_PROFILE_INSTALL_VARIABLE = PACKAGE_NAME + ".deployment_profile"; @@ -127,8 +124,6 @@ public class StandaloneContainerApplication implements Application { @Override public void configure() { bind(SubscriberFactory.class).toInstance(new StandaloneSubscriberFactory(modelRoot)); - bind(SlobroksConfig.class).toInstance(new SlobroksConfig(new SlobroksConfig.Builder())); - bind(QrConfig.class).toInstance(new QrConfig(new QrConfig.Builder())); } }); @@ -316,6 +311,7 @@ public class StandaloneContainerApplication implements Application { } } + @SuppressWarnings("deprecation") // TODO: what is the not-deprecated way? private static void initializeContainerModel(ContainerModel containerModel, ConfigModelRepo configModelRepo) { containerModel.initialize(configModelRepo); } @@ -327,5 +323,4 @@ public class StandaloneContainerApplication implements Application { } return Optional.ofNullable(System.getProperty(name)); // for unit testing } - } |