Revert "Jonmv/provide filter on data plane filters"

1 files changed, 0 insertions, 79 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
index 44a7578fd9f..7acbaa73fe4 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
@@ -2,29 +2,15 @@
 package com.yahoo.container.jdisc;
 
 import com.yahoo.component.ComponentId;
-import com.yahoo.component.ComponentSpecification;
-import com.yahoo.component.chain.ChainedComponent;
-import com.yahoo.component.chain.dependencies.After;
-import com.yahoo.component.chain.dependencies.Before;
-import com.yahoo.component.chain.dependencies.Provides;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.core.ChainsConfig;
-import com.yahoo.container.core.ChainsConfig.Chains;
-import com.yahoo.container.core.ChainsConfig.Components;
-import com.yahoo.container.core.ChainsConfig.Components.Builder;
 import com.yahoo.container.http.filter.FilterChainRepository;
-import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.ServerConfig;
-import com.yahoo.jdisc.http.filter.DiscFilterRequest;
 import com.yahoo.jdisc.http.filter.RequestFilter;
 import com.yahoo.jdisc.http.filter.ResponseFilter;
-import com.yahoo.jdisc.http.filter.SecurityRequestFilter;
-import com.yahoo.jdisc.http.filter.SecurityRequestFilterChain;
 import com.yahoo.jdisc.http.server.jetty.FilterBindings;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -64,71 +50,6 @@ public class FilterBindingsProviderTest {
     }
 
     @Test
-    void requireThatChainOrderIsCorrect() {
-
-        List<ChainedComponent> filteredBy = new ArrayList<>();
-
-        class DummyFilter extends ChainedComponent implements SecurityRequestFilter {
-            @Override public void filter(DiscFilterRequest request, ResponseHandler handler) { filteredBy.add(this); }
-            @Override public String toString() { return getClass().getAnnotation(Provides.class).value()[0]; }
-        }
-
-        @Provides("foo") class Filter1 extends DummyFilter { }
-        @Provides("bar") @After("foo") class Filter2 extends DummyFilter { }
-        @Provides("baz") @Before("foo") class Filter3 extends DummyFilter { }
-
-        ComponentRegistry<SecurityRequestFilter> filters = new ComponentRegistry<>();
-
-        SecurityRequestFilter foo = new Filter1();
-        SecurityRequestFilter bar = new Filter2();
-        SecurityRequestFilter baz = new Filter3();
-
-        filters.register(ComponentId.fromString("foo"), foo);
-        filters.register(ComponentId.fromString("bar"), bar);
-        filters.register(ComponentId.fromString("baz"), baz);
-
-        ChainsConfig.Builder oneChain = new ChainsConfig.Builder();
-        oneChain.components(new Components.Builder().id("foo"))
-                .components(new Components.Builder().id("bar"))
-                .components(new Components.Builder().id("baz"))
-                .chains(new Chains.Builder().id("chain")
-                                           .components("bar")
-                                           .components("foo")
-                                           .components("baz"));
-
-        ((SecurityRequestFilterChain) new FilterChainRepository(oneChain.build(),
-                                                                new ComponentRegistry<>(),
-                                                                new ComponentRegistry<>(),
-                                                                filters,
-                                                                new ComponentRegistry<>())
-                .getFilter(ComponentSpecification.fromString("chain"))).filter((DiscFilterRequest) null, null);
-
-        assertEquals(List.of(baz, foo, bar), filteredBy);
-
-        filteredBy.clear();
-        ChainsConfig.Builder childChain = new ChainsConfig.Builder();
-        childChain.components(new Builder().id("foo"))
-                  .components(new Builder().id("bar"))
-                  .components(new Builder().id("baz"))
-                  .chains(new Chains.Builder().id("parent")
-                                              .components("bar")
-                                              .components("baz"))
-                  .chains(new Chains.Builder().id("child")
-                                              .components("foo")
-                                              .inherits("parent"));
-
-        ((SecurityRequestFilterChain) new FilterChainRepository(childChain.build(),
-                                                                new ComponentRegistry<>(),
-                                                                new ComponentRegistry<>(),
-                                                                filters,
-                                                                new ComponentRegistry<>())
-                .getFilter(ComponentSpecification.fromString("child"))).filter((DiscFilterRequest) null, null);
-
-        assertEquals(List.of(baz, foo, bar), filteredBy);
-
-    }
-
-    @Test
     void requireThatCorrectlyConfiguredFiltersAreIncluded() {
         final String requestFilter1Id = "requestFilter1";
         final String requestFilter2Id = "requestFilter2";