From e04f95504e5469ae7e30dddc7cab69fdb5973004 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 3 Dec 2021 10:43:44 +0100 Subject: Make DiscFilterResponse concrete and remove package-private sub-class Make DiscFilterResponse opereate directly on a jdisc-core Response instance. Reduce use of jdisc-core types from its public API. --- .../security/cors/CorsResponseFilterTest.java | 26 ++-------------------- 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'jdisc-security-filters/src/test/java/com/yahoo/jdisc/http') diff --git a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java index 9803418e9ae..e3a3568700c 100644 --- a/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java +++ b/jdisc-security-filters/src/test/java/com/yahoo/jdisc/http/filter/security/cors/CorsResponseFilterTest.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.http.filter.security.cors; -import com.yahoo.jdisc.http.Cookie; import com.yahoo.jdisc.http.HttpResponse; import com.yahoo.jdisc.http.filter.DiscFilterResponse; import com.yahoo.jdisc.http.filter.RequestView; @@ -12,7 +11,6 @@ import org.junit.Test; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Optional; @@ -75,11 +73,9 @@ public class CorsResponseFilterTest { } private static class TestResponse extends DiscFilterResponse { - Map headers = new HashMap<>(); + final Map headers = new HashMap<>(); - TestResponse() { - super(mock(HttpResponse.class)); - } + TestResponse() { super(HttpResponse.newInstance(200)); } @Override public void setHeader(String name, String value) { @@ -90,23 +86,5 @@ public class CorsResponseFilterTest { public String getHeader(String name) { return headers.get(name); } - - @Override - public void removeHeaders(String s) { throw new UnsupportedOperationException(); } - - @Override - public void setHeaders(String s, String s1) { throw new UnsupportedOperationException(); } - - @Override - public void setHeaders(String s, List list) { throw new UnsupportedOperationException(); } - - @Override - public void addHeader(String s, String s1) { throw new UnsupportedOperationException(); } - - @Override - public void setCookies(List list) { throw new UnsupportedOperationException(); } - - @Override - public void setStatus(int i) { throw new UnsupportedOperationException(); } } } -- cgit v1.2.3