rliszli commented on code in PR #6281:
URL: https://github.com/apache/nifi/pull/6281#discussion_r955751469
##########
c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/UpdateConfigurationOperationHandler.java:
##########
@@ -75,30 +75,44 @@ public C2OperationAck handle(C2Operation operation) {
.map(map -> map.get(LOCATION))
.orElse(EMPTY);
- String newFlowId = parseFlowId(updateLocation);
- if (flowIdHolder.getFlowId() == null ||
!flowIdHolder.getFlowId().equals(newFlowId)) {
- logger.info("Will perform flow update from {} for operation #{}.
Previous flow id was {}, replacing with new id {}", updateLocation,
opIdentifier,
- flowIdHolder.getFlowId() == null ? "not set" :
flowIdHolder.getFlowId(), newFlowId);
+ String flowId = getFlowId(operation.getArgs(), updateLocation);
+ if (flowId == null) {
+ state.setState(C2OperationState.OperationState.NOT_APPLIED);
+ state.setDetails("Could not get flowId from the operation.");
+ logger.info("FlowId is missing, no update will be performed.");
} else {
- logger.info("Flow is current, no update is necessary...");
+ if (flowIdHolder.getFlowId() == null ||
!flowIdHolder.getFlowId().equals(flowId)) {
+ logger.info("Will perform flow update from {} for operation
#{}. Previous flow id was {}, replacing with new id {}", updateLocation,
opIdentifier,
+ flowIdHolder.getFlowId() == null ? "not set" :
flowIdHolder.getFlowId(), flowId);
+ } else {
+ logger.info("Flow is current, no update is necessary...");
+ }
+ flowIdHolder.setFlowId(flowId);
+ state.setState(updateFlow(opIdentifier, updateLocation));
}
+ return operationAck;
+ }
- flowIdHolder.setFlowId(newFlowId);
+ private C2OperationState.OperationState updateFlow(String opIdentifier,
String updateLocation) {
Optional<byte[]> updateContent =
client.retrieveUpdateContent(updateLocation);
if (updateContent.isPresent()) {
if (updateFlow.apply(updateContent.get())) {
- state.setState(C2OperationState.OperationState.FULLY_APPLIED);
logger.debug("Update configuration applied for operation
#{}.", opIdentifier);
+ return C2OperationState.OperationState.FULLY_APPLIED;
} else {
- state.setState(C2OperationState.OperationState.NOT_APPLIED);
logger.error("Update resulted in error for operation #{}.",
opIdentifier);
+ return C2OperationState.OperationState.NOT_APPLIED;
}
} else {
- state.setState(C2OperationState.OperationState.NOT_APPLIED);
logger.error("Update content retrieval resulted in empty content
so flow update was omitted for operation #{}.", opIdentifier);
+ return C2OperationState.OperationState.NOT_APPLIED;
}
+ }
- return operationAck;
+ private String getFlowId(Map<String, String> args, String updateLocation) {
+ Optional<String> flowId = Optional.ofNullable(args)
Review Comment:
Agreed. Removed, thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
