NIFI-7804 Split nifi-security-utils into sub-module for nifi-security… (

#4533) * NIFI-7804 Split nifi-security-utils into sub-module for nifi-security-utils-api (no external dependencies). Separated interface and implementation of TlsConfiguration. Reabsorbed nifi-security-xml-config into nifi-security-utils. * NIFI-7804 Resolved failing unit test on Java 8. Removed accidental module dependency. * NIFI-7804 Resolved failing unit test. * NIFI-7804 Removed legacy dependency. * NIFI-7804 Marked nifi-security-utils-api as provided and overrode with compile scope in specific modules which are not children of nifi-standard-services-api-nar.
apache · Sep 17, 2020 · 9370571 · 9370571
1 parent 6246784
commit 9370571
Show file tree

Hide file tree

Showing 185 changed files with 1,247 additions and 971 deletions.
diff --git a/nifi-api/src/main/java/org/apache/nifi/action/Action.java b/nifi-api/src/main/java/org/apache/nifi/action/Action.java
@@ -16,11 +16,10 @@
  */
 package org.apache.nifi.action;
 
-import org.apache.nifi.action.component.details.ComponentDetails;
-import org.apache.nifi.action.details.ActionDetails;
-
 import java.io.Serializable;
 import java.util.Date;
+import org.apache.nifi.action.component.details.ComponentDetails;
+import org.apache.nifi.action.details.ActionDetails;
 
 /**
  * An action taken on the flow by a user.

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/DynamicProperty.java b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/DynamicProperty.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.components.ConfigurableComponent;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/DynamicRelationship.java b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/DynamicRelationship.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.processor.Processor;
 import org.apache.nifi.processor.Relationship;

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/Restriction.java b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/Restriction.java
@@ -16,14 +16,13 @@
  */
 package org.apache.nifi.annotation.behavior;
 
-import org.apache.nifi.components.RequiredPermission;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.apache.nifi.components.RequiredPermission;
 
 /**
  * Specific restriction for a component. Indicates what the required permission is and why the restriction exists.

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/Stateful.java b/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/Stateful.java
@@ -23,7 +23,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.components.state.Scope;
 import org.apache.nifi.components.state.StateManager;
 

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/configuration/DefaultSchedule.java b/nifi-api/src/main/java/org/apache/nifi/annotation/configuration/DefaultSchedule.java
@@ -17,14 +17,13 @@
 
 package org.apache.nifi.annotation.configuration;
 
-import org.apache.nifi.scheduling.SchedulingStrategy;
-
 import java.lang.annotation.Documented;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.apache.nifi.scheduling.SchedulingStrategy;
 
 /**
  * <p>

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/configuration/DefaultSettings.java b/nifi-api/src/main/java/org/apache/nifi/annotation/configuration/DefaultSettings.java
@@ -18,11 +18,11 @@
 package org.apache.nifi.annotation.configuration;
 
 import java.lang.annotation.Documented;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.apache.nifi.logging.LogLevel;
 
 /**

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/DeprecationNotice.java b/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/DeprecationNotice.java
@@ -16,14 +16,13 @@
  */
 package org.apache.nifi.annotation.documentation;
 
-import org.apache.nifi.components.ConfigurableComponent;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.apache.nifi.components.ConfigurableComponent;
 
 /**
  * Annotation that can be applied to a {@link org.apache.nifi.processor.Processor Processor},

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/SeeAlso.java b/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/SeeAlso.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.components.ConfigurableComponent;
 
 /**

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java b/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.controller.ConfigurationContext;
 
 /**

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java b/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.controller.ConfigurationContext;
 import org.apache.nifi.processor.ProcessContext;
 

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java b/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.controller.ConfigurationContext;
 import org.apache.nifi.processor.ProcessContext;
 

diff --git a/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java b/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java
@@ -22,7 +22,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.apache.nifi.controller.ConfigurationContext;
 import org.apache.nifi.processor.ProcessContext;
 

diff --git a/nifi-api/src/main/java/org/apache/nifi/components/ConfigurableComponent.java b/nifi-api/src/main/java/org/apache/nifi/components/ConfigurableComponent.java
@@ -18,7 +18,6 @@
 
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.nifi.annotation.lifecycle.OnConfigurationRestored;
 
 public interface ConfigurableComponent {

diff --git a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -22,7 +22,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.nifi.controller.ControllerService;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 

diff --git a/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java b/nifi-api/src/main/java/org/apache/nifi/components/PropertyValue.java
@@ -18,7 +18,6 @@
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.nifi.controller.ControllerService;
 import org.apache.nifi.expression.AttributeValueDecorator;
 import org.apache.nifi.flowfile.FlowFile;
@@ -277,7 +276,7 @@ public interface PropertyValue {
      * @throws ProcessException if the Expression cannot be compiled or evaluating
      * the Expression against the given attributes causes an Exception to be thrown
      */
-    public PropertyValue evaluateAttributeExpressions(FlowFile flowFile, Map<String, String> additionalAttributes, AttributeValueDecorator decorator, Map<String, String> stateValues)
+    PropertyValue evaluateAttributeExpressions(FlowFile flowFile, Map<String, String> additionalAttributes, AttributeValueDecorator decorator, Map<String, String> stateValues)
             throws ProcessException;
 
     /**

diff --git a/nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java b/nifi-api/src/main/java/org/apache/nifi/components/ValidationContext.java
@@ -16,14 +16,13 @@
  */
 package org.apache.nifi.components;
 
+import java.util.Collection;
+import java.util.Map;
 import org.apache.nifi.context.PropertyContext;
 import org.apache.nifi.controller.ControllerService;
 import org.apache.nifi.controller.ControllerServiceLookup;
 import org.apache.nifi.expression.ExpressionLanguageCompiler;
 
-import java.util.Collection;
-import java.util.Map;
-
 public interface ValidationContext extends PropertyContext {
 
     /**

diff --git a/nifi-api/src/main/java/org/apache/nifi/components/state/StateManager.java b/nifi-api/src/main/java/org/apache/nifi/components/state/StateManager.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.Map;
-
 import org.apache.nifi.annotation.behavior.Stateful;
 import org.apache.nifi.components.state.exception.StateTooLargeException;
 

diff --git a/...-api/src/main/java/org/apache/nifi/components/state/exception/StateTooLargeException.java b/...-api/src/main/java/org/apache/nifi/components/state/exception/StateTooLargeException.java
@@ -17,9 +17,8 @@
 
 package org.apache.nifi.components.state.exception;
 
-import org.apache.nifi.components.state.StateManager;
-
 import java.io.IOException;
+import org.apache.nifi.components.state.StateManager;
 
 /**
  * Thrown when attempting to store state via the {@link StateManager} but the state being

diff --git a/nifi-api/src/main/java/org/apache/nifi/context/PropertyContext.java b/nifi-api/src/main/java/org/apache/nifi/context/PropertyContext.java
@@ -16,11 +16,10 @@
  */
 package org.apache.nifi.context;
 
+import java.util.Map;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.PropertyValue;
 
-import java.util.Map;
-
 /**
  * A context for retrieving a PropertyValue from a PropertyDescriptor.
  */

diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ConfigurationContext.java b/nifi-api/src/main/java/org/apache/nifi/controller/ConfigurationContext.java
@@ -16,11 +16,10 @@
  */
 package org.apache.nifi.controller;
 
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.context.PropertyContext;
-
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.context.PropertyContext;
 
 /**
  * This context is passed to ControllerServices and Reporting Tasks in order

diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java b/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
@@ -16,12 +16,11 @@
  */
 package org.apache.nifi.controller.status;
 
-import org.apache.nifi.registry.flow.VersionedFlowState;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.nifi.registry.flow.VersionedFlowState;
 
 /**
  */

diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java b/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
@@ -16,11 +16,10 @@
  */
 package org.apache.nifi.controller.status;
 
-import org.apache.nifi.scheduling.ExecutionNode;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import org.apache.nifi.scheduling.ExecutionNode;
 
 /**
  */

diff --git a/nifi-api/src/main/java/org/apache/nifi/documentation/AbstractDocumentationWriter.java b/nifi-api/src/main/java/org/apache/nifi/documentation/AbstractDocumentationWriter.java
@@ -16,6 +16,14 @@
  */
 package org.apache.nifi.documentation;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.apache.nifi.annotation.behavior.DynamicProperties;
 import org.apache.nifi.annotation.behavior.DynamicProperty;
 import org.apache.nifi.annotation.behavior.DynamicRelationship;
@@ -42,15 +50,6 @@
 import org.apache.nifi.reporting.InitializationException;
 import org.apache.nifi.reporting.ReportingTask;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Base class for DocumentationWriter that simplifies iterating over all information for a component, creating a separate method
  * for each, to ensure that implementations properly override all methods and therefore properly account for all information about

diff --git a/nifi-api/src/main/java/org/apache/nifi/documentation/ExtensionDocumentationWriter.java b/nifi-api/src/main/java/org/apache/nifi/documentation/ExtensionDocumentationWriter.java
@@ -16,11 +16,10 @@
  */
 package org.apache.nifi.documentation;
 
-import org.apache.nifi.components.ConfigurableComponent;
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
+import org.apache.nifi.components.ConfigurableComponent;
 
 /**
  * Generates documentation for an instance of a ConfigurableComponent.

diff --git a/...g/apache/nifi/documentation/init/DocumentationControllerServiceInitializationContext.java b/...g/apache/nifi/documentation/init/DocumentationControllerServiceInitializationContext.java
@@ -16,15 +16,14 @@
  */
 package org.apache.nifi.documentation.init;
 
+import java.io.File;
+import java.util.UUID;
 import org.apache.nifi.components.state.StateManager;
 import org.apache.nifi.controller.ControllerServiceInitializationContext;
 import org.apache.nifi.controller.ControllerServiceLookup;
 import org.apache.nifi.controller.NodeTypeProvider;
 import org.apache.nifi.logging.ComponentLog;
 
-import java.io.File;
-import java.util.UUID;
-
 public class DocumentationControllerServiceInitializationContext implements ControllerServiceInitializationContext {
     private final String id = UUID.randomUUID().toString();
     private final ControllerServiceLookup serviceLookup = new EmptyControllerServiceLookup();

diff --git a/.../java/org/apache/nifi/documentation/init/DocumentationProcessorInitializationContext.java b/.../java/org/apache/nifi/documentation/init/DocumentationProcessorInitializationContext.java
@@ -16,14 +16,13 @@
  */
 package org.apache.nifi.documentation.init;
 
+import java.io.File;
+import java.util.UUID;
 import org.apache.nifi.controller.ControllerServiceLookup;
 import org.apache.nifi.controller.NodeTypeProvider;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessorInitializationContext;
 
-import java.io.File;
-import java.util.UUID;
-
 public class DocumentationProcessorInitializationContext implements ProcessorInitializationContext {
     private final String uuid = UUID.randomUUID().toString();
     private final NodeTypeProvider nodeTypeProvider = new StandaloneNodeTypeProvider();

diff --git a/.../java/org/apache/nifi/documentation/init/DocumentationReportingInitializationContext.java b/.../java/org/apache/nifi/documentation/init/DocumentationReportingInitializationContext.java
@@ -16,16 +16,15 @@
  */
 package org.apache.nifi.documentation.init;
 
+import java.io.File;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import org.apache.nifi.controller.ControllerServiceLookup;
 import org.apache.nifi.controller.NodeTypeProvider;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.reporting.ReportingInitializationContext;
 import org.apache.nifi.scheduling.SchedulingStrategy;
 
-import java.io.File;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
 public class DocumentationReportingInitializationContext implements ReportingInitializationContext {
     private final String id = UUID.randomUUID().toString();
     private final ComponentLog componentLog = new NopComponentLog();

diff --git a/nifi-api/src/main/java/org/apache/nifi/documentation/init/EmptyControllerServiceLookup.java b/nifi-api/src/main/java/org/apache/nifi/documentation/init/EmptyControllerServiceLookup.java
@@ -16,11 +16,10 @@
  */
 package org.apache.nifi.documentation.init;
 
+import java.util.Set;
 import org.apache.nifi.controller.ControllerService;
 import org.apache.nifi.controller.ControllerServiceLookup;
 
-import java.util.Set;
-
 public class EmptyControllerServiceLookup implements ControllerServiceLookup {
     @Override
     public ControllerService getControllerService(final String serviceIdentifier) {

diff --git a/nifi-api/src/main/java/org/apache/nifi/documentation/init/NopStateManager.java b/nifi-api/src/main/java/org/apache/nifi/documentation/init/NopStateManager.java
@@ -16,12 +16,11 @@
  */
 package org.apache.nifi.documentation.init;
 
+import java.util.Map;
 import org.apache.nifi.components.state.Scope;
 import org.apache.nifi.components.state.StateManager;
 import org.apache.nifi.components.state.StateMap;
 
-import java.util.Map;
-
 public class NopStateManager implements StateManager {
     @Override
     public void setState(final Map<String, String> state, final Scope scope) {