Filters could be toggled at runtime

Author: graemerocher

http-client/src/main/java/io/micronaut/http/client/filter/HttpClientFilterResolver.java

@@ -91,11 +91,6 @@ public HttpClientFilterResolver(
                             annotationMetadata.stringValues(Filter.class)
                     );
                 }).filter(entry -> {
-                    final HttpClientFilter filter = entry.httpClientFilter;
-                    if (filter instanceof Toggleable && !((Toggleable) filter).isEnabled()) {
-                        return false;
-                    }
-
                     boolean matches;
                     AnnotationMetadata annotationMetadata = entry.annotationMetadata;
                     if (annotationValue != null) {
@@ -121,6 +116,10 @@ public List<HttpClientFilter> resolveFilters(HttpRequest<?> request) {
         io.micronaut.http.HttpMethod method = request.getMethod();
         List<HttpClientFilter> filterList = new ArrayList<>(clientFilters.size());
         for (HttpClientFilterEntry filterEntry : clientFilters) {
+            final HttpClientFilter filter = filterEntry.httpClientFilter;
+            if (filter instanceof Toggleable && !((Toggleable) filter).isEnabled()) {
+                continue;
+            }
             boolean matches = true;
             if (filterEntry.hasMethods) {
                 matches = anyMethodMatches(method, filterEntry.filterMethods);
@@ -130,7 +129,7 @@ public List<HttpClientFilter> resolveFilters(HttpRequest<?> request) {
             }
 
             if (matches) {
-                filterList.add(filterEntry.httpClientFilter);
+                filterList.add(filter);
             }
         }
         return filterList;