ER lookup retry strategy removed (#186)

* ER lookup retry strategy should be improved in generate

* ER lookup retry strategy

* CHANGELOG.md updated

Co-authored-by: Shubham Gupta C <eusupgh@seliiuts03306.seli.gic.ericsson.se>

Author: shubhamkumarguptaTCS

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 2.1.3
 - Uplifted eiffel-remrem-parent version from 2.0.4 to 2.0.5
 - Uplifted eiffel-remrem-shared version from 2.0.4 to 2.0.5
+- Removed ER retry mechanism
 
 ## 2.1.2
 - Implemented the functionality to read the Jasypt encryption key from jasypt.key file

service/src/main/java/com/ericsson/eiffel/remrem/generate/constants/RemremGenerateServiceConstants.java

@@ -18,6 +18,9 @@ public final class RemremGenerateServiceConstants {
 
         public static final String NO_SERVICE_ERROR = "{\"status_code\": 503, \"result\": \"FAIL\", "
                 + "\"message\":\"No protocol service has been found registered\"}";
+        
+        public static final String NO_ER = "{\"status_code\": 503, \"result\": \"FAIL\", "
+                + "\"message\":\"ER is down\"}";
 
         public static final String NO_TEMPLATE_ERROR = "{\"status_code\": 404, \"result\": \"FAIL\", "
                 + "\"message\":\"Requested template is not available\"}";

service/src/main/java/com/ericsson/eiffel/remrem/generate/controller/RemremGenerateController.java

@@ -120,6 +120,9 @@ public ResponseEntity<?> generate(
             bodyJson = erLookup(bodyJson, failIfMultipleFound, failIfNoneFound, lookupInExternalERs, lookupLimit);
             MsgService msgService = getMessageService(msgProtocol);
             String response;
+            if (bodyJson == null) {
+                return new ResponseEntity<>(parser.parse(RemremGenerateServiceConstants.NO_ER),HttpStatus.SERVICE_UNAVAILABLE);
+            }
             if (msgService != null) {
                 response = msgService.generateMsg(msgType, bodyJson, isLenientEnabled(okToLeaveOutInvalidOptionalFields));
                 JsonElement parsedResponse = parser.parse(response);
@@ -174,18 +177,15 @@ private JsonObject erLookup(final JsonObject bodyJson, Boolean failIfMultipleFou
                                 + String.format("&shallow=%s&pageSize=%d", !lookupInExternalERs, lookupLimit);
 
                         // Execute ER Query
-                        int j = 0;
-                        while (j < 2) {
-                            try {
-                                response = restTemplate.getForEntity(url, String.class);
-                                if (response.getStatusCode() == HttpStatus.OK) {
-                                    log.info("The result from Event Repository is: " + response.getStatusCodeValue());
-                                    break;
-                                }
-                            } catch (Exception e) {
-                                if (++j >= 2)
-                                    log.error("unable to connect configured Event Repository URL" + e.getMessage());
+                        try {
+                            response = restTemplate.getForEntity(url, String.class);
+                            if (response.getStatusCode() == HttpStatus.OK) {
+                                log.info("The result from Event Repository is: " + response.getStatusCodeValue());
+                                break;
                             }
+                        } catch (Exception e) {
+                            log.error("unable to connect configured Event Repository URL" + e.getMessage());
+                            return null;
                         }
                         String responseBody = response.getBody();
                         ids = ERLookupController.getIdsfromResponseBody(responseBody);