From 8e3eeb9dd746ad9a78b95817fd782745b9ed3acc Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com> Date: Tue, 4 Jun 2024 10:11:40 +0200 Subject: [PATCH] [ACS-5648] Add header 'X-Alfresco-Retry-Needed' indicating that recovery mode is on and client should retry later (#2670) * [ACS-5648] Add header'X-Alfresco-Retry-Needed' indicating that recovery mode is on and client should retry later * [ACS-5648] Bump ATS to 4.1.3-A1 --- pom.xml | 4 ++-- .../java/org/alfresco/transform/registry/CombinedConfig.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6fac186a48..2f4f5d814d 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ 7.0.1 5.23.0 5.23.0 - 5.1.2 - 4.1.2 + 5.1.3-A2 + 4.1.3-A1 7.0 0.0.27 diff --git a/repository/src/main/java/org/alfresco/transform/registry/CombinedConfig.java b/repository/src/main/java/org/alfresco/transform/registry/CombinedConfig.java index 414d15312f..4769d20d14 100644 --- a/repository/src/main/java/org/alfresco/transform/registry/CombinedConfig.java +++ b/repository/src/main/java/org/alfresco/transform/registry/CombinedConfig.java @@ -62,6 +62,7 @@ import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM_C */ public class CombinedConfig extends CombinedTransformConfig { + public static final String X_ALFRESCO_RETRY_NEEDED_HEADER = "X-Alfresco-Retry-Needed"; private final Log log; private ObjectMapper jsonObjectMapper = new ObjectMapper(); @@ -137,7 +138,7 @@ public class CombinedConfig extends CombinedTransformConfig { int transformCount = transformerCount(); configFileFinder.readFile(reader, remoteType+" on "+baseUrl, "json", baseUrl, log); - if (transformCount == transformerCount()) + if (transformCount == transformerCount() || response.containsHeader(X_ALFRESCO_RETRY_NEEDED_HEADER)) { successReadingConfig = false; }