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 666f60b685 NIFI-15522 Moved BootstrapCommunicator interface to MiNiFi
Framework API
666f60b685 is described below
commit 666f60b685241656ccddda59e9742cef39effda5
Author: exceptionfactory <[email protected]>
AuthorDate: Wed Jan 28 11:06:30 2026 -0600
NIFI-15522 Moved BootstrapCommunicator interface to MiNiFi Framework API
This closes #10823.
Signed-off-by: Pierre Villard <[email protected]>
---
.../org/apache/nifi/minifi}/bootstrap/BootstrapCommunicator.java | 2 +-
.../java/org/apache/nifi/minifi}/bootstrap/CommandResult.java | 2 +-
.../apache/nifi/minifi/c2/BootstrapC2OperationRestartHandler.java | 8 ++++----
.../main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java | 2 +-
.../nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java | 8 ++++----
.../java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java | 6 ++----
6 files changed, 13 insertions(+), 15 deletions(-)
diff --git
a/nifi-framework-api/src/main/java/org/apache/nifi/bootstrap/BootstrapCommunicator.java
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCommunicator.java
similarity index 97%
rename from
nifi-framework-api/src/main/java/org/apache/nifi/bootstrap/BootstrapCommunicator.java
rename to
minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCommunicator.java
index 1bfc1563d9..86ba8d55e7 100644
---
a/nifi-framework-api/src/main/java/org/apache/nifi/bootstrap/BootstrapCommunicator.java
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapCommunicator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nifi.bootstrap;
+package org.apache.nifi.minifi.bootstrap;
import java.io.IOException;
import java.io.OutputStream;
diff --git
a/nifi-framework-api/src/main/java/org/apache/nifi/bootstrap/CommandResult.java
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/src/main/java/org/apache/nifi/minifi/bootstrap/CommandResult.java
similarity index 95%
rename from
nifi-framework-api/src/main/java/org/apache/nifi/bootstrap/CommandResult.java
rename to
minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/src/main/java/org/apache/nifi/minifi/bootstrap/CommandResult.java
index ebb9bde6d3..e75a7e7e83 100644
---
a/nifi-framework-api/src/main/java/org/apache/nifi/bootstrap/CommandResult.java
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/src/main/java/org/apache/nifi/minifi/bootstrap/CommandResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nifi.bootstrap;
+package org.apache.nifi.minifi.bootstrap;
public enum CommandResult {
FAILURE,
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandler.java
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandler.java
index b23e3d3e55..d3847074ab 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandler.java
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandler.java
@@ -17,11 +17,11 @@
package org.apache.nifi.minifi.c2;
-import org.apache.nifi.bootstrap.BootstrapCommunicator;
-import org.apache.nifi.bootstrap.CommandResult;
import org.apache.nifi.c2.client.service.operation.C2OperationRestartHandler;
import org.apache.nifi.c2.protocol.api.C2Operation;
import org.apache.nifi.c2.protocol.api.C2OperationState.OperationState;
+import org.apache.nifi.minifi.bootstrap.BootstrapCommunicator;
+import org.apache.nifi.minifi.bootstrap.CommandResult;
import org.apache.nifi.minifi.commons.api.MiNiFiCommandState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,9 +37,9 @@ import java.util.concurrent.BlockingQueue;
import static java.util.Optional.empty;
import static java.util.Optional.ofNullable;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.nifi.bootstrap.CommandResult.FAILURE;
-import static org.apache.nifi.bootstrap.CommandResult.SUCCESS;
import static
org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.NOT_APPLIED;
+import static org.apache.nifi.minifi.bootstrap.CommandResult.FAILURE;
+import static org.apache.nifi.minifi.bootstrap.CommandResult.SUCCESS;
public class BootstrapC2OperationRestartHandler implements
C2OperationRestartHandler {
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java
index 5e7ecbcac6..56cf077d40 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java
@@ -19,7 +19,6 @@ package org.apache.nifi.minifi.c2;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.nifi.bootstrap.BootstrapCommunicator;
import org.apache.nifi.c2.client.C2ClientConfig;
import org.apache.nifi.c2.client.http.C2HttpClient;
import org.apache.nifi.c2.client.service.C2HeartbeatFactory;
@@ -64,6 +63,7 @@ import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.manifest.RuntimeManifestService;
import org.apache.nifi.manifest.StandardRuntimeManifestService;
+import org.apache.nifi.minifi.bootstrap.BootstrapCommunicator;
import org.apache.nifi.minifi.c2.command.DefaultFlowStateStrategy;
import org.apache.nifi.minifi.c2.command.DefaultProcessorStateStrategy;
import org.apache.nifi.minifi.c2.command.DefaultUpdateConfigurationStrategy;
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/test/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/test/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java
index f7bdca9184..8d947e3269 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/test/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/test/java/org/apache/nifi/minifi/c2/BootstrapC2OperationRestartHandlerTest.java
@@ -17,10 +17,10 @@
package org.apache.nifi.minifi.c2;
-import org.apache.nifi.bootstrap.BootstrapCommunicator;
-import org.apache.nifi.bootstrap.CommandResult;
import org.apache.nifi.c2.protocol.api.C2Operation;
import org.apache.nifi.c2.protocol.api.C2OperationState.OperationState;
+import org.apache.nifi.minifi.bootstrap.BootstrapCommunicator;
+import org.apache.nifi.minifi.bootstrap.CommandResult;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -33,11 +33,11 @@ import java.util.function.BiConsumer;
import static java.lang.Thread.sleep;
import static java.util.concurrent.Executors.newVirtualThreadPerTaskExecutor;
-import static org.apache.nifi.bootstrap.CommandResult.FAILURE;
-import static org.apache.nifi.bootstrap.CommandResult.SUCCESS;
import static
org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.FULLY_APPLIED;
import static
org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.NOT_APPLIED;
import static org.apache.nifi.c2.protocol.api.OperationType.START;
+import static org.apache.nifi.minifi.bootstrap.CommandResult.FAILURE;
+import static org.apache.nifi.minifi.bootstrap.CommandResult.SUCCESS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java
index ce6a0a1656..4909664355 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/src/main/java/org/apache/nifi/minifi/bootstrap/BootstrapListener.java
@@ -19,8 +19,6 @@ package org.apache.nifi.minifi.bootstrap;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.nifi.bootstrap.BootstrapCommunicator;
-import org.apache.nifi.bootstrap.CommandResult;
import org.apache.nifi.minifi.MiNiFiServer;
import org.apache.nifi.minifi.commons.status.FlowStatusReport;
import org.apache.nifi.minifi.status.StatusRequestException;
@@ -47,8 +45,8 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.BiConsumer;
-import static org.apache.nifi.bootstrap.CommandResult.FAILURE;
-import static org.apache.nifi.bootstrap.CommandResult.SUCCESS;
+import static org.apache.nifi.minifi.bootstrap.CommandResult.FAILURE;
+import static org.apache.nifi.minifi.bootstrap.CommandResult.SUCCESS;
public class BootstrapListener implements BootstrapCommunicator {
