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

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

@@ -195,7 +195,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/test/java/pl/wavesoftware/eid/exceptions/ExceptionsTest.java

@@ -104,7 +104,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 +160,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);
         }
     }