* limitations under the License.
* ========================LICENSE_END===================================
*/
+
package org.oransc.policyagent.dmaap;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
-import java.io.IOException;
import java.util.Optional;
-import org.onap.dmaap.mr.client.MRBatchingPublisher;
import org.oransc.policyagent.clients.AsyncRestClient;
import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation;
import org.oransc.policyagent.exceptions.ServiceException;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.web.reactive.function.client.WebClientException;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import reactor.core.publisher.Mono;
/**
* The class handles incoming requests from DMAAP.
* <p>
- * That means: invoke a REST call towards this services and to send back a
- * response though DMAAP
+ * That means: invoke a REST call towards this services and to send back a response though DMAAP
*/
public class DmaapMessageHandler {
private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
private static Gson gson = new GsonBuilder() //
.create(); //
- private final MRBatchingPublisher dmaapClient;
+ private final AsyncRestClient dmaapClient;
private final AsyncRestClient agentClient;
- public DmaapMessageHandler(MRBatchingPublisher dmaapClient, AsyncRestClient agentClient) {
+ public DmaapMessageHandler(AsyncRestClient dmaapClient, AsyncRestClient agentClient) {
this.agentClient = agentClient;
this.dmaapClient = dmaapClient;
}
public void handleDmaapMsg(String msg) {
- this.createTask(msg) //
- .subscribe(message -> logger.debug("handleDmaapMsg: {}", message), //
- throwable -> logger.warn("handleDmaapMsg failure ", throwable), //
- () -> logger.debug("handleDmaapMsg complete"));
+ try {
+ String result = this.createTask(msg).block();
+ logger.debug("handleDmaapMsg: {}", result);
+ } catch (Exception throwable) {
+ logger.warn("handleDmaapMsg failure {}", throwable.getMessage());
+ }
}
Mono<String> createTask(String msg) {
try {
DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class);
return this.invokePolicyAgent(dmaapRequestMessage) //
- .onErrorResume(t -> handleAgentCallError(t, msg, dmaapRequestMessage)) //
+ .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) //
.flatMap(
response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage, response.getStatusCode()));
} catch (Exception e) {
- logger.warn("Received unparsable message from DMAAP: {}", msg);
- return Mono.error(e); // Cannot make any response
+ String errorMsg = "Received unparsable message from DMAAP: \"" + msg + "\", reason: " + e.getMessage();
+ return Mono.error(new ServiceException(errorMsg)); // Cannot make any response
}
}
- private Mono<ResponseEntity<String>> handleAgentCallError(Throwable t, String originalMessage,
+ private Mono<ResponseEntity<String>> handleAgentCallError(Throwable error,
DmaapRequestMessage dmaapRequestMessage) {
- logger.debug("Agent call failed: {}", t.getMessage());
- HttpStatus status = HttpStatus.NOT_FOUND;
- String errorMessage = t.getMessage();
- if (t instanceof WebClientResponseException) {
- WebClientResponseException exception = (WebClientResponseException) t;
+ logger.debug("Agent call failed: {}", error.getMessage());
+ HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR;
+ String errorMessage = error.getMessage();
+ if (error instanceof WebClientResponseException) {
+ WebClientResponseException exception = (WebClientResponseException) error;
status = exception.getStatusCode();
errorMessage = exception.getResponseBodyAsString();
- } else if (t instanceof ServiceException) {
+ } else if (error instanceof ServiceException) {
status = HttpStatus.BAD_REQUEST;
- errorMessage = prepareBadOperationErrorMessage(t, originalMessage);
-
+ errorMessage = error.getMessage();
+ } else if (!(error instanceof WebClientException)) {
+ logger.warn("Unexpected exception ", error);
}
return sendDmaapResponse(errorMessage, dmaapRequestMessage, status) //
.flatMap(notUsed -> Mono.empty());
}
- private String prepareBadOperationErrorMessage(Throwable t, String originalMessage) {
- String operationParameterStart = "operation\":\"";
- int indexOfOperationStart = originalMessage.indexOf(operationParameterStart) + operationParameterStart.length();
- int indexOfOperationEnd = originalMessage.indexOf("\",\"", indexOfOperationStart);
- String badOperation = originalMessage.substring(indexOfOperationStart, indexOfOperationEnd);
- return t.getMessage().replace("null", badOperation);
- }
-
private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
DmaapRequestMessage.Operation operation = dmaapRequestMessage.operation();
String uri = dmaapRequestMessage.url();
} else {
return Mono.error(new ServiceException("Not implemented operation: " + operation));
}
-
}
private String payload(DmaapRequestMessage message) {
}
private Mono<String> sendToDmaap(String body) {
- try {
- logger.debug("sendToDmaap: {} ", body);
- dmaapClient.send(body);
- dmaapClient.sendBatchWithResponse();
- return Mono.just("OK");
- } catch (IOException e) {
- return Mono.error(e);
- }
+ logger.debug("sendToDmaap: {} ", body);
+ return dmaapClient.post("", "[" + body + "]");
}
private Mono<String> handleResponseCallError(Throwable t) {