refactor: rename RemoteEntityFileStorage to BuckieEntityFileStorage and update related methods

marioserrano09 · marioserrano09 · commit a34d56116e71 · 2026-05-20T10:06:14.000-05:00
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/EntityFileAccountProvider.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/EntityFileAccountProvider.java
@@ -18,12 +18,30 @@
 
 package tools.dynamia.modules.entityfile;
 
+import tools.dynamia.modules.entityfile.domain.EntityFile;
+
 /**
  *
  * @author Mario Serrano Leones
  */
 public interface EntityFileAccountProvider {
 
+    /**
+     * Return current account Id for tenant
+     *
+     * @return account id
+     */
     Long getAccountId();
 
+
+    /**
+     * Check is the account id is valid, by default just validate if account id not null
+     *
+     * @param entityFile
+     * @return valid
+     */
+    default boolean isValidEntityFile(EntityFile entityFile) {
+        return entityFile != null && entityFile.getAccountId() != null && entityFile.getAccountId() > 0;
+    }
+
 }
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/EntityFileStorageController.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/controller/EntityFileStorageController.java
@@ -74,7 +74,7 @@ public ResponseEntity<Map<String, Object>> export(@PathVariable String uuid, Htt
             return ResponseEntity.notFound().build();
         }
 
-        if (!isSameAccount(entityFile)) {
+        if (!isValidAccount(entityFile)) {
             return ResponseEntity.notFound().build();
         }
 
@@ -209,7 +209,7 @@ public ResponseEntity<Resource> get(@PathVariable("uuid") String uuid, @PathVari
             return ResponseEntity.notFound().build();
         }
 
-        if (!isSameAccount(entityFile)) {
+        if (!isValidAccount(entityFile)) {
             return ResponseEntity.notFound().build();
         }
 
@@ -320,7 +320,7 @@ private EntityFile resolveParent(String parentUuid) {
         }
 
         EntityFile parent = entityFileService.getEntityFile(parentUuid.trim());
-        if (parent == null || !isSameAccount(parent)) {
+        if (parent == null || !isValidAccount(parent)) {
             throw new UploadRequestException(HttpStatus.NOT_FOUND, "Parent entity file not found: " + parentUuid);
         }
         return parent;
@@ -565,12 +565,10 @@ private boolean isNumeric(String value) {
      * @param entityFile file to evaluate
      * @return {@code true} when the file can be accessed from the current account context
      */
-    private boolean isSameAccount(EntityFile entityFile) {
+    private boolean isValidAccount(EntityFile entityFile) {
         EntityFileAccountProvider accountProvider = Containers.get().findObject(EntityFileAccountProvider.class);
-        if (accountProvider != null) {
-            if (entityFile.getAccountId() != null) {
-                return entityFile.getAccountId().equals(accountProvider.getAccountId());
-            }
+        if (accountProvider != null && entityFile != null) {
+            return accountProvider.isValidEntityFile(entityFile);
         }
         return true;
     }
diff --git a/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/remote/BuckieEntityFileStorage.java b/extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/remote/BuckieEntityFileStorage.java
@@ -59,11 +59,11 @@
  * @author Dynamia Soluciones IT
  */
 @Service
-public class RemoteEntityFileStorage implements EntityFileStorage {
+public class BuckieEntityFileStorage implements EntityFileStorage {
 
-    private final LoggingService logger = new SLF4JLoggingService(RemoteEntityFileStorage.class, "SFS: ");
+    private final LoggingService logger = new SLF4JLoggingService(BuckieEntityFileStorage.class, "Buckie: ");
 
-    public static final String ID = "RemoteSimpleFileStorage";
+    public static final String ID = "buckie";
 
     // ── Parameter names ──────────────────────────────────────────────────────
     public static final String SFS_URL = "SFS_URL";
@@ -85,7 +85,7 @@ public class RemoteEntityFileStorage implements EntityFileStorage {
      */
     private volatile RestClient restClient;
 
-    public RemoteEntityFileStorage(LocalEntityFileStorage localEntityFileStorage, Parameters appParams, CrudService crudService, Environment environment) {
+    public BuckieEntityFileStorage(LocalEntityFileStorage localEntityFileStorage, Parameters appParams, CrudService crudService, Environment environment) {
         this.localEntityFileStorage = localEntityFileStorage;
         this.appParams = appParams;
         this.crudService = crudService;
@@ -101,7 +101,7 @@ public String getId() {
 
     @Override
     public String getName() {
-        return "Remote Simple File Storage";
+        return "Buckie Remote File Storage";
     }
 
     @Override
@@ -153,15 +153,15 @@ public StoredEntityFile download(EntityFile entityFile) {
         String remoteUrl = buildRemoteUrl(entityFile);
         String publicUrl = localEntityFileStorage.generateURL(entityFile);
 
-        return new RemoteStoredEntityFile(entityFile, remoteUrl, publicUrl, client(), getIdentity(), getSecret());
+        return new BuckieStoredEntityFile(entityFile, remoteUrl, publicUrl, client(), getIdentity(), getSecret());
     }
 
     @Override
     public void delete(EntityFile entityFile) {
         String key = buildKey(entityFile);
         String bucket = getBucket();
 
-        logger.info("Deleting from SFS: " + key);
+        logger.info("Deleting: " + key);
 
         try {
             client().delete()
@@ -297,12 +297,12 @@ private static String contentType(UploadedFileInfo fileInfo) {
      * SFS credentials are included in every download request so the server can
      * authorise the caller.
      */
-    public static class RemoteStoredEntityFile extends StoredEntityFile {
+    public static class BuckieStoredEntityFile extends StoredEntityFile {
 
         @Serial
         private static final long serialVersionUID = 1L;
 
-        private final LoggingService logger = LoggingService.get(RemoteStoredEntityFile.class, "SFS: ");
+        private final LoggingService logger = LoggingService.get(BuckieStoredEntityFile.class, "SFS: ");
 
 
         private final transient RestClient restClient;
@@ -311,7 +311,7 @@ public static class RemoteStoredEntityFile extends StoredEntityFile {
         private final String remoteUrl;
 
 
-        public RemoteStoredEntityFile(EntityFile entityFile, String remoteUrl, String publicUrl,
+        public BuckieStoredEntityFile(EntityFile entityFile, String remoteUrl, String publicUrl,
                                       RestClient restClient, String identity, String secret) {
             super(entityFile, publicUrl, null);
             this.remoteUrl = remoteUrl;
diff --git a/extensions/entity-files/sources/core/src/test/java/tools/dynamia/modules/entityfile/remote/BuckieEntityFileStorageTest.java b/extensions/entity-files/sources/core/src/test/java/tools/dynamia/modules/entityfile/remote/BuckieEntityFileStorageTest.java
@@ -43,7 +43,7 @@
 import static org.junit.Assert.*;
 
 /**
- * Integration tests for {@link RemoteEntityFileStorage}.
+ * Integration tests for {@link BuckieEntityFileStorage}.
  *
  * <p>Pure-logic tests (buildKey, getFileName, etc.) always run.
  * HTTP tests are skipped automatically via {@code Assume.assumeTrue}
@@ -59,45 +59,45 @@
  * Maven example: {@code mvn test -DSFS_URL=http://my-sfs:8081 -DSFS_BUCKET=test}
  * </p>
  */
-public class RemoteEntityFileStorageTest {
+public class BuckieEntityFileStorageTest {
 
     private static String sfsUrl;
     private static String sfsBucket;
     private static String sfsIdentity;
     private static String sfsSecret;
 
-    private RemoteEntityFileStorage storage;
+    private BuckieEntityFileStorage storage;
 
     // ── Setup ─────────────────────────────────────────────────────────────────
 
     @BeforeClass
     public static void readConfiguration() {
-        sfsUrl = systemOrEnv(RemoteEntityFileStorage.SFS_URL, "http://localhost:8500");
-        sfsBucket = systemOrEnv(RemoteEntityFileStorage.SFS_BUCKET, "test");
-        sfsIdentity = systemOrEnv(RemoteEntityFileStorage.SFS_IDENTITY, "test");
-        sfsSecret = systemOrEnv(RemoteEntityFileStorage.SFS_SECRET, "test");
+        sfsUrl = systemOrEnv(BuckieEntityFileStorage.SFS_URL, "http://localhost:8500");
+        sfsBucket = systemOrEnv(BuckieEntityFileStorage.SFS_BUCKET, "test");
+        sfsIdentity = systemOrEnv(BuckieEntityFileStorage.SFS_IDENTITY, "test");
+        sfsSecret = systemOrEnv(BuckieEntityFileStorage.SFS_SECRET, "test");
 
         System.out.println("[SFS Test] URL=" + sfsUrl + " | BUCKET=" + sfsBucket);
     }
 
     @Before
     public void setUp() {
         MockEnvironment env = new MockEnvironment();
-        env.setProperty(RemoteEntityFileStorage.SFS_URL, sfsUrl);
-        env.setProperty(RemoteEntityFileStorage.SFS_BUCKET, sfsBucket);
-        env.setProperty(RemoteEntityFileStorage.SFS_IDENTITY, sfsIdentity);
-        env.setProperty(RemoteEntityFileStorage.SFS_SECRET, sfsSecret);
+        env.setProperty(BuckieEntityFileStorage.SFS_URL, sfsUrl);
+        env.setProperty(BuckieEntityFileStorage.SFS_BUCKET, sfsBucket);
+        env.setProperty(BuckieEntityFileStorage.SFS_IDENTITY, sfsIdentity);
+        env.setProperty(BuckieEntityFileStorage.SFS_SECRET, sfsSecret);
 
         var local = new LocalEntityFileStorage(noOpParameters(), new InMemoryCrudService(), env);
 
-        storage = new RemoteEntityFileStorage(local, noOpParameters(), new InMemoryCrudService(), env);
+        storage = new BuckieEntityFileStorage(local, noOpParameters(), new InMemoryCrudService(), env);
     }
 
     // ── Pure-logic tests (no server required) ─────────────────────────────────
 
     @Test
     public void testGetId() {
-        assertEquals(RemoteEntityFileStorage.ID, storage.getId());
+        assertEquals(BuckieEntityFileStorage.ID, storage.getId());
     }
 
     @Test
@@ -127,7 +127,7 @@ public void testBuildKey_withSubfolder() {
     @Test
     public void testGetFileName_withSpacesAndDashes() {
         EntityFile ef = buildEntityFile("My File-Final.pdf", null, 1L);
-        String name = RemoteEntityFileStorage.getFileName(ef);
+        String name = BuckieEntityFileStorage.getFileName(ef);
 
         assertFalse("File name must not contain spaces", name.contains(" "));
         assertFalse("File name base must not contain dashes",
@@ -137,7 +137,7 @@ public void testGetFileName_withSpacesAndDashes() {
     @Test
     public void testGetFileName_withAccentsAndSpecialChars() {
         EntityFile ef = buildEntityFile("Ñoño Ávido Murió.pdf", null, 1L);
-        String name = RemoteEntityFileStorage.getFileName(ef);
+        String name = BuckieEntityFileStorage.getFileName(ef);
 
         assertFalse("File name must not contain ñ", name.contains("ñ"));
         assertFalse("File name must not contain á", name.contains("á"));
@@ -150,25 +150,25 @@ public void testGetFileName_usesStoredFileNameWhenSet() {
         EntityFile ef = buildEntityFile("original.pdf", null, 1L);
         ef.setStoredFileName("custom_stored_name.pdf");
 
-        String name = RemoteEntityFileStorage.getFileName(ef);
+        String name = BuckieEntityFileStorage.getFileName(ef);
 
         assertEquals("Must use storedFileName when it is set", "custom_stored_name.pdf", name);
     }
 
     @Test
     public void testGetFileName_withoutSubfolder() {
         EntityFile ef = buildEntityFile("doc.txt", null, 1L);
-        String name = RemoteEntityFileStorage.getFileName(ef);
+        String name = BuckieEntityFileStorage.getFileName(ef);
 
         assertFalse("Without subfolder the name must not start with /", name.startsWith("/"));
         assertTrue("Name must contain the uuid", name.contains(ef.getUuid()));
     }
 
     @Test
     public void testGetAccountFolderName() {
-        assertEquals("account42/", RemoteEntityFileStorage.getAccountFolderName(42L));
-        assertEquals("account1/", RemoteEntityFileStorage.getAccountFolderName(1L));
-        assertEquals("account999/", RemoteEntityFileStorage.getAccountFolderName(999L));
+        assertEquals("account42/", BuckieEntityFileStorage.getAccountFolderName(42L));
+        assertEquals("account1/", BuckieEntityFileStorage.getAccountFolderName(1L));
+        assertEquals("account999/", BuckieEntityFileStorage.getAccountFolderName(999L));
     }
 
     @Test
@@ -336,7 +336,7 @@ public void testUploadAndDownloadUrl_areConsistent() {
         storage.upload(ef, info);
 
         StoredEntityFile stored = storage.download(ef);
-        String url = stored instanceof RemoteEntityFileStorage.RemoteStoredEntityFile r ? r.getRemoteUrl() : stored.getUrl();
+        String url = stored instanceof BuckieEntityFileStorage.BuckieStoredEntityFile r ? r.getRemoteUrl() : stored.getUrl();
 
         // The URL returned by download() must point to the same resource that was uploaded
         assertNotNull(url);
diff --git a/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3EntityFileStorage.java b/extensions/entity-files/sources/s3/src/main/java/tools/dynamia/modules/entityfiles/s3/S3EntityFileStorage.java
@@ -45,10 +45,8 @@
 import tools.dynamia.modules.entityfile.UploadedFileInfo;
 import tools.dynamia.modules.entityfile.domain.EntityFile;
 import tools.dynamia.modules.entityfile.enums.EntityFileType;
-import tools.dynamia.modules.entityfile.remote.RemoteEntityFileStorage;
 
 import java.io.File;
-import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -58,8 +56,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static tools.dynamia.modules.entityfile.remote.RemoteEntityFileStorage.getAccountFolderName;
-import static tools.dynamia.modules.entityfile.remote.RemoteEntityFileStorage.getFileName;
+import static tools.dynamia.modules.entityfile.remote.BuckieEntityFileStorage.getAccountFolderName;
+import static tools.dynamia.modules.entityfile.remote.BuckieEntityFileStorage.getFileName;
 
 /**
  * {@link EntityFileStorage} implementation that store files in Amazon S3 service.
diff --git a/extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/AccountEntityFileProvider.java b/extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/AccountEntityFileProvider.java

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public ResponseEntity<Map<String, Object>> export(@PathVariable String uuid, Htt`
`74`	`74`	`return ResponseEntity.notFound().build();`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (!isSameAccount(entityFile)) {`
	`77`	`+ if (!isValidAccount(entityFile)) {`
`78`	`78`	`return ResponseEntity.notFound().build();`
`79`	`79`	`}`
`80`	`80`
`@@ -209,7 +209,7 @@ public ResponseEntity<Resource> get(@PathVariable("uuid") String uuid, @PathVari`
`209`	`209`	`return ResponseEntity.notFound().build();`
`210`	`210`	`}`
`211`	`211`
`212`		`- if (!isSameAccount(entityFile)) {`
	`212`	`+ if (!isValidAccount(entityFile)) {`
`213`	`213`	`return ResponseEntity.notFound().build();`
`214`	`214`	`}`
`215`	`215`
`@@ -320,7 +320,7 @@ private EntityFile resolveParent(String parentUuid) {`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`EntityFile parent = entityFileService.getEntityFile(parentUuid.trim());`
`323`		`- if (parent == null \|\| !isSameAccount(parent)) {`
	`323`	`+ if (parent == null \|\| !isValidAccount(parent)) {`
`324`	`324`	`throw new UploadRequestException(HttpStatus.NOT_FOUND, "Parent entity file not found: " + parentUuid);`
`325`	`325`	`}`
`326`	`326`	`return parent;`
`@@ -565,12 +565,10 @@ private boolean isNumeric(String value) {`
`565`	`565`	`* @param entityFile file to evaluate`
`566`	`566`	`* @return {@code true} when the file can be accessed from the current account context`
`567`	`567`	`*/`
`568`		`- private boolean isSameAccount(EntityFile entityFile) {`
	`568`	`+ private boolean isValidAccount(EntityFile entityFile) {`
`569`	`569`	`EntityFileAccountProvider accountProvider = Containers.get().findObject(EntityFileAccountProvider.class);`
`570`		`- if (accountProvider != null) {`
`571`		`- if (entityFile.getAccountId() != null) {`
`572`		`- return entityFile.getAccountId().equals(accountProvider.getAccountId());`
`573`		`- }`
	`570`	`+ if (accountProvider != null && entityFile != null) {`
	`571`	`+ return accountProvider.isValidEntityFile(entityFile);`
`574`	`572`	`}`
`575`	`573`	`return true;`
`576`	`574`	`}`