chore: use location key instead of location name for archiving

Author: cgutmann

service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataArchivingEloServiceImpl.java

@@ -57,7 +57,7 @@ public Uni<LocationMetaData> createLocation(ILocationMetaItem location) {
     }
 
     @Override
-    public Uni<ResourceMetaData> archiveData(String locationName, String filename, UUID uuid, File body, IAbstractArchivedResourceMetaItem archivedResource) {
+    public Uni<ResourceMetaData> archiveData(String locationKey, String filename, UUID uuid, File body, IAbstractArchivedResourceMetaItem archivedResource) {
         LOGGER.debug("Archiving related resource '{}' in ELO!", archivedResource.getId());
 
         String extension = archivedResource.getName().substring(archivedResource.getName().lastIndexOf(".") + 1).toLowerCase();
@@ -67,7 +67,7 @@ public Uni<ResourceMetaData> archiveData(String locationName, String filename, U
         generateBaseResourceDataDto(archivedResource, resourceData, extension, contentType);
         resourceData.uuid(UUID.fromString(archivedResource.getId()))
             .type(TypeEnum.RESOURCE)
-            .location(locationName)
+            .location(locationKey)
             .name(name);
 
         try (FileInputStream fis = new FileInputStream(body)) {
@@ -107,7 +107,7 @@ private void generateBaseResourceDataDto(IAbstractArchivedResourceMetaItem archi
     }
 
     @Override
-    public Uni<ResourceMetaData> archiveSclData(UUID uuid, IAbstractArchivedResourceMetaItem archivedResource, String locationName, String data) throws CompasSclDataServiceException {
+    public Uni<ResourceMetaData> archiveSclData(UUID uuid, IAbstractArchivedResourceMetaItem archivedResource, String locationKey, String data) throws CompasSclDataServiceException {
         LOGGER.debug("Archiving scl resource '{}' in ELO!", uuid);
 
         String extension = archivedResource.getType();
@@ -117,7 +117,7 @@ public Uni<ResourceMetaData> archiveSclData(UUID uuid, IAbstractArchivedResource
         generateBaseResourceDataDto(archivedResource, resourceData, extension, contentType);
         resourceData.uuid(uuid)
             .type(TypeEnum.RESOURCE)
-            .location(locationName)
+            .location(locationKey)
             .name(archivedResource.getName())
             .data(encodedDataString);
 

service/src/main/java/org/lfenergy/compas/scl/data/service/CompasSclDataArchivingServiceImpl.java

@@ -2,8 +2,6 @@
 
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.lfenergy.compas.scl.data.dto.LocationMetaData;
 import org.lfenergy.compas.scl.data.dto.ResourceMetaData;
@@ -38,8 +36,8 @@ public Uni<LocationMetaData> createLocation(ILocationMetaItem location) {
     }
 
     @Override
-    public Uni<ResourceMetaData> archiveData(String locationName, String filename, UUID resourceId, File body, IAbstractArchivedResourceMetaItem archivedResource) {
-        String absolutePath = generateSclDataLocation(resourceId, archivedResource, locationName) + File.separator + "referenced_resources";
+    public Uni<ResourceMetaData> archiveData(String locationKey, String filename, UUID resourceId, File body, IAbstractArchivedResourceMetaItem archivedResource) {
+        String absolutePath = generateSclDataLocation(resourceId, archivedResource, locationKey) + File.separator + "referenced_resources";
         File locationDir = new File(absolutePath);
         locationDir.mkdirs();
         File f = new File(absolutePath + File.separator + filename);
@@ -54,12 +52,12 @@ public Uni<ResourceMetaData> archiveData(String locationName, String filename, U
             return Uni.createFrom().failure(new RuntimeException(e));
         }
         List<ResourceTag> archivedResourceTag = archivedResource.getFields().stream().map(field -> new ResourceTag(field.getKey(), field.getValue())).toList();
-        return Uni.createFrom().item(new ResourceMetaData(TypeEnum.RESOURCE, resourceId, locationName, archivedResourceTag));
+        return Uni.createFrom().item(new ResourceMetaData(TypeEnum.RESOURCE, resourceId, locationKey, archivedResourceTag));
     }
 
     @Override
-    public Uni<ResourceMetaData> archiveSclData(UUID resourceId, IAbstractArchivedResourceMetaItem archivedResource, String locationName, String data) {
-        String absolutePath = generateSclDataLocation(resourceId, archivedResource, locationName);
+    public Uni<ResourceMetaData> archiveSclData(UUID resourceId, IAbstractArchivedResourceMetaItem archivedResource, String locationKey, String data) {
+        String absolutePath = generateSclDataLocation(resourceId, archivedResource, locationKey);
         File locationDir = new File(absolutePath);
         locationDir.mkdirs();
         File f = new File(locationDir + File.separator + archivedResource.getName() + "." + archivedResource.getType().toLowerCase());
@@ -69,10 +67,10 @@ public Uni<ResourceMetaData> archiveSclData(UUID resourceId, IAbstractArchivedRe
             throw new RuntimeException(e);
         }
         List<ResourceTag> archivedResourceTag = archivedResource.getFields().stream().map(field -> new ResourceTag(field.getKey(), field.getValue())).toList();
-        return Uni.createFrom().item(new ResourceMetaData(TypeEnum.RESOURCE, resourceId, locationName, archivedResourceTag));
+        return Uni.createFrom().item(new ResourceMetaData(TypeEnum.RESOURCE, resourceId, locationKey, archivedResourceTag));
     }
 
-    private String generateSclDataLocation(UUID resourceId, IAbstractArchivedResourceMetaItem archivedResource, String locationName) {
-        return locationPath + File.separator + locationName + File.separator + resourceId + File.separator + archivedResource.getVersion();
+    private String generateSclDataLocation(UUID resourceId, IAbstractArchivedResourceMetaItem archivedResource, String locationKey) {
+        return locationPath + File.separator + locationKey + File.separator + resourceId + File.separator + archivedResource.getVersion();
     }
 }

service/src/main/java/org/lfenergy/compas/scl/data/service/ICompasSclDataArchivingService.java

@@ -13,7 +13,7 @@ public interface ICompasSclDataArchivingService {
 
     Uni<LocationMetaData> createLocation(ILocationMetaItem location);
 
-    Uni<ResourceMetaData> archiveData(String locationName, String filename, UUID uuid, File body, IAbstractArchivedResourceMetaItem archivedResource);
+    Uni<ResourceMetaData> archiveData(String locationKey, String filename, UUID uuid, File body, IAbstractArchivedResourceMetaItem archivedResource);
 
-    Uni<ResourceMetaData> archiveSclData(UUID uuid, IAbstractArchivedResourceMetaItem archivedResource, String locationName, String data);
+    Uni<ResourceMetaData> archiveSclData(UUID uuid, IAbstractArchivedResourceMetaItem archivedResource, String locationKey, String data);
 }