Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <olamy@webtide.com>
This commit is contained in:
olivier lamy 2018-02-19 13:37:28 +10:00
parent 41b40dc97d
commit bd0b440da9
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
jetty-util/src/main/java/org/eclipse/jetty/util/PathWatcher.java
View File

@ -50,6 +50,7 @@ import java.util.Scanner;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Stream;
import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -1029,35 +1030,34 @@ public class PathWatcher extends AbstractLifeCycle implements Runnable
register(dir,config); register(dir,config);
final MultiException me = new MultiException(); final MultiException me = new MultiException();
Files.list(dir).forEach(p-> try (Stream<Path> stream = Files.list( dir)) {
{ stream.forEach( p -> {
if (LOG.isDebugEnabled()) if ( LOG.isDebugEnabled() ) LOG.debug( "registerTree? {}", p );
LOG.debug("registerTree? {}",p);
try try
{
if (notify && config.test(p))
pending.put(p,new PathWatchEvent(p,PathWatchEventType.ADDED,config));
switch(config.handleDir(p))
{ {
case ENTER: if ( notify && config.test( p ) )
registerTree(p,config.asSubConfig(p),notify); pending.put( p, new PathWatchEvent( p, PathWatchEventType.ADDED, config ) );
break;
case WATCH:
registerDir(p,config);
break;
case IGNORE:
default:
break;
}
}
catch(IOException e)
{
me.add(e);
}
});
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 );
}
} );
}
try try
{ {
me.ifExceptionThrow(); me.ifExceptionThrow();

6
pom.xml
View File

@ -406,16 +406,20 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.2</version> <version>3.6.2</version>
<configuration> <configuration>
<showWarnings>true</showWarnings>
<compilerId>javac-with-errorprone</compilerId> <compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse> <forceJavacCompilerUse>true</forceJavacCompilerUse>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
<compilerArgs>
<arg>-XepAllErrorsAsWarnings</arg>
</compilerArgs>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId> <artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8</version> <version>2.8.2</version>
</dependency> </dependency>
<!-- override plexus-compiler-javac-errorprone's dependency on <!-- override plexus-compiler-javac-errorprone's dependency on
Error Prone with the latest version --> Error Prone with the latest version -->