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 re...@apache.org on 2024/09/09 19:16:53 UTC

(jackrabbit-oak) branch trunk updated: OAK-11020: Remove usage of Guava StandardSystemProperty (leftovers)

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 98da38c9d6 OAK-11020: Remove usage of Guava StandardSystemProperty (leftovers)
98da38c9d6 is described below

commit 98da38c9d62d07240d2d83c704e80147f88202b0
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Sep 9 20:16:43 2024 +0100

    OAK-11020: Remove usage of Guava StandardSystemProperty (leftovers)
---
 .../oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java        | 3 +--
 .../org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java    | 4 +---
 .../document/incrementalstore/IncrementalFlatFileStoreEditor.java    | 4 +---
 .../java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java    | 5 ++---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
index f0f0ef0c35..7c0af90f94 100644
--- a/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
+++ b/oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreUtils.java
@@ -18,7 +18,6 @@
  */
 package org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage;
 
-import static org.apache.jackrabbit.guava.common.base.StandardSystemProperty.USER_HOME;
 import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
@@ -89,7 +88,7 @@ public class AzureDataStoreUtils extends DataStoreUtils {
     public static Properties getAzureConfig() {
         String config = System.getProperty(SYS_PROP_NAME);
         if (Strings.isNullOrEmpty(config)) {
-            File cfgFile = new File(USER_HOME.value(), DEFAULT_PROPERTY_FILE);
+            File cfgFile = new File(System.getProperty("user.home"), DEFAULT_PROPERTY_FILE);
             if (cfgFile.exists()) {
                 config = cfgFile.getAbsolutePath();
             }
diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
index 253aecdcc5..750afc6e8d 100644
--- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
+++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreUtils.java
@@ -50,8 +50,6 @@ import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.apache.jackrabbit.guava.common.base.StandardSystemProperty.USER_HOME;
-
 /**
  * Extension to {@link DataStoreUtils} to enable S3 extensions for cleaning and initialization.
  */
@@ -102,7 +100,7 @@ public class S3DataStoreUtils extends DataStoreUtils {
     public static Properties getS3Config() {
         String config = System.getProperty(SYS_PROP_NAME);
         if (Strings.isNullOrEmpty(config)) {
-            File cfgFile = new File(USER_HOME.value(), DEFAULT_PROPERTY_FILE);
+            File cfgFile = new File(System.getProperty("user.home"), DEFAULT_PROPERTY_FILE);
             if (cfgFile.exists()) {
                 config = cfgFile.getAbsolutePath();
             }
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreEditor.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreEditor.java
index 504b44fc28..cb87699c7a 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreEditor.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalFlatFileStoreEditor.java
@@ -31,8 +31,6 @@ import java.io.BufferedWriter;
 import java.io.IOException;
 import java.util.function.Predicate;
 
-import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
-
 public class IncrementalFlatFileStoreEditor implements Editor {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -40,7 +38,7 @@ public class IncrementalFlatFileStoreEditor implements Editor {
     private final IncrementalFlatFileStoreNodeStateEntryWriter entryWriter;
     private final Predicate<String> predicate;
     private final IncrementalFlatFileStoreStrategy incrementalFlatFileStoreStrategy;
-    private static final int LINE_SEP_LENGTH = LINE_SEPARATOR.value().length();
+    private static final int LINE_SEP_LENGTH = System.getProperty("line.separator").length();
 
     public IncrementalFlatFileStoreEditor(BufferedWriter bufferedWriter, IncrementalFlatFileStoreNodeStateEntryWriter entryWriter, Predicate<String> predicate,
                                           IncrementalFlatFileStoreStrategy incrementalFlatFileStoreStrategy) {
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
index 5e73076567..ca99eff4f3 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
@@ -18,7 +18,6 @@
 
 package org.apache.jackrabbit.oak.segment.upgrade;
 
-import static org.apache.jackrabbit.guava.common.base.StandardSystemProperty.OS_NAME;
 import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.MINUTES;
@@ -100,7 +99,7 @@ public class UpgradeIT {
         Compact.builder()
             .withPath(fileStoreHome.getRoot())
             .withMmap(true)
-            .withOs(OS_NAME.value())
+            .withOs(System.getProperty("os.name"))
             .withForce(true)
             .build()
             .run();
@@ -118,7 +117,7 @@ public class UpgradeIT {
         Compact.builder()
             .withPath(fileStoreHome.getRoot())
             .withMmap(true)
-            .withOs(OS_NAME.value())
+            .withOs(System.getProperty("os.name"))
             .withForce(false)
             .build()
             .run();