removed inmem doc manager and some tests

Tim Fox · Tim Fox · commit 0f60a94c6d8e · 2016-12-16T11:50:00.000Z
diff --git a/src/example/java/com/tesco/mewbase/example/mewblet/ShoppingBasketMewblet.java b/src/example/java/com/tesco/mewbase/example/mewblet/ShoppingBasketMewblet.java
@@ -15,7 +15,7 @@ public void setup(MewAdmin admin) throws Exception {
         admin.createChannel("orders").get();
         admin.createBinder("baskets").get();
 
-        admin.buildProjection("maintain_basket")                             // projection name
+        admin.buildProjection("maintain_basket")                                // projection name
                 .projecting("orders")                                           // channel name
                 .filteredBy(ev -> ev.getString("eventType").equals("add_item")) // event filter
                 .onto("baskets")                                                // binder name
diff --git a/src/main/java/com/tesco/mewbase/doc/DocManager.java b/src/main/java/com/tesco/mewbase/doc/DocManager.java
@@ -2,6 +2,7 @@
 
 import com.tesco.mewbase.bson.BsonObject;
 
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
@@ -54,4 +55,6 @@ public interface DocManager {
 
     CompletableFuture<Boolean> createBinder(String binderName);
 
+    Set<String> getBinderNames();
+
 }
diff --git a/src/main/java/com/tesco/mewbase/doc/impl/inmem/Binder.java b/src/main/java/com/tesco/mewbase/doc/impl/inmem/Binder.java
diff --git a/src/main/java/com/tesco/mewbase/doc/impl/inmem/InMemoryDocManager.java b/src/main/java/com/tesco/mewbase/doc/impl/inmem/InMemoryDocManager.java
diff --git a/src/main/java/com/tesco/mewbase/doc/impl/lmdb/LmdbDocManager.java b/src/main/java/com/tesco/mewbase/doc/impl/lmdb/LmdbDocManager.java
@@ -15,6 +15,7 @@
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
@@ -137,6 +138,11 @@ public synchronized CompletableFuture<Boolean> createBinder(String binderName) {
         return res;
     }
 
+    @Override
+    public Set<String> getBinderNames() {
+        return databases.keySet();
+    }
+
     private void createIfDoesntExists(File dir) {
         if (!dir.exists()) {
             if (!dir.mkdirs()) {
diff --git a/src/main/java/com/tesco/mewbase/log/LogManager.java b/src/main/java/com/tesco/mewbase/log/LogManager.java
@@ -1,5 +1,6 @@
 package com.tesco.mewbase.log;
 
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -12,4 +13,6 @@ public interface LogManager {
     CompletableFuture<Boolean> createLog(String channel);
 
     CompletableFuture<Void> close();
+
+    Set<String> getChannelNames();
 }
diff --git a/src/main/java/com/tesco/mewbase/log/impl/file/FileLogManager.java b/src/main/java/com/tesco/mewbase/log/impl/file/FileLogManager.java
@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -61,6 +62,11 @@ public CompletableFuture<Void> close() {
         return CompletableFuture.allOf(arr);
     }
 
+    @Override
+    public Set<String> getChannelNames() {
+        return logs.keySet();
+    }
+
     @Override
     public Log getLog(String channel) {
         return logs.get(channel);
diff --git a/src/main/java/com/tesco/mewbase/projection/ProjectionManager.java b/src/main/java/com/tesco/mewbase/projection/ProjectionManager.java
@@ -1,9 +1,15 @@
 package com.tesco.mewbase.projection;
 
+import java.util.Set;
+
 /**
  * Created by tim on 30/09/16.
  */
 public interface ProjectionManager {
 
     ProjectionBuilder buildProjection(String name);
+
+    Set<String> getProjectionNames();
+
+    Projection getProjection(String projectionName);
 }
diff --git a/src/main/java/com/tesco/mewbase/projection/impl/ProjectionManagerImpl.java b/src/main/java/com/tesco/mewbase/projection/impl/ProjectionManagerImpl.java
@@ -17,6 +17,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -45,6 +46,16 @@ public ProjectionBuilder buildProjection(String name) {
         return new ProjectionBuilderImpl(name, this);
     }
 
+    @Override
+    public Set<String> getProjectionNames() {
+        return projections.keySet();
+    }
+
+    @Override
+    public Projection getProjection(String projectionName) {
+        return projections.get(projectionName);
+    }
+
     private class ProjectionImpl implements Projection {
 
         final String name;
diff --git a/src/main/java/com/tesco/mewbase/server/MewAdmin.java b/src/main/java/com/tesco/mewbase/server/MewAdmin.java
@@ -4,6 +4,7 @@
 import com.tesco.mewbase.projection.ProjectionBuilder;
 
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -17,10 +18,12 @@ public interface MewAdmin {
 
     CompletableFuture<Boolean> createBinder(String binderName);
 
-    List<Projection> listProjections();
+    Set<String> getProjectionNames();
 
-    List<String> listChannels();
+    Projection getProjection(String projectionName);
 
-    List<String> listBinders();
+    Set<String> getChannelNames();
+
+    Set<String> getBinderNames();
 
 }
diff --git a/src/main/java/com/tesco/mewbase/server/impl/MewAdminImpl.java b/src/main/java/com/tesco/mewbase/server/impl/MewAdminImpl.java
@@ -4,7 +4,7 @@
 import com.tesco.mewbase.projection.ProjectionBuilder;
 import com.tesco.mewbase.server.MewAdmin;
 
-import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -34,21 +34,23 @@ public CompletableFuture<Boolean> createBinder(String binderName) {
     }
 
     @Override
-    public List<Projection> listProjections() {
-        //TODO
-        return null;
+    public Set<String> getProjectionNames() {
+        return server.projectionManager().getProjectionNames();
     }
 
     @Override
-    public List<String> listChannels() {
-        //TODO
-        return null;
+    public Projection getProjection(String projectionName) {
+        return server.projectionManager().getProjection(projectionName);
     }
 
     @Override
-    public List<String> listBinders() {
-        //TODO
-        return null;
+    public Set<String> getChannelNames() {
+        return server.logManager().getChannelNames();
+    }
+
+    @Override
+    public Set<String> getBinderNames() {
+        return server.docManager().getBinderNames();
     }
 
 }
diff --git a/src/test/java/com/tesco/mewbase/MewbaseTestBase.java b/src/test/java/com/tesco/mewbase/MewbaseTestBase.java
@@ -23,7 +23,6 @@ public class MewbaseTestBase {
     protected static final String TEST_BINDER1 = "binder1";
     protected static final String TEST_BINDER2 = "binder2";
 
-
     @Rule
     public TemporaryFolder testFolder = new TemporaryFolder();
 
diff --git a/src/test/java/com/tesco/mewbase/ProjectionTest.java b/src/test/java/com/tesco/mewbase/ProjectionTest.java
@@ -16,10 +16,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -78,15 +82,16 @@ public void testPauseResume(TestContext testContext) throws Exception {
     }
 
     @Test
-    public void testUsingBuilder() throws Exception {
-        server.admin().buildProjection(TEST_PROJECTION_NAME1).projecting(TEST_CHANNEL_1).filteredBy(ev -> true)
-                .onto(TEST_BINDER1).identifiedBy(ev -> ev.getString("basketID"))
-                .as((basket, del) ->
-                        BsonPath.add(basket, del.event().getInteger("quantity"), "products", del.event().getString("productID")))
-                .create();
-        Producer prod = client.createProducer(TEST_CHANNEL_1);
-        prod.publish(new BsonObject().put("basketID", TEST_BASKET_ID).put("productID", "prod1").put("quantity", 10)).get();
-        waitUntilNumItems(10);
+    public void testProjectionNames() throws Exception {
+        int numProjections = 10;
+        for (int i = 0; i < numProjections; i++) {
+            registerProjection("projection" + i);
+        }
+        Set<String> names = server.admin().getProjectionNames();
+        assertEquals(numProjections, names.size());
+        for (int i = 0; i < numProjections; i++) {
+            assertTrue(names.contains("projection" + i));
+        }
     }
 
     private void testProjectionRestart(boolean duplicates) throws Exception {
@@ -139,7 +144,11 @@ private void sendEvents(int num) throws Exception {
     }
 
     private Projection registerProjection() {
-        return server.admin().buildProjection(TEST_PROJECTION_NAME1).projecting(TEST_CHANNEL_1).onto(TEST_BINDER1)
+        return registerProjection(TEST_PROJECTION_NAME1);
+    }
+
+    private Projection registerProjection(String projectionName) {
+        return server.admin().buildProjection(projectionName).projecting(TEST_CHANNEL_1).onto(TEST_BINDER1)
                 .filteredBy(ev -> true).identifiedBy(ev -> ev.getString("basketID"))
                 .as((basket, del) ->
                         BsonPath.add(basket, del.event().getInteger("quantity"), "products", del.event().getString("productID")))

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.tesco.mewbase.bson.BsonObject;`
`4`	`4`
	`5`	`+import java.util.Set;`
`5`	`6`	`import java.util.concurrent.CompletableFuture;`
`6`	`7`	`import java.util.function.Function;`
`7`	`8`
`@@ -54,4 +55,6 @@ public interface DocManager {`
`54`	`55`
`55`	`56`	`CompletableFuture<Boolean> createBinder(String binderName);`
`56`	`57`
	`58`	`+ Set<String> getBinderNames();`
	`59`	`+`
`57`	`60`	`}`