make some java modern changes

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java

@@ -22,9 +22,9 @@
 
 // TODO should it be BuildWorkspace or something like that?
 public interface BuildContext {
-  public static final int SEVERITY_WARNING = 1;
+  int SEVERITY_WARNING = 1;
 
-  public static final int SEVERITY_ERROR = 2;
+  int SEVERITY_ERROR = 2;
 
   // TODO should we add File getBasedir()?
 
@@ -50,7 +50,7 @@ public interface BuildContext {
    *  
    * @param relpaths List<String> are paths relative to build context basedir
    */
-  boolean hasDelta(List relpaths);
+  boolean hasDelta(List<String> relpaths);
 
   /**
    * Indicates that the file or folder content has been modified during the build.
@@ -103,7 +103,7 @@ public interface BuildContext {
    * 
    * Returns empty Scanner if <code>basedir</code> is not under this build context basedir.
    * 
-   * @see http://jira.codehaus.org/browse/MSHARED-125
+   * https://issues.apache.org/jira/browse/MSHARED-125
    */
   Scanner newScanner(File basedir, boolean ignoreDelta);
 

src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java

@@ -46,7 +46,7 @@ public boolean hasDelta(File file) {
     return true;
   }
 
-  public boolean hasDelta(List relpaths) {
+  public boolean hasDelta(List<String> relpaths) {
     return true;
   }
 
@@ -84,10 +84,7 @@ public void setValue(String key, Object value) {
   }
 
   private String getMessage(File file, int line, int column, String message) {
-    StringBuffer sb = new StringBuffer();
-    sb.append(file.getAbsolutePath()).append(" [").append(line).append(':').append(column).append("]: ");
-    sb.append(message);
-    return sb.toString();
+    return file.getAbsolutePath() + " [" + line + ':' + column + "]: " + message;
   }
 
   /**

src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java

@@ -31,16 +31,17 @@
  */
 public class ThreadBuildContext implements BuildContext {
 
-  private static final ThreadLocal threadContext = new ThreadLocal();
+  private static final ThreadLocal<BuildContext> threadContext = new ThreadLocal<BuildContext>(){
+    @Override
+    protected BuildContext initialValue() {
+      return defaultContext;
+    }
+  };
 
   private static final DefaultBuildContext defaultContext = new DefaultBuildContext();
 
   public static BuildContext getContext() {
-    BuildContext context = (BuildContext) threadContext.get();
-    if(context == null) {
-      context = defaultContext;
-    }
-    return context;
+    return threadContext.get();
   }
 
   public static void setThreadBuildContext(BuildContext context) {
@@ -55,7 +56,7 @@ public boolean hasDelta(File file) {
     return getContext().hasDelta(file);
   }
 
-  public boolean hasDelta(List relPaths) {
+  public boolean hasDelta(List<String> relPaths) {
     return getContext().hasDelta(relPaths);
   }
 

src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java

@@ -20,9 +20,9 @@
 
 public class TestFullBuildContext extends DefaultBuildContext {
 
-  private final Map context;
+  private final Map<String, Object> context;
 
-  public TestFullBuildContext(Map context) {
+  public TestFullBuildContext(Map<String, Object> context) {
     this.context = context;
   }
 

src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java

@@ -32,7 +32,7 @@ public class TestIncrementalBuildContext implements BuildContext {
 
   private final File basedir;
 
-  private final HashSet refresh = new HashSet();
+  private final Set<File> refresh = new HashSet<>();
 
   private static final class TestScanner implements Scanner {
     private final File basedir;
@@ -105,9 +105,9 @@ public boolean hasDelta(String relpath) {
     return changedFiles.contains(relpath) || deletedFiles.contains(relpath);
   }
 
-  public boolean hasDelta(List relpaths) {
-    for(Iterator i = relpaths.iterator(); i.hasNext();) {
-      String relpath = (String) i.next();
+  public boolean hasDelta(List<String> relpaths) {
+    for(Iterator<String> i = relpaths.iterator(); i.hasNext();) {
+      String relpath = i.next();
       if(hasDelta(relpath)) {
         return true;
       }