Merge pull request #5744 from eclipse/jetty-10.0.x-5086-review-scanner

Issue #5086 Review and rework o.e.j.util.Scanner
jetty · Dec 2, 2020 · 0eccdde · 0eccdde
2 parents 3788223 + 9c882ee
commit 0eccdde
Show file tree

Hide file tree

Showing 9 changed files with 409 additions and 445 deletions.
diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/ServerProxyImpl.java
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.jetty.ant.types.Connector;
 import org.eclipse.jetty.ant.types.ContextHandlers;
@@ -135,7 +136,7 @@ public WebAppScannerListener(AntWebAppContext awc)
         }
 
         @Override
-        public void filesChanged(List<String> changedFileNames)
+        public void filesChanged(Set<String> changedFileNames)
         {
             boolean isScanned = false;
             try

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
@@ -41,20 +41,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 @ManagedObject("Abstract Provider for loading webapps")
 public abstract class ScanningAppProvider extends ContainerLifeCycle implements AppProvider
 {
     private static final Logger LOG = LoggerFactory.getLogger(ScanningAppProvider.class);
 
-    private Map<String, App> _appMap = new HashMap<String, App>();
-
+    private final Map<String, App> _appMap = new HashMap<>();
     private DeploymentManager _deploymentManager;
-    protected FilenameFilter _filenameFilter;
+    private FilenameFilter _filenameFilter;
     private final List<Resource> _monitored = new CopyOnWriteArrayList<>();
-    private boolean _recursive = false;
     private int _scanInterval = 10;
     private Scanner _scanner;
 
@@ -140,7 +135,6 @@ protected void doStart() throws Exception
         _scanner = new Scanner();
         _scanner.setScanDirs(files);
         _scanner.setScanInterval(_scanInterval);
-        _scanner.setRecursive(_recursive);
         _scanner.setFilenameFilter(_filenameFilter);
         _scanner.setReportDirs(true);
         _scanner.setScanDepth(1); //consider direct dir children of monitored dir
@@ -237,12 +231,6 @@ public int getScanInterval()
         return _scanInterval;
     }
 
-    @ManagedAttribute("recursive scanning supported")
-    public boolean isRecursive()
-    {
-        return _recursive;
-    }
-
     @Override
     public void setDeploymentManager(DeploymentManager deploymentManager)
     {
@@ -295,11 +283,6 @@ public void setMonitoredDirectories(Collection<String> directories)
         }
     }
 
-    protected void setRecursive(boolean recursive)
-    {
-        _recursive = recursive;
-    }
-
     public void setScanInterval(int scanInterval)
     {
         _scanInterval = scanInterval;
@@ -312,7 +295,7 @@ public void scan()
             getMonitoredResources().stream().map((r) -> r.getURI().toASCIIString())
                 .collect(Collectors.joining(", ", "[", "]"))
         );
-        _scanner.scan();
+        _scanner.nudge();
     }
 
     @Override

diff --git a/...c/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java b/...c/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
@@ -76,10 +76,10 @@ public void setupEnvironment() throws Exception
             if (provider instanceof ScanningAppProvider)
             {
                 _providers++;
-                ((ScanningAppProvider)provider).addScannerListener(new Scanner.ScanListener()
+                ((ScanningAppProvider)provider).addScannerListener(new Scanner.ScanCycleListener()
                 {
                     @Override
-                    public void scan()
+                    public void scanEnded(int cycle)
                     {
                         _scans.incrementAndGet();
                     }

diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java
@@ -22,7 +22,7 @@
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
 import java.util.Date;
-import java.util.List;
+import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -191,7 +191,7 @@ protected void configureScanner()
         }
         scanner.addListener(new Scanner.BulkListener()
         {
-            public void filesChanged(List<String> changes)
+            public void filesChanged(Set<String> changes)
             {
                 try
                 {

diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunWarMojo.java
@@ -22,7 +22,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
-import java.util.List;
+import java.util.Set;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Execute;
@@ -197,7 +197,7 @@ public void configureScanner() throws MojoExecutionException
             configureScanTargetPatterns(scanner);
             scanner.addListener(new Scanner.BulkListener()
             {
-                public void filesChanged(List<String> changes)
+                public void filesChanged(Set<String> changes)
                 {
                     try
                     {