You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/06/13 16:57:52 UTC
svn commit: r1349895 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
Author: mduerig
Date: Wed Jun 13 14:57:50 2012
New Revision: 1349895
URL: http://svn.apache.org/viewvc?rev=1349895&view=rev
Log:
remove/replace constructor only used from tests
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
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=1349895&r1=1349894&r2=1349895&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 Wed Jun 13 14:57:50 2012
@@ -16,16 +16,15 @@
*/
package org.apache.jackrabbit.oak.kernel;
+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.EmptyCommitHook;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch;
-import javax.annotation.Nonnull;
-
/**
* {@code NodeStore} implementations against {@link MicroKernel}.
*/
@@ -51,10 +50,6 @@ public class KernelNodeStore extends Mem
*/
private KernelNodeState root;
- public KernelNodeStore(MicroKernel kernel) {
- this(kernel, new EmptyCommitHook());
- }
-
public KernelNodeStore(MicroKernel kernel, CommitHook commitHook) {
assert kernel != null;
assert commitHook != null;
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=1349895&r1=1349894&r2=1349895&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 Wed Jun 13 14:57:50 2012
@@ -30,6 +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.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -78,13 +79,13 @@ public class RootImplFuzzIT {
counter = 0;
MicroKernel mk1 = new MicroKernelImpl("./target/mk1/" + random.nextInt());
- store1 = new KernelNodeStore(mk1);
+ store1 = new KernelNodeStore(mk1, EmptyCommitHook.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);
+ store2 = new KernelNodeStore(mk2, EmptyCommitHook.INSTANCE);
mk2.commit("", "+\"/root\":{}", mk2.getHeadRevision(), "");
root2 = new RootImpl(store2, null);
}