Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove using of DMAAP client from ONAP
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
dmaap
/
DmaapMessageHandler.java
diff --git
a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
index
b0c2caf
..
efdccd8
100644
(file)
--- a/
policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
+++ b/
policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java
@@
-17,16
+17,15
@@
* limitations under the License.
* ========================LICENSE_END===================================
*/
* 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;
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 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.oransc.policyagent.clients.AsyncRestClient;
import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation;
import org.oransc.policyagent.exceptions.ServiceException;
@@
-34,6
+33,7
@@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
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;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import reactor.core.publisher.Mono;
@@
-47,52
+47,63
@@
public class DmaapMessageHandler {
private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
private static Gson gson = new GsonBuilder() //
.create(); //
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;
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.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) //
}
Mono<String> createTask(String msg) {
try {
DmaapRequestMessage dmaapRequestMessage = gson.fromJson(msg, ImmutableDmaapRequestMessage.class);
return this.invokePolicyAgent(dmaapRequestMessage) //
- .onErrorResume(t -> handleAgentCallError(t, dmaapRequestMessage)) //
+ .onErrorResume(t -> handleAgentCallError(t,
msg,
dmaapRequestMessage)) //
.flatMap(
.flatMap(
-
response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage, response.getStatusCode()));
} catch (Exception e) {
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, DmaapRequestMessage dmaapRequestMessage) {
+ private Mono<ResponseEntity<String>> handleAgentCallError(Throwable t, String originalMessage,
+ DmaapRequestMessage dmaapRequestMessage) {
logger.debug("Agent call failed: {}", t.getMessage());
logger.debug("Agent call failed: {}", t.getMessage());
- HttpStatus status = HttpStatus.
NOT_FOUND
;
+ HttpStatus status = HttpStatus.
INTERNAL_SERVER_ERROR
;
String errorMessage = t.getMessage();
if (t instanceof WebClientResponseException) {
WebClientResponseException exception = (WebClientResponseException) t;
status = exception.getStatusCode();
errorMessage = exception.getResponseBodyAsString();
String errorMessage = t.getMessage();
if (t instanceof WebClientResponseException) {
WebClientResponseException exception = (WebClientResponseException) t;
status = exception.getStatusCode();
errorMessage = exception.getResponseBodyAsString();
+ } else if (t instanceof ServiceException) {
+ status = HttpStatus.BAD_REQUEST;
+ errorMessage = prepareBadOperationErrorMessage(t, originalMessage);
+ } else if (!(t instanceof WebClientException)) {
+ logger.warn("Unexpected exception ", t);
}
return sendDmaapResponse(errorMessage, dmaapRequestMessage, status) //
.flatMap(notUsed -> Mono.empty());
}
}
return sendDmaapResponse(errorMessage, dmaapRequestMessage, status) //
.flatMap(notUsed -> Mono.empty());
}
+ private String prepareBadOperationErrorMessage(Throwable t, String originalMessage) {
+ return t.getMessage();
+ }
+
private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
DmaapRequestMessage.Operation operation = dmaapRequestMessage.operation();
private Mono<ResponseEntity<String>> invokePolicyAgent(DmaapRequestMessage dmaapRequestMessage) {
DmaapRequestMessage.Operation operation = dmaapRequestMessage.operation();
-
String uri = dmaapRequestMessage.url();
String uri = dmaapRequestMessage.url();
+
if (operation == Operation.DELETE) {
return agentClient.deleteForEntity(uri);
} else if (operation == Operation.GET) {
if (operation == Operation.DELETE) {
return agentClient.deleteForEntity(uri);
} else if (operation == Operation.GET) {
@@
-104,7
+115,6
@@
public class DmaapMessageHandler {
} else {
return Mono.error(new ServiceException("Not implemented operation: " + operation));
}
} else {
return Mono.error(new ServiceException("Not implemented operation: " + operation));
}
-
}
private String payload(DmaapRequestMessage message) {
}
private String payload(DmaapRequestMessage message) {
@@
-125,18
+135,12
@@
public class DmaapMessageHandler {
}
private Mono<String> sendToDmaap(String body) {
}
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) {
}
private Mono<String> handleResponseCallError(Throwable t) {
- logger.debug("Failed to
respond
: {}", t.getMessage());
+ logger.debug("Failed to
send response to DMaaP
: {}", t.getMessage());
return Mono.empty();
}
return Mono.empty();
}
@@
-144,12
+148,12
@@
public class DmaapMessageHandler {
HttpStatus status) {
DmaapResponseMessage dmaapResponseMessage = ImmutableDmaapResponseMessage.builder() //
.status(status.toString()) //
HttpStatus status) {
DmaapResponseMessage dmaapResponseMessage = ImmutableDmaapResponseMessage.builder() //
.status(status.toString()) //
- .message(response) //
+ .message(response
== null ? "" : response
) //
.type("response") //
.type("response") //
- .correlationId(dmaapRequestMessage.correlationId()) //
- .originatorId(dmaapRequestMessage.originatorId()) //
- .requestId(dmaapRequestMessage.requestId()) //
- .timestamp(dmaapRequestMessage.timestamp()) //
+ .correlationId(dmaapRequestMessage.correlationId()
== null ? "" : dmaapRequestMessage.correlationId()
) //
+ .originatorId(dmaapRequestMessage.originatorId()
== null ? "" : dmaapRequestMessage.originatorId()
) //
+ .requestId(dmaapRequestMessage.requestId()
== null ? "" : dmaapRequestMessage.requestId()
) //
+ .timestamp(dmaapRequestMessage.timestamp()
== null ? "" : dmaapRequestMessage.timestamp()
) //
.build();
String str = gson.toJson(dmaapResponseMessage);
return Mono.just(str);
.build();
String str = gson.toJson(dmaapResponseMessage);
return Mono.just(str);