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/08/20 16:35:33 UTC
(jackrabbit-oak) 01/01: OAK-11049: Remove usage of Guava Strings.isNullToEmpty
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11049
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1daa2b67d3ea6ed1575ce150fdd97a08a9ee4c93
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Aug 20 17:35:16 2024 +0100
OAK-11049: Remove usage of Guava Strings.isNullToEmpty
---
.../oak/blob/cloud/s3/S3DataRecordAccessProviderIT.java | 3 +--
.../jackrabbit/oak/segment/SegmentNodeStoreFactory.java | 15 ++++-----------
.../jackrabbit/oak/segment/SegmentNodeStoreService.java | 9 ++++-----
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataRecordAccessProviderIT.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataRecordAccessProviderIT.java
index 6338a86d6b..8d7808da59 100644
--- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataRecordAccessProviderIT.java
+++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataRecordAccessProviderIT.java
@@ -34,7 +34,6 @@ import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.rules.TemporaryFolder;
-import static org.apache.jackrabbit.guava.common.base.Strings.isNullOrEmpty;
import static org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.getFixtures;
import static org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.getS3DataStore;
import static org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.isS3Configured;
@@ -51,7 +50,7 @@ public class S3DataRecordAccessProviderIT extends AbstractDataRecordAccessProvid
@BeforeClass
public static void setupDataStore() throws Exception {
- assumeTrue(isS3Configured() && !isNullOrEmpty(System.getProperty("test.opts.memory")));
+ assumeTrue(isS3Configured() && !System.getProperty("test.opts.memory", "").isEmpty());
dataStore = (S3DataStore) getS3DataStore(getFixtures().get(0), S3DataStoreUtils.getS3Config(),
homeDir.newFolder().getAbsolutePath());
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
index 785e6e96a7..4b0f09eae7 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Strings.isNullOrEmpty;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import static org.apache.jackrabbit.oak.osgi.OsgiUtil.lookupConfigurationThenFramework;
import static org.apache.jackrabbit.oak.segment.CachingSegmentReader.DEFAULT_STRING_CACHE_MB;
@@ -41,10 +40,9 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.jackrabbit.guava.common.io.Closer;
-import org.apache.jackrabbit.api.stats.RepositoryStatistics;
-import org.apache.jackrabbit.api.stats.TimeSeries;
import org.apache.jackrabbit.oak.osgi.OsgiUtil;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.segment.spi.monitor.RoleStatisticsProvider;
@@ -54,12 +52,7 @@ import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStoreProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
-import org.apache.jackrabbit.oak.stats.CounterStats;
-import org.apache.jackrabbit.oak.stats.HistogramStats;
-import org.apache.jackrabbit.oak.stats.MeterStats;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
-import org.apache.jackrabbit.oak.stats.StatsOptions;
-import org.apache.jackrabbit.oak.stats.TimerStats;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
@@ -411,7 +404,7 @@ public class SegmentNodeStoreFactory {
String getMode() {
String mode = configuration.tarmk_mode();
- if (isNullOrEmpty(mode)) {
+ if (Objects.toString(mode, "").isEmpty()) {
return System.getProperty("tarmk.mode", System.getProperty("sun.arch.data.model", "32"));
}
return mode;
@@ -573,7 +566,7 @@ public class SegmentNodeStoreFactory {
@Override
public String getRepositoryHome() {
String repositoryHome = OsgiUtil.lookupConfigurationThenFramework(context, "repository.home");
- if (isNullOrEmpty(repositoryHome)) {
+ if (Objects.toString(repositoryHome, "").isEmpty()) {
return "repository";
}
return repositoryHome;
@@ -592,7 +585,7 @@ public class SegmentNodeStoreFactory {
@Override
public File getBackupDirectory() {
String backupDirectory = configuration.repository_backup_dir();
- if (isNullOrEmpty(backupDirectory)) {
+ if (Objects.toString(backupDirectory, "").isEmpty()) {
return new File(getRepositoryHome(), appendRole("segmentstore-backup"));
}
return new File(backupDirectory);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
index 259e55a219..3389e2d14a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreService.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.base.Strings.isNullOrEmpty;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import static org.apache.jackrabbit.oak.segment.CachingSegmentReader.DEFAULT_STRING_CACHE_MB;
import static org.apache.jackrabbit.oak.segment.CachingSegmentReader.DEFAULT_TEMPLATE_CACHE_MB;
@@ -65,6 +63,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.util.Objects;
/**
* An OSGi wrapper for the segment node store.
@@ -340,7 +339,7 @@ public class SegmentNodeStoreService {
String getMode() {
String mode = configuration.tarmk_mode();
- if (isNullOrEmpty(mode)) {
+ if (Objects.toString(mode, "").isEmpty()) {
return System.getProperty("tarmk.mode", System.getProperty("sun.arch.data.model", "32"));
}
return mode;
@@ -522,7 +521,7 @@ public class SegmentNodeStoreService {
@Override
public String getRepositoryHome() {
String repositoryHome = OsgiUtil.lookupConfigurationThenFramework(context, "repository.home");
- if (isNullOrEmpty(repositoryHome)) {
+ if (Objects.toString(repositoryHome, "").isEmpty()) {
return "repository";
}
return repositoryHome;
@@ -541,7 +540,7 @@ public class SegmentNodeStoreService {
@Override
public File getBackupDirectory() {
String backupDirectory = configuration.repository_backup_dir();
- if (isNullOrEmpty(backupDirectory)) {
+ if (Objects.toString(backupDirectory, "").isEmpty()) {
return new File(getRepositoryHome(), "segmentstore-backup");
}
return new File(backupDirectory);