From a02e48c17a5d1ae7da794c2dd8c24eeec400fe86 Mon Sep 17 00:00:00 2001 From: yhampe Date: Mon, 18 Nov 2024 11:05:31 +0100 Subject: [PATCH] RED-9472: solving merge conflicts --- .../v1/external/api/impl/controller/RulesController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java index 7bc836c3c..5ab60c1ac 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java @@ -83,7 +83,7 @@ public class RulesController implements RulesResource { mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules(); } catch (FeignException e) { if (e.status() == HttpStatus.BAD_REQUEST.value()) { - throw new BadRequestException("The provided rule string is not a valid drools rule file!"); + throw new BadRequestException("The provided rule file is not a valid drools rule file!"); } } }