diff --git a/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java b/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java index 11213616f9..f34794d95f 100644 --- a/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java +++ b/zuul-core/src/test/java/com/netflix/zuul/filters/BaseFilterTest.java @@ -28,6 +28,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import rx.Observable; /** * Tests for {@link BaseFilter}. Currently named BaseFilter2Test as there is an existing class named BaseFilterTest. @@ -79,12 +80,12 @@ public ZuulMessage apply(ZuulMessage req) { @Test void validateDefaultConcurrencyLimit() { final int[] limit = {0}; - class ConcInboundFilter extends BaseSyncFilter { + class ConcInboundFilter extends BaseFilter { @Override - public ZuulMessage apply(ZuulMessage input) { + public Observable applyAsync(ZuulMessage input) { limit[0] = Math.max(filterConcurrencyCustom.get(), filterConcurrencyDefault.get()); - return null; + return Observable.just("Done"); } @Override @@ -97,7 +98,7 @@ public boolean shouldFilter(ZuulMessage msg) { return true; } } - new ConcInboundFilter().apply(new ZuulMessageImpl(new SessionContext(), new Headers())); + new ConcInboundFilter().applyAsync(new ZuulMessageImpl(new SessionContext(), new Headers())); Truth.assertThat(limit[0]).isEqualTo(4000); } @@ -108,12 +109,12 @@ void validateFilterConcurrencyLimitOverride() { configuration.setProperty("zuul.ConcInboundFilter.in.concurrency.limit", 4000); final int[] limit = {0}; - class ConcInboundFilter extends BaseSyncFilter { + class ConcInboundFilter extends BaseFilter { @Override - public ZuulMessage apply(ZuulMessage input) { + public Observable applyAsync(ZuulMessage input) { limit[0] = Math.max(filterConcurrencyCustom.get(), filterConcurrencyDefault.get()); - return null; + return Observable.just("Done"); } @Override @@ -126,7 +127,7 @@ public boolean shouldFilter(ZuulMessage msg) { return true; } } - new ConcInboundFilter().apply(new ZuulMessageImpl(new SessionContext(), new Headers())); + new ConcInboundFilter().applyAsync(new ZuulMessageImpl(new SessionContext(), new Headers())); Truth.assertThat(limit[0]).isEqualTo(7000); } }