jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1354045 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/core/ main/java/org/apache/jackrabbit/oak/kernel/ main/java/org/apache/jackrabbit/oak/spi/commit/ test/java/org/apache/jackrabbit/oak/core/ test/java/org/...
Date Tue, 26 Jun 2012 14:55:10 GMT
Author: jukka
Date: Tue Jun 26 14:55:08 2012
New Revision: 1354045

URL: http://svn.apache.org/viewvc?rev=1354045&view=rev
Log:
OAK-153: Split the CommitHook interface

Rename CommitHook to CommitEditor

Added:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitEditor.java
      - copied, changed from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
      - copied, changed from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyEditor.java
      - copied, changed from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingEditor.java
      - copied, changed from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingCommitHook.java
Removed:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingCommitHook.java
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/AbstractOakTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java?rev=1354045&r1=1354044&r2=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java
Tue Jun 26 14:55:08 2012
@@ -39,10 +39,10 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.query.QueryEngineImpl;
 import org.apache.jackrabbit.oak.security.authentication.LoginContextProviderImpl;
 import org.apache.jackrabbit.oak.spi.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
-import org.apache.jackrabbit.oak.spi.commit.CompositeCommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitEditor;
+import org.apache.jackrabbit.oak.spi.commit.CompositeEditor;
 import org.apache.jackrabbit.oak.spi.commit.CompositeValidatorProvider;
-import org.apache.jackrabbit.oak.spi.commit.ValidatingCommitHook;
+import org.apache.jackrabbit.oak.spi.commit.ValidatingEditor;
 import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider;
 import org.apache.jackrabbit.oak.spi.security.authentication.LoginContextProvider;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -91,9 +91,9 @@ public class ContentRepositoryImpl imple
             validatorProvider = createDefaultValidatorProvider();
         }
 
-        List<CommitHook> hooks = new ArrayList<CommitHook>();
-        hooks.add(new ValidatingCommitHook(validatorProvider));
-        CompositeCommitHook compositeHook = new CompositeCommitHook(hooks);
+        List<CommitEditor> hooks = new ArrayList<CommitEditor>();
+        hooks.add(new ValidatingEditor(validatorProvider));
+        CompositeEditor compositeHook = new CompositeEditor(hooks);
 
         nodeStore = new KernelNodeStore(microKernel, compositeHook);
         QueryIndexProvider qip = (indexProvider == null) ? getDefaultIndexProvider(microKernel)
: indexProvider;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java?rev=1354045&r1=1354044&r2=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
Tue Jun 26 14:55:08 2012
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.oak.api.CoreValueFactory;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitEditor;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch;
 
@@ -38,7 +38,7 @@ public class KernelNodeStore extends Mem
     /**
      * Commit hook.
      */
-    private final CommitHook commitHook;
+    private final CommitEditor commitHook;
 
     /**
      * Value factory backed by the {@link #kernel} instance.
@@ -50,7 +50,7 @@ public class KernelNodeStore extends Mem
      */
     private KernelNodeState root;
 
-    public KernelNodeStore(MicroKernel kernel, CommitHook commitHook) {
+    public KernelNodeStore(MicroKernel kernel, CommitEditor commitHook) {
         assert kernel != null;
         assert commitHook != null;
 
@@ -89,7 +89,7 @@ public class KernelNodeStore extends Mem
     }
 
     @Nonnull
-    CommitHook getCommitHook() {
+    CommitEditor getCommitHook() {
         return commitHook;
     }
 }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java?rev=1354045&r1=1354044&r2=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Tue Jun 26 14:55:08 2012
@@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.api.Com
 import org.apache.jackrabbit.oak.api.CoreValueFactory;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitEditor;
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
@@ -123,7 +123,7 @@ class KernelNodeStoreBranch implements N
     @Override
     public KernelNodeState merge() throws CommitFailedException {
         MicroKernel kernel = store.getKernel();
-        CommitHook commitHook = store.getCommitHook();
+        CommitEditor commitHook = store.getCommitHook();
 
         NodeState preMergeRoot = store.getRoot();
         NodeState oldRoot = preMergeRoot;

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitEditor.java
(from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitEditor.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitEditor.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java&r1=1354044&r2=1354045&rev=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitHook.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitEditor.java
Tue Jun 26 14:55:08 2012
@@ -47,7 +47,7 @@ import javax.annotation.Nonnull;
  * hooks are better expressed as implementations of the more specific
  * extension interfaces defined in this package.
  */
-public interface CommitHook {
+public interface CommitEditor {
 
     /**
      * Before-commit hook. The implementation can validate, record or

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
(from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java&r1=1354044&r2=1354045&rev=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeCommitHook.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
Tue Jun 26 14:55:08 2012
@@ -26,10 +26,10 @@ import java.util.List;
  * This {@code CommitHook} aggregates a list of commit hooks into
  * a single commit hook.
  */
-public class CompositeCommitHook implements CommitHook {
-    private final List<CommitHook> hooks;
+public class CompositeEditor implements CommitEditor {
+    private final List<CommitEditor> hooks;
 
-    public CompositeCommitHook(List<CommitHook> hooks) {
+    public CompositeEditor(List<CommitEditor> hooks) {
         this.hooks = hooks;
     }
 
@@ -39,7 +39,7 @@ public class CompositeCommitHook impleme
 
         NodeState oldState = before;
         NodeState newState = after;
-        for (CommitHook hook : hooks) {
+        for (CommitEditor hook : hooks) {
             NodeState newOldState = newState;
             newState = hook.beforeCommit(store, oldState, newState);
             oldState = newOldState;
@@ -50,7 +50,7 @@ public class CompositeCommitHook impleme
 
     @Override
     public void afterCommit(NodeStore store, NodeState before, NodeState after) {
-        for (CommitHook hook : hooks) {
+        for (CommitEditor hook : hooks) {
             hook.afterCommit(store, before, after);
         }
     }

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyEditor.java
(from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyEditor.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyEditor.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java&r1=1354044&r2=1354045&rev=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyCommitHook.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyEditor.java
Tue Jun 26 14:55:08 2012
@@ -29,18 +29,18 @@ import org.apache.jackrabbit.oak.spi.sta
  * the need for extra code for such cases.</li>
  * <li>Other commit hook implementations can extend this class and gain
  * improved forwards-compatibility to possible changes in the
- * {@link CommitHook} interface. For example if it is later decided that
+ * {@link CommitEditor} interface. For example if it is later decided that
  * new arguments are needed in the hook methods, this class is guaranteed
  * to implement any new method signatures in a way that falls gracefully
  * back to any earlier behavior.</li>
  * </ol>
  */
-public class EmptyCommitHook implements CommitHook {
+public class EmptyEditor implements CommitEditor {
 
     /**
      * Static instance of this class, useful as a "null object".
      */
-    public static final CommitHook INSTANCE = new EmptyCommitHook();
+    public static final CommitEditor INSTANCE = new EmptyEditor();
 
     @Override
     public NodeState beforeCommit(

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingEditor.java
(from r1354044, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingCommitHook.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingEditor.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingEditor.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingCommitHook.java&r1=1354044&r2=1354045&rev=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingCommitHook.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatingEditor.java
Tue Jun 26 14:55:08 2012
@@ -29,7 +29,7 @@ import static org.apache.jackrabbit.oak.
  * against all {@link Validator}s provided by the {@link ValidatorProvider}
  * passed to the class' constructor.
  */
-public class ValidatingCommitHook implements CommitHook {
+public class ValidatingEditor implements CommitEditor {
 
     private final ValidatorProvider validatorProvider;
 
@@ -38,7 +38,7 @@ public class ValidatingCommitHook implem
      * {@link Validator}s provided by {@code validatorProvider}.
      * @param validatorProvider  validator provider
      */
-    public ValidatingCommitHook(ValidatorProvider validatorProvider) {
+    public ValidatingEditor(ValidatorProvider validatorProvider) {
         this.validatorProvider = validatorProvider;
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/AbstractOakTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/AbstractOakTest.java?rev=1354045&r1=1354044&r2=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/AbstractOakTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/AbstractOakTest.java
Tue Jun 26 14:55:08 2012
@@ -20,8 +20,8 @@ import org.apache.jackrabbit.mk.api.Micr
 import org.apache.jackrabbit.mk.core.MicroKernelImpl;
 import org.apache.jackrabbit.oak.api.CoreValueFactory;
 import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
-import org.apache.jackrabbit.oak.spi.commit.EmptyCommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitEditor;
+import org.apache.jackrabbit.oak.spi.commit.EmptyEditor;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.junit.Before;
@@ -53,8 +53,8 @@ public abstract class AbstractOakTest {
         state = createInitialState(microKernel);
     }
 
-    protected CommitHook createCommitHook() {
-        return new EmptyCommitHook();
+    protected CommitEditor createCommitHook() {
+        return new EmptyEditor();
     }
 
     protected abstract NodeState createInitialState(MicroKernel microKernel);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java?rev=1354045&r1=1354044&r2=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
Tue Jun 26 14:55:08 2012
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.api.Tre
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.core.RootImplFuzzIT.Operation.Rebase;
 import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
-import org.apache.jackrabbit.oak.spi.commit.EmptyCommitHook;
+import org.apache.jackrabbit.oak.spi.commit.EmptyEditor;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -79,13 +79,13 @@ public class RootImplFuzzIT {
         counter = 0;
 
         MicroKernel mk1 = new MicroKernelImpl("./target/mk1/" + random.nextInt());
-        store1 = new KernelNodeStore(mk1, EmptyCommitHook.INSTANCE);
+        store1 = new KernelNodeStore(mk1, EmptyEditor.INSTANCE);
         vf = store1.getValueFactory();
         mk1.commit("", "+\"/root\":{}", mk1.getHeadRevision(), "");
         root1 = new RootImpl(store1, null);
 
         MicroKernel mk2 = new MicroKernelImpl("./target/mk2/" + random.nextInt());
-        store2 = new KernelNodeStore(mk2, EmptyCommitHook.INSTANCE);
+        store2 = new KernelNodeStore(mk2, EmptyEditor.INSTANCE);
         mk2.commit("", "+\"/root\":{}", mk2.getHeadRevision(), "");
         root2 = new RootImpl(store2, null);
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreTest.java?rev=1354045&r1=1354044&r2=1354045&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreTest.java
Tue Jun 26 14:55:08 2012
@@ -23,8 +23,8 @@ import org.apache.jackrabbit.oak.api.Com
 import org.apache.jackrabbit.oak.api.CoreValue;
 import org.apache.jackrabbit.oak.core.AbstractOakTest;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
-import org.apache.jackrabbit.oak.spi.commit.EmptyCommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitEditor;
+import org.apache.jackrabbit.oak.spi.commit.EmptyEditor;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -51,7 +51,7 @@ public class KernelNodeStoreTest extends
     }
 
     @Override
-    protected CommitHook createCommitHook() {
+    protected CommitEditor createCommitHook() {
         return commitHookDelegate;
     }
 
@@ -139,7 +139,7 @@ public class KernelNodeStoreTest extends
         rootBuilder.setNode("test", testBuilder.getNodeState());
         final NodeState newRoot = rootBuilder.getNodeState();
 
-        commitWithHook(newRoot, new EmptyCommitHook() {
+        commitWithHook(newRoot, new EmptyEditor() {
             @Override
             public void afterCommit(NodeStore store, NodeState before, NodeState after) {
                 assertNull(before.getChildNode("test").getChildNode("newNode"));
@@ -169,7 +169,7 @@ public class KernelNodeStoreTest extends
         rootBuilder.setNode("test", testBuilder.getNodeState());
         final NodeState newRoot = rootBuilder.getNodeState();
 
-        commitWithHook(newRoot, new EmptyCommitHook() {
+        commitWithHook(newRoot, new EmptyEditor() {
             @Override
             public NodeState beforeCommit(NodeStore store, NodeState before, NodeState after)
{
                 NodeStateBuilder rootBuilder = store.getBuilder(after);
@@ -190,7 +190,7 @@ public class KernelNodeStoreTest extends
 
     //------------------------------------------------------------< private >---
 
-    private void commitWithHook(NodeState nodeState, CommitHook commitHook)
+    private void commitWithHook(NodeState nodeState, CommitEditor commitHook)
             throws CommitFailedException {
 
         commitHookDelegate.set(commitHook);
@@ -200,14 +200,14 @@ public class KernelNodeStoreTest extends
             branch.merge();
         }
         finally {
-            commitHookDelegate.set(new EmptyCommitHook());
+            commitHookDelegate.set(new EmptyEditor());
         }
     }
 
-    private static class CommitHookDelegate implements CommitHook {
-        private CommitHook delegate = new EmptyCommitHook();
+    private static class CommitHookDelegate implements CommitEditor {
+        private CommitEditor delegate = new EmptyEditor();
 
-        public void set(CommitHook commitHook) {
+        public void set(CommitEditor commitHook) {
             delegate = commitHook;
         }
 



Mime
View raw message