diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-09 17:14:28 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-09 17:30:13 +0100 |
commit | 76bb30d6f06ace62dd12f4fbd618146e5c62d089 (patch) | |
tree | 246ced8bccc8763b8af8c3563ea19acf3ab20a52 /standalone-container/src/main/java | |
parent | 1dd94fa117dc987a6b9411509fcc6f65fb8cec44 (diff) |
Remove standalone container activator
The standalone container activator is no longer needed after pre-binding
of server sockets was removed.
Diffstat (limited to 'standalone-container/src/main/java')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java | 136 |
1 files changed, 0 insertions, 136 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java deleted file mode 100644 index dbf0b748eea..00000000000 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.standalone; - -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Module; -import com.google.inject.util.Modules; -import com.yahoo.jdisc.application.ContainerActivator; -import com.yahoo.jdisc.application.ContainerBuilder; -import com.yahoo.jdisc.application.DeactivatedContainer; -import com.yahoo.jdisc.application.OsgiFramework; -import com.yahoo.jdisc.http.ConnectorConfig; -import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.http.ConnectorFactory; -import com.yahoo.vespa.model.container.http.JettyHttpServer; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author Einar M R Rosenvinge - */ -public class StandaloneContainerActivator implements BundleActivator { - - @Override public void start(BundleContext bundleContext) {} - @Override public void stop(BundleContext bundleContext) {} - - static Container getContainer(Module... modules) { - Module activatorModule = new ActivatorModule(); - List<Module> allModules = new ArrayList<>(); - allModules.addAll(Arrays.asList(modules)); - allModules.add(activatorModule); - - StandaloneContainerApplication app = new StandaloneContainerApplication(Guice.createInjector(Modules.combine(allModules))); - return app.container(); - } - - static List<ConnectorConfig> getConnectorConfigs(Container container) { - return getConnectorConfigs(container.getHttpServer()); - } - - private static List<ConnectorConfig> getConnectorConfigs(JettyHttpServer jettyHttpServer) { - if (jettyHttpServer == null) - return Collections.emptyList(); - - return jettyHttpServer.getConnectorFactories().stream(). - map(StandaloneContainerActivator::getConnectorConfig). - collect(Collectors.toList()); - } - - private static ConnectorConfig getConnectorConfig(ConnectorFactory connectorFactory) { - return VespaModel.getConfig(ConnectorConfig.class, connectorFactory); - } - - - private static class ActivatorModule implements Module { - @Override - public void configure(Binder binder) { - binder.bind(OsgiFramework.class).toInstance(new DummyOsgiFramework()); - binder.bind(ContainerActivator.class).toInstance(new DummyActivatorForStandaloneContainerApp()); - } - } - - private static class DummyActivatorForStandaloneContainerApp implements ContainerActivator { - @Override - public ContainerBuilder newContainerBuilder() { - return new ContainerBuilder(new ArrayList<Module>()); - } - - @Override - public DeactivatedContainer activateContainer(ContainerBuilder builder) { - return new DeactivatedContainer() { - @Override - public Object appContext() { - return new Object(); - } - - @Override - public void notifyTermination(Runnable task) { - } - }; - } - } - - public static class DummyOsgiFramework implements OsgiFramework { - @Override - public List<Bundle> installBundle(String bundleLocation) { - throw new UnsupportedOperationException(); - } - - @Override - public void startBundles(List<Bundle> bundles, boolean privileged) { - throw new UnsupportedOperationException(); - } - - @Override - public void refreshPackages() { - throw new UnsupportedOperationException(); - } - - @Override - public BundleContext bundleContext() { - return null; - } - - @Override - public List<Bundle> bundles() { - return Collections.emptyList(); - } - - @Override - public List<Bundle> getBundles(Bundle requestingBundle) { - return Collections.emptyList(); - } - - @Override - public void allowDuplicateBundles(Collection<Bundle> bundles) { } - - @Override - public void start() { - } - - @Override - public void stop() { - } - } - -} |