This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new c5a4c46d5b3 NIFI-15766 Fixed modification order for complete status
and Verification Results (#11074)
c5a4c46d5b3 is described below
commit c5a4c46d5b37171b5262258e0a484c3800a0ddde
Author: Pierre Villard <[email protected]>
AuthorDate: Mon Mar 30 22:52:53 2026 +0200
NIFI-15766 Fixed modification order for complete status and Verification
Results (#11074)
Signed-off-by: David Handermann <[email protected]>
---
.../src/main/java/org/apache/nifi/web/api/ConnectorResource.java | 3 +--
.../src/main/java/org/apache/nifi/web/api/ControllerResource.java | 6 ++----
.../java/org/apache/nifi/web/api/ControllerServiceResource.java | 3 +--
.../src/main/java/org/apache/nifi/web/api/ProcessorResource.java | 3 +--
.../main/java/org/apache/nifi/web/api/ReportingTaskResource.java | 3 +--
.../nifi/web/api/concurrent/StandardAsynchronousWebRequest.java | 2 +-
6 files changed, 7 insertions(+), 13 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectorResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectorResource.java
index 2f99790a5ec..5543e2ba717 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectorResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectorResource.java
@@ -1500,13 +1500,11 @@ public class ConnectorResource extends
ApplicationResource {
final String connectorId, final String configurationStepName,
final String requestId) {
final VerifyConnectorConfigStepRequestDTO requestDto =
asyncRequest.getRequest().getRequest();
- final List<ConfigVerificationResultDTO> resultsList =
asyncRequest.getResults();
final VerifyConnectorConfigStepRequestDTO dto = new
VerifyConnectorConfigStepRequestDTO();
dto.setConnectorId(requestDto.getConnectorId());
dto.setConfigurationStepName(requestDto.getConfigurationStepName());
dto.setConfigurationStep(requestDto.getConfigurationStep());
- dto.setResults(resultsList);
dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
@@ -1515,6 +1513,7 @@ public class ConnectorResource extends
ApplicationResource {
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("connectors", connectorId,
"configuration-steps", configurationStepName, "verify-config", requestId));
+ dto.setResults(asyncRequest.getResults());
final VerifyConnectorConfigStepRequestEntity entity = new
VerifyConnectorConfigStepRequestEntity();
entity.setRequest(dto);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
index 4fb23033296..a6af326fb5d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
@@ -1441,12 +1441,10 @@ public class ControllerResource extends
ApplicationResource {
final AsynchronousWebRequest<VerifyConfigRequestEntity,
List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {
final VerifyConfigRequestDTO requestDto =
asyncRequest.getRequest().getRequest();
- final List<ConfigVerificationResultDTO> resultsList =
asyncRequest.getResults();
final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
- dto.setResults(resultsList);
dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
@@ -1455,6 +1453,7 @@ public class ControllerResource extends
ApplicationResource {
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("controller/flow-analysis-rules",
requestDto.getComponentId(), "config", "verification-requests", requestId));
+ dto.setResults(asyncRequest.getResults());
final VerifyConfigRequestEntity entity = new
VerifyConfigRequestEntity();
entity.setRequest(dto);
@@ -1779,13 +1778,11 @@ public class ControllerResource extends
ApplicationResource {
final AsynchronousWebRequest<VerifyConfigRequestEntity,
List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {
final VerifyConfigRequestDTO requestDto =
asyncRequest.getRequest().getRequest();
- final List<ConfigVerificationResultDTO> resultsList =
asyncRequest.getResults();
final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
dto.setAttributes(requestDto.getAttributes());
- dto.setResults(resultsList);
dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
@@ -1794,6 +1791,7 @@ public class ControllerResource extends
ApplicationResource {
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("controller/registry-clients",
requestDto.getComponentId(), "config", "verification-requests", requestId));
+ dto.setResults(asyncRequest.getResults());
final VerifyConfigRequestEntity entity = new
VerifyConfigRequestEntity();
entity.setRequest(dto);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
index 719c359776b..5e4110224a2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
@@ -1176,12 +1176,10 @@ public class ControllerServiceResource extends
ApplicationResource {
final AsynchronousWebRequest<VerifyConfigRequestEntity,
List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {
final VerifyConfigRequestDTO requestDto =
asyncRequest.getRequest().getRequest();
- final List<ConfigVerificationResultDTO> resultsList =
asyncRequest.getResults();
final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
- dto.setResults(resultsList);
dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
@@ -1190,6 +1188,7 @@ public class ControllerServiceResource extends
ApplicationResource {
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("controller-services",
requestDto.getComponentId(), "config", "verification-requests", requestId));
+ dto.setResults(asyncRequest.getResults());
final VerifyConfigRequestEntity entity = new
VerifyConfigRequestEntity();
entity.setRequest(dto);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
index 321bc493d1c..4a10f70adaa 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
@@ -1159,12 +1159,10 @@ public class ProcessorResource extends
ApplicationResource {
final AsynchronousWebRequest<VerifyConfigRequestEntity,
List<ConfigVerificationResultDTO>> asyncRequest,
final String requestId) {
final VerifyConfigRequestDTO requestDto =
asyncRequest.getRequest().getRequest();
- final List<ConfigVerificationResultDTO> resultsList =
asyncRequest.getResults();
final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
- dto.setResults(resultsList);
dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
@@ -1173,6 +1171,7 @@ public class ProcessorResource extends
ApplicationResource {
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("processors",
requestDto.getComponentId(), "config", "verification-requests", requestId));
+ dto.setResults(asyncRequest.getResults());
final VerifyConfigRequestEntity entity = new
VerifyConfigRequestEntity();
entity.setRequest(dto);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java
index 7c69f378113..43048f161d1 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java
@@ -973,12 +973,10 @@ public class ReportingTaskResource extends
ApplicationResource {
final AsynchronousWebRequest<VerifyConfigRequestEntity,
List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {
final VerifyConfigRequestDTO requestDto =
asyncRequest.getRequest().getRequest();
- final List<ConfigVerificationResultDTO> resultsList =
asyncRequest.getResults();
final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
- dto.setResults(resultsList);
dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
@@ -987,6 +985,7 @@ public class ReportingTaskResource extends
ApplicationResource {
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("reporting-tasks",
requestDto.getComponentId(), "config", "verification-requests", requestId));
+ dto.setResults(asyncRequest.getResults());
final VerifyConfigRequestEntity entity = new
VerifyConfigRequestEntity();
entity.setRequest(dto);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/concurrent/StandardAsynchronousWebRequest.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/concurrent/StandardAsynchronousWebRequest.java
index d78c7ef248e..341dc9a9b00 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/concurrent/StandardAsynchronousWebRequest.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/concurrent/StandardAsynchronousWebRequest.java
@@ -102,8 +102,8 @@ public class StandardAsynchronousWebRequest<R, T>
implements AsynchronousWebRequ
}
currentStepIndex++;
- this.complete = currentStepIndex >= updateSteps.size();
this.results = results;
+ this.complete = currentStepIndex >= updateSteps.size();
this.lastUpdated = new Date();
this.percentComplete = currentStepIndex * 100 / updateSteps.size();
}
