Fix passing extra options (do not remove dashes), let the compiler itself check the version number as Java releases now come every half year.

Author: fjalvingh

plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java

@@ -40,7 +40,6 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -125,7 +124,7 @@ public CompilerResult performCompile(CompilerConfiguration config )
 
         // Set Eclipse-specific options
         // compiler-specific extra options override anything else in the config object...
-        Map<String, String> extras = removeDashesFromAllKeys( config.getCustomCompilerArgumentsAsMap() );
+        Map<String, String> extras = config.getCustomCompilerArgumentsAsMap();
         if( extras.containsKey( "errorsAsWarnings" ) )
         {
             extras.remove( "errorsAsWarnings" );
@@ -137,21 +136,19 @@ else if(extras.containsKey("-errorsAsWarnings"))
             this.errorsAsWarnings = true;
         }
 
-        //-- Handle the properties silliness
-        String props = extras.get("properties");
-        if(null == props)
-            props = extras.get("properties");
+        //-- check for existence of the properties file manually
+        String props = extras.get("-properties");
         if(null != props) {
             File propFile = new File(props);
             if(! propFile.exists() || ! propFile.isFile())
-                throw new IllegalArgumentException("Properties file " + propFile + " does not exist");
+                throw new IllegalArgumentException("Properties file specified by -properties " + propFile + " does not exist");
         }
 
         for(Entry<String, String> entry : extras.entrySet())
         {
             String opt = entry.getKey();
             if(! opt.startsWith("-"))
-                opt = "-" + opt;					// This is beyond sad
+                opt = "-" + opt;					// compiler mojo apparently messes with this; make sure we are safe
             args.add(opt);
             String value = entry.getValue();
             if(null != value && ! value.isEmpty())
@@ -201,7 +198,7 @@ else if(extras.containsKey("-errorsAsWarnings"))
         }
 
         //-- Write .class files even when error occur, but make sure methods with compile errors do abort when called
-        if(extras.containsKey("-proceedOnError") || extras.containsKey("proceedOnError"))
+        if(extras.containsKey("-proceedOnError"))
             args.add("-proceedOnError:Fatal");      // Generate a class file even with errors, but make methods with errors fail when called
 
         //-- classpath
@@ -299,26 +296,6 @@ private boolean isPreJava16(CompilerConfiguration config) {
             || s.startsWith( "1.1" ) || s.startsWith( "1.0" );
     }
 
-    /**
-     * The compiler mojo adds a dash to all keys which does not make sense for the eclipse compiler
-     */
-    Map<String, String> removeDashesFromAllKeys(Map<String, String> customCompilerArgumentsAsMap )
-    {
-        LinkedHashMap<String, String> cleanedMap = new LinkedHashMap<String, String>();
-
-        for ( Map.Entry<String, String> entry : customCompilerArgumentsAsMap.entrySet() )
-        {
-            String key = entry.getKey();
-            if ( key.startsWith( "-" ) )
-            {
-                key = key.substring( 1 );
-            }
-            cleanedMap.put( key, entry.getValue() );
-        }
-
-        return cleanedMap;
-    }
-
     public String[] createCommandLine( CompilerConfiguration config )
         throws CompilerException
     {

plexus-compilers/plexus-compiler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java

@@ -30,7 +30,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map;
 
 /**
  * @author <a href="mailto:[email protected]">Jason van Zyl</a>
@@ -82,25 +81,6 @@ public void testCustomArgument()
         compiler.performCompile( compilerConfig );
     }
 
-    public void testCustomArgumentCleanup()
-    {
-        EclipseJavaCompiler compiler = new EclipseJavaCompiler();
-
-        CompilerConfiguration compilerConfig = createMinimalCompilerConfig();
-
-        compilerConfig.addCompilerCustomArgument( "-key", "value" );
-        compilerConfig.addCompilerCustomArgument( "cleanKey", "value" );
-
-        Map<String, String> cleaned = compiler.removeDashesFromAllKeys( compilerConfig.getCustomCompilerArgumentsAsMap() );
-
-        assertTrue( "Key should have been cleaned", cleaned.containsKey( "key" ) );
-
-        assertFalse( "Key should have been cleaned", cleaned.containsKey( "-key" ) );
-
-        assertTrue( "This key should not have been cleaned does not start with dash", cleaned.containsKey( "cleanKey" ) );
-
-    }
-
     public void testInitializeWarningsForPropertiesArgument()
         throws Exception
     {