- return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) //
- .flatMap(notUsed -> Mono.empty());
+ if (t instanceof ServiceException) {
+ String errorMessage = prepareBadOperationErrorMessage(t, origianalMessage);
+ return sendDmaapResponse(errorMessage, dmaapRequestMessage, HttpStatus.NOT_FOUND) //
+ .flatMap(notUsed -> Mono.empty());
+ } else {
+ return sendDmaapResponse(t.toString(), dmaapRequestMessage, HttpStatus.NOT_FOUND) //
+ .flatMap(notUsed -> Mono.empty());
+ }
+ }
+
+ private String prepareBadOperationErrorMessage(Throwable t, String origianalMessage) {
+ String badOperation = origianalMessage.substring(origianalMessage.indexOf("operation\":\"") + 12,
+ origianalMessage.indexOf(",\"url\":"));
+ String errorMessage = t.getMessage().replace("null", badOperation);
+ return errorMessage;