This is an automated email from the ASF dual-hosted git repository.
briansolo1985 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 25ca4b4c20 NIFI-14149 Fix invalid MiNiFi flow json by setting the
default value of maxTimerDrivenThreadCount and update minifi-toolkit command
set with examples
25ca4b4c20 is described below
commit 25ca4b4c20c8341ca63834a00de45220f6eee975
Author: Peter Kedvessy <[email protected]>
AuthorDate: Sat Jan 11 00:33:16 2025 +0100
NIFI-14149 Fix invalid MiNiFi flow json by setting the default value of
maxTimerDrivenThreadCount and update minifi-toolkit command set with examples
Signed-off-by: Ferenc Kis <[email protected]>
This closes #9628.
---
minifi/minifi-toolkit/minifi-toolkit-assembly/README.md | 7 ++++++-
.../toolkit/configuration/json/TransformNifiCommandFactory.java | 6 ++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/README.md
b/minifi/minifi-toolkit/minifi-toolkit-assembly/README.md
index c6651d313e..dd82bcb8de 100644
--- a/minifi/minifi-toolkit/minifi-toolkit-assembly/README.md
+++ b/minifi/minifi-toolkit/minifi-toolkit-assembly/README.md
@@ -48,7 +48,8 @@ After downloading the binary and extracting it, to run the
MiNiFi Toolkit Conver
java org.apache.nifi.minifi.toolkit.configuration.ConfigMain <command>
options
Valid commands include:
- transform-yml: Transforms legacy MiNiFi flow config YAML into MiNiFi
flow config JSON
+ - transform-nifi: Transform NiFi2 flow JSON format into MiNifi flow JSON
format
+ - transform-yml: Transforms legacy MiNiFi flow config YAML into MiNiFi
flow config JSON
## Example
- You have an older version of MiNiFi located in <legacy_minifi_directory>.
@@ -57,6 +58,10 @@ After downloading the binary and extracting it, to run the
MiNiFi Toolkit Conver
```
./config.sh transform-yml <legacy_minifi_directory>/conf/config.yml
<legacy_minifi_directory>/conf/bootstrap.conf
<latest_minifi_directory>/conf/flow.json.raw
<latest_minifi_directory>/conf/bootstrap.conf
```
+- Run the following command to transform NiFi flow JSON format into MiNifi
flow JSON format
+```
+./config.sh transform-nifi <downloaded_nifi2_flow_json_file>
<minifi_flow_json_file>
+```
## Note
It's not guaranteed in all circumstances that the migration will result in a
correct flow. For example if a processor's configuration has changed between
version, the conversion tool won't be aware of this, and will use the
deprecated property names. You will need to fix such issues manually.
diff --git
a/minifi/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/json/TransformNifiCommandFactory.java
b/minifi/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/json/TransformNifiCommandFactory.java
index 69ec5214b7..01edccb199 100644
---
a/minifi/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/json/TransformNifiCommandFactory.java
+++
b/minifi/minifi-toolkit/minifi-toolkit-configuration/src/main/java/org/apache/nifi/minifi/toolkit/configuration/json/TransformNifiCommandFactory.java
@@ -27,6 +27,7 @@ import
org.apache.nifi.minifi.toolkit.configuration.ConfigMain;
import org.apache.nifi.minifi.toolkit.configuration.ConfigTransformException;
import org.apache.nifi.minifi.toolkit.configuration.PathInputStreamFactory;
import org.apache.nifi.minifi.toolkit.configuration.PathOutputStreamFactory;
+import org.apache.nifi.minifi.toolkit.schema.CorePropertiesSchema;
import org.apache.nifi.registry.flow.RegisteredFlowSnapshot;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -63,8 +64,9 @@ public class TransformNifiCommandFactory {
RegisteredFlowSnapshot registeredFlowSnapshot =
readNifiFlow(sourceNiFiJsonPath);
VersionedDataflow versionedDataflow = new VersionedDataflow();
versionedDataflow.setRootGroup(registeredFlowSnapshot.getFlowContents());
- versionedDataflow
- .setParameterContexts(new
ArrayList<>(registeredFlowSnapshot.getParameterContexts().values()));
+ versionedDataflow.setParameterContexts(new
ArrayList<>(registeredFlowSnapshot.getParameterContexts().values()));
+
versionedDataflow.setMaxTimerDrivenThreadCount(CorePropertiesSchema.DEFAULT_MAX_CONCURRENT_THREADS);
+
persistFlowJson(versionedDataflow, targetMiNiFiJsonPath);
} catch (ConfigTransformException e) {
System.out.println("Unable to convert NiFi JSON to MiNiFi flow
JSON: " + e);
