Skip to content

Commit b2fe993

Browse files
committed
Remove directory level in ObjectNamePrefix Naming Strategy
1 parent c7d14b0 commit b2fe993

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

google-cloud-storage/src/main/java/com/google/cloud/storage/ParallelCompositeUploadBlobWriteSessionConfig.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ public static PartNamingStrategy prefix(String prefixPattern) {
527527
* <p>General format is
528528
*
529529
* <pre><code>
530-
* {objectName}-parts/{randomKeyDigest};{objectInfoDigest};{partIndex}.part
530+
* {objectName}-{randomKeyDigest};{objectInfoDigest};{partIndex}.part
531531
* </code></pre>
532532
*
533533
* <p>{@code {objectInfoDigest}} will be fixed for an individual {@link BlobWriteSession}.
@@ -539,11 +539,11 @@ public static PartNamingStrategy prefix(String prefixPattern) {
539539
* @since 2.30.2 This new api is in preview and is subject to breaking changes.
540540
*/
541541
@BetaApi
542-
public static PartNamingStrategy objectNamePrefix() {
543-
return objectNamePrefix("");
542+
public static PartNamingStrategy useObjectNameAsPrefix() {
543+
return useObjectNameAsPrefix("");
544544
}
545545

546-
private static PartNamingStrategy objectNamePrefix(String prefixPattern) {
546+
private static PartNamingStrategy useObjectNameAsPrefix(String prefixPattern) {
547547
checkNotNull(prefixPattern, "prefixPattern must be non null");
548548
SecureRandom rand = new SecureRandom();
549549
return new WithObjectLevelPrefix(rand, prefixPattern);
@@ -594,8 +594,7 @@ protected String fmtFields(String randomKey, String ultimateObjectName, String p
594594
String nameDigest = B64.encodeToString(hashCode.asBytes());
595595
return prefix
596596
+ ultimateObjectName
597-
+ "-parts"
598-
+ "/"
597+
+ "-"
599598
+ randomKey
600599
+ FIELD_SEPARATOR
601600
+ nameDigest

google-cloud-storage/src/test/java/com/google/cloud/storage/ParallelCompositeUploadBlobWriteSessionConfigTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void partNameStrategy_prefix_stillWorksWithFmtPattern() throws Exception
7474
public void partNameStrategy_objectNamePrefix() throws Exception {
7575
// Creating an object level prefix without specifying an additional prefix will append the
7676
// object name to the beginning of the part name.
77-
PartNamingStrategy strategy = PartNamingStrategy.objectNamePrefix();
77+
PartNamingStrategy strategy = PartNamingStrategy.useObjectNameAsPrefix();
7878

7979
String fmt = strategy.fmtName("a/b/obj", PartRange.of(1, 96));
8080
assertAll(

0 commit comments

Comments
 (0)