Quality fixes for Eid

Author: Suszyński Krzysztof

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

@@ -71,12 +71,7 @@ public class Eid implements Serializable {
      * @param ref an optional reference
      */
     public Eid(String id, @Nullable String ref) {
-        futureUniqueId = new StdFuture<String>() {
-            @Override
-            protected String produce() {
-                return uniqIdGenerator.generateUniqId();
-            }
-        };
+        futureUniqueId = new UniqFuture();
         this.id = id;
         this.ref = ref == null ? "" : ref;
     }
@@ -246,17 +241,18 @@ public interface UniqIdGenerator {
         String generateUniqId();
     }
 
-    private interface Future<T> {
+    private interface Future<T extends Serializable> extends Serializable {
         T get();
     }
 
-    private static abstract class StdFuture<T> implements Future<T> {
-        private T future;
-        protected abstract T produce();
+    private static final class UniqFuture implements Future<String> {
+        private static final long serialVersionUID = 20160325113314L;
+        private String future;
+        private UniqFuture() {}
         @Override
-        public T get() {
+        public String get() {
             if (future == null) {
-                future = produce();
+                future = uniqIdGenerator.generateUniqId();
             }
             return future;
         }

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

@@ -1,5 +1,6 @@
 package pl.wavesoftware.eid.exceptions;
 
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
@@ -12,6 +13,7 @@
 import org.openjdk.jmh.runner.options.TimeValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pl.wavesoftware.testing.JmhCleaner;
 
 import java.util.Collection;
 import java.util.Date;
@@ -25,10 +27,13 @@
  */
 public class EidIT {
 
+    private static final int PERCENT = 100;
     private static final int OPERATIONS = 1000;
     private static final Logger LOG = LoggerFactory.getLogger(EidIT.class);
     private static final double SPEED_THRESHOLD = 0.75d;
-    public static final int PERCENT = 100;
+
+    @ClassRule
+    public static JmhCleaner cleaner = new JmhCleaner(EidIT.class);
 
     @Test
     public void doBenckmarking() throws Exception {

src/test/java/pl/wavesoftware/testing/JmhCleaner.java

@@ -0,0 +1,83 @@
+package pl.wavesoftware.testing;
+
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URISyntaxException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+
+/**
+ * @author <a href="mailto:krzysztof.suszynski@coi.gov.pl">Krzysztof Suszynski</a>
+ * @since 25.03.16
+ */
+public class JmhCleaner implements TestRule {
+    private static final String GENERATED_TEST_SOURCES = "generated-test-sources";
+    private static final String TEST_ANNOTATIONS = "test-annotations";
+    private final Class<?> testClass;
+
+    public JmhCleaner(Class<?> testClass) {
+        this.testClass = validateTestClass(testClass);
+    }
+
+    private Class<?> validateTestClass(Class<?> testClass) {
+        boolean hasTests = false;
+        for (Method method : testClass.getDeclaredMethods()) {
+            Test annot = method.getAnnotation(Test.class);
+            if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers()) && annot != null) {
+                hasTests = true;
+                break;
+            }
+        }
+        if (!hasTests) {
+            throw new IllegalArgumentException("You need to pass a test class to constructor of JmhCleaner!!");
+        }
+        return testClass;
+    }
+
+
+    @Override
+    public Statement apply(final Statement base, Description description) {
+
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                try {
+                    base.evaluate();
+                } finally {
+                    cleanup();
+                }
+            }
+        };
+    }
+
+    private void cleanup() throws IOException, URISyntaxException {
+        String location = testClass.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
+        Path testAnnotationsPath = Paths.get(location).getParent().resolve(GENERATED_TEST_SOURCES).resolve(TEST_ANNOTATIONS);
+        if (!testAnnotationsPath.toFile().isDirectory()) {
+            return;
+        }
+        Files.walkFileTree(testAnnotationsPath, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.delete(file);
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                Files.delete(dir);
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
+}