fix StaticBucketRouter refactor DefaultInboxActionsModule

adorsys · Sep 18, 2024 · add30e6 · add30e6
1 parent 400ee52
commit add30e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.../main/java/de/adorsys/datasafe/business/impl/inbox/actions/DefaultInboxActionsModule.java b/.../main/java/de/adorsys/datasafe/business/impl/inbox/actions/DefaultInboxActionsModule.java
@@ -36,10 +36,6 @@ public abstract class DefaultInboxActionsModule {
  /**
  * By default, writes file into users' INBOX using his public key (no privatespace access required).
  */
- @Provides
- static String provideRootBucket() {
- return "datasafe-root";
- }
 
  @Binds
  abstract WriteToInbox writeInbox(WriteToInboxImplRuntimeDelegatable impl);

diff --git a/...storage-impl-s3/src/main/java/de/adorsys/datasafe/storage/impl/s3/StaticBucketRouter.java b/...storage-impl-s3/src/main/java/de/adorsys/datasafe/storage/impl/s3/StaticBucketRouter.java
@@ -20,10 +20,10 @@ public String resourceKey(AbsoluteLocation resource) {
  UnaryOperator<String> trimStartingSlash = str -> str.replaceFirst("^/", "");
 
  String resourcePath = trimStartingSlash.apply(resource.location().getRawPath());
- if (bucketName == null || "".equals(bucketName) || !resourcePath.contains(bucketName)) {
+ if (bucketName == null || "".equals(bucketName) || !resourcePath.startsWith(bucketName)) {
  return resourcePath;
  }
 
- return trimStartingSlash.apply(resourcePath.substring(resourcePath.indexOf(bucketName) + bucketName.length()));
+ return trimStartingSlash.apply(resourcePath.substring(bucketName.length()));
  }
 }