RED-9472
fixing 500 bug when calling upload endpoint
This commit is contained in:
parent
d406b0a207
commit
1a7421a225
@ -75,16 +75,27 @@ public class RulesController implements RulesResource {
|
||||
if (ruleEntityOptional.isPresent()) {
|
||||
RulesUpdateRequest rulesUpdateRequest = new RulesUpdateRequest(ruleEntityOptional.get().getValue(), rules.getRules());
|
||||
try {
|
||||
ResponseEntity mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest);
|
||||
ResponseEntity<RulesUploadResponse> mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest);
|
||||
|
||||
if (mergedRules == null || mergedRules.getBody() == null) {
|
||||
throw new BadRequestException("Failed to merge rules - received null response from service");
|
||||
}
|
||||
|
||||
if (mergedRules.getStatusCode().equals(HttpStatus.UNPROCESSABLE_ENTITY)) {
|
||||
DroolsValidationResponse mergedRulesValidationResponse = ((RulesUploadResponse) mergedRules.getBody()).getDroolsValidationResponse();
|
||||
DroolsValidationResponse mergedRulesValidationResponse = mergedRules.getBody().getDroolsValidationResponse();
|
||||
return new ResponseEntity<>(mergedRulesValidationResponse, !rules.isDryRun() ? HttpStatus.UNPROCESSABLE_ENTITY : HttpStatus.OK);
|
||||
}
|
||||
mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules();
|
||||
|
||||
mergedRulesString = mergedRules.getBody().getRules();
|
||||
if (mergedRulesString == null) {
|
||||
throw new BadRequestException("Failed to merge rules - merged result is null");
|
||||
}
|
||||
|
||||
} catch (FeignException e) {
|
||||
if (e.status() == HttpStatus.BAD_REQUEST.value()) {
|
||||
throw new BadRequestException("The provided rule file is not a valid drools rule file!");
|
||||
}
|
||||
throw new BadRequestException("Failed to merge rules: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
if (!rules.isDryRun()) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user