From bd0b440da9cd0f9e594fa0176ecc6a7c299c420b Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Feb 2018 13:37:28 +1000 Subject: [PATCH] fixing one errorprone error, ATM configure it to generate warning and not errors, let see if we can collect in jenkins Signed-off-by: olivier lamy --- .../org/eclipse/jetty/util/PathWatcher.java | 52 +++++++++---------- pom.xml | 6 ++- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java index 30114e4d5db..4e4a2a04802 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java @@ -50,6 +50,7 @@ import java.util.Scanner; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; +import java.util.stream.Stream; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; @@ -1029,35 +1030,34 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable register(dir,config); final MultiException me = new MultiException(); - Files.list(dir).forEach(p-> - { - if (LOG.isDebugEnabled()) - LOG.debug("registerTree? {}",p); + try (Stream stream = Files.list( dir)) { + stream.forEach( p -> { + if ( LOG.isDebugEnabled() ) LOG.debug( "registerTree? {}", p ); - try - { - if (notify && config.test(p)) - pending.put(p,new PathWatchEvent(p,PathWatchEventType.ADDED,config)); - - switch(config.handleDir(p)) + try { - case ENTER: - registerTree(p,config.asSubConfig(p),notify); - break; - case WATCH: - registerDir(p,config); - break; - case IGNORE: - default: - break; + if ( notify && config.test( p ) ) + pending.put( p, new PathWatchEvent( p, PathWatchEventType.ADDED, config ) ); + + switch ( config.handleDir( p ) ) + { + case ENTER: + registerTree( p, config.asSubConfig( p ), notify ); + break; + case WATCH: + registerDir( p, config ); + break; + case IGNORE: + default: + break; + } } - } - catch(IOException e) - { - me.add(e); - } - }); - + catch ( IOException e ) + { + me.add( e ); + } + } ); + } try { me.ifExceptionThrow(); diff --git a/pom.xml b/pom.xml index 2bbbadfc590..84d9de8a254 100644 --- a/pom.xml +++ b/pom.xml @@ -406,16 +406,20 @@ maven-compiler-plugin 3.6.2 + true javac-with-errorprone true 1.8 1.8 + + -XepAllErrorsAsWarnings + org.codehaus.plexus plexus-compiler-javac-errorprone - 2.8 + 2.8.2