Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java Wed Apr 13 12:19:54 2016 @@ -44,7 +44,7 @@ public class RepeatedRepositorySidegrade sourceDir.mkdirs(); FileStore fileStore = FileStore.builder(sourceDir).build(); - SegmentNodeStore segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); + SegmentNodeStore segmentNodeStore = SegmentNodeStore.builder(fileStore).build(); RepositoryImpl repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository(); Session session = repository.login(CREDENTIALS); try { @@ -61,7 +61,7 @@ public class RepeatedRepositorySidegrade fileStore.flush(); fileStore = FileStore.builder(sourceDir).build(); - segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); + segmentNodeStore = SegmentNodeStore.builder(fileStore).build(); repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository(); session = repository.login(CREDENTIALS); try { @@ -83,7 +83,7 @@ public class RepeatedRepositorySidegrade @Override protected void doUpgradeRepository(File source, NodeStore target) throws RepositoryException, IOException { FileStore fileStore = FileStore.builder(source).build(); - SegmentNodeStore segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); + SegmentNodeStore segmentNodeStore = SegmentNodeStore.builder(fileStore).build(); try { final RepositorySidegrade repositoryUpgrade = new RepositorySidegrade(segmentNodeStore, target); repositoryUpgrade.copy(new RepositoryInitializer() {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java Wed Apr 13 12:19:54 2016 @@ -37,7 +37,6 @@ import org.junit.Test; import javax.annotation.Nonnull; import javax.jcr.NamespaceRegistry; import javax.jcr.Node; -import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; import java.io.File; @@ -59,7 +58,7 @@ public class RepeatedRepositoryUpgradeTe @Override protected NodeStore createTargetNodeStore() { - return new SegmentNodeStore(fileStore); + return SegmentNodeStore.builder(fileStore).build(); } @BeforeClass Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java Wed Apr 13 12:19:54 2016 @@ -62,6 +62,7 @@ import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.jcr.Jcr; import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; @@ -88,7 +89,7 @@ public class RepositorySidegradeTest { @Before public synchronized void upgradeRepository() throws Exception { - targetNodeStore = new SegmentNodeStore(); + targetNodeStore = SegmentNodeStore.builder(new MemoryStore()).build(); targetRepository = new Jcr(new Oak(targetNodeStore)).createRepository(); NodeStore source = createSourceContent(); RepositorySidegrade sidegrade = new RepositorySidegrade(source, targetNodeStore); @@ -115,7 +116,7 @@ public class RepositorySidegradeTest { @SuppressWarnings("unchecked") protected NodeStore createSourceContent() throws Exception { - NodeStore source = new SegmentNodeStore(); + NodeStore source = SegmentNodeStore.builder(new MemoryStore()).build(); setAsync(source); Repository repository = new Jcr(new Oak(source)).createRepository(); Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java?rev=1738929&r1=1738928&r2=1738929&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java Wed Apr 13 12:19:54 2016 @@ -44,7 +44,7 @@ public class UpgradeFromTwoSourcesTest e @Override protected NodeStore createTargetNodeStore() { - return new SegmentNodeStore(fileStore); + return SegmentNodeStore.builder(fileStore).build(); } @BeforeClass Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java?rev=1738929&r1=1738928&r2=1738929&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNodeStoreContainer.java Wed Apr 13 12:19:54 2016 @@ -55,7 +55,7 @@ public class SegmentNodeStoreContainer i builder.withBlobStore(blob.open()); } fs = builder.build(); - return SegmentNodeStore.newSegmentNodeStore(fs).create(); + return SegmentNodeStore.builder(fs).build(); } @Override Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/NodeStateTestUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/NodeStateTestUtils.java?rev=1738929&r1=1738928&r2=1738929&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/NodeStateTestUtils.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/util/NodeStateTestUtils.java Wed Apr 13 12:19:54 2016 @@ -33,6 +33,7 @@ import org.apache.jackrabbit.oak.api.Com import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.DefaultValidator; import org.apache.jackrabbit.oak.spi.commit.EditorDiff; @@ -49,7 +50,7 @@ public class NodeStateTestUtils { } public static NodeStore createNodeStoreWithContent(String... paths) throws CommitFailedException, IOException { - final SegmentNodeStore store = new SegmentNodeStore(); + final SegmentNodeStore store = SegmentNodeStore.builder(new MemoryStore()).build(); final NodeBuilder builder = store.getRoot().builder(); for (String path : paths) { create(builder, path);
