Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/LargeNumberOfPropertiesTestIT.java Tue Apr 12 11:45:05 2016 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.segment.file; import static org.apache.commons.io.FileUtils.deleteDirectory; -import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore; import static org.junit.Assume.assumeTrue; import java.io.File; @@ -77,8 +76,8 @@ public class LargeNumberOfPropertiesTest @Test public void corruption() throws Exception { - FileStore fileStore = newFileStore(directory).withMaxFileSize(5) - .withNoCache().withMemoryMapping(true).create(); + FileStore fileStore = FileStore.builder(directory).withMaxFileSize(5) + .withNoCache().withMemoryMapping(true).build(); SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore); NodeBuilder root = nodeStore.getRoot().builder();
Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java (original) +++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/SegmentReferenceLimitTestIT.java Tue Apr 12 11:45:05 2016 @@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.plugins.segment.file; import static org.apache.commons.io.FileUtils.deleteDirectory; -import static org.apache.jackrabbit.oak.plugins.segment.file.FileStore.newFileStore; import static org.junit.Assume.assumeTrue; import java.io.File; @@ -85,8 +84,8 @@ public class SegmentReferenceLimitTestIT @Test public void corruption() throws IOException, CommitFailedException, ExecutionException, InterruptedException { - FileStore fileStore = newFileStore(directory).withMaxFileSize(1) - .withNoCache().withMemoryMapping(true).create(); + FileStore fileStore = FileStore.builder(directory).withMaxFileSize(1) + .withNoCache().withMemoryMapping(true).build(); SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore); NodeBuilder root = nodeStore.getRoot().builder(); Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java (original) +++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java Tue Apr 12 11:45:05 2016 @@ -37,7 +37,7 @@ public class ExternalToExternalMigration @Override protected NodeStore createNodeStore(BlobStore blobStore, File repository) throws IOException { File segmentDir = new File(repository, "segmentstore"); - segmentStore = FileStore.newFileStore(segmentDir).withBlobStore(blobStore).create(); + segmentStore = FileStore.builder(segmentDir).withBlobStore(blobStore).build(); return SegmentNodeStore.newSegmentNodeStore(segmentStore).create(); } Modified: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java (original) +++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java Tue Apr 12 11:45:05 2016 @@ -37,11 +37,11 @@ public class SegmentToExternalMigrationT @Override protected NodeStore createNodeStore(BlobStore blobStore, File repository) throws IOException { File segmentDir = new File(repository, "segmentstore"); - FileStore.Builder builder = FileStore.newFileStore(segmentDir); + FileStore.Builder builder = FileStore.builder(segmentDir); if (blobStore != null) { builder.withBlobStore(blobStore); } - segmentStore = builder.create(); + segmentStore = builder.build(); return SegmentNodeStore.newSegmentNodeStore(segmentStore).create(); } @@ -60,4 +60,4 @@ public class SegmentToExternalMigrationT return new FileBlobStore(repository.getPath() + "/new"); } -} \ No newline at end of file +} Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTestUtils.java Tue Apr 12 11:45:05 2016 @@ -49,8 +49,8 @@ public final class SegmentTestUtils { } public static void assertEqualStores(File d1, File d2) throws IOException { - FileStore f1 = new FileStore(d1, 1, false); - FileStore f2 = new FileStore(d2, 1, false); + FileStore f1 = FileStore.builder(d1).withMaxFileSize(1).withMemoryMapping(false).build(); + FileStore f2 = FileStore.builder(d2).withMaxFileSize(1).withMemoryMapping(false).build(); try { assertEquals(f1.getHead(), f2.getHead()); } finally { Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java Tue Apr 12 11:45:05 2016 @@ -62,12 +62,12 @@ public class DataStoreTestBase extends T fds.setMinRecordLength(4092); fds.init(path); DataStoreBlobStore blobStore = new DataStoreBlobStore(fds); - return FileStore.newFileStore(d) + return FileStore.builder(d) .withMaxFileSize(1) .withMemoryMapping(false) .withNoCache() .withBlobStore(blobStore) - .create(); + .build(); } protected byte[] addTestContent(NodeStore store, String child, int size) Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (original) +++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Tue Apr 12 11:45:05 2016 @@ -80,11 +80,11 @@ public class TestBase { } private static FileStore newFileStore(File directory) throws IOException { - return FileStore.newFileStore(directory) + return FileStore.builder(directory) .withMaxFileSize(1) .withMemoryMapping(false) .withNoCache() - .create(); + .build(); } protected FileStore setupPrimary(File directory) throws IOException { Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java Tue Apr 12 11:45:05 2016 @@ -44,12 +44,12 @@ public class SegmentFactory implements N @Override public NodeStore create(BlobStore blobStore, Closer closer) throws IOException { - Builder builder = FileStore.newFileStore(new File(dir, "segmentstore")); + Builder builder = FileStore.builder(new File(dir, "segmentstore")); if (blobStore != null) { builder.withBlobStore(blobStore); } builder.withMaxFileSize(256).withMemoryMapping(mmap); - FileStore fs = builder.create(); + FileStore fs = builder.build(); closer.register(asCloseable(fs)); return SegmentNodeStore.newSegmentNodeStore(fs).create(); } Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java?rev=1738778&r1=1738777&r2=1738778&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java (original) +++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java Tue Apr 12 11:45:05 2016 @@ -38,7 +38,7 @@ public class IncludeExcludeSidegradeTest File directory = getTestDirectory(); File source = new File(directory, "source"); source.mkdirs(); - FileStore fileStore = FileStore.newFileStore(source).create(); + FileStore fileStore = FileStore.builder(source).build(); SegmentNodeStore segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); RepositoryImpl repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository(); Session session = repository.login(CREDENTIALS); @@ -58,7 +58,7 @@ public class IncludeExcludeSidegradeTest @Override protected void doUpgradeRepository(File source, NodeStore target) throws RepositoryException, IOException { - FileStore fileStore = FileStore.newFileStore(source).create(); + FileStore fileStore = FileStore.builder(source).build(); SegmentNodeStore segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); try { final RepositorySidegrade sidegrade = new RepositorySidegrade(segmentNodeStore, target); 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=1738778&r1=1738777&r2=1738778&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 Tue Apr 12 11:45:05 2016 @@ -43,7 +43,7 @@ public class RepeatedRepositorySidegrade sourceDir.mkdirs(); - FileStore fileStore = FileStore.newFileStore(sourceDir).create(); + FileStore fileStore = FileStore.builder(sourceDir).build(); SegmentNodeStore segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); RepositoryImpl repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository(); Session session = repository.login(CREDENTIALS); @@ -60,7 +60,7 @@ public class RepeatedRepositorySidegrade doUpgradeRepository(sourceDir, target); fileStore.flush(); - fileStore = FileStore.newFileStore(sourceDir).create(); + fileStore = FileStore.builder(sourceDir).build(); segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository(); session = repository.login(CREDENTIALS); @@ -82,7 +82,7 @@ public class RepeatedRepositorySidegrade @Override protected void doUpgradeRepository(File source, NodeStore target) throws RepositoryException, IOException { - FileStore fileStore = FileStore.newFileStore(source).create(); + FileStore fileStore = FileStore.builder(source).build(); SegmentNodeStore segmentNodeStore = SegmentNodeStore.newSegmentNodeStore(fileStore).create(); try { final RepositorySidegrade repositoryUpgrade = new RepositorySidegrade(segmentNodeStore, target); @@ -96,4 +96,4 @@ public class RepeatedRepositorySidegrade fileStore.close(); } } -} \ No newline at end of file +} 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=1738778&r1=1738777&r2=1738778&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 Tue Apr 12 11:45:05 2016 @@ -67,7 +67,7 @@ public class RepeatedRepositoryUpgradeTe final File dir = new File(getTestDirectory(), "segments"); dir.mkdirs(); try { - fileStore = FileStore.newFileStore(dir).withMaxFileSize(128).create(); + fileStore = FileStore.builder(dir).withMaxFileSize(128).build(); upgradeComplete = false; } catch (IOException e) { throw new RuntimeException(e); @@ -205,4 +205,4 @@ public class RepeatedRepositoryUpgradeTe ); } -} \ No newline at end of file +} 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=1738778&r1=1738777&r2=1738778&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 Tue Apr 12 11:45:05 2016 @@ -52,7 +52,7 @@ public class UpgradeFromTwoSourcesTest e final File dir = new File(getTestDirectory(), "segments"); dir.mkdirs(); try { - fileStore = FileStore.newFileStore(dir).withMaxFileSize(128).create(); + fileStore = FileStore.builder(dir).withMaxFileSize(128).build(); upgradeComplete = false; } catch (IOException e) { throw new RuntimeException(e); @@ -154,4 +154,4 @@ public class UpgradeFromTwoSourcesTest e "/left/child2/grandchild1" ); } -} \ No newline at end of file +} 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=1738778&r1=1738777&r2=1738778&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 Tue Apr 12 11:45:05 2016 @@ -50,11 +50,11 @@ public class SegmentNodeStoreContainer i @Override public NodeStore open() throws IOException { - FileStore.Builder builder = FileStore.newFileStore(new File(directory, "segmentstore")); + FileStore.Builder builder = FileStore.builder(new File(directory, "segmentstore")); if (blob != null) { builder.withBlobStore(blob.open()); } - fs = builder.create(); + fs = builder.build(); return SegmentNodeStore.newSegmentNodeStore(fs).create(); }
