Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java?rev=1532782&r1=1532781&r2=1532782&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java Wed Oct 16 14:43:01 2013 @@ -31,8 +31,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.NodeStoreFixture; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; @@ -40,12 +38,10 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.commit.Observer; -import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -86,7 +82,8 @@ public class NodeStoreTest { test.child("x"); test.child("y"); test.child("z"); - root = store.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + root = store.merge(builder, EmptyHook.INSTANCE); + root = store.merge(builder, EmptyHook.INSTANCE); } @After @@ -129,7 +126,7 @@ public class NodeStoreTest { assertFalse(testState.getChildNode("newNode").exists()); assertTrue(testState.getChildNode("x").exists()); - store.merge(rootBuilder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(rootBuilder, EmptyHook.INSTANCE); // Assert changes are present in the trunk testState = store.getRoot().getChildNode("test"); @@ -160,7 +157,7 @@ public class NodeStoreTest { testBuilder.getChildNode("a").remove(); - store.merge(rootBuilder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(rootBuilder, EmptyHook.INSTANCE); NodeState newRoot = store.getRoot(); // triggers the observer NodeState before = states[0]; @@ -194,7 +191,7 @@ public class NodeStoreTest { testBuilder.child("fromHook"); return rootBuilder.getNodeState(); } - }, PostCommitHook.EMPTY); + }); NodeState test = store.getRoot().getChildNode("test"); assertTrue(test.getChildNode("newNode").exists()); @@ -211,13 +208,13 @@ public class NodeStoreTest { for (int i = 0; i <= KernelNodeState.MAX_CHILD_NODE_NAMES; i++) { parent.child("child-" + i); } - store.merge(root, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(root, EmptyHook.INSTANCE); NodeState base = store.getRoot(); root = base.builder(); parent = root.child("parent"); parent.child("child-new"); - store.merge(root, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(root, EmptyHook.INSTANCE); Diff diff = new Diff(); store.getRoot().compareAgainstBaseState(base, diff); @@ -230,7 +227,7 @@ public class NodeStoreTest { root = base.builder(); parent = root.getChildNode("parent"); parent.getChildNode("child-new").moveTo(parent, "child-moved"); - store.merge(root, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(root, EmptyHook.INSTANCE); diff = new Diff(); store.getRoot().compareAgainstBaseState(base, diff); @@ -246,7 +243,7 @@ public class NodeStoreTest { parent.child("child-moved").setProperty("foo", "value"); parent.child("child-moved").setProperty( new MultiStringPropertyState("bar", Arrays.asList("value"))); - store.merge(root, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(root, EmptyHook.INSTANCE); diff = new Diff(); store.getRoot().compareAgainstBaseState(base, diff); @@ -263,7 +260,7 @@ public class NodeStoreTest { parent.setProperty("foo", "value"); parent.setProperty(new MultiStringPropertyState( "bar", Arrays.asList("value"))); - store.merge(root, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(root, EmptyHook.INSTANCE); diff = new Diff(); store.getRoot().compareAgainstBaseState(base, diff); @@ -278,7 +275,7 @@ public class NodeStoreTest { root = base.builder(); parent = root.child("parent"); parent.getChildNode("child-moved").remove(); - store.merge(root, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(root, EmptyHook.INSTANCE); diff = new Diff(); store.getRoot().compareAgainstBaseState(base, diff); @@ -311,7 +308,7 @@ public class NodeStoreTest { private static NodeStore init(NodeStore store) throws CommitFailedException { NodeBuilder builder = store.getRoot().builder(); builder.setChildNode("root"); - store.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(builder, EmptyHook.INSTANCE); return store; } @@ -325,27 +322,11 @@ public class NodeStoreTest { builder1.setChildNode("node1"); builder2.setChildNode("node2"); - store.merge(builder1, EmptyHook.INSTANCE, new PostCommitHook() { - @Override - public void contentChanged(@Nonnull NodeState before, @Nonnull NodeState after) { - assertFalse(before.hasChildNode("node1")); - assertFalse(before.hasChildNode("node2")); - assertTrue(after.hasChildNode("node1")); - assertFalse(after.hasChildNode("node2")); - } - }); + store.merge(builder1, EmptyHook.INSTANCE); assertTrue(store.getRoot().hasChildNode("node1")); assertFalse(store.getRoot().hasChildNode("node2")); - store.merge(builder2, EmptyHook.INSTANCE, new PostCommitHook() { - @Override - public void contentChanged(@Nonnull NodeState before, @Nonnull NodeState after) { - assertTrue(before.hasChildNode("node1")); - assertFalse(before.hasChildNode("node2")); - assertTrue(after.hasChildNode("node1")); - assertTrue(after.hasChildNode("node2")); - } - }); + store.merge(builder2, EmptyHook.INSTANCE); assertTrue(store.getRoot().hasChildNode("node1")); assertTrue(store.getRoot().hasChildNode("node2")); } @@ -373,7 +354,7 @@ public class NodeStoreTest { } builder.child("foo").child(":bar").child("quz").setProperty("p", "v"); - store.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(builder, EmptyHook.INSTANCE); NodeState after = store.getRoot(); Diff diff = new Diff();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1532782&r1=1532781&r2=1532782&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Wed Oct 16 14:43:01 2013 @@ -17,28 +17,26 @@ package org.apache.jackrabbit.oak.plugins.index; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.ASYNC_PROPERTY_NAME; -import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME; import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_CONTENT_NODE_NAME; +import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME; import static org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider; import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexLookup; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; -import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.query.PropertyValues; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.Test; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - public class AsyncIndexUpdateTest { // TODO test index config deletes @@ -79,7 +77,7 @@ public class AsyncIndexUpdateTest { builder.child("testRoot").setProperty("foo", "abc"); // merge it back in - store.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(builder, EmptyHook.INSTANCE); AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider); async.run(); @@ -120,7 +118,7 @@ public class AsyncIndexUpdateTest { builder.child("testSecond").setProperty("bar", "ghi"); // merge it back in - store.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(builder, EmptyHook.INSTANCE); AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider); async.run(); @@ -172,7 +170,7 @@ public class AsyncIndexUpdateTest { .setProperty("foo", "xyz"); // merge it back in - store.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(builder, EmptyHook.INSTANCE); AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider); async.run(); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java?rev=1532782&r1=1532781&r2=1532782&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java Wed Oct 16 14:43:01 2013 @@ -41,7 +41,6 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.query.ast.SelectorImpl; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.spi.commit.EditorHook; -import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.lifecycle.OakInitializer; import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.query.Cursors; @@ -79,7 +78,7 @@ public class NodeTypeIndexTest { addFile(root, "file-1"); store.merge(root, new EditorHook(new IndexUpdateProvider( - new PropertyIndexEditorProvider())), PostCommitHook.EMPTY); + new PropertyIndexEditorProvider()))); NodeState rootState = store.getRoot(); NodeTypeIndex index = new NodeTypeIndex(); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java?rev=1532782&r1=1532781&r2=1532782&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java Wed Oct 16 14:43:01 2013 @@ -22,7 +22,6 @@ import org.apache.jackrabbit.oak.api.Com import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; -import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.junit.Test; @@ -47,7 +46,7 @@ public class JournalTest { builder.setProperty("foo", "bar"); NodeState newState = builder.getNodeState(); - root.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + root.merge(builder, EmptyHook.INSTANCE); assertEquals(newState, root.getRoot()); assertEquals(oldState, left.getRoot()); @@ -74,7 +73,7 @@ public class JournalTest { builder.setProperty("foo", "bar"); NodeState newState = builder.getNodeState(); - left.merge(builder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + left.merge(builder, EmptyHook.INSTANCE); assertEquals(oldState, root.getRoot()); assertEquals(newState, left.getRoot()); @@ -101,7 +100,7 @@ public class JournalTest { leftBuilder.setProperty("foo", "bar"); NodeState leftState = leftBuilder.getNodeState(); - left.merge(leftBuilder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + left.merge(leftBuilder, EmptyHook.INSTANCE); assertEquals(oldState, root.getRoot()); assertEquals(leftState, left.getRoot()); @@ -115,7 +114,7 @@ public class JournalTest { NodeBuilder rightBuilder = oldState.builder(); rightBuilder.setProperty("bar", "foo"); - right.merge(rightBuilder, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + right.merge(rightBuilder, EmptyHook.INSTANCE); store.getJournal("right").merge(); NodeState newState = root.getRoot(); Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java?rev=1532782&r1=1532781&r2=1532782&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java Wed Oct 16 14:43:01 2013 @@ -29,7 +29,6 @@ import org.apache.jackrabbit.oak.api.Com import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; -import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; @@ -46,14 +45,14 @@ public class MergeTest { NodeBuilder a = store.getRoot().builder(); a.setProperty("foo", "abc"); - store.merge(a, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(a, EmptyHook.INSTANCE); assertTrue(store.getRoot().hasProperty("foo")); assertFalse(store.getRoot().hasProperty("bar")); NodeBuilder b = store.getRoot().builder(); b.setProperty("bar", "xyz"); - store.merge(b, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(b, EmptyHook.INSTANCE); assertTrue(store.getRoot().hasProperty("foo")); assertTrue(store.getRoot().hasProperty("bar")); @@ -72,12 +71,12 @@ public class MergeTest { assertFalse(store.getRoot().hasProperty("foo")); assertFalse(store.getRoot().hasProperty("bar")); - store.merge(a, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(a, EmptyHook.INSTANCE); assertTrue(store.getRoot().hasProperty("foo")); assertFalse(store.getRoot().hasProperty("bar")); - store.merge(b, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(b, EmptyHook.INSTANCE); assertTrue(store.getRoot().hasProperty("foo")); assertTrue(store.getRoot().hasProperty("bar")); @@ -96,7 +95,7 @@ public class MergeTest { try { NodeBuilder a = store.getRoot().builder(); a.setProperty("foo", "abc" + i); - store.merge(a, EmptyHook.INSTANCE, PostCommitHook.EMPTY); + store.merge(a, EmptyHook.INSTANCE); semaphore.release(); } catch (CommitFailedException e) { fail(); @@ -125,7 +124,7 @@ public class MergeTest { } return after; } - }, PostCommitHook.EMPTY); + }); assertTrue(store.getRoot().hasProperty("foo")); assertTrue(store.getRoot().hasProperty("bar")); Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1532782&r1=1532781&r2=1532782&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java Wed Oct 16 14:43:01 2013 @@ -76,7 +76,6 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.plugins.name.Namespaces; import org.apache.jackrabbit.oak.plugins.nodetype.RegistrationEditorProvider; import org.apache.jackrabbit.oak.spi.commit.EditorHook; -import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.spi.Name; @@ -177,7 +176,7 @@ public class RepositoryUpgrade { copyVersionStore(builder, idxToPrefix); copyWorkspaces(builder, idxToPrefix); - target.merge(builder, new EditorHook(new RegistrationEditorProvider()), PostCommitHook.EMPTY); // TODO: default hooks? + target.merge(builder, new EditorHook(new RegistrationEditorProvider())); // TODO: default hooks? } catch (Exception e) { throw new RepositoryException("Failed to copy content", e); }
