Allow java version to be specified (#40)

* Merge Sonar's Options and CC's Config

* Ensure sonar.java.source can be set

* Set java version

Author: filipesperandio

.codeclimate.yml

@@ -7,6 +7,7 @@ engines:
       squid:S00112: # Requires dedicated exceptions even for tests
         enabled: false
     config:
+      sonar.java.source: 1.8
       tests_patterns:
         - src/test/**
 exclude_paths:

fixtures/java_source_version/Main.java

@@ -0,0 +1,6 @@
+{
+  "enabled": true,
+  "config": {
+    "sonar.java.source": "1.6"
+  }
+}

fixtures/java_source_version/config.json

@@ -4,7 +4,6 @@
 import cc.files.Finder;
 import org.sonarlint.cli.EngineWrapper;
 import org.sonarlint.cli.InputFileFinder;
-import org.sonarlint.cli.Options;
 import org.sonarlint.cli.config.ConfigurationReader;
 import org.sonarlint.cli.report.ReportFactory;
 import org.sonarlint.cli.util.System2;
@@ -33,7 +32,7 @@ public static void execute(System2 system) {
             SonarLintFactory sonarLintFactory = new SonarLintFactory(reader, config.getSonarlintDir());
             Path projectHome = getProjectHome(system);
 
-            int exitCode = new EngineWrapper(new Options(), sonarLintFactory, reportFactory, fileFinder, projectHome).run();
+            int exitCode = new EngineWrapper(config, sonarLintFactory, reportFactory, fileFinder, projectHome).run();
             system.exit(exitCode);
         } catch (Exception e) {
             e.printStackTrace(System.err);

src/main/java/cc/App.java

@@ -4,40 +4,49 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.stream.JsonReader;
+import org.sonarlint.cli.Options;
 
 import java.io.FileReader;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
-public class Config {
+public class Config extends Options {
     private List<String> includePaths = Arrays.asList("");
-    private EngineConfig config = new EngineConfig();
-
-    private class EngineConfig {
-        String charset;
-        List<String> testsPatterns;
-        String sonarlintDir;
-    }
+    private Map<String, Object> config = new LinkedHashMap<>();
 
     public List<String> getIncludePaths() {
         return includePaths;
     }
 
     public Charset getCharset() {
-        return createCharset(config.charset);
+        return createCharset(charset());
+    }
+
+    @Override
+    public String charset() {
+        return (String) config.get("charset");
     }
 
     public String getTestsPatterns() {
-        return joinPatterns(config.testsPatterns);
+        List<String> testsPatterns = (List<String>) config.get("tests_patterns");
+        return joinPatterns(testsPatterns);
     }
 
     public Path getSonarlintDir() {
         return Paths.get("/tmp/sonarlint");
     }
 
+    @Override
+    public Properties properties() {
+        Properties properties = super.properties();
+        for (Map.Entry entry : config.entrySet()) {
+            properties.put(entry.getKey(), entry.getValue().toString());
+        }
+        return properties;
+    }
+
     String joinPatterns(List<String> patterns) {
         if (patterns == null) {
             return null;

src/main/java/cc/Config.java

@@ -44,10 +44,16 @@ public void null_tests_patterns_does_not_cause_error() throws Exception {
         Config config = Config.gson().fromJson("{\"config\":{}}", Config.class);
         assertThat(config.getTestsPatterns()).isNull();
     }
-    
     @Test
     public void has_default_work_dir() throws Exception {
         Config config = Config.gson().fromJson("{}", Config.class);
         assertThat(config.getSonarlintDir()).isEqualTo(Paths.get("/tmp/sonarlint"));
     }
+
+    @Test
+    public void include_generic_properties() throws Exception {
+        Config config = Config.gson().fromJson("{\"config\":{\"key\":\"value\",\"charset\":\"utf-16\"}}", Config.class);
+        assertThat(config.properties().getProperty("key")).isEqualTo("value");
+        assertThat(config.getCharset()).isEqualTo(Charset.forName("UTF-16"));
+    }
 }

src/test/java/cc/ConfigTest.java

@@ -66,4 +66,4 @@ public void capture_exceptions_and_log_to_stderr() throws Exception {
         assertThat(system.exitCode).isEqualTo(1);
         assertThat(stderr.toString()).contains("Can't find project home. System property not set: project.home");
     }
-}
+}

src/test/java/integration/ConfigurationOptionsTest.java

@@ -0,0 +1,14 @@
+package integration;
+
+import org.junit.Test;
+import support.Shell;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JavaSourceVersion {
+    @Test
+    public void specify_java_source_version_through_config() throws Exception {
+        Shell.Process process = Shell.execute("build/codeclimate-sonar fixtures/java_source_version fixtures/java_source_version/config.json");
+        assertThat(process.stderr).contains("Configured Java source version (sonar.java.source): 6");
+    }
+}

src/test/java/integration/JavaSourceVersion.java

@@ -35,4 +35,4 @@ public void setProperty(String key, String value) {
     public void removeProperty(String key) {
         properties.remove(key);
     }
-}
+}