You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2025/12/10 18:56:13 UTC

(nifi) branch NIFI-15318-1 created (now 588cde2d31)

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a change to branch NIFI-15318-1
in repository https://gitbox.apache.org/repos/asf/nifi.git


      at 588cde2d31 NIFI-15317 Fixed Script Engine property name migration

This branch includes the following new commits:

     new cef145874d NIFI-15309 Fixed property migration for FetchGridFS (#10620)
     new eeec3c4f24 NIFI-15297 Support setting configuredForClustering in mock contexts
     new 588cde2d31 NIFI-15317 Fixed Script Engine property name migration

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(nifi) 03/03: NIFI-15317 Fixed Script Engine property name migration

Posted by ex...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch NIFI-15318-1
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 588cde2d313d22cf7e55d9a7195991b828a94b63
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Tue Dec 9 21:15:12 2025 -0600

    NIFI-15317 Fixed Script Engine property name migration
    
    - Reverted Script Language property name to Script Engine
    - Added migrate properties method to scripting components to cover released versions
    - Added unit tests for migrate properties in representative components
    
    Signed-off-by: Pierre Villard <pi...@gmail.com>
    
    This closes #10623.
    
    (cherry picked from commit 6e866b85db640cea63887ef016134ee2340998d6)
---
 .../nifi/processors/script/ExecuteScript.java      |  5 ++++
 .../processors/script/InvokeScriptedProcessor.java |  6 ++++
 .../processors/script/ScriptedRecordProcessor.java |  9 ++----
 .../reporting/script/ScriptedReportingTask.java    |  6 ++++
 .../script/AbstractScriptedControllerService.java  |  6 ++++
 .../nifi/script/ScriptingComponentHelper.java      | 33 ++++++++++++++++------
 .../processors/script/ExecuteScriptGroovyTest.java | 20 ++++++++++++-
 .../script/TestScriptingComponentHelper.java       | 32 +++++++++++++++++++--
 .../nifi/record/script/ScriptedReaderTest.java     | 20 +++++++++++++
 .../script/ScriptedReportingTaskTest.java          | 33 ++++++++++++++++++++--
 10 files changed, 149 insertions(+), 21 deletions(-)

diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
index 277a79e507..865e255949 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
@@ -37,6 +37,7 @@ import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.components.state.Scope;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
@@ -100,6 +101,10 @@ public class ExecuteScript extends AbstractSessionFactoryProcessor implements Se
     private volatile String scriptToRun = null;
     volatile ScriptingComponentHelper scriptingComponentHelper = new ScriptingComponentHelper();
 
+    @Override
+    public void migrateProperties(final PropertyConfiguration config) {
+        ScriptingComponentHelper.migrateProperties(config);
+    }
 
     /**
      * Returns the valid relationships for this processor.
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
index afb9308f13..f96e5d5594 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
@@ -42,6 +42,7 @@ import org.apache.nifi.controller.ControllerServiceLookup;
 import org.apache.nifi.controller.NodeTypeProvider;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSessionFactory;
@@ -106,6 +107,11 @@ public class InvokeScriptedProcessor extends AbstractSessionFactoryProcessor {
     private volatile File kerberosServiceKeytab = null;
     volatile ScriptingComponentHelper scriptingComponentHelper = new ScriptingComponentHelper();
 
+    @Override
+    public void migrateProperties(final PropertyConfiguration config) {
+        ScriptingComponentHelper.migrateProperties(config);
+    }
+
     /**
      * Returns the valid relationships for this processor as supplied by the
      * script itself.
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java
index 6272ac9087..88bb16b276 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java
@@ -70,12 +70,9 @@ abstract class ScriptedRecordProcessor extends AbstractProcessor implements Sear
             .identifiesControllerService(RecordSetWriterFactory.class)
             .build();
 
-    static final PropertyDescriptor LANGUAGE = new PropertyDescriptor.Builder()
-            .name(ScriptingComponentHelper.SCRIPT_ENGINE_PROPERTY)
-            .description("The Language to use for the script")
+    static final PropertyDescriptor LANGUAGE = ScriptingComponentHelper.getScriptEnginePropertyBuilder()
             .allowableValues(SCRIPT_OPTIONS)
             .defaultValue("Groovy")
-            .required(true)
             .build();
 
     protected static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS = List.of(
@@ -140,8 +137,8 @@ abstract class ScriptedRecordProcessor extends AbstractProcessor implements Sear
     }
 
     @Override
-    public void migrateProperties(PropertyConfiguration config) {
-        config.renameProperty("Script Engine", LANGUAGE.getName());
+    public void migrateProperties(final PropertyConfiguration config) {
+        ScriptingComponentHelper.migrateProperties(config);
     }
 
     protected static Bindings setupBindings(final ScriptEngine scriptEngine) {
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/reporting/script/ScriptedReportingTask.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/reporting/script/ScriptedReportingTask.java
index c90099da36..dc48a37c8a 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/reporting/script/ScriptedReportingTask.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/reporting/script/ScriptedReportingTask.java
@@ -32,6 +32,7 @@ import org.apache.nifi.controller.ConfigurationContext;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.metrics.jvm.JmxJvmMetrics;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.processors.script.ScriptRunner;
@@ -79,6 +80,11 @@ public class ScriptedReportingTask extends AbstractReportingTask {
     private volatile String scriptToRun = null;
     private volatile JmxJvmMetrics vmMetrics;
 
+    @Override
+    public void migrateProperties(final PropertyConfiguration config) {
+        ScriptingComponentHelper.migrateProperties(config);
+    }
+
     /**
      * Returns a list of property descriptors supported by this processor. The list always includes properties such as
      * script engine name, script file name, script body name, script arguments, and an external module path. If the
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/AbstractScriptedControllerService.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/AbstractScriptedControllerService.java
index 174f3dcd65..8931039ab6 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/AbstractScriptedControllerService.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/AbstractScriptedControllerService.java
@@ -25,6 +25,7 @@ import org.apache.nifi.controller.AbstractControllerService;
 import org.apache.nifi.controller.ConfigurationContext;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.processors.script.ScriptRunner;
 import org.apache.nifi.util.StringUtils;
@@ -52,6 +53,11 @@ public abstract class AbstractScriptedControllerService extends AbstractControll
     protected volatile ScriptingComponentHelper scriptingComponentHelper = new ScriptingComponentHelper();
     protected volatile ConfigurationContext configurationContext = null;
 
+    @Override
+    public void migrateProperties(final PropertyConfiguration config) {
+        ScriptingComponentHelper.migrateProperties(config);
+    }
+
     /**
      * Returns a list of property descriptors supported by this record reader. The
      * list always includes properties such as script engine name, script file
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
index f6d23c6517..21f255a2fc 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentHelper.java
@@ -24,6 +24,7 @@ import org.apache.nifi.components.resource.ResourceReferences;
 import org.apache.nifi.context.PropertyContext;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processors.script.ScriptRunner;
 import org.apache.nifi.util.StringUtils;
@@ -43,6 +44,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -54,9 +56,11 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
  * This class contains variables and methods common to scripting processors, reporting tasks, etc.
  */
 public class ScriptingComponentHelper {
-    public static final String SCRIPT_ENGINE_PROPERTY = "Script Language";
     private static final String UNKNOWN_VERSION = "UNKNOWN";
 
+    private static final String SCRIPT_ENGINE_PROPERTY_NAME = "Script Engine";
+    private static final String SCRIPT_LANGUAGE_PROPERTY_NAME = "Script Language";
+
     public PropertyDescriptor SCRIPT_ENGINE;
 
     public final AtomicBoolean isInitialized = new AtomicBoolean(false);
@@ -71,6 +75,25 @@ public class ScriptingComponentHelper {
 
     public BlockingQueue<ScriptRunner> scriptRunnerQ = null;
 
+    /**
+     * Get Property Descriptor Builder for Script Engine with standard settings and no default value configured
+     *
+     * @return Property Descriptor Builder
+     */
+    public static PropertyDescriptor.Builder getScriptEnginePropertyBuilder() {
+        return new PropertyDescriptor.Builder()
+                .name("Script Engine")
+                .required(true)
+                .description("Language Engine for executing scripts")
+                .expressionLanguageSupported(ExpressionLanguageScope.NONE);
+    }
+
+    public static void migrateProperties(final PropertyConfiguration configuration) {
+        Objects.requireNonNull(configuration, "Property Configuration required");
+        // Revert name changes from NIFI-15108
+        configuration.renameProperty(SCRIPT_LANGUAGE_PROPERTY_NAME, SCRIPT_ENGINE_PROPERTY_NAME);
+    }
+
     public String getScriptEngineName() {
         return scriptEngineName;
     }
@@ -175,13 +198,7 @@ public class ScriptingComponentHelper {
             engineAllowableValues = engineList;
             AllowableValue[] engines = engineList.toArray(new AllowableValue[0]);
 
-            final PropertyDescriptor.Builder enginePropertyBuilder = new PropertyDescriptor.Builder()
-                    .name(SCRIPT_ENGINE_PROPERTY)
-                    .required(true)
-                    .description("Language Engine for executing scripts")
-                    .required(true)
-                    .expressionLanguageSupported(ExpressionLanguageScope.NONE);
-
+            final PropertyDescriptor.Builder enginePropertyBuilder = getScriptEnginePropertyBuilder();
             if (engineList.isEmpty()) {
                 enginePropertyBuilder.description("No Script Engines found");
             } else {
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/ExecuteScriptGroovyTest.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/ExecuteScriptGroovyTest.java
index 0febf5c18f..eebdd7d20a 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/ExecuteScriptGroovyTest.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/ExecuteScriptGroovyTest.java
@@ -16,15 +16,19 @@
  */
 package org.apache.nifi.processors.script;
 
+import org.apache.nifi.script.ScriptingComponentHelper;
 import org.apache.nifi.script.ScriptingComponentUtils;
 import org.apache.nifi.util.MockFlowFile;
 import org.apache.nifi.util.MockProcessContext;
+import org.apache.nifi.util.PropertyMigrationResult;
 import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.Map;
 import java.util.regex.Pattern;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -32,7 +36,7 @@ class ExecuteScriptGroovyTest extends BaseScriptTest {
     private static final Pattern SINGLE_POOL_THREAD_PATTERN = Pattern.compile("pool-\\d+-thread-1");
 
     @BeforeEach
-    public void setUp() throws Exception {
+    public void setUp() {
         super.setupExecuteScript();
         runner.setValidateExpressionUsage(false);
         runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy");
@@ -40,6 +44,20 @@ class ExecuteScriptGroovyTest extends BaseScriptTest {
         runner.setProperty(ScriptingComponentUtils.MODULES, TEST_RESOURCE_LOCATION + "groovy");
     }
 
+    @Test
+    void testMigrateProperties() {
+        runner.clearProperties();
+
+        final String scriptLanguage = "Script Language";
+        runner.setProperty(scriptLanguage, "Groovy");
+
+        final PropertyMigrationResult result = runner.migrateProperties();
+
+        final Map<String, String> propertiesRenamed = result.getPropertiesRenamed();
+        final String scriptLanguageRenamed = propertiesRenamed.get(scriptLanguage);
+        assertEquals(ScriptingComponentHelper.getScriptEnginePropertyBuilder().build().getName(), scriptLanguageRenamed);
+    }
+
     @Test
     void testShouldExecuteScript() {
         runner.assertValid();
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
index 8cf55d79ff..79f733f96a 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptingComponentHelper.java
@@ -19,25 +19,35 @@ package org.apache.nifi.processors.script;
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.script.ScriptingComponentHelper;
+import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.PropertyMigrationResult;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestScriptingComponentHelper {
+class TestScriptingComponentHelper {
+
+    private static final String SCRIPT_LANGUAGE = "Script Language";
+    private static final String SCRIPT_ENGINE = "Script Engine";
+    private static final String CONFIGURED_SCRIPT_ENGINE = "AWK";
 
     @Test
-    public void testScriptEngineAllowableValuesWithDescriptions() {
+    void testScriptEngineAllowableValuesWithDescriptions() {
         final ScriptingComponentHelper helper = new ScriptingComponentHelper();
         helper.createResources();
 
         final List<PropertyDescriptor> descriptors = helper.getDescriptors();
         final Optional<PropertyDescriptor> optionalScriptEngine = descriptors.stream().filter(
-                descriptor -> descriptor.getName().equals(ScriptingComponentHelper.SCRIPT_ENGINE_PROPERTY)
+                descriptor -> descriptor.getName().equals(
+                        ScriptingComponentHelper.getScriptEnginePropertyBuilder().build().getName()
+                )
         ).findFirst();
 
         assertTrue(optionalScriptEngine.isPresent());
@@ -50,4 +60,20 @@ public class TestScriptingComponentHelper {
             assertNotNull(allowableValue.getDescription());
         }
     }
+
+    @Test
+    void testMigrateProperties() {
+        final Map<String, String> propertyValues = Map.of(
+                SCRIPT_LANGUAGE, CONFIGURED_SCRIPT_ENGINE
+        );
+        final MockPropertyConfiguration configuration = new MockPropertyConfiguration(propertyValues);
+
+        ScriptingComponentHelper.migrateProperties(configuration);
+
+        final PropertyMigrationResult result = configuration.toPropertyMigrationResult();
+        final Map<String, String> propertiesRenamed = result.getPropertiesRenamed();
+
+        final String scriptLanguageRenamed = propertiesRenamed.get(SCRIPT_LANGUAGE);
+        assertEquals(SCRIPT_ENGINE, scriptLanguageRenamed);
+    }
 }
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/script/ScriptedReaderTest.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/script/ScriptedReaderTest.java
index af2a044ed4..1e683cba15 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/script/ScriptedReaderTest.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/record/script/ScriptedReaderTest.java
@@ -22,7 +22,9 @@ import org.apache.nifi.script.ScriptingComponentUtils;
 import org.apache.nifi.serialization.RecordReader;
 import org.apache.nifi.serialization.record.Record;
 import org.apache.nifi.util.MockComponentLog;
+import org.apache.nifi.util.MockPropertyConfiguration;
 import org.apache.nifi.util.NoOpProcessor;
+import org.apache.nifi.util.PropertyMigrationResult;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.jupiter.api.AfterAll;
@@ -80,6 +82,24 @@ class ScriptedReaderTest {
         runner.setProperty(recordReaderFactory, ScriptingComponentUtils.MODULES, (String) null);
     }
 
+    @Test
+    void testMigrateProperties() {
+        final String scriptLanguage = "Script Language";
+        final Map<String, String> propertyValues = Map.of(
+                scriptLanguage, "Groovy"
+        );
+        final MockPropertyConfiguration configuration = new MockPropertyConfiguration(propertyValues);
+
+        final ScriptedReader scriptedReader = new ScriptedReader();
+        scriptedReader.migrateProperties(configuration);
+
+        final PropertyMigrationResult result = configuration.toPropertyMigrationResult();
+
+        final Map<String, String> propertiesRenamed = result.getPropertiesRenamed();
+        final String scriptLanguageRenamed = propertiesRenamed.get(scriptLanguage);
+        assertEquals(ScriptingComponentHelper.getScriptEnginePropertyBuilder().build().getName(), scriptLanguageRenamed);
+    }
+
     @Test
     void testRecordReaderGroovyScript() throws Exception {
         Files.copy(Paths.get(SOURCE_DIR, GROOVY_DIR, "test_record_reader_inline.groovy"), targetScriptFile, StandardCopyOption.REPLACE_EXISTING);
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.java
index 51d8033a40..6efab579d7 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/reporting/script/ScriptedReportingTaskTest.java
@@ -27,7 +27,9 @@ import org.apache.nifi.script.ScriptingComponentHelper;
 import org.apache.nifi.script.ScriptingComponentUtils;
 import org.apache.nifi.util.MockConfigurationContext;
 import org.apache.nifi.util.MockEventAccess;
+import org.apache.nifi.util.MockPropertyConfiguration;
 import org.apache.nifi.util.MockReportingContext;
+import org.apache.nifi.util.PropertyMigrationResult;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -69,17 +71,35 @@ class ScriptedReportingTaskTest {
     private MockReportingContext reportingContext;
 
     @BeforeEach
-    public void setUp(@Mock ComponentLog logger) {
+    public void setUp() {
         task = new MockScriptedReportingTask();
         properties = new HashMap<>();
         configurationContext = new MockConfigurationContext(properties, null, null);
         reportingContext = new MockReportingContext(new LinkedHashMap<>(), null);
-        when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString());
-        when(initContext.getLogger()).thenReturn(logger);
+    }
+
+    @Test
+    void testMigrateProperties() {
+        final String scriptLanguage = "Script Language";
+        final Map<String, String> propertyValues = Map.of(
+                scriptLanguage, "Groovy"
+        );
+        final MockPropertyConfiguration configuration = new MockPropertyConfiguration(propertyValues);
+
+        final ScriptedReportingTask scriptedReportingTask = new ScriptedReportingTask();
+        scriptedReportingTask.migrateProperties(configuration);
+
+        final PropertyMigrationResult result = configuration.toPropertyMigrationResult();
+
+        final Map<String, String> propertiesRenamed = result.getPropertiesRenamed();
+        final String scriptLanguageRenamed = propertiesRenamed.get(scriptLanguage);
+        assertEquals(ScriptingComponentHelper.getScriptEnginePropertyBuilder().build().getName(), scriptLanguageRenamed);
     }
 
     @Test
     void testProvenanceGroovyScript() throws Exception {
+        setInitializationContext();
+
         properties.put(SCRIPT_ENGINE_PROPERTY_DESCRIPTOR, GROOVY);
         Files.copy(Paths.get("src/test/resources/groovy/test_log_provenance_events.groovy"), targetPath, StandardCopyOption.REPLACE_EXISTING);
         properties.put(ScriptingComponentUtils.SCRIPT_FILE, targetPath.toString());
@@ -111,6 +131,8 @@ class ScriptedReportingTaskTest {
 
     @Test
     void testVMEventsGroovyScript() throws Exception {
+        setInitializationContext();
+
         properties.put(SCRIPT_ENGINE_PROPERTY_DESCRIPTOR, GROOVY);
         Files.copy(Paths.get("src/test/resources/groovy/test_log_vm_stats.groovy"), targetPath, StandardCopyOption.REPLACE_EXISTING);
         properties.put(ScriptingComponentUtils.SCRIPT_FILE, targetPath.toString());
@@ -126,6 +148,11 @@ class ScriptedReportingTaskTest {
         assertTrue(x.get("uptime") >= 0);
     }
 
+    private void setInitializationContext() {
+        when(initContext.getIdentifier()).thenReturn(UUID.randomUUID().toString());
+        when(initContext.getLogger()).thenReturn(mock(ComponentLog.class));
+    }
+
     private void run() throws Exception {
         task.initialize(initContext);
         task.getSupportedPropertyDescriptors();


(nifi) 01/03: NIFI-15309 Fixed property migration for FetchGridFS (#10620)

Posted by ex...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch NIFI-15318-1
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit cef145874d80e64ac9a18a6152eb8d443ec61637
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Tue Dec 9 09:04:48 2025 -0500

    NIFI-15309 Fixed property migration for FetchGridFS (#10620)
    
    Signed-off-by: David Handermann <ex...@apache.org>
    (cherry picked from commit 6dfddc928a017a1d83b4428e27a19bb580c07d3a)
---
 .../main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java
index 64d4eca9a3..a40f479667 100644
--- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java
+++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java
@@ -103,6 +103,7 @@ public class FetchGridFS extends AbstractGridFSProcessor implements QueryHelper
 
     @Override
     public void migrateProperties(PropertyConfiguration config) {
+        super.migrateProperties(config);
         config.renameProperty(OLD_OPERATION_MODE_PROPERTY_NAME, OPERATION_MODE.getName());
         config.renameProperty("gridfs-query", QUERY.getName());
     }


(nifi) 02/03: NIFI-15297 Support setting configuredForClustering in mock contexts

Posted by ex...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch NIFI-15318-1
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit eeec3c4f24222c9dae128c614261604ba92d3205
Author: Adela Jaworowska-Nowak <ad...@gmail.com>
AuthorDate: Mon Dec 8 09:27:15 2025 +0100

    NIFI-15297 Support setting configuredForClustering in mock contexts
    
    This closes #10615
    
    Signed-off-by: David Handermann <ex...@apache.org>
    (cherry picked from commit 40b343ff0876b18f0e66cd701c8db54814aca37e)
---
 ...MockControllerServiceInitializationContext.java | 10 ++++++++
 .../nifi/util/StandardProcessorTestRunner.java     |  1 +
 .../nifi/util/TestStandardProcessorTestRunner.java | 29 ++++++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
index 021bdc2459..ba3beda870 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockControllerServiceInitializationContext.java
@@ -33,6 +33,7 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
     private final ComponentLog logger;
     private final StateManager stateManager;
     private volatile boolean isClustered;
+    private volatile boolean isConfiguredForClustering = false;
     private volatile boolean isPrimaryNode;
     private final KerberosContext kerberosContext;
 
@@ -107,6 +108,11 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
         return isClustered;
     }
 
+    @Override
+    public boolean isConfiguredForClustering() {
+        return isConfiguredForClustering;
+    }
+
     @Override
     public boolean isPrimary() {
         return isPrimaryNode;
@@ -116,6 +122,10 @@ public class MockControllerServiceInitializationContext extends MockControllerSe
         isClustered = clustered;
     }
 
+    public void setConfiguredForClustering(final boolean configuredForClustering) {
+        this.isConfiguredForClustering = configuredForClustering;
+    }
+
     public void setPrimaryNode(boolean primaryNode) {
         if (!isClustered && primaryNode) {
             throw new IllegalArgumentException("Primary node is only available in cluster. Use setClustered(true) first.");
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index a8b69a2277..433c52172c 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -692,6 +692,7 @@ public class StandardProcessorTestRunner implements TestRunner {
         final MockControllerServiceInitializationContext initContext = new MockControllerServiceInitializationContext(
                 Objects.requireNonNull(service), Objects.requireNonNull(identifier), mockComponentLog, serviceStateManager, kerberosContext);
         controllerServiceStateManagers.put(identifier, serviceStateManager);
+        initContext.setConfiguredForClustering(context.isConfiguredForClustering());
         initContext.addControllerServices(context);
         service.initialize(initContext);
 
diff --git a/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java b/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
index 11b9dc0b27..2befa6a280 100644
--- a/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
+++ b/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
@@ -21,6 +21,7 @@ import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.controller.AbstractControllerService;
 import org.apache.nifi.controller.ControllerService;
+import org.apache.nifi.controller.ControllerServiceInitializationContext;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessContext;
@@ -376,4 +377,32 @@ public class TestStandardProcessorTestRunner {
         assertTrue(msg.getMsg().contains("expected test error"));
         assertNotNull(msg.getThrowable());
     }
+
+    @Test
+    public void testControllerServiceReceivesConfiguredForClusteringSetting() throws InitializationException {
+        final ClusterAwareTestService testService = new ClusterAwareTestService();
+        final AddAttributeProcessor proc = new AddAttributeProcessor();
+        final TestRunner runner = TestRunners.newTestRunner(proc);
+
+        assertFalse(testService.isConfiguredForClustering());
+
+        runner.setIsConfiguredForClustering(true);
+        runner.addControllerService("clusterService", testService);
+
+        assertTrue(testService.isConfiguredForClustering());
+    }
+
+    private static class ClusterAwareTestService extends AbstractControllerService {
+        private boolean configuredForClustering = false;
+
+        @Override
+        protected void init(final ControllerServiceInitializationContext context) {
+            // Capture the value during initialization
+            this.configuredForClustering = context.getNodeTypeProvider().isConfiguredForClustering();
+        }
+
+        public boolean isConfiguredForClustering() {
+            return configuredForClustering;
+        }
+    }
 }