Fixed build

- coverage - code cleanup - update informations in pom.xml, some plugin updates - stop shallow clone to remove warning in SonarCloud - added link to sonarcloud
matteobaccan · Sep 3, 2019 · 281abb8 · 281abb8
1 parent 913369b
commit 281abb8
Show file tree

Hide file tree

Showing 14 changed files with 125 additions and 119 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@
 sudo: required
 dist: trusty
 group: edge
+git:
+  depth: false
 
 language: java
 jdk:
@@ -16,7 +18,7 @@ os:
 
 install: mvn -B -V -DskipTests=true -Dmaven.javadoc.skip=true install
 script: mvn -B -V test
-after_success: if [[ $JAVA_HOME =~ java-9 ]] ; then mvn -B -V -Pcoverage clean verify sonar:sonar; fi
+after_success: if [[ $JAVA_HOME =~ java-9 ]] ; then mvn -B -V -Pcoverage clean verify sonar:sonar coveralls:report; fi
 
 addons:
   apt:

diff --git a/owner-extras/pom.xml b/owner-extras/pom.xml
@@ -21,6 +21,20 @@
     <description>Extras for OWNER library</description>
     <packaging>jar</packaging>
 
+    <profiles>
+        <profile>
+            <id>coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>org.aeonbits.owner</groupId>
@@ -58,16 +72,6 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/owner-java8-extras/pom.xml b/owner-java8-extras/pom.xml
@@ -26,22 +26,27 @@
     <properties>
         <compiler-release>8</compiler-release>
     </properties>
+
+    <profiles>
+        <profile>
+            <id>coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/owner-java8-extras/src/main/java/org/aeonbits/owner/converters/ConverterUtil.java b/owner-java8-extras/src/main/java/org/aeonbits/owner/converters/ConverterUtil.java
@@ -14,6 +14,10 @@
  * @author Stefan Freyr Stefansson
  */
 class ConverterUtil {
+
+    // Suppresses default constructor, ensuring no one instantiate this class.
+    private ConverterUtil() {}
+
     /**
      * Splits a string into a numeric part and a character part. The input string should conform to the format
      * <code>[numeric_part][char_part]</code> with an optional whitespace between the two parts.

diff --git a/owner-java8-extras/src/main/java/org/aeonbits/owner/converters/DurationConverter.java b/owner-java8-extras/src/main/java/org/aeonbits/owner/converters/DurationConverter.java
@@ -128,15 +128,4 @@ private static Duration parseDuration(String input) {
 
         return Duration.of(Long.parseLong(numberString), units);
     }
-
-    private static String getUnits(String s) {
-        int i = s.length() - 1;
-        while (i >= 0) {
-            char c = s.charAt(i);
-            if (!Character.isLetter(c))
-                break;
-            i -= 1;
-        }
-        return s.substring(i + 1);
-    }
 }
diff --git a/owner-java8/pom.xml b/owner-java8/pom.xml
@@ -26,22 +26,26 @@
         <compiler-release>8</compiler-release>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/owner-site/site/_includes/docs_contents.html b/owner-site/site/_includes/docs_contents.html
@@ -56,13 +56,9 @@ <h4>Other stuff</h4>
       <li><a href="https://github.com/lviggiano/owner/releases">Releases</a></li>
       <li><a href="https://t.me/ownerapi">Telegram Chat</a></li>
       <li><a href="https://travis-ci.org/lviggiano/owner">Travis CI reports</a></li>
+      <li><a href="https://sonarcloud.io/dashboard?id=org.aeonbits.owner%3Aowner-parent">Sonar reports</a></li>
       <li><a href="https://coveralls.io/r/lviggiano/owner">Coveralls reports</a></li>
       <li><a href="https://www.ohloh.net/p/owner">OWNER at Ohloh</a></li>
-      <!-- Newinstance and dev.aeonbits.org servers are gone, cloudbees is not reliable.
-      <li><a href="https://aeonbits.ci.cloudbees.com/job/owner-api/">Jenkins reports</a></li>
-      <li><a href="http://dev.aeonbits.org:9000/dashboard/index/org.aeonbits.owner:owner">Sonar reports</a></li>
-      <li><a href="http://newinstance.it/owner/latest/">Maven site</a></li>
-      -->
     </ul>
 
   </aside>

diff --git a/owner-site/site/_includes/docs_contents_mobile.html b/owner-site/site/_includes/docs_contents_mobile.html
@@ -47,13 +47,9 @@
             <option value="https://github.com/lviggiano/owner/releases">Releases</option>
             <option value="https://t.me/ownerapi">Telegram Chat</option>
             <option value="https://travis-ci.org/lviggiano/owner">Travis CI reports</option>
+            <option value="https://sonarcloud.io/dashboard?id=org.aeonbits.owner%3Aowner-parent">Sonar reports</option>
             <option value="https://coveralls.io/r/lviggiano/owner">Coveralls reports</option>
             <option value="https://www.ohloh.net/p/owner">OWNER at Ohloh</option>
-            <!-- Newinstance and dev.aeonbits.org servers are gone, cloudbees is not reliable.
-            <option value="https://aeonbits.ci.cloudbees.com/job/owner-api/">Jenkins reports</option>
-            <option value="http://dev.aeonbits.org:9000/dashboard/index/org.aeonbits.owner:owner">Sonar reports</option>
-            <option value="http://newinstance.it/owner/latest/">Maven site</option>
-            -->
         </optgroup>
 
     </select>

diff --git a/owner/pom.xml b/owner/pom.xml
@@ -20,6 +20,20 @@
     <description>Get rid of the boilerplate code in Java properties based configuration.</description>
     <packaging>jar</packaging>
 
+    <profiles>
+        <profile>
+            <id>coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <!-- Order matters -->
         <dependency>
@@ -50,16 +64,6 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-            </plugin>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/owner/src/main/java/org/aeonbits/owner/util/Base64.java b/owner/src/main/java/org/aeonbits/owner/util/Base64.java
@@ -18,6 +18,9 @@ public class Base64 {
     private static Object decoderObject;
     private static Object encoderObject;
 
+    // Suppresses default constructor, ensuring no one instantiate this class.
+    private Base64() {}
+
     static {
         Class<?>[] decodeParameterTypes = { String.class };
         Class<?>[] encodeParameterTypes = { byte[].class };

diff --git a/owner/src/main/java/org/aeonbits/owner/util/Collections.java b/owner/src/main/java/org/aeonbits/owner/util/Collections.java
@@ -39,7 +39,7 @@
  */
 public abstract class Collections {
 
-    // Suppresses default constructor, ensuring non-instantiability.
+    // Suppresses default constructor, ensuring no one instantiate this class.
     private Collections() {}
 
     private static final class EntryMap<K, V> extends AbstractMap<K, V> implements Serializable {
@@ -55,6 +55,24 @@ private EntryMap(Entry<? extends K, ? extends V>... entries) {
         public Set<Entry<K, V>> entrySet() {
             return (Set) entries;
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            if (!super.equals(o)) return false;
+
+            EntryMap<?, ?> entryMap = (EntryMap<?, ?>) o;
+
+            return entries.equals(entryMap.entries);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = super.hashCode();
+            result = 31 * result + entries.hashCode();
+            return result;
+        }
     }
 
     public static <K, V> Entry<K, V> entry(K key, V value) {

diff --git a/owner/src/main/java/org/aeonbits/owner/util/Reflection.java b/owner/src/main/java/org/aeonbits/owner/util/Reflection.java
@@ -15,9 +15,8 @@
  */
 public final class Reflection {
 
-    // Suppresses default LOOKUP_CONSTRUCTOR, ensuring non-instantiability.
-    private Reflection() {
-    }
+    // Suppresses default constructor, ensuring no one instantiate this class.
+    private Reflection() {}
 
     public static boolean isClassAvailable(String className) {
         return forName(className) != null;

diff --git a/owner/src/main/java/org/aeonbits/owner/util/Util.java b/owner/src/main/java/org/aeonbits/owner/util/Util.java
@@ -93,14 +93,18 @@ public static <T> T[] reverse(T[] array) {
 
     public static String expandUserHome(String text) {
         if (text.equals("~"))
-            return system.getProperty("user.home");
+            return getUserHome();
         if (text.indexOf("~/") == 0 || text.indexOf("file:~/") == 0 || text.indexOf("jar:file:~/") == 0)
-            return text.replaceFirst("~/", Matcher.quoteReplacement(system.getProperty("user.home")) + "/");
+            return text.replaceFirst("~/", Matcher.quoteReplacement(getUserHome()) + "/");
         if (text.indexOf("~\\") == 0 || text.indexOf("file:~\\") == 0 || text.indexOf("jar:file:~\\") == 0)
-            return text.replaceFirst("~\\\\", Matcher.quoteReplacement(system.getProperty("user.home")) + "\\\\");
+            return text.replaceFirst("~\\\\", Matcher.quoteReplacement(getUserHome()) + "\\\\");
         return text;
     }
 
+    private static String getUserHome() {
+        return system.getProperty("user.home");
+    }
+
     public static String fixBackslashesToSlashes(String path) {
         return path.replace('\\', '/');
     }
@@ -238,17 +242,25 @@ private static void rename(File source, File target) throws IOException {
     private static void storeJar(File target, String entryName, Properties props) throws IOException {
         byte[] bytes = toBytes(props);
         InputStream input = new ByteArrayInputStream(bytes);
-        JarOutputStream output = new JarOutputStream(new FileOutputStream(target));
         try {
-            ZipEntry entry = new ZipEntry(entryName);
-            output.putNextEntry(entry);
-            byte[] buffer = new byte[4096];
-            int size;
-            while ((size = input.read(buffer)) != -1)
-                output.write(buffer, 0, size);
+            FileOutputStream fileOutputStream = new FileOutputStream(target);
+            try {
+                JarOutputStream output = new JarOutputStream(fileOutputStream);
+                try {
+                    ZipEntry entry = new ZipEntry(entryName);
+                    output.putNextEntry(entry);
+                    byte[] buffer = new byte[4096];
+                    int size;
+                    while ((size = input.read(buffer)) != -1)
+                        output.write(buffer, 0, size);
+                } finally {
+                    output.close();
+                }
+            } finally {
+                fileOutputStream.close();
+            }
         } finally {
             input.close();
-            output.close();
         }
     }