This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11020b
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11020b by this push:
new 49e4f46f85 OAK-11020: Remove usage of Guava StandardSystemProperty
49e4f46f85 is described below
commit 49e4f46f852572a9b2c04f5d2caff81082421d9a
Author: Julian Reschke <[email protected]>
AuthorDate: Thu Aug 15 10:20:11 2024 +0100
OAK-11020: Remove usage of Guava StandardSystemProperty
---
.../suites/ScalabilityNodeRelationshipSuite.java | 6 +-
.../scalability/suites/ScalabilityNodeSuite.java | 6 +-
.../plugins/blob/MarkSweepGarbageCollector.java | 4 +-
.../apache/jackrabbit/oak/commons/CIHelper.java | 6 +-
.../commons/FileLineDifferenceIteratorTest.java | 7 +-
.../blob/datastore/DataStoreTrackerGCTest.java | 7 +-
.../jackrabbit/oak/fixture/SegmentTarFixture.java | 80 +++++++++++-----------
.../document/flatfile/StoreAndSortStrategy.java | 4 +-
.../jackrabbit/oak/run/cli/OakHelpFormatter.java | 9 +--
.../apache/jackrabbit/oak/run/CompactCommand.java | 4 +-
.../jackrabbit/oak/run/DataStoreCheckCommand.java | 11 ++-
.../jackrabbit/oak/run/DataStoreCommand.java | 9 ++-
.../jackrabbit/oak/run/DataStoreCopyCommand.java | 12 ++--
.../jackrabbit/oak/run/DataStoreCommandTest.java | 5 +-
.../segment/standby/store/StandbyStoreService.java | 4 +-
.../plugins/document/VersionGarbageCollector.java | 6 +-
.../document/mongo/MongoVersionGCSupport.java | 3 +-
17 files changed, 80 insertions(+), 103 deletions(-)
diff --git
a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
index 040d4195e3..8ad6a72108 100644
---
a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
+++
b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
@@ -49,7 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.jackrabbit.guava.common.base.Splitter;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.collect.Maps;
@@ -196,7 +196,7 @@ public class ScalabilityNodeRelationshipSuite extends
ScalabilityNodeSuite {
// define lucene index on properties
case LUCENE_FILE:
persistencePath =
- "target" + StandardSystemProperty.FILE_SEPARATOR.value() +
"lucene" + String
+ "target" + System.getProperty("file.separator") + "lucene"
+ String
.valueOf(System.currentTimeMillis());
OakLuceneIndexUtils.luceneIndexDefinition(session,
"customIndexActivity", ASYNC_INDEX,
new String[]{SOURCE_ID, CREATED},
@@ -205,7 +205,7 @@ public class ScalabilityNodeRelationshipSuite extends
ScalabilityNodeSuite {
break;
case LUCENE_FILE_DOC:
persistencePath =
- "target" + StandardSystemProperty.FILE_SEPARATOR.value() +
"lucene" + String
+ "target" + System.getProperty("file.separator") + "lucene"
+ String
.valueOf(System.currentTimeMillis());
case LUCENE_DOC:
Map<String, String> propMap = Maps.newHashMap();
diff --git
a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
index 83c8d5922b..3d4af5c722 100644
---
a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
+++
b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
@@ -35,7 +35,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.jackrabbit.guava.common.base.Splitter;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.Maps;
@@ -263,7 +263,7 @@ public class ScalabilityNodeSuite extends
ScalabilityAbstractSuite {
// define lucene index on properties
case LUCENE_FILE:
persistencePath =
- "target" + StandardSystemProperty.FILE_SEPARATOR.value() +
"lucene" + String
+ "target" + System.getProperty("file.separator") + "lucene"
+ String
.valueOf(System.currentTimeMillis());
OakLuceneIndexUtils.luceneIndexDefinition(session,
"customIndex", ASYNC_INDEX,
new String[]{FILTER_PROP, DATE_PROP},
@@ -272,7 +272,7 @@ public class ScalabilityNodeSuite extends
ScalabilityAbstractSuite {
break;
case LUCENE_FILE_DOC:
persistencePath =
- "target" + StandardSystemProperty.FILE_SEPARATOR.value() +
"lucene" + String
+ "target" + System.getProperty("file.separator") + "lucene"
+ String
.valueOf(System.currentTimeMillis());
case LUCENE_DOC:
Map<String, String> propMap = Maps.newHashMap();
diff --git
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
index 3bbd3fa4fb..f7bf8737e3 100644
---
a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
+++
b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
@@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.jackrabbit.guava.common.base.Joiner;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
@@ -98,7 +98,7 @@ public class MarkSweepGarbageCollector implements
BlobGarbageCollector {
public static final Logger LOG =
LoggerFactory.getLogger(MarkSweepGarbageCollector.class);
- public static final String TEMP_DIR =
StandardSystemProperty.JAVA_IO_TMPDIR.value();
+ public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
public static final int DEFAULT_BATCH_COUNT = 1024;
diff --git
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
index d70fe035fc..8b5cdbc966 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
@@ -21,10 +21,9 @@ package org.apache.jackrabbit.oak.commons;
import static java.lang.Boolean.parseBoolean;
import static java.lang.System.getenv;
+import java.util.Locale;
import java.util.Objects;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
-
/**
* Utility class for ITs to determine the environment running in.
*/
@@ -93,7 +92,6 @@ public final class CIHelper {
* @return {@code true} iff running in a Windows environment
*/
public static boolean windows() {
- return
StandardSystemProperty.OS_NAME.value().toLowerCase().contains("windows");
+ return
System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows");
}
-
}
diff --git
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
index d01716a3de..74590555c0 100644
---
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
+++
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.commons;
import static java.util.Arrays.asList;
@@ -37,7 +36,7 @@ import java.util.function.Function;
import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Splitter;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator;
@@ -45,7 +44,7 @@ import org.jetbrains.annotations.Nullable;
import org.junit.Test;
public class FileLineDifferenceIteratorTest {
-
+
@Test
public void testRandomized() throws Exception {
Random r = new Random(0);
@@ -175,7 +174,7 @@ public class FileLineDifferenceIteratorTest {
private static LineIterator lineItr(String seq) {
Iterable<String> seqItr = Splitter.on(',').trimResults().split(seq);
- String lines =
Joiner.on(StandardSystemProperty.LINE_SEPARATOR.value()).join(seqItr);
+ String lines =
Joiner.on(System.getProperty("line.separator")).join(seqItr);
return new LineIterator(new StringReader(lines));
}
diff --git
a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
index 328ac6c93f..dbae8ed5c8 100644
---
a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
+++
b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
@@ -61,7 +61,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.union;
@@ -205,7 +204,7 @@ public class DataStoreTrackerGCTest {
@Test
public void consistencyCheckNoActiveDeletion() throws Exception {
File tmpFolder = folder.newFolder();
- String previousTmp = System.setProperty(JAVA_IO_TMPDIR.key(),
tmpFolder.getAbsolutePath());
+ String previousTmp = System.setProperty("java.io.tmpdir",
tmpFolder.getAbsolutePath());
try {
Cluster cluster = new Cluster("cluster1");
@@ -218,9 +217,9 @@ public class DataStoreTrackerGCTest {
assertTrue(FileUtils.listFiles(tmpFolder, null, true).size() == 0);
} finally {
if (previousTmp != null) {
- System.setProperty(JAVA_IO_TMPDIR.key(), previousTmp);
+ System.setProperty("java.io.tmpdir", previousTmp);
} else {
- System.clearProperty(JAVA_IO_TMPDIR.key());
+ System.clearProperty("java.io.tmpdir");
}
}
}
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
index 36751f7ac7..062c1d8666 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.fixture;
import static
org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
@@ -29,7 +28,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
import com.microsoft.azure.storage.CloudStorageAccount;
import com.microsoft.azure.storage.StorageException;
import com.microsoft.azure.storage.blob.CloudBlobContainer;
@@ -70,14 +68,14 @@ public class SegmentTarFixture extends OakFixture {
@Override
public void notify(@NotNull SegmentId id, @NotNull
SegmentNotFoundException snfe) { }
};
-
+
private static final int MB = 1024 * 1024;
private static final int DEFAULT_TIMEOUT = 60_000;
static class SegmentTarFixtureBuilder {
private final String name;
private final File base;
-
+
private int maxFileSize;
private int segmentCacheSize;
private boolean memoryMapping;
@@ -122,7 +120,7 @@ public class SegmentTarFixture extends OakFixture {
this.binariesInlineThreshold = binariesInlineThreshold;
return this;
}
-
+
public SegmentTarFixtureBuilder withBlobStore(boolean useBlobStore) {
this.useBlobStore = useBlobStore;
return this;
@@ -147,12 +145,12 @@ public class SegmentTarFixture extends OakFixture {
this.azureRootPath = azureRootPath;
return this;
}
-
+
public SegmentTarFixture build() {
return new SegmentTarFixture(this);
}
}
-
+
private final File base;
private final int maxFileSize;
private final int segmentCacheSize;
@@ -160,7 +158,7 @@ public class SegmentTarFixture extends OakFixture {
private final int binariesInlineThreshold;
private final boolean useBlobStore;
private final int dsCacheSize;
-
+
private final boolean withColdStandby;
private final int syncInterval;
private final boolean shareBlobStore;
@@ -180,21 +178,21 @@ public class SegmentTarFixture extends OakFixture {
private FileStore[] stores;
private BlobStoreFixture[] blobStoreFixtures;
-
+
private StandbyServerSync[] serverSyncs;
private StandbyClientSync[] clientSyncs;
private ScheduledExecutorService[] executors;
private CloudBlobContainer[] containers;
-
+
public SegmentTarFixture(SegmentTarFixtureBuilder builder) {
this(builder, false, -1);
}
-
+
public SegmentTarFixture(SegmentTarFixtureBuilder builder, boolean
withColdStandby, int syncInterval) {
this(builder, withColdStandby, syncInterval, false, false, false);
}
-
+
public SegmentTarFixture(SegmentTarFixtureBuilder builder, boolean
withColdStandby, int syncInterval,
boolean shareBlobStore, boolean oneShotRun, boolean secure) {
super(builder.name);
@@ -230,42 +228,42 @@ public class SegmentTarFixture extends OakFixture {
public Class<? extends Annotation> annotationType() {
return null;
}
-
+
@Override
public String sessionToken() {
return null;
}
-
+
@Override
public String secretKey() {
return null;
}
-
+
@Override
public String rootDirectory() {
return awsRootPath;
}
-
+
@Override
public String region() {
return null;
}
-
+
@Override
public String lockTableName() {
return awsLockTableName;
}
-
+
@Override
public String journalTableName() {
return awsJournalTableName;
}
-
+
@Override
public String bucketName() {
return awsBucketName;
}
-
+
@Override
public String accessKey() {
return null;
@@ -300,10 +298,10 @@ public class SegmentTarFixture extends OakFixture {
fds.setMinRecordLength(4092);
fds.init(parentPath.getAbsolutePath());
blobStore = new DataStoreBlobStore(fds);
-
+
fileStoreBuilder.withBlobStore(blobStore);
}
-
+
FileStore fs = fileStoreBuilder
.withBinariesInlineThreshold(binariesInlineThreshold)
.build();
@@ -319,9 +317,9 @@ public class SegmentTarFixture extends OakFixture {
@Override
public Oak[] setUpCluster(int n, StatisticsProvider statsProvider) throws
Exception {
init(n);
-
+
Oak[] cluster = new Oak[n];
-
+
for (int i = 0; i < cluster.length; i++) {
BlobStore blobStore = null;
if (useBlobStore) {
@@ -349,7 +347,7 @@ public class SegmentTarFixture extends OakFixture {
if (blobStore != null) {
builder.withBlobStore(blobStore);
}
-
+
stores[i] = builder
.withMaxFileSize(maxFileSize)
.withStatisticsProvider(statsProvider)
@@ -358,11 +356,11 @@ public class SegmentTarFixture extends OakFixture {
.withStrictVersionCheck(true)
.withBinariesInlineThreshold(binariesInlineThreshold)
.build();
-
+
if (withColdStandby) {
attachStandby(i, n, statsProvider, blobStore);
}
-
+
cluster[i] =
newOak(SegmentNodeStoreBuilders.builder(stores[i]).build());
if (blobStore != null) {
cluster[i].getWhiteboard()
@@ -392,7 +390,7 @@ public class SegmentTarFixture extends OakFixture {
private void attachStandby(int i, int n, StatisticsProvider statsProvider,
BlobStore blobStore)
throws InvalidFileStoreVersionException, IOException {
FileStoreBuilder builder = fileStoreBuilder(new File(parentPath,
"standby-" + i));
-
+
if (useBlobStore) {
if (shareBlobStore) {
builder.withBlobStore(blobStore);
@@ -413,7 +411,7 @@ public class SegmentTarFixture extends OakFixture {
.withMemoryMapping(memoryMapping)
.withSnfeListener(IGNORE_SNFE)
.build();
-
+
int port = 0;
try (ServerSocket socket = new ServerSocket(0)) {
port = socket.getLocalPort();
@@ -432,7 +430,7 @@ public class SegmentTarFixture extends OakFixture {
.withSecureConnection(secure)
.withReadTimeoutMs(DEFAULT_TIMEOUT)
.withAutoClean(false)
- .withSpoolFolder(new
File(StandardSystemProperty.JAVA_IO_TMPDIR.value()))
+ .withSpoolFolder(new File(System.getProperty("java.io.tmpdir")))
.build();
if (!oneShotRun) {
@@ -455,10 +453,10 @@ public class SegmentTarFixture extends OakFixture {
private void init(int n) {
int fileStoresLength = n;
int blobStoresLength = 0;
-
+
if (withColdStandby) {
fileStoresLength = 2 * n;
-
+
if (useBlobStore) {
if (shareBlobStore) {
blobStoresLength = n;
@@ -466,10 +464,10 @@ public class SegmentTarFixture extends OakFixture {
blobStoresLength = 2 * n;
}
}
-
+
serverSyncs = new StandbyServerSync[n];
clientSyncs = new StandbyClientSync[n];
-
+
if (!oneShotRun) {
executors = new ScheduledExecutorService[n];
}
@@ -478,7 +476,7 @@ public class SegmentTarFixture extends OakFixture {
blobStoresLength = n;
}
}
-
+
stores = new FileStore[fileStoresLength];
blobStoreFixtures = new BlobStoreFixture[blobStoresLength];
@@ -493,22 +491,22 @@ public class SegmentTarFixture extends OakFixture {
for (StandbyClientSync clientSync : clientSyncs) {
clientSync.close();
}
-
+
for (StandbyServerSync serverSync : serverSyncs) {
serverSync.close();
}
-
+
if (!oneShotRun) {
for (ExecutorService executor : executors) {
executor.shutdownNow();
}
}
}
-
+
for (FileStore store : stores) {
store.close();
}
-
+
if (blobStoreFixtures != null) {
for (BlobStoreFixture bsf : blobStoreFixtures) {
bsf.tearDown();
@@ -526,7 +524,7 @@ public class SegmentTarFixture extends OakFixture {
}
}
}
-
+
FileUtils.deleteQuietly(parentPath);
}
@@ -545,5 +543,5 @@ public class SegmentTarFixture extends OakFixture {
public StandbyClientSync[] getClientSyncs() {
return clientSyncs;
}
-
+
}
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
index b9dd13389a..2e3575ed5d 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/StoreAndSortStrategy.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.index.indexer.document.flatfile;
import org.apache.commons.io.FileUtils;
@@ -40,7 +39,6 @@ import java.io.IOException;
import java.util.Set;
import java.util.function.Predicate;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.LINE_SEPARATOR;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_MAX_SORT_MEMORY_IN_GB;
import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFileNodeStoreBuilder.OAK_INDEXER_MAX_SORT_MEMORY_IN_GB_DEFAULT;
@@ -51,7 +49,7 @@ import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFile
@Deprecated
class StoreAndSortStrategy extends IndexStoreSortStrategyBase {
private static final String OAK_INDEXER_DELETE_ORIGINAL =
"oak.indexer.deleteOriginal";
- private static final int LINE_SEP_LENGTH = LINE_SEPARATOR.value().length();
+ private static final int LINE_SEP_LENGTH =
System.getProperty("line.separator").length();
private final Logger log = LoggerFactory.getLogger(getClass());
private final NodeStateEntryTraverserFactory nodeStatesFactory;
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
index 91e55e9423..9d09416562 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.run.cli;
import java.lang.reflect.Field;
@@ -38,8 +37,6 @@ import joptsimple.OptionDescriptor;
import joptsimple.OptionSpec;
import joptsimple.internal.Strings;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.LINE_SEPARATOR;
-
import org.jetbrains.annotations.Nullable;
public class OakHelpFormatter implements HelpFormatter {
@@ -64,10 +61,10 @@ public class OakHelpFormatter implements HelpFormatter {
//TODO Take care of left over options
StringBuilder builder = new StringBuilder();
- builder.append(new
MainSectionFormatter().format(options)).append(LINE_SEPARATOR.value());
+ builder.append(new
MainSectionFormatter().format(options)).append(System.getProperty("line.separator"));
for (OptionCategory c : optionCategories){
- builder.append(c.format()).append(LINE_SEPARATOR.value());
+
builder.append(c.format()).append(System.getProperty("line.separator"));
}
return builder.toString();
@@ -132,7 +129,7 @@ public class OakHelpFormatter implements HelpFormatter {
StringBuilder builder = new StringBuilder();
builder.append(new CategoryFormatter(bean).format(options));
if (!operations.isEmpty()) {
- builder.append(LINE_SEPARATOR.value());
+ builder.append(System.getProperty("line.separator"));
builder.append(new OperationsFormatter().format(operations));
}
return builder.toString();
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
index 0f8ee389fe..76cb912bb2 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CompactCommand.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.run;
import java.io.File;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
@@ -159,7 +157,7 @@ class CompactCommand implements Command {
.withPath(new File(path))
.withForce(options.has(forceArg))
.withMmap(mmapArg.value(options))
- .withOs(StandardSystemProperty.OS_NAME.value())
+ .withOs(System.getProperty("os.name"))
.withSegmentCacheSize(Integer.getInteger("cache", 256))
.withGCLogInterval(Long.getLong("compaction-progress-log",
150000))
.withConcurrency(nThreads.value(options));
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
index 6107f2d960..facb06396c 100644
---
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
+++
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.run;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.FILE_SEPARATOR;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.JAVA_IO_TMPDIR;
import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted;
import static org.apache.jackrabbit.guava.common.io.Closeables.close;
import static java.io.File.createTempFile;
@@ -45,7 +43,6 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-
import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Splitter;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
@@ -178,7 +175,7 @@ public class DataStoreCheckCommand implements Command {
return 0;
}
- String dumpPath = JAVA_IO_TMPDIR.value();
+ String dumpPath = System.getProperty("java.io.tmpdir");
if (options.has(dump)) {
dumpPath = options.valueOf(dump);
}
@@ -323,8 +320,8 @@ public class DataStoreCheckCommand implements Command {
String blobId = idLengthSepList.get(0);
if (dsType.equals(FDS)) {
- return (blobId.substring(0, 2) + FILE_SEPARATOR.value() +
blobId.substring(2, 4) + FILE_SEPARATOR.value() + blobId
- .substring(4, 6) + FILE_SEPARATOR.value() + blobId);
+ return String.join(System.getProperty("file.separator"),
blobId.substring(0, 2), blobId.substring(2, 4),
+ blobId.substring(4, 6), blobId);
} else if (dsType.equals(S3DS) || dsType.equals(AZUREDS)) {
return (blobId.substring(0, 4) + DASH + blobId.substring(4));
}
@@ -332,7 +329,7 @@ public class DataStoreCheckCommand implements Command {
}
private static String decodeId(String id) {
- List<String> list =
Splitter.on(FILE_SEPARATOR.value()).trimResults().omitEmptyStrings().splitToList(id);
+ List<String> list =
Splitter.on(System.getProperty("file.separator")).trimResults().omitEmptyStrings().splitToList(id);
String pathStrippedId = list.get(list.size() -1);
return
Joiner.on("").join(Splitter.on(DASH).omitEmptyStrings().trimResults().splitToList(pathStrippedId));
}
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
index c70ea6267d..31c2823d0e 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
@@ -88,9 +88,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.FILE_SEPARATOR;
-import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted;
import static java.util.concurrent.TimeUnit.SECONDS;
+
+import static org.apache.jackrabbit.guava.common.base.Stopwatch.createStarted;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeAsLine;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings;
@@ -659,9 +659,8 @@ public class DataStoreCommand implements Command {
if (dsType == FAKE || dsType == FDS) {
// 0102030405... => 01/02/03/0102030405...
- blobId =
- (blobId.substring(0, 2) + FILE_SEPARATOR.value() +
blobId.substring(2, 4) + FILE_SEPARATOR.value()
- + blobId.substring(4, 6) + FILE_SEPARATOR.value() +
blobId);
+ blobId = String.join(System.getProperty("file.separator"),
blobId.substring(0, 2), blobId.substring(2, 4),
+ blobId.substring(4, 6), blobId);
} else if (dsType == S3 || dsType == AZURE) {
//b47b58169f121822cd4a0... => b47b-58169f121822cd4a0...
blobId = (blobId.substring(0, 4) + DASH + blobId.substring(4));
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCopyCommand.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCopyCommand.java
index 6fd244558c..7f54ad96a5 100644
---
a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCopyCommand.java
+++
b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCopyCommand.java
@@ -34,8 +34,6 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.stream.Stream;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.FILE_SEPARATOR;
-
/**
* Command to concurrently download blobs from an azure datastore using sas
token authentication.
* <p>
@@ -116,13 +114,13 @@ public class DataStoreCopyCommand implements Command {
protected String getDestinationFromId(String id) {
// Rename the blob names to match expected datastore cache format
(remove the "-" in the name)
String blobName = id.replaceAll("-", "");
+
if (id.length() < 6) {
LOG.warn("Blob with name {} is less than 6 chars. Cannot create
data folder structure. Storing in the root folder", blobName);
- return outDir + FILE_SEPARATOR.value() + blobName;
+ return String.join(System.getProperty("file.separator"), outDir,
blobName);
} else {
- return outDir + FILE_SEPARATOR.value()
- + blobName.substring(0, 2) + FILE_SEPARATOR.value() +
blobName.substring(2, 4) + FILE_SEPARATOR.value()
- + blobName.substring(4, 6) + FILE_SEPARATOR.value() +
blobName;
+ return String.join(System.getProperty("file.separator"), outDir,
blobName.substring(0, 2), blobName.substring(2, 4),
+ blobName.substring(4, 6), blobName);
}
}
@@ -146,7 +144,7 @@ public class DataStoreCopyCommand implements Command {
.withRequiredArg().ofType(String.class);
OptionSpec<String> outDirOpt = parser.accepts("out-dir",
"Path where to store the blobs. Otherwise, blobs will
be stored in the current directory.")
-
.withRequiredArg().ofType(String.class).defaultsTo(System.getProperty("user.dir")
+ FILE_SEPARATOR.value() + "blobs");
+
.withRequiredArg().ofType(String.class).defaultsTo(System.getProperty("user.dir")
+ System.getProperty("file.separator") + "blobs");
OptionSpec<Integer> concurrencyOpt = parser.accepts("concurrency",
"Max number of concurrent requests that can occur (the
default value is equal to 16 multiplied by the number of cores)")
.withRequiredArg().ofType(Integer.class).defaultsTo(16 *
Runtime.getRuntime().availableProcessors());
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java
index 6a33a27f83..89769aad2a 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java
@@ -99,7 +99,6 @@ import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.FILE_SEPARATOR;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.sort;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.writeStrings;
@@ -950,8 +949,8 @@ public class DataStoreCommandTest {
String blobId = idLengthSepList.get(0);
if (dsType == Type.FDS) {
- return (blobId.substring(0, 2) + FILE_SEPARATOR.value() +
blobId.substring(2, 4) + FILE_SEPARATOR.value() + blobId
- .substring(4, 6) + FILE_SEPARATOR.value() + blobId);
+ return String.join(System.getProperty("file.separator"),
blobId.substring(0, 2), blobId.substring(2, 4),
+ blobId.substring(4, 6), blobId);
} else if (dsType == Type.S3 || dsType == Type.AZURE) {
return (blobId.substring(0, 4) + DASH + blobId.substring(4));
}
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
index 371aa1fa59..7fbe43e92f 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment.standby.store;
import static org.osgi.service.component.annotations.ReferencePolicy.STATIC;
@@ -24,7 +23,6 @@ import java.io.File;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.oak.segment.SegmentStore;
import org.apache.jackrabbit.oak.segment.SegmentStoreProvider;
@@ -225,7 +223,7 @@ public class StandbyStoreService {
.withSecureConnection(config.secure())
.withReadTimeoutMs(config.standby_readtimeout())
.withAutoClean(config.standby_autoclean())
- .withSpoolFolder(new
File(StandardSystemProperty.JAVA_IO_TMPDIR.value()))
+ .withSpoolFolder(new File(System.getProperty("java.io.tmpdir")))
.withSecureConnection(config.secure())
.withSSLKeyFile(config.sslKeyFile())
.withSSLChainFile(config.sslChainFile())
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
index 764ff585f1..5ba453a95d 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
@@ -81,7 +81,7 @@ import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toMap;
import static java.util.stream.Collectors.toSet;
import static java.util.stream.StreamSupport.stream;
-import static
org.apache.jackrabbit.guava.common.base.StandardSystemProperty.LINE_SEPARATOR;
+
import static
org.apache.jackrabbit.guava.common.base.Stopwatch.createUnstarted;
import static org.apache.jackrabbit.guava.common.collect.Iterables.all;
import static org.apache.jackrabbit.guava.common.collect.Iterators.partition;
@@ -2390,7 +2390,7 @@ public class VersionGarbageCollector {
if (log.isTraceEnabled()) {
StringBuilder sb = new StringBuilder("Performing batch
deletion of documents with following ids. \n");
- Joiner.on(LINE_SEPARATOR.value()).appendTo(sb,
deletionBatch.keySet());
+
Joiner.on(System.getProperty("line.separator")).appendTo(sb,
deletionBatch.keySet());
log.trace(sb.toString());
}
@@ -2480,7 +2480,7 @@ public class VersionGarbageCollector {
if (log.isDebugEnabled()) {
StringBuilder sb = new StringBuilder("Performing batch
deletion of previous documents with following ids. \n");
- Joiner.on(LINE_SEPARATOR.value()).appendTo(sb,
deletionBatch);
+
Joiner.on(System.getProperty("line.separator")).appendTo(sb, deletionBatch);
log.debug(sb.toString());
}
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
index 4e796c91f9..e72991ff34 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
@@ -73,7 +73,6 @@ import org.slf4j.LoggerFactory;
import org.apache.jackrabbit.guava.common.base.Joiner;
-import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
import org.apache.jackrabbit.guava.common.collect.Lists;
import com.mongodb.BasicDBObject;
import com.mongodb.Block;
@@ -463,7 +462,7 @@ public class MongoVersionGCSupport extends VersionGCSupport
{
.forEach((Block<BasicDBObject>) doc -> ids.add(getID(doc)));
StringBuilder sb = new StringBuilder("Split documents with following
ids were deleted as part of GC \n");
- Joiner.on(StandardSystemProperty.LINE_SEPARATOR.value()).appendTo(sb,
ids);
+ Joiner.on(System.getProperty("line.separator")).appendTo(sb, ids);
LOG.debug(sb.toString());
}
