tests for aol#277

johnmcclean · johnmcclean · commit ecf66237f092 · 2016-10-24T14:36:13.000+01:00
diff --git a/micro-event-metrics/readme.md b/micro-event-metrics/readme.md
@@ -36,6 +36,23 @@ Gradle
 2. User requests
 3. Errors
 
+
+## Properties 
+
+Job names are configurable as either 
+
+* SIMPLE (simple class name)
+* PACKAGE (last part of package + simple class name)
+* FULL (canononical class name)
+
+e.g.
+
+    micro.events.job.name.format:SIMPLE
+    
+or
+
+    micro.events.job.name.format:SIMPLE 
+
 ## The following metrics are captured
 
 ### Requests :
diff --git a/micro-events/src/main/java/com/aol/micro/server/events/JobName.java b/micro-events/src/main/java/com/aol/micro/server/events/JobName.java
@@ -1,6 +1,8 @@
 package com.aol.micro.server.events;
 
-import com.aol.cyclops.control.ReactiveSeq;
+import java.util.stream.Stream;
+
+import com.aol.cyclops.control.Maybe;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -46,16 +48,15 @@ public static class PackageJobName implements JobName {
 
         @Override
         public String getType(Class c) {
-            String packageName = c.getPackage()
-                                  .getName();
-            String[] packages = packageName.split("\\.");
-            ReactiveSeq.of(packages)
-                       .forEach(System.out::println);
-            return ReactiveSeq.of(packages)
-                              .takeRight(1)
-                              .singleOptional()
-                              .map(i -> i + ".")
-                              .orElse("")
+            return Maybe.ofNullable(c.getPackage())
+                        .map(Package::getName)
+                        .map(packageName -> packageName.split("\\."))
+                        .stream()
+                        .flatMap(Stream::of)
+                        .takeRight(1)
+                        .singleOptional()
+                        .map(i -> i + ".")
+                        .orElse("")
                     + c.getSimpleName();
         }
     }
diff --git a/micro-events/src/test/java/NoPackageTest.java b/micro-events/src/test/java/NoPackageTest.java
@@ -0,0 +1,16 @@
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+import com.aol.micro.server.events.JobName;
+import com.aol.micro.server.events.JobName.Types;
+
+public class NoPackageTest {
+    JobName one = Types.PACKAGE.getCreator();
+
+    @Test
+    public void testPackageNone() {
+        assertThat(one.getType(NoPackageTest.class), equalTo("NoPackage"));
+    }
+}
diff --git a/micro-events/src/test/java/com/aol/micro/server/events/JobNameTest.java b/micro-events/src/test/java/com/aol/micro/server/events/JobNameTest.java
@@ -0,0 +1,30 @@
+package com.aol.micro.server.events;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+import com.aol.micro.server.events.JobName.Types;
+
+public class JobNameTest {
+    JobName simple = Types.SIMPLE.getCreator();
+    JobName full = Types.FULL.getCreator();
+    JobName one = Types.PACKAGE.getCreator();
+
+    @Test
+    public void testSimple() {
+        assertThat(simple.getType(JobNameTest.class), equalTo("JobNameTest"));
+    }
+
+    @Test
+    public void testFull() {
+        assertThat(full.getType(JobNameTest.class), equalTo("com.aol.micro.server.events.JobNameTest"));
+    }
+
+    @Test
+    public void testPackage() {
+        assertThat(one.getType(JobNameTest.class), equalTo("events.JobNameTest"));
+    }
+
+}
