#5 Added Sonar Cloud setup (#7)

jakobbraun · web-flow · commit 1a34f85c00df · 2020-10-19T08:10:32.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,15 @@ language: java
 sudo: required
 matrix:
   include:
-    - jdk: openjdk11
+  - jdk: openjdk11
 addons:
   sonarcloud:
     organization: exasol
-
+    token:
+      secure: AgZwCb56VbdlHlyTAsRi99yVB/+/inLhki2+mzMWf5BJ8IZhjJNN5zRP+gmjf0sjHwKtL3NdoPeqjMy3Q4+UxhydEd3mbZ8NaIYeQ3ZBE9zBZqBCEG15TfVCL9gSNkXuFfmpdyQt+MdnzkL9/vUKlMajfUuywDj/4FOzCW6PfPrDCvxHEUwkmWYLCTqxnDAGJu6ogb8RrpOqoWSOyUH2hMm+Qm5YKY9+xn+UjfD0kApv868BF1g7Jgz6PYv1hiQMwPjTNlI1ISuom3RXY5QtNSchB7/ZLK3KXpbpwjDNh+AfDFCrrCNiHM24kIp4gwJoyjg4wh/ao3umTalIR3iVErMmz7F/Mbd7ZJHNFC9rqXbgzrj1rySYJ0QemeI7FvTqdRQTaXENlz45sw3YRf4PU/Palpga/RCqwFYxuF5wErSngMOFVvaxjxYUDrNz3aO4v1ZYCOksKM7LhnOPE+sqrZAWBRDU+iKfevoLXUpfWMfedKYVQAqO+tqgolxPSUVmyfzgQC1vqhVrcDbXHFXfE5hJdCUd9YN4PJo98EtUXou4SGp6dpwRn/D9M3nZjOsfpahPFMYYzfaBpIIG6AEN6eGVbE9AA94x/tMKdhlUcEiHBA57YbyvHly8wA8wHoMWFWe7QxE7cP3afi/ognfHRb77/Ay0ggcG1CT9VeCov6A=
 script:
   - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent org.jacoco:jacoco-maven-plugin:prepare-agent-integration
-    verify
-    #sonar:sonar -Dsonar.login=${SONAR_TOKEN} -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml,target/site/jacoco-udf/jacoco.xml
+    verify sonar:sonar -Dsonar.login=${SONAR_TOKEN} -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml,target/site/jacoco-udf/jacoco.xml
 cache:
   directories:
     - "$HOME/.m2"
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -1,3 +1,4 @@
 # Changes
 
+* [0.2.0](changes_0.2.0.md)
 * [0.1.0](changes_0.1.0.md)
diff --git a/doc/changes/changes_0.2.0.md b/doc/changes/changes_0.2.0.md
@@ -0,0 +1,12 @@
+# udf-debugging-java 0.2.0, released 2020-XX-XX
+ 
+Code name: 
+
+## Features / Enhancements
+
+* #5: Sonar Cloud setup
+* #6: Changed default value of getSelectionThatIsSentToTheAdapter to empty string 
+
+## Dependency Updates:
+
+* `com:exasol:project-keeper-maven-plugin` from 0.1.0 to 0.2.0
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.exasol</groupId>
     <artifactId>udf-debugging-java</artifactId>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
     <name>udf-debugging-java</name>
     <description>Utilities for debugging, profiling and code coverage measure for UDFs.</description>
     <url>https://github.com/exasol/udf-debugging-javat</url>
@@ -131,9 +131,7 @@
                 <configuration>
                     <!-- Set the highest log level for coverage testing, so that we
                       have a chance to reach branches in the logging lambdas too. -->
-                    <argLine>-Djava.util.logging.config.file=src/test/resources/logging.properties
-                        ${argLine}
-                    </argLine>
+                    <argLine>-Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine}</argLine>
                     <excludes>
                         <exclude>**IT.java</exclude>
                     </excludes>
@@ -344,7 +342,7 @@
             <plugin>
                 <groupId>com.exasol</groupId>
                 <artifactId>project-keeper-maven-plugin</artifactId>
-                <version>0.1.0</version>
+                <version>0.2.0</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/src/main/java/com/exasol/udfdebugging/PushDownTesting.java b/src/main/java/com/exasol/udfdebugging/PushDownTesting.java
@@ -24,7 +24,7 @@ public static String getSelectionThatIsSentToTheAdapter(final Statement statemen
             final String pushdownJson = pushDownSqlResult.getString("PUSHDOWN_JSON");
             try (final JsonReader reader = Json.createReader(new StringReader(pushdownJson))) {
                 final JsonObject response = reader.readArray().get(2).asJsonObject();
-                return response.getJsonObject("pushdownRequest").getString("filter_expr_string_for_debug");
+                return response.getJsonObject("pushdownRequest").getString("filter_expr_string_for_debug", "");
             }
         }
     }
diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties
@@ -0,0 +1,6 @@
+handlers=java.util.logging.ConsoleHandler
+.level=INFO
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=%1$tF %1$tT.%1$tL [%4$-7s] %5$s %n
+com.exasol=ALL

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`# Changes`
`2`	`2`
	`3`	`+* [0.2.0](changes_0.2.0.md)`
`3`	`4`	`* [0.1.0](changes_0.1.0.md)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static String getSelectionThatIsSentToTheAdapter(final Statement statemen`
`24`	`24`	`final String pushdownJson = pushDownSqlResult.getString("PUSHDOWN_JSON");`
`25`	`25`	`try (final JsonReader reader = Json.createReader(new StringReader(pushdownJson))) {`
`26`	`26`	`final JsonObject response = reader.readArray().get(2).asJsonObject();`
`27`		`- return response.getJsonObject("pushdownRequest").getString("filter_expr_string_for_debug");`
	`27`	`+ return response.getJsonObject("pushdownRequest").getString("filter_expr_string_for_debug", "");`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`