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=1746410&r1=1746409&r2=1746410&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 Jun 1 07:48:51 2016 @@ -18,13 +18,22 @@ */ package org.apache.jackrabbit.oak.upgrade; +import java.io.File; +import java.io.IOException; + +import javax.annotation.Nonnull; +import javax.jcr.NamespaceRegistry; +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.jcr.Session; + import org.apache.jackrabbit.api.JackrabbitWorkspace; import org.apache.jackrabbit.api.security.authorization.PrivilegeManager; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -34,14 +43,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import javax.annotation.Nonnull; -import javax.jcr.NamespaceRegistry; -import javax.jcr.Node; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import java.io.File; -import java.io.IOException; - /** * Test case to simulate an incremental upgrade, where a source repository is * copied to target initially. Then some modifications are made in the source @@ -58,7 +59,7 @@ public class RepeatedRepositoryUpgradeTe @Override protected NodeStore createTargetNodeStore() { - return SegmentNodeStore.builder(fileStore).build(); + return SegmentNodeStoreBuilders.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=1746410&r1=1746409&r2=1746410&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 Jun 1 07:48:51 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.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; @@ -89,7 +90,7 @@ public class RepositorySidegradeTest { @Before public synchronized void upgradeRepository() throws Exception { - targetNodeStore = SegmentNodeStore.builder(new MemoryStore()).build(); + targetNodeStore = SegmentNodeStoreBuilders.builder(new MemoryStore()).build(); targetRepository = new Jcr(new Oak(targetNodeStore)).createRepository(); NodeStore source = createSourceContent(); RepositorySidegrade sidegrade = new RepositorySidegrade(source, targetNodeStore); @@ -116,7 +117,7 @@ public class RepositorySidegradeTest { @SuppressWarnings("unchecked") protected NodeStore createSourceContent() throws Exception { - NodeStore source = SegmentNodeStore.builder(new MemoryStore()).build(); + NodeStore source = SegmentNodeStoreBuilders.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=1746410&r1=1746409&r2=1746410&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 Jun 1 07:48:51 2016 @@ -16,11 +16,17 @@ */ package org.apache.jackrabbit.oak.upgrade; +import java.io.File; +import java.io.IOException; + +import javax.jcr.RepositoryException; +import javax.jcr.Session; + import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.junit.AfterClass; @@ -28,11 +34,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import java.io.File; -import java.io.IOException; - /** * Test case that simulates copying different paths from two source repositories * into a single target repository. @@ -44,7 +45,7 @@ public class UpgradeFromTwoSourcesTest e @Override protected NodeStore createTargetNodeStore() { - return SegmentNodeStore.builder(fileStore).build(); + return SegmentNodeStoreBuilders.builder(fileStore).build(); } @BeforeClass Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java?rev=1746410&r1=1746409&r2=1746410&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java Wed Jun 1 07:48:51 2016 @@ -18,16 +18,14 @@ */ package org.apache.jackrabbit.oak.upgrade; -import com.google.common.collect.Iterators; -import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.api.JackrabbitRepository; -import org.apache.jackrabbit.commons.cnd.CndImporter; -import org.apache.jackrabbit.oak.jcr.Jcr; -import org.apache.jackrabbit.oak.segment.SegmentStore; -import org.apache.jackrabbit.oak.segment.file.FileStore; -import org.apache.jackrabbit.oak.upgrade.cli.OakUpgrade; -import org.apache.jackrabbit.oak.upgrade.cli.Util; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.InputStream; +import java.io.StringReader; import javax.jcr.Node; import javax.jcr.Repository; @@ -36,15 +34,17 @@ import javax.jcr.SimpleCredentials; import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeManager; import javax.jcr.nodetype.PropertyDefinition; -import java.io.File; -import java.io.InputStream; -import java.io.StringReader; -import static org.apache.jackrabbit.oak.segment.SegmentNodeStore.builder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import com.google.common.collect.Iterators; +import org.apache.commons.io.FileUtils; +import org.apache.jackrabbit.api.JackrabbitRepository; +import org.apache.jackrabbit.commons.cnd.CndImporter; +import org.apache.jackrabbit.oak.jcr.Jcr; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; +import org.apache.jackrabbit.oak.segment.file.FileStore; +import org.apache.jackrabbit.oak.upgrade.cli.OakUpgrade; +import org.apache.jackrabbit.oak.upgrade.cli.Util; +import org.junit.Test; public class UpgradeOldSegmentTest { @@ -62,8 +62,8 @@ public class UpgradeOldSegmentTest { OakUpgrade.main("segment-old:" + oldRepo.getPath(), newRepo.getPath()); - SegmentStore store = FileStore.builder(new File(newRepo, "segmentstore")).build(); - Repository repo = new Jcr(builder(store).build()).createRepository(); + FileStore store = FileStore.builder(new File(newRepo, "segmentstore")).build(); + Repository repo = new Jcr(SegmentNodeStoreBuilders.builder(store).build()).createRepository(); Session s = repo.login(new SimpleCredentials("admin", "admin".toCharArray())); Node myType = s.getNode("/jcr:system/jcr:nodeTypes/test:MyType"); Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java?rev=1746410&r1=1746409&r2=1746410&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java Wed Jun 1 07:48:51 2016 @@ -21,7 +21,7 @@ import java.io.IOException; import com.google.common.io.Files; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.oak.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.spi.state.NodeStore; @@ -54,7 +54,7 @@ public class SegmentTarNodeStoreContaine builder.withBlobStore(blob.open()); } fs = builder.build(); - return SegmentNodeStore.builder(fs).build(); + return SegmentNodeStoreBuilders.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=1746410&r1=1746409&r2=1746410&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 Jun 1 07:48:51 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.segment.SegmentNodeStore; +import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; import org.apache.jackrabbit.oak.segment.memory.MemoryStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.DefaultValidator; @@ -50,7 +51,7 @@ public class NodeStateTestUtils { } public static NodeStore createNodeStoreWithContent(String... paths) throws CommitFailedException, IOException { - final SegmentNodeStore store = SegmentNodeStore.builder(new MemoryStore()).build(); + final SegmentNodeStore store = SegmentNodeStoreBuilders.builder(new MemoryStore()).build(); final NodeBuilder builder = store.getRoot().builder(); for (String path : paths) { create(builder, path);
