Revert "Inject default threadpool to handlers [run-systemtest]"

2 files changed, 3 insertions, 19 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index fb7ba1ab39e..11355dee24f 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -50,7 +50,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
         this(executor, metric, false);
     }
 
-    // TODO: deprecate this and the Context class. The context component set up in the model does not get a dedicated thread pool.
+    // TODO: move Inject annotation here!
     public ThreadedHttpRequestHandler(Context context) {
         this(context.executor, context.metric);
     }
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 5abb96527bd..f8f567e1890 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
@@ -102,7 +102,7 @@ public class ComponentGraphTest {
     }
 
     @Test
-    public void component_can_be_explicitly_injected_into_another_component() {
+    public void component_can_be_injected_into_another_component() {
         Node injectedComponent = mockComponentNode(SimpleComponent.class);
         Node targetComponent = mockComponentNode(ComponentTakingComponent.class);
         targetComponent.inject(injectedComponent);
@@ -117,22 +117,6 @@ public class ComponentGraphTest {
 
         ComponentTakingComponent instance = componentGraph.getInstance(ComponentTakingComponent.class);
         assertNotNull(instance);
-        assertSame(injectedComponent.instance.get(), instance.injectedComponent);
-    }
-
-    @Test
-    public void explicitly_injected_components_may_be_unused() {
-        Node notUsingInjected = mockComponentNode(SimpleComponent.class);
-        Node injectedComponent = mockComponentNode(SimpleComponent2.class);
-        notUsingInjected.inject(injectedComponent);
-
-        ComponentGraph componentGraph = new ComponentGraph();
-        componentGraph.add(injectedComponent);
-        componentGraph.add(notUsingInjected);
-        componentGraph.complete();
-
-        SimpleComponent instanceNotUsingInjected = componentGraph.getInstance(SimpleComponent.class);
-        assertNotNull(instanceNotUsingInjected);
     }
 
     @Test
@@ -530,7 +514,7 @@ public class ComponentGraphTest {
     }
 
     public static class ComponentTakingComponent extends AbstractComponent {
-        final SimpleComponent injectedComponent;
+        private final SimpleComponent injectedComponent;
 
         public ComponentTakingComponent(SimpleComponent injectedComponent) {
             assertNotNull(injectedComponent);