Remove Jersey integration from DI framework.

3 files changed, 0 insertions, 152 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
index b596246a43d..47ac3018fde 100644
--- a/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/ContainerTest.java
@@ -5,13 +5,10 @@ import com.google.inject.Guice;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.config.di.IntConfig;
 import com.yahoo.config.test.TestConfig;
-import com.yahoo.container.bundle.MockBundle;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.container.di.componentgraph.core.ComponentGraph;
 import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.SimpleComponent;
-import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.SimpleComponent2;
 import com.yahoo.container.di.componentgraph.core.ComponentNode.ComponentConstructorException;
-import com.yahoo.container.di.config.RestApiContext;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
@@ -218,64 +215,6 @@ public class ContainerTest extends ContainerTestBase {
         assertNotNull(newGraph.get(5, TimeUnit.MINUTES));
     }
 
-
-    @Test
-    public void bundle_info_is_set_on_rest_api_context() {
-        Class<RestApiContext> clazz = RestApiContext.class;
-
-        writeBootstrapConfigs("restApiContext", clazz);
-        dirConfigSource.writeConfig("jersey-bundles", "bundles[0].spec \"mock-entry-to-enforce-a-MockBundle\"");
-        dirConfigSource.writeConfig("jersey-injection", "inject[0]");
-
-        Container container = newContainer(dirConfigSource);
-        ComponentGraph componentGraph = getNewComponentGraph(container);
-
-        RestApiContext restApiContext = componentGraph.getInstance(clazz);
-        assertNotNull(restApiContext);
-
-        assertEquals(1, restApiContext.getBundles().size());
-        assertEquals(MockBundle.SymbolicName, restApiContext.getBundles().get(0).symbolicName);
-        assertEquals(MockBundle.BundleVersion, restApiContext.getBundles().get(0).version);
-
-        container.shutdownConfigurer();
-    }
-
-    @Test
-    public void restApiContext_has_all_components_injected() {
-        Class<RestApiContext> restApiClass = RestApiContext.class;
-        Class<SimpleComponent> injectedClass = SimpleComponent.class;
-        String injectedComponentId = "injectedComponent";
-        Class<SimpleComponent2> anotherComponentClass = SimpleComponent2.class;
-        String anotherComponentId = "anotherComponent";
-
-        String componentsConfig =
-                new ComponentEntry(injectedComponentId, injectedClass).asConfig(0) + "\n" +
-                        new ComponentEntry(anotherComponentId, anotherComponentClass).asConfig(1) + "\n" +
-                        new ComponentEntry("restApiContext", restApiClass).asConfig(2) + "\n" +
-                        "components[2].inject[0].id " + injectedComponentId + "\n" +
-                        "components[2].inject[1].id " + anotherComponentId + "\n";
-
-        String injectionConfig = "inject[1]\n" +//
-                "inject[0].instance " + injectedComponentId + "\n" +//
-                "inject[0].forClass \"" + injectedClass.getName() + "\"\n";
-
-        dirConfigSource.writeConfig("components", componentsConfig);
-        dirConfigSource.writeConfig("platform-bundles", "");
-        dirConfigSource.writeConfig("application-bundles", "");
-        dirConfigSource.writeConfig("jersey-bundles", "bundles[0].spec \"mock-entry-to-enforce-a-MockBundle\"");
-        dirConfigSource.writeConfig("jersey-injection", injectionConfig);
-
-        Container container = newContainer(dirConfigSource);
-        ComponentGraph componentGraph = getNewComponentGraph(container);
-
-        RestApiContext restApiContext = componentGraph.getInstance(restApiClass);
-
-        assertFalse(restApiContext.getInjectableComponents().isEmpty());
-        assertEquals(2, restApiContext.getInjectableComponents().size());
-
-        container.shutdownConfigurer();
-    }
-
     @Test
     public void providers_are_destructed() {
         writeBootstrapConfigs("id1", DestructableProvider.class);
diff --git a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
index 70dc4c8665c..43e36781101 100644
--- a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
+++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java
@@ -16,11 +16,7 @@ import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.config.test.Test2Config;
 import com.yahoo.config.test.TestConfig;
-import com.yahoo.container.di.Osgi;
 import com.yahoo.container.di.componentgraph.Provider;
-import com.yahoo.container.di.config.JerseyBundlesConfig;
-import com.yahoo.container.di.config.JerseyInjectionConfig;
-import com.yahoo.container.di.config.RestApiContext;
 import com.yahoo.vespa.config.ConfigKey;
 import org.junit.Test;
 
@@ -485,25 +481,6 @@ public class ComponentGraphTest {
         assertThat(componentGraph.getInstance(ComponentTakingComponentId.class).componentId, is(ComponentId.fromString(componentId)));
     }
 
-    @Test
-    public void rest_api_context_can_be_instantiated() {
-        String configId = "raw:\"\"";
-
-        Class<RestApiContext> clazz = RestApiContext.class;
-        JerseyNode jerseyNode = new JerseyNode(uniqueComponentId(clazz.getName()), configId, clazz, new Osgi() {
-        });
-
-        ComponentGraph componentGraph = new ComponentGraph();
-        componentGraph.add(jerseyNode);
-        componentGraph.complete();
-
-        componentGraph
-                .setAvailableConfigs(ConfigMap.newMap(JerseyBundlesConfig.class, configId).add(JerseyInjectionConfig.class, configId));
-
-        RestApiContext restApiContext = componentGraph.getInstance(clazz);
-        assertNotNull(restApiContext);
-        assertThat(restApiContext.getBundles().size(), is(0));
-    }
 
     //Note that all Components must be defined in a static context,
     //otherwise their constructor will take the outer class as the first parameter.
diff --git a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java
deleted file mode 100644
index f30f9260830..00000000000
--- a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/JerseyNodeTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.di.componentgraph.core;
-
-import com.yahoo.container.bundle.MockBundle;
-import com.yahoo.container.di.config.RestApiContext;
-import com.yahoo.container.di.osgi.OsgiUtil;
-import org.junit.Test;
-import org.osgi.framework.wiring.BundleWiring;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author gjoranv
- * @author ollivir
- */
-
-public class JerseyNodeTest {
-    private MockBundle bundle;
-    private List<String> bundleClasses;
-    private final Map<String, String> resources;
-
-    public JerseyNodeTest() {
-        resources = new HashMap<>();
-        resources.put("com/foo", "com/foo/Foo.class");
-        resources.put("com/bar", "com/bar/Bar.class");
-        bundle = new MockBundle() {
-            @Override
-            public Collection<String> listResources(String path, String ignored, int options) {
-                if ((options & BundleWiring.LISTRESOURCES_RECURSE) != 0 && path.equals("/")) {
-                    return resources.values();
-                } else {
-                    return Collections.singleton(resources.get(path));
-                }
-            }
-        };
-        bundleClasses = new ArrayList<>(resources.values());
-    }
-
-    @Test
-    public void all_bundle_entries_are_returned_when_no_packages_are_given() {
-        Collection<String> entries = OsgiUtil.getClassEntriesInBundleClassPath(bundle, Collections.emptySet());
-        assertThat(entries, containsInAnyOrder(bundleClasses.toArray()));
-    }
-
-    @Test
-    public void only_bundle_entries_from_the_given_packages_are_returned() {
-        Collection<String> entries = OsgiUtil.getClassEntriesInBundleClassPath(bundle, Collections.singleton("com.foo"));
-        assertThat(entries, contains(resources.get("com/foo")));
-    }
-
-    @Test
-    public void bundle_info_is_initialized() {
-        RestApiContext.BundleInfo bundleInfo = JerseyNode.createBundleInfo(bundle, Collections.emptyList());
-        assertThat(bundleInfo.symbolicName, is(bundle.getSymbolicName()));
-        assertThat(bundleInfo.version, is(bundle.getVersion()));
-        assertThat(bundleInfo.fileLocation, is(bundle.getLocation()));
-    }
-}