From e8cd2856d6d00be964336f412bfc9f5fcead6a09 Mon Sep 17 00:00:00 2001 From: alandavis Date: Mon, 15 Aug 2022 20:59:36 +0100 Subject: [PATCH] Consistent use of filestore-url rather than it & fileStoreUrl --- .../transform/base/registry/TransformConfigFromFiles.java | 2 +- .../org/alfresco/transform/base/sfs/SharedFileStoreClient.java | 2 +- engines/base/src/main/resources/application.yaml | 2 +- engines/base/src/test/resources/logback.xml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java index 6edf8550..da2aa851 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java @@ -67,7 +67,7 @@ public class TransformConfigFromFiles { String filename = resource.getFilename(); transformConfigSources.add( - new AbstractTransformConfigSource(filename, "Additional config "+filename,null) + new AbstractTransformConfigSource(filename, filename,null) { @Override public TransformConfig getTransformConfig() { diff --git a/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java b/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java index 20c960f8..1c8f3408 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/sfs/SharedFileStoreClient.java @@ -62,7 +62,7 @@ public class SharedFileStoreClient { private static final Logger logger = LoggerFactory.getLogger(SharedFileStoreClient.class); - @Value("${fileStoreUrl}") + @Value("${filestore-url}") private String url; @Autowired diff --git a/engines/base/src/main/resources/application.yaml b/engines/base/src/main/resources/application.yaml index 304ac132..4c5dbfa5 100644 --- a/engines/base/src/main/resources/application.yaml +++ b/engines/base/src/main/resources/application.yaml @@ -29,7 +29,7 @@ logging: level: org.alfresco.transform.common.TransformerDebug: debug -fileStoreUrl: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file} +filestore-url: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file} transform: core: diff --git a/engines/base/src/test/resources/logback.xml b/engines/base/src/test/resources/logback.xml index 2fc992fc..980ce897 100644 --- a/engines/base/src/test/resources/logback.xml +++ b/engines/base/src/test/resources/logback.xml @@ -7,7 +7,6 @@ -