Skip on non-existing issue file

Author: Suszyński Krzysztof

.travis.yml

@@ -7,16 +7,18 @@ notifications:
 matrix:
   include:
   - jdk: openjdk6
-    env: JACOCO=true COVERALLS=true
+    env: JACOCO=true
   - jdk: openjdk7
     env: JACOCO=true COVERALLS=true
   - jdk: oraclejdk7
-    env: JACOCO=true COVERALLS=true
+    env: JACOCO=true
   - jdk: oraclejdk8
-    env: JACOCO=true COVERALLS=true
+    env: JACOCO=true
+  - jdk: openjdk7
+    env: JACOCO=true GDMSESSION=sonar
   - jdk: openjdk7
-    env: JACOCO=true GDMSESSION=sonar SONAR_ANALYSIS_MODE=publish
-    script: mvn clean install -Dsonar.analysis.mode=publish --fail-at-end
+    env: JACOCO=true SONAR=publish
+    script: mvn clean install sonar:sonar --fail-at-end
   - jdk: openjdk6
     env: JACOCO=false
   - jdk: openjdk7

pom.xml

@@ -322,7 +322,7 @@
 
     <profiles>
         <profile>
-            <id>ci</id>
+            <id>jacoco</id>
             <activation>
                 <property>
                     <name>env.JACOCO</name>
@@ -389,6 +389,7 @@
                             <defaults>
                                 <sonar.issues.file>${sonar.working.directory}/${sonar.report.export.path}
                                 </sonar.issues.file>
+                                <sonar.skip>${sonar.skip}</sonar.skip>
                             </defaults>
                             <source>${project.basedir}/src/test/groovy/verify-sonar-issues.groovy</source>
                         </configuration>

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

@@ -49,6 +49,8 @@ public class Eid implements Serializable {
 
     private static final int MESSAGE_FORMAT_NUM_SPEC = 2;
 
+    private static final String EMPTY_REF = "";
+
     private static String messageFormat = DEFAULT_MESSAGE_FORMAT;
 
     private static UniqIdGenerator uniqIdGenerator = DEFAULT_UNIQ_ID_GENERATOR;
@@ -61,7 +63,7 @@ public class Eid implements Serializable {
 
     private final String ref;
 
-    private final Future<String> futureUniqueId;
+    private String uniqueId;
 
     /**
      * Constructor
@@ -70,9 +72,8 @@ public class Eid implements Serializable {
      * @param ref an optional reference
      */
     public Eid(String id, @Nullable String ref) {
-        futureUniqueId = new UniqFuture();
         this.id = id;
-        this.ref = ref == null ? "" : ref;
+        this.ref = ref == null ? EMPTY_REF : ref;
     }
 
     /**
@@ -81,7 +82,8 @@ public Eid(String id, @Nullable String ref) {
      * @param id the exception id, must be unique developer inserted string, from date
      */
     public Eid(String id) {
-        this(id, null);
+        this.id = id;
+        this.ref = EMPTY_REF;
     }
 
     /**
@@ -177,9 +179,9 @@ public String makeLogMessage(String logMessageFormat, Object... parameters) {
     @Override
     public String toString() {
         if ("".equals(ref)) {
-            return String.format(format, id, futureUniqueId.get());
+            return String.format(format, id, getUniq());
         }
-        return String.format(refFormat, id, ref, futureUniqueId.get());
+        return String.format(refFormat, id, ref, getUniq());
     }
 
     /**
@@ -206,7 +208,10 @@ public String getRef() {
      * @return a unique string
      */
     public String getUniq() {
-        return futureUniqueId.get();
+        if (uniqueId == null) {
+            uniqueId = uniqIdGenerator.generateUniqId();
+        }
+        return uniqueId;
     }
 
     private static void validateFormat(String format, int numSpecifiers) {
@@ -240,23 +245,6 @@ public interface UniqIdGenerator {
         String generateUniqId();
     }
 
-    private interface Future<T extends Serializable> extends Serializable {
-        T get();
-    }
-
-    private static final class UniqFuture implements Future<String> {
-        private static final long serialVersionUID = 20160325113314L;
-        private String future;
-        private UniqFuture() {}
-        @Override
-        public String get() {
-            if (future == null) {
-                future = uniqIdGenerator.generateUniqId();
-            }
-            return future;
-        }
-    }
-
     private static final class StdUniqIdGenerator implements UniqIdGenerator {
 
         private static final int BASE36 = 36;

src/test/groovy/verify-sonar-issues.groovy

@@ -1,11 +1,15 @@
 import groovy.json.JsonSlurper
 
-propertyName = 'sonar.issues.file'
-filepath = new File(properties.getAt(propertyName))
+String skip = properties.getAt('sonar.skip')
+if (skip == 'true') {
+    log.info('sonar.skip = true: Skipping Sonar issues file analysis.')
+    return;
+}
+String issueFile = properties.getAt('sonar.issues.file')
+filepath = new File(issueFile)
 log.info('Sonar Issues file: ' + filepath)
-
-def slurper = new JsonSlurper()
-def contents = filepath.getText('UTF-8')
+JsonSlurper slurper = new JsonSlurper()
+String contents = filepath.getText('UTF-8')
 def json = slurper.parseText(contents)
 
 def major = 0
@@ -49,4 +53,4 @@ if (red > 0) {
     fail(msg)
 } else {
     log.info('No new issues have been found')
-}
+}

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

@@ -1,10 +1,14 @@
 package pl.wavesoftware.eid.exceptions;
 
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.results.RunResult;
 import org.openjdk.jmh.runner.Runner;
@@ -16,6 +20,7 @@
 import pl.wavesoftware.testing.JavaAgentSkip;
 import pl.wavesoftware.testing.JmhCleaner;
 
+import java.text.NumberFormat;
 import java.util.Collection;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
@@ -38,6 +43,26 @@ public class EidIT {
         .outerRule(new JmhCleaner(EidIT.class))
         .around(JavaAgentSkip.ifActive());
 
+    @Before
+    public void before() {
+        printMemory();
+    }
+
+    public static void printMemory() {
+        Runtime runtime = Runtime.getRuntime();
+
+        NumberFormat format = NumberFormat.getInstance();
+
+        long maxMemory = runtime.maxMemory();
+        long allocatedMemory = runtime.totalMemory();
+        long freeMemory = runtime.freeMemory();
+
+        LOG.info("free memory: {} KiB", format.format(freeMemory / 1024));
+        LOG.info("allocated memory: {} KiB", format.format(allocatedMemory / 1024));
+        LOG.info("max memory: {} KiB", format.format(maxMemory / 1024));
+        LOG.info("total free memory: {} KiB", format.format((freeMemory + (maxMemory - allocatedMemory)) / 1024));
+    }
+
     @Test
     public void doBenckmarking() throws Exception {
         Options opt = new OptionsBuilder()
@@ -69,7 +94,7 @@ public void doBenckmarking() throws Exception {
 
         String title = "method speed quotient to the control sample";
         String eidTitle = String.format("%s %s should be at least %.2f%%", "#eid()",
-                title, SPEED_THRESHOLD * PERCENT);
+            title, SPEED_THRESHOLD * PERCENT);
 
         double eidTimes = eidScore / controlScore;
 
@@ -80,17 +105,28 @@ public void doBenckmarking() throws Exception {
         assertThat(eidTimes).as(eidTitle).isGreaterThanOrEqualTo(SPEED_THRESHOLD);
     }
 
+    @State(Scope.Benchmark)
+    public static class MemoryState {
+        private String eid;
+
+        @Setup
+        public void setup() {
+            printMemory();
+            this.eid = "20160330:124244";
+        }
+    }
+
     @Benchmark
-    public void control(Blackhole bh) {
+    public void control(MemoryState state, Blackhole bh) {
         for (int i = 0; i < OPERATIONS; i++) {
             bh.consume(new Date());
         }
     }
 
     @Benchmark
-    public void eid(Blackhole bh) {
+    public void eid(MemoryState state, Blackhole bh) {
         for (int i = 0; i < OPERATIONS; i++) {
-            bh.consume(new Eid("20160324:223837"));
+            bh.consume(new Eid(state.eid));
         }
     }