Ensure resource commits are properly unwrapped by resource manager.

atomix · Aug 5, 2015 · 3b70460 · 3b70460
1 parent c05c372
commit 3b70460
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/core/src/main/java/net/kuujo/copycat/Node.java b/core/src/main/java/net/kuujo/copycat/Node.java
@@ -78,11 +78,9 @@ public CompletableFuture<List<Node>> children() {
     return copycat.client.submit(PathChildren.builder()
       .withPath(path)
       .build())
-      .thenApply(children -> {
+      .thenApply(children ->  children.stream()
-        return children.stream()
+        .map(copycat::node)
-          .map(copycat::node)
+        .collect(Collectors.toList()));
-          .collect(Collectors.toList());
-      });
   }
 
   /**

diff --git a/core/src/main/java/net/kuujo/copycat/manager/ResourceCommit.java b/core/src/main/java/net/kuujo/copycat/manager/ResourceCommit.java
@@ -18,6 +18,7 @@
 import net.kuujo.copycat.raft.Operation;
 import net.kuujo.copycat.raft.Session;
 import net.kuujo.copycat.raft.server.Commit;
+import net.kuujo.copycat.resource.ResourceOperation;
 
 /**
  * Resource commit.
@@ -26,7 +27,7 @@
  */
 class ResourceCommit implements Commit {
   private final ResourceCommitPool pool;
-  private Commit commit;
+  private Commit<ResourceOperation> commit;
   private Session session;
 
   public ResourceCommit(ResourceCommitPool pool) {
@@ -39,7 +40,7 @@ public ResourceCommit(ResourceCommitPool pool) {
    * @param commit The parent commit.
    * @param session The resource session.
    */
-  void reset(Commit commit, Session session) {
+  void reset(Commit<ResourceOperation> commit, Session session) {
     this.commit = commit;
     this.session = session;
   }
@@ -61,12 +62,12 @@ public long timestamp() {
 
   @Override
   public Class type() {
-    return commit.type();
+    return commit.operation().operation().getClass();
   }
 
   @Override
   public Operation operation() {
-    return commit.operation();
+    return commit.operation().operation();
   }
 
   @Override