Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove code smells in dashboard"
[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
15d9952
..
b23595a
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
@@
-38,7
+38,6
@@
public class DmaapMessageHandler {
private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
private static Gson gson = new GsonBuilder() //
private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandler.class);
private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
.create(); //
private final MRBatchingPublisher dmaapClient;
.create(); //
private final MRBatchingPublisher dmaapClient;
@@
-85,15
+84,24
@@
public class DmaapMessageHandler {
} else if (operation == Operation.GET) {
result = agentClient.get(uri);
} else if (operation == Operation.PUT) {
} else if (operation == Operation.GET) {
result = agentClient.get(uri);
} else if (operation == Operation.PUT) {
- result = agentClient.put(uri,
dmaapRequestMessage.payload(
));
+ result = agentClient.put(uri,
payload(dmaapRequestMessage
));
} else if (operation == Operation.POST) {
} else if (operation == Operation.POST) {
- result = agentClient.post(uri,
dmaapRequestMessage.payload(
));
+ result = agentClient.post(uri,
payload(dmaapRequestMessage
));
} else {
return Mono.error(new Exception("Not implemented operation: " + operation));
}
return result;
}
} else {
return Mono.error(new Exception("Not implemented operation: " + operation));
}
return result;
}
+ private String payload(DmaapRequestMessage message) {
+ if (message.payload().isPresent()) {
+ return gson.toJson(message.payload().get());
+ } else {
+ logger.warn("Expected payload in message from DMAAP: {}", message);
+ return "";
+ }
+ }
+
private Mono<String> sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage,
HttpStatus status) {
return getDmaapResponseMessage(dmaapRequestMessage, response, status) //
private Mono<String> sendDmaapResponse(String response, DmaapRequestMessage dmaapRequestMessage,
HttpStatus status) {
return getDmaapResponseMessage(dmaapRequestMessage, response, status) //