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 2ba0e91201 NIFI-15447 Removed teardown method from Component
Initializers
2ba0e91201 is described below
commit 2ba0e91201417086fd1d042efd10e77564036093
Author: exceptionfactory <[email protected]>
AuthorDate: Thu Jan 8 17:00:14 2026 -0600
NIFI-15447 Removed teardown method from Component Initializers
- The teardown method is not needed for current documentation generation
Signed-off-by: Pierre Villard <[email protected]>
This closes #10751.
---
.../org/apache/nifi/FlowRegistryClientInitializer.java | 15 ---------------
.../nifi/init/ConfigurableComponentInitializer.java | 7 -------
.../apache/nifi/init/ControllerServiceInitializer.java | 18 ------------------
.../apache/nifi/init/FlowAnalysisRuleInitializer.java | 16 ----------------
.../apache/nifi/init/ParameterProviderInitializer.java | 16 ----------------
.../org/apache/nifi/init/ProcessorInitializer.java | 18 ------------------
.../org/apache/nifi/init/ReportingTaskInitializer.java | 16 ----------------
7 files changed, 106 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/FlowRegistryClientInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/FlowRegistryClientInitializer.java
index 1040eb7623..93d75f7fee 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/FlowRegistryClientInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/FlowRegistryClientInitializer.java
@@ -16,18 +16,14 @@
*/
package org.apache.nifi;
-import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.init.ConfigurableComponentInitializer;
-import org.apache.nifi.mock.MockComponentLogger;
-import org.apache.nifi.mock.MockConfigurationContext;
import org.apache.nifi.mock.MockFlowRegistryClientInitializationContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.registry.flow.FlowRegistryClient;
import org.apache.nifi.registry.flow.FlowRegistryClientInitializationContext;
import org.apache.nifi.reporting.InitializationException;
-import org.apache.nifi.util.ReflectionUtils;
/**
* Initializes a FlowRegistryClient using a
MockFlowRegistryClientInitializationContext;
@@ -49,15 +45,4 @@ public class FlowRegistryClientInitializer implements
ConfigurableComponentIniti
flowRegistryClient.initialize(context);
}
}
-
- @Override
- public void teardown(final ConfigurableComponent component) {
- FlowRegistryClient flowRegistryClient = (FlowRegistryClient) component;
- try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager, component.getClass(),
component.getIdentifier())) {
- final MockConfigurationContext context = new
MockConfigurationContext();
-
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class,
flowRegistryClient, new MockComponentLogger(), context);
- } finally {
-
extensionManager.removeInstanceClassLoader(component.getIdentifier());
- }
- }
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ConfigurableComponentInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ConfigurableComponentInitializer.java
index 9a1149c45b..464b4693c5 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ConfigurableComponentInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ConfigurableComponentInitializer.java
@@ -35,11 +35,4 @@ public interface ConfigurableComponentInitializer {
* @throws InitializationException if the component could not be
initialized
*/
void initialize(ConfigurableComponent component) throws
InitializationException;
-
- /**
- * Calls the lifecycle methods that should be called when a flow is
shutdown.
- *
- * @param component the component to initialize
- */
- void teardown(ConfigurableComponent component);
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ControllerServiceInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ControllerServiceInitializer.java
index 8b39e0d593..a99dc0d19e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ControllerServiceInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ControllerServiceInitializer.java
@@ -16,18 +16,13 @@
*/
package org.apache.nifi.init;
-import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceInitializationContext;
-import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.mock.MockComponentLogger;
-import org.apache.nifi.mock.MockConfigurationContext;
import org.apache.nifi.mock.MockControllerServiceInitializationContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.reporting.InitializationException;
-import org.apache.nifi.util.ReflectionUtils;
/**
* Initializes a ControllerService using a
MockControllerServiceInitializationContext
@@ -50,17 +45,4 @@ public class ControllerServiceInitializer implements
ConfigurableComponentInitia
controllerService.initialize(context);
}
}
-
- @Override
- public void teardown(ConfigurableComponent component) {
- try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager, component.getClass(),
component.getIdentifier())) {
- ControllerService controllerService = (ControllerService)
component;
-
- final ComponentLog logger = new MockComponentLogger();
- final MockConfigurationContext context = new
MockConfigurationContext();
-
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class,
controllerService, logger, context);
- } finally {
-
extensionManager.removeInstanceClassLoader(component.getIdentifier());
- }
- }
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/FlowAnalysisRuleInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/FlowAnalysisRuleInitializer.java
index fc2d5b8c21..ff1d96ff55 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/FlowAnalysisRuleInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/FlowAnalysisRuleInitializer.java
@@ -16,17 +16,13 @@
*/
package org.apache.nifi.init;
-import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.flowanalysis.FlowAnalysisRule;
import org.apache.nifi.flowanalysis.FlowAnalysisRuleInitializationContext;
-import org.apache.nifi.mock.MockComponentLogger;
-import org.apache.nifi.mock.MockConfigurationContext;
import org.apache.nifi.mock.MockFlowAnalysisRuleInitializationContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.reporting.InitializationException;
-import org.apache.nifi.util.ReflectionUtils;
/**
* Initializes a FlowAnalysisRule using a
MockFlowAnalysisRuleInitializationContext;
@@ -47,16 +43,4 @@ public class FlowAnalysisRuleInitializer implements
ConfigurableComponentInitial
flowAnalysisRule.initialize(context);
}
}
-
- @Override
- public void teardown(ConfigurableComponent component) {
- FlowAnalysisRule flowAnalysisRule = (FlowAnalysisRule) component;
- try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager, component.getClass(),
component.getIdentifier())) {
-
- final MockConfigurationContext context = new
MockConfigurationContext();
-
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class,
flowAnalysisRule, new MockComponentLogger(), context);
- } finally {
-
extensionManager.removeInstanceClassLoader(component.getIdentifier());
- }
- }
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ParameterProviderInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ParameterProviderInitializer.java
index ce9708b9a0..48ae061764 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ParameterProviderInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ParameterProviderInitializer.java
@@ -16,17 +16,13 @@
*/
package org.apache.nifi.init;
-import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
-import org.apache.nifi.mock.MockComponentLogger;
-import org.apache.nifi.mock.MockConfigurationContext;
import org.apache.nifi.mock.MockParameterProviderInitializationContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.parameter.ParameterProvider;
import org.apache.nifi.parameter.ParameterProviderInitializationContext;
import org.apache.nifi.reporting.InitializationException;
-import org.apache.nifi.util.ReflectionUtils;
/**
* Initializes a ParameterProvider using a MockReportingInitializationContext;
@@ -49,16 +45,4 @@ public class ParameterProviderInitializer implements
ConfigurableComponentInitia
parameterProvider.initialize(context);
}
}
-
- @Override
- public void teardown(final ConfigurableComponent component) {
- ParameterProvider parameterProvider = (ParameterProvider) component;
- try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager, component.getClass(),
component.getIdentifier())) {
-
- final MockConfigurationContext context = new
MockConfigurationContext();
-
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class,
parameterProvider, new MockComponentLogger(), context);
- } finally {
-
extensionManager.removeInstanceClassLoader(component.getIdentifier());
- }
- }
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ProcessorInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ProcessorInitializer.java
index 3c874aee96..f32fa516a6 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ProcessorInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ProcessorInitializer.java
@@ -16,17 +16,12 @@
*/
package org.apache.nifi.init;
-import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
-import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.mock.MockComponentLogger;
-import org.apache.nifi.mock.MockProcessContext;
import org.apache.nifi.mock.MockProcessorInitializationContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.ProcessorInitializationContext;
-import org.apache.nifi.util.ReflectionUtils;
/**
* Initializes a Processor using a MockProcessorInitializationContext
@@ -49,17 +44,4 @@ public class ProcessorInitializer implements
ConfigurableComponentInitializer {
processor.initialize(initializationContext);
}
}
-
- @Override
- public void teardown(ConfigurableComponent component) {
- Processor processor = (Processor) component;
- try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager, component.getClass(),
component.getIdentifier())) {
-
- final ComponentLog logger = new MockComponentLogger();
- final MockProcessContext context = new MockProcessContext();
-
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class, processor,
logger, context);
- } finally {
-
extensionManager.removeInstanceClassLoader(component.getIdentifier());
- }
- }
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ReportingTaskInitializer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ReportingTaskInitializer.java
index aa586bf9d1..f70c76fcac 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ReportingTaskInitializer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/init/ReportingTaskInitializer.java
@@ -16,17 +16,13 @@
*/
package org.apache.nifi.init;
-import org.apache.nifi.annotation.lifecycle.OnShutdown;
import org.apache.nifi.components.ConfigurableComponent;
-import org.apache.nifi.mock.MockComponentLogger;
-import org.apache.nifi.mock.MockConfigurationContext;
import org.apache.nifi.mock.MockReportingInitializationContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.reporting.ReportingInitializationContext;
import org.apache.nifi.reporting.ReportingTask;
-import org.apache.nifi.util.ReflectionUtils;
/**
* Initializes a ReportingTask using a MockReportingInitializationContext;
@@ -49,16 +45,4 @@ public class ReportingTaskInitializer implements
ConfigurableComponentInitialize
reportingTask.initialize(context);
}
}
-
- @Override
- public void teardown(ConfigurableComponent component) {
- ReportingTask reportingTask = (ReportingTask) component;
- try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager, component.getClass(),
component.getIdentifier())) {
-
- final MockConfigurationContext context = new
MockConfigurationContext();
-
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class,
reportingTask, new MockComponentLogger(), context);
- } finally {
-
extensionManager.removeInstanceClassLoader(component.getIdentifier());
- }
- }
}
