Merge pull request #1 from wavesoftware/feature/support-for-jdk6

Support for compatibility with JDK 1.6

Author: cardil

.travis.yml

@@ -4,6 +4,7 @@ script: mvn clean install -Pci
 notifications:
   email: false
 jdk:
+  - openjdk6
   - openjdk7
-  - oraclejdk8
   - oraclejdk7
+  - oraclejdk8

README.md

@@ -10,7 +10,7 @@ This classes shouldn't be used in any public API or library. It is designed to b
 
 ## Requirements
 
-* JDK >= 1.7
+* JDK >= 1.6
 
 ## Maven
 

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>pl.wavesoftware</groupId>
     <artifactId>eid-exceptions</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>EID Runtime Exceptions and Utilities</name>
@@ -23,8 +23,8 @@
         <netbeans.hint.license>apache20</netbeans.hint.license>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
         <coveralls.skip>${skipTests}</coveralls.skip>
     </properties>
 
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>2.1.0</version>
+            <version>1.7.1</version> <!-- For compatibility with JDK 1.6 -->
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -86,7 +86,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.7.4.201502262128</version>
+                        <version>0.7.4.201502262128</version> <!-- 0.7.5 fails on SONAR -->
 
                         <executions>
                             <execution>

src/main/java/pl/wavesoftware/eid/exceptions/Eid.java

@@ -93,6 +93,7 @@ public Eid(String id) {
      * @throws IllegalArgumentException if given format hasn't got two format specifiers <tt>"%s"</tt>, or if given format was
      * null
      */
+    @SuppressWarnings("UnusedReturnValue")
     public static String setMessageFormat(String format) {
         validateFormat(format, MESSAGE_FORMAT_NUM_SPEC);
         String oldFormat = Eid.messageFormat;
@@ -195,7 +196,7 @@ private static void validateFormat(String format, int numSpecifiers) {
         if (format == null) {
             throw new IllegalArgumentException("Format can't be null, but just received one");
         }
-        List<String> specifiers = new ArrayList<>();
+        List<String> specifiers = new ArrayList<String>();
         for (int i = 0; i < numSpecifiers; i++) {
             specifiers.add(i + "-test-id");
         }

src/main/java/pl/wavesoftware/eid/utils/EidPreconditions.java

@@ -104,6 +104,7 @@
  * @since 0.1.0 (idea imported from Guava Library and COI code)
  * @author Krzysztof Suszyński <krzysztof.suszynski@wavesoftware.pl>
  */
+@SuppressWarnings("WeakerAccess")
 public final class EidPreconditions {
 
     protected EidPreconditions() {

src/main/scripts/sonar-incremental.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 unset MAVEN_OPTS
 unset JAVA_TOOL_OPTIONS
-exec mvn -Pci sonar:sonar \
-    -DskipTests \
-    -Dsonar.language=java \
-    -Dsonar.analysis.mode=incremental \
-    -Dsonar.host.url=https://sonar.wavesoftware.pl \
-    -Dsonar.preview.excludePlugins=buildstability,devcockpit,pdfreport,report,views,jira,buildbreaker,issueassign,scmstats
+exec mvn -P ci sonar:sonar \
+    -D skipTests \
+    -D sonar.language=java \
+    -D sonar.analysis.mode=incremental \
+    -D sonar.host.url=https://sonar.wavesoftware.pl \
+    -D sonar.preview.excludePlugins=buildstability,devcockpit,pdfreport,report,views,jira,buildbreaker,issueassign,scmstats

src/test/java/pl/wavesoftware/eid/exceptions/EidTest.java

@@ -26,10 +26,11 @@
  *
  * @author Krzysztof Suszyński <krzysztof.suszynski@wavesoftware.pl>
  */
+@SuppressWarnings({"ConstantConditions", "unused"})
 public class EidTest {
 
     @Rule
-    public ExpectedException thrown = ExpectedException.none();
+    public final ExpectedException thrown = ExpectedException.none();
 
     @Test
     public void testSetMessageFormat_Null() {

src/test/java/pl/wavesoftware/eid/exceptions/ExceptionsTest.java

@@ -31,6 +31,7 @@
  *
  * @author Krzysztof Suszyński <krzysztof.suszynski@wavesoftware.pl>
  */
+@SuppressWarnings("unused")
 @RunWith(Parameterized.class)
 public class ExceptionsTest {
 
@@ -104,7 +105,9 @@ private static void addParameters(Map.Entry<Class<? extends EidRuntimeException>
                 constructor,
                 args
             });
-        } catch (NoSuchMethodException | SecurityException ex) {
+        } catch (NoSuchMethodException ex) {
+            throw new RuntimeException(ex);
+        } catch (SecurityException ex) {
             throw new RuntimeException(ex);
         }
     }
@@ -158,7 +161,13 @@ public void testConstruction() {
     private <T extends EidRuntimeException> T construct() {
         try {
             return (T) constructor.newInstance(arguments);
-        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
+        } catch (InstantiationException ex) {
+            throw new RuntimeException(ex);
+        } catch (IllegalAccessException ex) {
+            throw new RuntimeException(ex);
+        } catch (IllegalArgumentException ex) {
+            throw new RuntimeException(ex);
+        } catch (InvocationTargetException ex) {
             throw new RuntimeException(ex);
         }
     }

src/test/java/pl/wavesoftware/eid/utils/EidPreconditionsTest.java

@@ -23,7 +23,6 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import static org.hamcrest.Matchers.*;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
@@ -39,17 +38,14 @@
  *
  * @author Krzysztof Suszyński <krzysztof.suszynski@wavesoftware.pl>
  */
+@SuppressWarnings({"ConstantConditions", "unused"})
 public class EidPreconditionsTest {
 
     @Rule
-    public ExpectedException thrown = ExpectedException.none();
+    public final ExpectedException thrown = ExpectedException.none();
 
     private final String eid = "20150718:075046";
 
-    @Before
-    public void setUp() throws Exception {
-    }
-
     @Test
     public void testCheckArgument() {
         // given
@@ -227,8 +223,8 @@ public String execute() throws InterruptedIOException {
     public void testCreate() throws NoSuchMethodException {
         // given
         Class<EidPreconditions> cls = EidPreconditions.class;
-        Constructor<?> constr = cls.getDeclaredConstructor();
-        boolean access = constr.isAccessible();
+        Constructor<?> constructor = cls.getDeclaredConstructor();
+        boolean access = constructor.isAccessible();
 
         // then
         assertThat(access).isFalse();
@@ -237,6 +233,7 @@ public void testCreate() throws NoSuchMethodException {
 
             @Override
             public boolean matches(Object item) {
+                @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
                 Eid eidObject = EidRuntimeException.class.cast(item).getEid();
                 return eidObject.getId().equals("20150718:083450")
                     && !eidObject.getRef().isEmpty()
@@ -406,6 +403,7 @@ public String execute() {
         assertThat(result).isEqualTo(tester);
     }
 
+    @SuppressWarnings("SameReturnValue")
     private Eid getNullEid() {
         return null;
     }