From c113a26e5923d16ee4b02de86bae233508f1087b Mon Sep 17 00:00:00 2001 From: kochetkov Date: Mon, 9 Dec 2024 16:18:01 +0300 Subject: [PATCH 1/3] fix --- .../main/java/service/ConfigExecutorService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/service/ConfigExecutorService.java b/backend/src/main/java/service/ConfigExecutorService.java index d046375..7a64299 100644 --- a/backend/src/main/java/service/ConfigExecutorService.java +++ b/backend/src/main/java/service/ConfigExecutorService.java @@ -8,6 +8,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -81,13 +82,18 @@ public class ConfigExecutorService { catch (HttpClientErrorException e) { if (e.getStatusCode() == HttpStatus.BAD_REQUEST) { - Map responseMap = new Gson().fromJson(e.getResponseBodyAsString(), - new TypeToken>() { + Map responseMap = new Gson().fromJson(e.getResponseBodyAsString(), + new TypeToken>() { }.getType() ); - String details = responseMap.get("details"); - throw new ConfigExecutorException(details); + @SuppressWarnings("unchecked") + Map details = (Map) responseMap.get("details"); + String detailsStr = details.entrySet() + .stream() + .map(entry -> entry.getKey() + " : " + entry.getValue()) + .collect(Collectors.joining("\n")); + throw new ConfigExecutorException(detailsStr); } else { throw new RuntimeException( From e1380c172a80ebc83248507eee714c7710f082f8 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Mon, 9 Dec 2024 16:31:19 +0300 Subject: [PATCH 2/3] fix --- backend/src/main/java/service/ConfigExecutorService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/backend/src/main/java/service/ConfigExecutorService.java b/backend/src/main/java/service/ConfigExecutorService.java index 7a64299..4a92b8e 100644 --- a/backend/src/main/java/service/ConfigExecutorService.java +++ b/backend/src/main/java/service/ConfigExecutorService.java @@ -89,10 +89,7 @@ public class ConfigExecutorService { @SuppressWarnings("unchecked") Map details = (Map) responseMap.get("details"); - String detailsStr = details.entrySet() - .stream() - .map(entry -> entry.getKey() + " : " + entry.getValue()) - .collect(Collectors.joining("\n")); + String detailsStr = String.join("\n", details.values()); throw new ConfigExecutorException(detailsStr); } else { From 409b07342a227931a3cf558b30d1048ccad1d081 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Mon, 9 Dec 2024 19:44:16 +0300 Subject: [PATCH 3/3] fix --- config-data-executor/src/main/resources/application.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config-data-executor/src/main/resources/application.yml b/config-data-executor/src/main/resources/application.yml index 0cf969f..f800835 100644 --- a/config-data-executor/src/main/resources/application.yml +++ b/config-data-executor/src/main/resources/application.yml @@ -1 +1,4 @@ configDirectory: C:\work\ervu-eks\config\cde-xml +logging: + level: + root: info