Remove support for groovy filters (#1913)

Author: gavinbunney

build.gradle

@@ -267,8 +267,4 @@ rewrite {
     failOnDryRunResults = true
     activeRecipe("org.openrewrite.java.testing.junit5.JUnit5BestPractices")
     activeRecipe("org.openrewrite.java.logging.slf4j.Slf4jBestPractices")
-
-    exclusion(
-            // Exclude all groovy files
-            "**/*.groovy")
 }

gradle.properties

@@ -1,4 +1,3 @@
-versions_groovy=3.0.19
 versions_ribbon=2.4.4
 versions_netty=4.1.118.Final
 versions_netty_io_uring=0.0.25.Final

settings.gradle

@@ -1,7 +1,6 @@
 rootProject.name='zuul'
 
 include 'zuul-core'
-include 'zuul-groovy'
 include 'zuul-guice'
 include 'zuul-processor'
 include 'zuul-sample'

zuul-core/dependencies.lock

@@ -1907,7 +1907,7 @@
             ]
         },
         "org.mockito:mockito-core": {
-            "locked": "5.16.0",
+            "locked": "5.16.1",
             "transitive": [
                 "org.mockito:mockito-junit-jupiter"
             ]
@@ -3219,7 +3219,7 @@
             ]
         },
         "org.mockito:mockito-core": {
-            "locked": "5.16.0",
+            "locked": "5.16.1",
             "transitive": [
                 "org.mockito:mockito-junit-jupiter"
             ]
@@ -3884,7 +3884,7 @@
             ]
         },
         "org.mockito:mockito-core": {
-            "locked": "5.16.0",
+            "locked": "5.16.1",
             "transitive": [
                 "org.mockito:mockito-junit-jupiter"
             ]

zuul-core/src/main/java/com/netflix/zuul/DynamicCodeCompiler.java

@@ -19,8 +19,6 @@
 import com.netflix.zuul.filters.FilterRegistry;
 import com.netflix.zuul.filters.FilterType;
 import com.netflix.zuul.filters.ZuulFilter;
-import java.io.File;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -38,100 +36,27 @@ public final class DynamicFilterLoader implements FilterLoader {
     private static final Logger LOG = LoggerFactory.getLogger(DynamicFilterLoader.class);
 
     private final ConcurrentMap<String, Long> filterClassLastModified = new ConcurrentHashMap<>();
-    private final ConcurrentMap<String, String> filterClassCode = new ConcurrentHashMap<>();
-    private final ConcurrentMap<String, String> filterCheck = new ConcurrentHashMap<>();
     private final ConcurrentMap<FilterType, SortedSet<ZuulFilter<?, ?>>> hashFiltersByType = new ConcurrentHashMap<>();
     private final ConcurrentMap<String, ZuulFilter<?, ?>> filtersByNameAndType = new ConcurrentHashMap<>();
 
     private final FilterRegistry filterRegistry;
 
-    private final DynamicCodeCompiler compiler;
-
     private final FilterFactory filterFactory;
 
     @Inject
     public DynamicFilterLoader(
-            FilterRegistry filterRegistry, DynamicCodeCompiler compiler, FilterFactory filterFactory) {
+            FilterRegistry filterRegistry, FilterFactory filterFactory) {
         this.filterRegistry = filterRegistry;
-        this.compiler = compiler;
         this.filterFactory = filterFactory;
     }
 
-    /**
-     * Given source and name will compile and store the filter if it detects that the filter code
-     * has changed or the filter doesn't exist. Otherwise it will return an instance of the
-     * requested ZuulFilter.
-     *
-     * @deprecated it is unclear to me why this method is needed.   Nothing seems to use it, and the
-     *             swapping of code seems to happen elsewhere.   This will be removed in a later
-     *             Zuul release.
-     */
-    @Deprecated
-    public ZuulFilter<?, ?> getFilter(String sourceCode, String filterName) throws Exception {
-        if (filterCheck.get(filterName) == null) {
-            filterCheck.putIfAbsent(filterName, filterName);
-            if (!sourceCode.equals(filterClassCode.get(filterName))) {
-                if (filterRegistry.isMutable()) {
-                    LOG.info("reloading code {}", filterName);
-                    filterRegistry.remove(filterName);
-                } else {
-                    LOG.warn("Filter registry is not mutable, discarding {}", filterName);
-                }
-            }
-        }
-        ZuulFilter<?, ?> filter = filterRegistry.get(filterName);
-        if (filter == null) {
-            Class<?> clazz = compiler.compile(sourceCode, filterName);
-            if (!Modifier.isAbstract(clazz.getModifiers())) {
-                filter = filterFactory.newInstance(clazz);
-            }
-        }
-        return filter;
-    }
-
     /**
      * @return the total number of Zuul filters
      */
     public int filterInstanceMapSize() {
         return filterRegistry.size();
     }
 
-    /**
-     * From a file this will read the ZuulFilter source code, compile it, and add it to the list of current filters
-     * a true response means that it was successful.
-     *
-     * @param file the file to load
-     * @return true if the filter in file successfully read, compiled, verified and added to Zuul
-     */
-    @Override
-    public boolean putFilter(File file) {
-        if (!filterRegistry.isMutable()) {
-            return false;
-        }
-        try {
-            String sName = file.getAbsolutePath();
-            if (filterClassLastModified.get(sName) != null
-                    && (file.lastModified() != filterClassLastModified.get(sName))) {
-                LOG.debug("reloading filter {}", sName);
-                filterRegistry.remove(sName);
-            }
-            ZuulFilter<?, ?> filter = filterRegistry.get(sName);
-            if (filter == null) {
-                Class<?> clazz = compiler.compile(file);
-                if (!Modifier.isAbstract(clazz.getModifiers())) {
-                    filter = filterFactory.newInstance(clazz);
-                    putFilter(sName, filter, file.lastModified());
-                    return true;
-                }
-            }
-        } catch (Exception e) {
-            LOG.error("Error loading filter! Continuing. file={}", file, e);
-            return false;
-        }
-
-        return false;
-    }
-
     private void putFilter(String filterName, ZuulFilter<?, ?> filter, long lastModified) {
         if (!filterRegistry.isMutable()) {
             LOG.warn("Filter registry is not mutable, discarding {}", filterName);