This is an automated email from the ASF dual-hosted git repository.
pvillard 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 1e1a1dfd488 NIFI-15337 - Fix optional ComponentStateEntity handling
for clear-requests
1e1a1dfd488 is described below
commit 1e1a1dfd48845ea15a0b9682412884d15e0a0739
Author: László Dénes Terjéki <[email protected]>
AuthorDate: Sat Dec 13 16:07:29 2025 +0100
NIFI-15337 - Fix optional ComponentStateEntity handling for clear-requests
Signed-off-by: Pierre Villard <[email protected]>
This closes #10639.
---
.../src/main/java/org/apache/nifi/web/api/ControllerResource.java | 6 +++++-
.../java/org/apache/nifi/web/api/ControllerServiceResource.java | 6 +++++-
.../java/org/apache/nifi/web/api/ParameterProviderResource.java | 6 +++++-
.../src/main/java/org/apache/nifi/web/api/ProcessorResource.java | 6 +++++-
.../main/java/org/apache/nifi/web/api/ReportingTaskResource.java | 6 +++++-
5 files changed, 25 insertions(+), 5 deletions(-)
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 90d98197a39..a3d0a1cf279 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
@@ -720,7 +720,11 @@ public class ControllerResource extends
ApplicationResource {
) final ComponentStateEntity componentStateEntity) {
if (isReplicateRequest()) {
- return replicate(HttpMethod.POST, componentStateEntity);
+ if (componentStateEntity == null) {
+ return replicate(HttpMethod.POST);
+ } else {
+ return replicate(HttpMethod.POST, componentStateEntity);
+ }
}
final FlowAnalysisRuleEntity requestFlowAnalysisRuleEntity = new
FlowAnalysisRuleEntity();
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 6dde123c462..8392b90fa73 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
@@ -378,7 +378,11 @@ public class ControllerServiceResource extends
ApplicationResource {
) final ComponentStateEntity componentStateEntity) {
if (isReplicateRequest()) {
- return replicate(HttpMethod.POST, componentStateEntity);
+ if (componentStateEntity == null) {
+ return replicate(HttpMethod.POST);
+ } else {
+ return replicate(HttpMethod.POST, componentStateEntity);
+ }
}
final ControllerServiceEntity requestControllerServiceEntity = new
ControllerServiceEntity();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
index f5b6d8109fe..5efcc435d6b 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
@@ -472,7 +472,11 @@ public class ParameterProviderResource extends
AbstractParameterResource {
) final ComponentStateEntity componentStateEntity) {
if (isReplicateRequest()) {
- return replicate(HttpMethod.POST, componentStateEntity);
+ if (componentStateEntity == null) {
+ return replicate(HttpMethod.POST);
+ } else {
+ return replicate(HttpMethod.POST, componentStateEntity);
+ }
}
final ParameterProviderEntity requestParameterProviderEntity = new
ParameterProviderEntity();
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 f26f0390fed..0b259159095 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
@@ -521,7 +521,11 @@ public class ProcessorResource extends ApplicationResource
{
) final ComponentStateEntity componentStateEntity) throws
InterruptedException {
if (isReplicateRequest()) {
- return replicate(HttpMethod.POST, componentStateEntity);
+ if (componentStateEntity == null) {
+ return replicate(HttpMethod.POST);
+ } else {
+ return replicate(HttpMethod.POST, componentStateEntity);
+ }
}
final ProcessorEntity requestProcessorEntity = new ProcessorEntity();
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 c139ded985c..1c42edc7121 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
@@ -363,7 +363,11 @@ public class ReportingTaskResource extends
ApplicationResource {
) final ComponentStateEntity componentStateEntity) {
if (isReplicateRequest()) {
- return replicate(HttpMethod.POST, componentStateEntity);
+ if (componentStateEntity == null) {
+ return replicate(HttpMethod.POST);
+ } else {
+ return replicate(HttpMethod.POST, componentStateEntity);
+ }
}
final ReportingTaskEntity requestReportTaskEntity = new
ReportingTaskEntity();
