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 2026/02/23 19:03:11 UTC
(jackrabbit-oak) branch OAK-11267-no-new-guava created (now 0bcf18d7a7)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-11267-no-new-guava
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 0bcf18d7a7 OAK-11267: remove new use of base.Strings
This branch includes the following new commits:
new 0bcf18d7a7 OAK-11267: remove new use of base.Strings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11267: remove new use of base.Strings
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11267-no-new-guava
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 0bcf18d7a77755de9587ed8c76525f3524dab302
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Mon Feb 23 20:02:39 2026 +0100
OAK-11267: remove new use of base.Strings
---
.../blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java | 3 +--
.../jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java | 6 +++---
.../cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java | 13 ++++++-------
.../oak/blob/cloud/azure/blobstorage/v8/UtilsV8.java | 8 ++++----
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
index 4ead20ae0e..2e06a3deb9 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureBlobStoreBackend.java
@@ -38,7 +38,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.core.data.DataIdentifier;
import org.apache.jackrabbit.core.data.DataRecord;
import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.cache.Cache;
import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
import org.apache.jackrabbit.guava.common.collect.Lists;
@@ -1066,7 +1065,7 @@ public class AzureBlobStoreBackend extends AbstractAzureBlobStoreBackend {
Map<String, String> additionalQueryParams,
String domain,
BlobSasHeaders optionalHeaders) {
- if (Strings.isNullOrEmpty(domain)) {
+ if (Objects.toString(domain, "").isEmpty()) {
LOG.warn("Can't generate presigned URI - no Azure domain provided (is Azure account name configured?)");
return null;
}
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
index 6abede68a0..6ba260defa 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/Utils.java
@@ -23,6 +23,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
+import java.util.Objects;
import java.util.Properties;
import com.azure.core.http.HttpClient;
@@ -36,7 +37,6 @@ import com.azure.storage.common.policy.RequestRetryOptions;
import com.azure.storage.common.policy.RetryPolicyType;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -77,7 +77,7 @@ public final class Utils {
String proxyHost = properties.getProperty(AzureConstants.PROXY_HOST);
String proxyPort = properties.getProperty(AzureConstants.PROXY_PORT);
- if(!(Strings.isNullOrEmpty(proxyHost) || Strings.isNullOrEmpty(proxyPort))) {
+ if(!(Objects.toString(proxyHost, "").isEmpty() || Objects.toString(proxyPort, "").isEmpty())) {
return new ProxyOptions(ProxyOptions.Type.HTTP,
new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
}
@@ -133,7 +133,7 @@ public final class Utils {
StringBuilder connString = new StringBuilder("DefaultEndpointsProtocol=https");
connString.append(";AccountName=").append(accountName);
connString.append(";AccountKey=").append(accountKey);
- if (!Strings.isNullOrEmpty(blobEndpoint)) {
+ if (!Objects.toString(blobEndpoint, "").isEmpty()) {
connString.append(";BlobEndpoint=").append(blobEndpoint);
}
return connString.toString();
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java
index c295f6b740..d8035f9d10 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/AzureBlobStoreBackendV8.java
@@ -59,7 +59,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.cache.Cache;
import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
@@ -781,13 +780,13 @@ public class AzureBlobStoreBackendV8 extends AbstractAzureBlobStoreBackend {
headers.setCacheControl(String.format("private, max-age=%d, immutable", httpDownloadURIExpirySeconds));
String contentType = downloadOptions.getContentTypeHeader();
- if (!Strings.isNullOrEmpty(contentType)) {
+ if (!Objects.toString(contentType, "").isEmpty()) {
headers.setContentType(contentType);
}
String contentDisposition =
downloadOptions.getContentDispositionHeader();
- if (!Strings.isNullOrEmpty(contentDisposition)) {
+ if (!Objects.toString(contentDisposition, "").isEmpty()) {
headers.setContentDisposition(contentDisposition);
}
@@ -985,7 +984,7 @@ public class AzureBlobStoreBackendV8 extends AbstractAzureBlobStoreBackend {
private String getDefaultBlobStorageDomain() {
String accountName = properties.getProperty(AzureConstants.AZURE_STORAGE_ACCOUNT_NAME, "");
- if (Strings.isNullOrEmpty(accountName)) {
+ if (Objects.toString(accountName, "").isEmpty()) {
LOG.warn("Can't generate presigned URI - Azure account name not found in properties");
return null;
}
@@ -996,7 +995,7 @@ public class AzureBlobStoreBackendV8 extends AbstractAzureBlobStoreBackend {
String domain = ignoreDomainOverride
? getDefaultBlobStorageDomain()
: downloadDomainOverride;
- if (Strings.isNullOrEmpty(domain)) {
+ if (Objects.toString(domain, "").isEmpty()) {
domain = getDefaultBlobStorageDomain();
}
return domain;
@@ -1006,7 +1005,7 @@ public class AzureBlobStoreBackendV8 extends AbstractAzureBlobStoreBackend {
String domain = ignoreDomainOverride
? getDefaultBlobStorageDomain()
: uploadDomainOverride;
- if (Strings.isNullOrEmpty(domain)) {
+ if (Objects.toString(domain, "").isEmpty()) {
domain = getDefaultBlobStorageDomain();
}
return domain;
@@ -1034,7 +1033,7 @@ public class AzureBlobStoreBackendV8 extends AbstractAzureBlobStoreBackend {
Map<String, String> additionalQueryParams,
SharedAccessBlobHeaders optionalHeaders,
String domain) {
- if (Strings.isNullOrEmpty(domain)) {
+ if (Objects.toString(domain, "").isEmpty()) {
LOG.warn("Can't generate presigned URI - no Azure domain provided (is Azure account name configured?)");
return null;
}
diff --git a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/UtilsV8.java b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/UtilsV8.java
index 5a61f4fd1d..a21c1a1a31 100644
--- a/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/UtilsV8.java
+++ b/oak-blob-cloud-azure/src/main/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/v8/UtilsV8.java
@@ -30,7 +30,6 @@ import com.microsoft.azure.storage.blob.CloudBlobClient;
import com.microsoft.azure.storage.blob.CloudBlobContainer;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.oak.blob.cloud.azure.blobstorage.AzureConstants;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.jetbrains.annotations.NotNull;
@@ -41,6 +40,7 @@ import java.net.Proxy;
import java.net.SocketAddress;
import java.net.URISyntaxException;
import java.security.InvalidKeyException;
+import java.util.Objects;
import java.util.Properties;
public final class UtilsV8 {
@@ -100,8 +100,8 @@ public final class UtilsV8 {
String proxyHost = properties.getProperty(AzureConstants.PROXY_HOST);
String proxyPort = properties.getProperty(AzureConstants.PROXY_PORT);
- if (!(Strings.isNullOrEmpty(proxyHost) ||
- Strings.isNullOrEmpty(proxyPort))) {
+ if (!(Objects.toString(proxyHost, "").isEmpty() ||
+ Objects.toString(proxyPort, "").isEmpty())) {
int port = Integer.parseInt(proxyPort);
SocketAddress proxyAddr = new InetSocketAddress(proxyHost, port);
Proxy proxy = new Proxy(Proxy.Type.HTTP, proxyAddr);
@@ -148,7 +148,7 @@ public final class UtilsV8 {
connString.append(";AccountName=").append(accountName);
connString.append(";AccountKey=").append(accountKey);
- if (!Strings.isNullOrEmpty(blobEndpoint)) {
+ if (!Objects.toString(blobEndpoint, "").isEmpty()) {
connString.append(";BlobEndpoint=").append(blobEndpoint);
}
return connString.toString();