Skip to content

Modified endpoint generate to accept array of events #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified endpoint generate to accept array of events #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 94 additions & 21 deletions ...rc/main/java/com/ericsson/eiffel/remrem/generate/controller/RemremGenerateController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -113,43 +114,63 @@ public ResponseEntity<?> generate(
@ApiParam(value = RemremGenerateServiceConstants.LOOKUP_IN_EXTERNAL_ERS) @RequestParam(value = "lookupInExternalERs", required = false, defaultValue = "false") final Boolean lookupInExternalERs,
@ApiParam(value = RemremGenerateServiceConstants.LOOKUP_LIMIT) @RequestParam(value = "lookupLimit", required = false, defaultValue = "1") final int lookupLimit,
@ApiParam(value = RemremGenerateServiceConstants.LenientValidation) @RequestParam(value = "okToLeaveOutInvalidOptionalFields", required = false, defaultValue = "false") final Boolean okToLeaveOutInvalidOptionalFields,
@ApiParam(value = "JSON message", required = true) @RequestBody JsonObject bodyJson) {
@ApiParam(value = "JSON message", required = true) @RequestBody JsonElement bodyJson) {

try {
bodyJson = erLookup(bodyJson, failIfMultipleFound, failIfNoneFound, lookupInExternalERs, lookupLimit);
MsgService msgService = getMessageService(msgProtocol);
String response;
if (msgService != null) {
response = msgService.generateMsg(msgType, bodyJson, isLenientEnabled(okToLeaveOutInvalidOptionalFields));
JsonElement parsedResponse = parser.parse(response);
if(lookupLimit <= 0) {
return new ResponseEntity<>("LookupLimit must be greater than or equals to 1", HttpStatus.BAD_REQUEST);
if (msgService == null){
return new ResponseEntity<>(parser.parse(RemremGenerateServiceConstants.NO_SERVICE_ERROR),
HttpStatus.SERVICE_UNAVAILABLE);
}

if (lookupLimit <= 0) {
return new ResponseEntity<>("LookupLimit must be greater than or equals to 1", HttpStatus.BAD_REQUEST);
}

if (bodyJson.isJsonArray()) {
JsonArray jsonArray = bodyJson.getAsJsonArray();
JsonArray response1 = new JsonArray();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

response1: use more descriptive name


for (JsonElement element: jsonArray) {

JsonObject jsonObject = element.getAsJsonObject();

jsonObject = erLookup(jsonObject, failIfMultipleFound, failIfNoneFound, lookupInExternalERs, lookupLimit);
String response = msgService.generateMsg(msgType, jsonObject, isLenientEnabled(okToLeaveOutInvalidOptionalFields));
JsonElement parsedResponse = parser.parse(response);

if (parsedResponse.getAsJsonObject().has(RemremGenerateServiceConstants.JSON_ERROR_MESSAGE_FIELD)) {
return new ResponseEntity<>(parsedResponse, HttpStatus.BAD_REQUEST);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about templates processed so far? Are they lost?

}

response1.add(parsedResponse);
}
return new ResponseEntity<>(response1, HttpStatus.OK);
} else if (bodyJson.isJsonObject()) {
JsonObject jsonObject1 = bodyJson.getAsJsonObject();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lines 150-153 are the same as 136-140. Create a function for them.

jsonObject1 = erLookup(jsonObject1, failIfMultipleFound, failIfNoneFound, lookupInExternalERs, lookupLimit);
String response = msgService.generateMsg(msgType, jsonObject1, isLenientEnabled(okToLeaveOutInvalidOptionalFields));
JsonElement parsedResponse = parser.parse(response);

if (!parsedResponse.getAsJsonObject().has(RemremGenerateServiceConstants.JSON_ERROR_MESSAGE_FIELD)) {
return new ResponseEntity<>(parsedResponse, HttpStatus.OK);
} else {
return new ResponseEntity<>(parsedResponse, HttpStatus.BAD_REQUEST);
}
return new ResponseEntity<>(parsedResponse,HttpStatus.OK);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why status is OK even if response has error message?

} else {
return new ResponseEntity<>(parser.parse(RemremGenerateServiceConstants.NO_SERVICE_ERROR),
HttpStatus.SERVICE_UNAVAILABLE);
return new ResponseEntity<>("Invalid Json INPUT", HttpStatus.BAD_REQUEST);
}
} catch (REMGenerateException e1) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e1: use better name

if (e1.getMessage().contains(Integer.toString(HttpStatus.NOT_ACCEPTABLE.value()))) {
return new ResponseEntity<>(parser.parse(e1.getMessage()), HttpStatus.NOT_ACCEPTABLE);
}
else if (e1.getMessage().contains(Integer.toString(HttpStatus.EXPECTATION_FAILED.value()))) {
} else if (e1.getMessage().contains(Integer.toString(HttpStatus.EXPECTATION_FAILED.value()))) {
return new ResponseEntity<>(parser.parse(e1.getMessage()), HttpStatus.EXPECTATION_FAILED);
}
else if (e1.getMessage().contains(Integer.toString(HttpStatus.EXPECTATION_FAILED.value()))) {
} else if (e1.getMessage().contains(Integer.toString(HttpStatus.EXPECTATION_FAILED.value()))) {
return new ResponseEntity<>(parser.parse(e1.getMessage()), HttpStatus.EXPECTATION_FAILED);
}
else if (e1.getMessage()
.contains(Integer.toString(HttpStatus.SERVICE_UNAVAILABLE.value()))) {
} else if (e1.getMessage()
.contains(Integer.toString(HttpStatus.SERVICE_UNAVAILABLE.value()))) {
return new ResponseEntity<>(parser.parse(RemremGenerateServiceConstants.NO_ER),
HttpStatus.SERVICE_UNAVAILABLE);
}
else {
} else {
return new ResponseEntity<>(parser.parse(e1.getMessage()), HttpStatus.UNPROCESSABLE_ENTITY);
}
} catch (Exception e) {
Expand All @@ -159,6 +180,58 @@ else if (e1.getMessage()
}
}

/*ResponseEntity<?> processJsonElement(JsonElement jsonElement, String msgProtocol, String msgType, Boolean failIfMultipleFound,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the comment

Boolean failIfNoneFound, Boolean lookupInExternalERs, int lookupLimit, Boolean okToLeaveOutInvalidOptionalFields) throws REMGenerateException {

if (jsonElement.isJsonArray()) {
JsonArray jsonArray = jsonElement.getAsJsonArray();
ArrayList<? extends ResponseEntity<?>> arrayList = new ArrayList<>();
for (JsonElement element : jsonArray) {

JsonObject jsonObject = element.getAsJsonObject();
ResponseEntity<?> response2 = cin(jsonObject, msgProtocol,msgType, failIfMultipleFound, okToLeaveOutInvalidOptionalFields, failIfNoneFound,
lookupInExternalERs, lookupLimit);

arrayList.add(response2);

}
return new ResponseEntity<>(arrayList, HttpStatus.OK);

} else if (jsonElement.isJsonObject()) {
JsonObject object = jsonElement.getAsJsonObject();
ResponseEntity<?> response1 = cin(object, msgProtocol,msgType, failIfMultipleFound, okToLeaveOutInvalidOptionalFields, failIfNoneFound,
lookupInExternalERs, lookupLimit);
return new ResponseEntity<>(response1, HttpStatus.OK);
} else {
return new ResponseEntity<>(parser.parse(RemremGenerateServiceConstants.NO_SERVICE_ERROR), HttpStatus.BAD_REQUEST);
}

}*/

/*private ResponseEntity<?> cin(JsonObject jsonElement, String msgProtocol, String msgType, Boolean failIfMultipleFound, Boolean okToLeaveOutInvalidOptionalFields,
Boolean failIfNoneFound, Boolean lookupInExternalERs,
int lookupLimit) throws REMGenerateException {

jsonElement = erLookup(jsonElement, failIfMultipleFound, failIfNoneFound, lookupInExternalERs, lookupLimit);
MsgService msgService = getMessageService(msgProtocol);
String response;
if (msgService != null) {
response = msgService.generateMsg(msgType, jsonElement, isLenientEnabled(okToLeaveOutInvalidOptionalFields));
JsonElement parsedResponse = parser.parse(response);
if (lookupLimit <= 0) {
return new ResponseEntity<>("LookupLimit must be greater than or equals to 1", HttpStatus.BAD_REQUEST);
}
if (!parsedResponse.getAsJsonObject().has(RemremGenerateServiceConstants.JSON_ERROR_MESSAGE_FIELD)) {
return new ResponseEntity<>(parsedResponse, HttpStatus.OK);
} else {
return new ResponseEntity<>(parsedResponse, HttpStatus.BAD_REQUEST);
}
} else {
return new ResponseEntity<>(parser.parse(RemremGenerateServiceConstants.NO_SERVICE_ERROR),
HttpStatus.SERVICE_UNAVAILABLE);
}

}*/
private JsonObject erLookup(final JsonObject bodyJson, Boolean failIfMultipleFound, Boolean failIfNoneFound,
final Boolean lookupInExternalERs, final int lookupLimit)
throws REMGenerateException {
Expand Down
Loading