REMReM publish /generateAndPublish endpoint support to lenient validation (#207)

* REMReM publish /generateAndPublish endpoint support to
lenient validation

Added lenient velidation featute in /generateAndPublish endpoint.

* Added change log.

Co-authored-by: Suryakumari Kolli <[email protected]>

Author: Surya-Kolli

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.19
+- Added the lenientValidation parameter(okToLeaveOutInvalidOptionalFields) for /generateAndPublish 
+  end point.
+
 ## 2.0.18
 - Implemented the functionality to read the Jasypt encryption key from jasypt.key file.
 

pom.xml

@@ -9,7 +9,7 @@
         <version>2.0.4</version>
     </parent>
     <properties>
-        <eiffel-remrem-publish.version>2.0.18</eiffel-remrem-publish.version>
+        <eiffel-remrem-publish.version>2.0.19</eiffel-remrem-publish.version>
         <eiffel-remrem-shared.version>2.0.4</eiffel-remrem-shared.version>
         <eiffel-remrem-semantics.version>2.0.13</eiffel-remrem-semantics.version>
     </properties>

publish-service/src/main/java/com/ericsson/eiffel/remrem/publish/controller/ProducerController.java

@@ -159,6 +159,9 @@ public ResponseEntity generateAndPublish(@ApiParam(value = "message protocol", r
                                              @ApiParam(value = "The maximum number of events returned from a lookup. If more events are found "
                                                      + "they will be disregarded. The order of the events is undefined, which means that what events are "
                                                      + "disregarded is also undefined.") @RequestParam(value = "lookupLimit", required = false, defaultValue = "1") final int lookupLimit,
+                                             @ApiParam(value = "okToLeaveOutInvalidOptionalFields true will remove the optional "
+                                                     + "event fields from the input event data that does not validate successfully, "
+                                                     + "and add those removed field information into customData/remremGenerateFailures") @RequestParam(value = "okToLeaveOutInvalidOptionalFields", required = false, defaultValue = "false")  final Boolean okToLeaveOutInvalidOptionalFields,
                                              @ApiParam(value = "JSON message", required = true) @RequestBody final JsonObject bodyJson) {
 
         String bodyJsonOut = null;
@@ -180,7 +183,7 @@ public ResponseEntity generateAndPublish(@ApiParam(value = "message protocol", r
         try {
             String generateUrl = generateURLTemplate.getUrl() + "&failIfMultipleFound=" + failIfMultipleFound
                     + "&failIfNoneFound=" + failIfNoneFound + "&lookupInExternalERs=" + lookupInExternalERs
-                    + "&lookupLimit=" + lookupLimit;
+                    + "&lookupLimit=" + lookupLimit + "&okToLeaveOutInvalidOptionalFields=" + okToLeaveOutInvalidOptionalFields;
             ResponseEntity<String> response = restTemplate.postForEntity(generateUrl,
                     entity, String.class, generateURLTemplate.getMap(msgProtocol, msgType));
 

publish-service/src/test/java/com/ericsson/eiffel/remrem/publish/service/EiffelRemremCommonControllerUnitTest.java

@@ -131,7 +131,7 @@ public void testRestTemplateCallSuccess() throws Exception {
                 Mockito.eq(String.class), Mockito.anyMap())).thenReturn(responseOK);
 
         ResponseEntity<?> elem = unit.generateAndPublish("eiffelsemantics", "eiffelactivityfinished", "", "", "",false,
-                null, null, true, 1, body.getAsJsonObject());
+                null, null, true, 1, false, body.getAsJsonObject());
         assertEquals(elem.getStatusCode(), HttpStatus.OK);
 
     }
@@ -145,7 +145,7 @@ public void testRestTemplateCallFail() throws Exception {
                 Mockito.eq(String.class), Mockito.anyMap())).thenReturn(responseBad);
 
         ResponseEntity<?> elem = unit.generateAndPublish("eiffel3", "eiffelactivityfinished", "", "", "",false,
-                null, null, true, 1, body.getAsJsonObject());
+                null, null, true, 1, false, body.getAsJsonObject());
         assertEquals(elem.getStatusCode(), HttpStatus.BAD_REQUEST);
 
     }
@@ -181,7 +181,7 @@ public void testErLookupFailedWithOptions() throws Exception {
                 Mockito.eq(String.class), Mockito.anyMap())).thenReturn(responseOptionsFailed);
 
         ResponseEntity<?> elem = unit.generateAndPublish("eiffelsemantics", "eiffelactivityfinished", "", "", "", false,
-                false, false, true, 1, body.getAsJsonObject());
+                false, false, true, 1, false, body.getAsJsonObject());
         assertEquals(elem.getStatusCode(), HttpStatus.UNPROCESSABLE_ENTITY);
 
     }
@@ -194,7 +194,7 @@ public void testErLookupFailedWithMultipleFound() throws Exception {
                 Mockito.eq(String.class), Mockito.anyMap())).thenReturn(responseMultipleFound);
 
         ResponseEntity<?> elem = unit.generateAndPublish("eiffelsemantics", "eiffelactivityfinished", "", "", "", false,
-                false, false, true, 1, body.getAsJsonObject());
+                false, false, true, 1, false, body.getAsJsonObject());
         assertEquals(elem.getStatusCode(), HttpStatus.EXPECTATION_FAILED);
 
     }
@@ -207,7 +207,7 @@ public void testErLookupFailedWithNoneFound() throws Exception {
                 Mockito.eq(String.class), Mockito.anyMap())).thenReturn(responseNoneFound);
 
         ResponseEntity<?> elem = unit.generateAndPublish("eiffelsemantics", "eiffelactivityfinished", "", "", "", false,
-                false, false, true, 1, body.getAsJsonObject());
+                false, false, true, 1, false, body.getAsJsonObject());
         assertEquals(elem.getStatusCode(), HttpStatus.NOT_ACCEPTABLE);
 
     }