From 9ea4d329d649c5807bf64228a01815e17222dd5e Mon Sep 17 00:00:00 2001 From: Steve Todorov Date: Mon, 21 Oct 2024 14:02:23 +0300 Subject: [PATCH] deprecated: Move `S3FileSystem#key2Parts` into `S3Utils`. --- .../carlspring/cloud/storage/s3fs/S3FileSystem.java | 10 +++++++++- .../carlspring/cloud/storage/s3fs/util/S3Utils.java | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystem.java b/src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystem.java index 03aed220..49e1380f 100644 --- a/src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystem.java +++ b/src/main/java/org/carlspring/cloud/storage/s3fs/S3FileSystem.java @@ -7,11 +7,14 @@ import java.nio.file.PathMatcher; import java.nio.file.WatchService; import java.nio.file.attribute.UserPrincipalLookupService; +import java.util.List; import java.util.Properties; import java.util.Set; +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import org.carlspring.cloud.storage.s3fs.util.S3Utils; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.Bucket; import static org.carlspring.cloud.storage.s3fs.S3Path.PATH_SEPARATOR; @@ -171,9 +174,14 @@ public String getEndpoint() return endpoint; } + /** + * @deprecated Use {@link org.carlspring.cloud.storage.s3fs.util.S3Utils#key2Parts(String)} instead. To be removed in one of next majors versions. + * @param keyParts + * @return String[] + */ public String[] key2Parts(String keyParts) { - return keyParts.split(PATH_SEPARATOR); + return S3Utils.key2Parts(keyParts); } public int getCache() diff --git a/src/main/java/org/carlspring/cloud/storage/s3fs/util/S3Utils.java b/src/main/java/org/carlspring/cloud/storage/s3fs/util/S3Utils.java index f9113537..db1ee07b 100644 --- a/src/main/java/org/carlspring/cloud/storage/s3fs/util/S3Utils.java +++ b/src/main/java/org/carlspring/cloud/storage/s3fs/util/S3Utils.java @@ -31,6 +31,8 @@ import software.amazon.awssdk.services.s3.model.Permission; import software.amazon.awssdk.services.s3.model.S3Exception; import software.amazon.awssdk.services.s3.model.S3Object; + +import static org.carlspring.cloud.storage.s3fs.S3Path.PATH_SEPARATOR; import static software.amazon.awssdk.http.HttpStatusCode.NOT_FOUND; /** @@ -310,4 +312,10 @@ else if (!resolvedKey.equals(key) && resolvedKey.startsWith(key)) return new S3BasicFileAttributes(resolvedKey, lastModifiedTime, size, directory, regularFile); } + public static String[] key2Parts(String keyParts) + { + return keyParts.split(PATH_SEPARATOR); + } + + }