From 332f0e1912388ce17e556170d23a4886115dfb12 Mon Sep 17 00:00:00 2001 From: dan-s1 Date: Mon, 26 Jan 2026 17:40:26 +0000 Subject: [PATCH] NIFI-15502 Updated the checkstyle.xml to contain the same rules as Apache NIFI. --- checkstyle.xml | 163 +++++++--- .../java/org/apache/nifi/action/Action.java | 5 +- .../annotation/behavior/DynamicProperty.java | 5 +- .../behavior/DynamicRelationship.java | 7 +- .../nifi/annotation/behavior/Restriction.java | 3 +- .../configuration/DefaultSchedule.java | 3 +- .../configuration/DefaultSettings.java | 3 +- .../documentation/DeprecationNotice.java | 3 +- .../annotation/documentation/SeeAlso.java | 3 +- .../nifi/annotation/lifecycle/OnDisabled.java | 3 +- .../nifi/annotation/lifecycle/OnRemoved.java | 5 +- .../nifi/annotation/lifecycle/OnShutdown.java | 5 +- .../nifi/annotation/lifecycle/OnStopped.java | 5 +- .../components/ConfigurableComponent.java | 3 +- .../apache/nifi/components/PropertyValue.java | 7 +- .../exception/StateTooLargeException.java | 3 +- .../apache/nifi/context/PropertyContext.java | 3 +- .../VerifiableControllerService.java | 2 +- .../controller/status/ProcessorStatus.java | 3 +- .../AbstractDocumentationWriter.java | 5 +- .../ExtensionDocumentationWriter.java | 3 +- ...ontrollerServiceInitializationContext.java | 5 +- ...owRegistryClientInitializationContext.java | 2 +- ...ntationProcessorInitializationContext.java | 5 +- ...ntationReportingInitializationContext.java | 7 +- .../init/EmptyControllerServiceLookup.java | 3 +- .../documentation/init/NopStateManager.java | 3 +- .../xml/XmlDocumentationWriter.java | 33 +- .../java/org/apache/nifi/flow/BatchSize.java | 1 + .../nifi/flow/ConnectableComponent.java | 1 + .../nifi/flow/ControllerServiceAPI.java | 4 +- .../org/apache/nifi/flow/VersionedLabel.java | 4 +- ...ResourceProviderInitializationContext.java | 2 +- .../AbstractSessionFactoryProcessor.java | 5 +- .../org/apache/nifi/processor/DataUnit.java | 300 +++++++++--------- .../apache/nifi/processor/ProcessSession.java | 23 +- .../processor/exception/ProcessException.java | 1 - .../exception/TerminatedTaskException.java | 5 +- .../provenance/ProvenanceEventBuilder.java | 5 +- .../flow/AbstractFlowRegistryClient.java | 2 +- ...owRegistryClientInitializationContext.java | 2 +- .../apache/nifi/reporting/EventAccess.java | 8 +- .../nifi/reporting/ReportingContext.java | 3 +- .../ReportingInitializationContext.java | 3 +- .../reporting/VerifiableReportingTask.java | 2 +- .../org/apache/nifi/search/SearchContext.java | 3 +- 46 files changed, 386 insertions(+), 288 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 7c87426..ededf31 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,67 +1,134 @@ - - + + + + + + + + + - + - - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + diff --git a/src/main/java/org/apache/nifi/action/Action.java b/src/main/java/org/apache/nifi/action/Action.java index 44c28a6..ed6505f 100644 --- a/src/main/java/org/apache/nifi/action/Action.java +++ b/src/main/java/org/apache/nifi/action/Action.java @@ -16,11 +16,12 @@ */ package org.apache.nifi.action; -import java.io.Serializable; -import java.util.Date; import org.apache.nifi.action.component.details.ComponentDetails; import org.apache.nifi.action.details.ActionDetails; +import java.io.Serializable; +import java.util.Date; + /** * An action taken on the flow by a user. */ diff --git a/src/main/java/org/apache/nifi/annotation/behavior/DynamicProperty.java b/src/main/java/org/apache/nifi/annotation/behavior/DynamicProperty.java index 5bccd48..28753b8 100644 --- a/src/main/java/org/apache/nifi/annotation/behavior/DynamicProperty.java +++ b/src/main/java/org/apache/nifi/annotation/behavior/DynamicProperty.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.annotation.behavior; +import org.apache.nifi.components.ConfigurableComponent; +import org.apache.nifi.expression.ExpressionLanguageScope; + 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; -import org.apache.nifi.expression.ExpressionLanguageScope; /** * An annotation that may be placed on a {@link ConfigurableComponent} to diff --git a/src/main/java/org/apache/nifi/annotation/behavior/DynamicRelationship.java b/src/main/java/org/apache/nifi/annotation/behavior/DynamicRelationship.java index 006f6ad..642e878 100644 --- a/src/main/java/org/apache/nifi/annotation/behavior/DynamicRelationship.java +++ b/src/main/java/org/apache/nifi/annotation/behavior/DynamicRelationship.java @@ -16,15 +16,16 @@ */ package org.apache.nifi.annotation.behavior; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.processor.Processor; +import org.apache.nifi.processor.Relationship; + 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.PropertyDescriptor; -import org.apache.nifi.processor.Processor; -import org.apache.nifi.processor.Relationship; /** * Annotation to indicate that a {@link Processor} supports dynamic diff --git a/src/main/java/org/apache/nifi/annotation/behavior/Restriction.java b/src/main/java/org/apache/nifi/annotation/behavior/Restriction.java index 63efc98..c16293f 100644 --- a/src/main/java/org/apache/nifi/annotation/behavior/Restriction.java +++ b/src/main/java/org/apache/nifi/annotation/behavior/Restriction.java @@ -16,13 +16,14 @@ */ 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/src/main/java/org/apache/nifi/annotation/configuration/DefaultSchedule.java b/src/main/java/org/apache/nifi/annotation/configuration/DefaultSchedule.java index f1a145a..a54120f 100644 --- a/src/main/java/org/apache/nifi/annotation/configuration/DefaultSchedule.java +++ b/src/main/java/org/apache/nifi/annotation/configuration/DefaultSchedule.java @@ -17,13 +17,14 @@ package org.apache.nifi.annotation.configuration; +import org.apache.nifi.scheduling.SchedulingStrategy; + 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.scheduling.SchedulingStrategy; /** *

diff --git a/src/main/java/org/apache/nifi/annotation/configuration/DefaultSettings.java b/src/main/java/org/apache/nifi/annotation/configuration/DefaultSettings.java index 09402c7..970cad6 100644 --- a/src/main/java/org/apache/nifi/annotation/configuration/DefaultSettings.java +++ b/src/main/java/org/apache/nifi/annotation/configuration/DefaultSettings.java @@ -17,13 +17,14 @@ package org.apache.nifi.annotation.configuration; +import org.apache.nifi.logging.LogLevel; + 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.logging.LogLevel; /** *

diff --git a/src/main/java/org/apache/nifi/annotation/documentation/DeprecationNotice.java b/src/main/java/org/apache/nifi/annotation/documentation/DeprecationNotice.java index e385843..f9d47dd 100644 --- a/src/main/java/org/apache/nifi/annotation/documentation/DeprecationNotice.java +++ b/src/main/java/org/apache/nifi/annotation/documentation/DeprecationNotice.java @@ -16,13 +16,14 @@ */ 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/src/main/java/org/apache/nifi/annotation/documentation/SeeAlso.java b/src/main/java/org/apache/nifi/annotation/documentation/SeeAlso.java index 5eae159..f21e27b 100644 --- a/src/main/java/org/apache/nifi/annotation/documentation/SeeAlso.java +++ b/src/main/java/org/apache/nifi/annotation/documentation/SeeAlso.java @@ -16,13 +16,14 @@ */ 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 may be placed on a null {@link org.apache.nifi.processor.Processor Processor}, diff --git a/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java b/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java index c8d77e3..5f71a45 100644 --- a/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java +++ b/src/main/java/org/apache/nifi/annotation/lifecycle/OnDisabled.java @@ -16,13 +16,14 @@ */ package org.apache.nifi.annotation.lifecycle; +import org.apache.nifi.controller.ConfigurationContext; + 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.controller.ConfigurationContext; /** *

diff --git a/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java b/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java index 172979e..c08132b 100644 --- a/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java +++ b/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.annotation.lifecycle; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.processor.ProcessContext; + 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.controller.ConfigurationContext; -import org.apache.nifi.processor.ProcessContext; /** *

diff --git a/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java b/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java index 88a3ec3..16436cd 100644 --- a/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java +++ b/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.annotation.lifecycle; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.processor.ProcessContext; + 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.controller.ConfigurationContext; -import org.apache.nifi.processor.ProcessContext; /** *

diff --git a/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java b/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java index 647c2ec..1ed3d97 100644 --- a/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java +++ b/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.annotation.lifecycle; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.processor.ProcessContext; + 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.controller.ConfigurationContext; -import org.apache.nifi.processor.ProcessContext; /** *

diff --git a/src/main/java/org/apache/nifi/components/ConfigurableComponent.java b/src/main/java/org/apache/nifi/components/ConfigurableComponent.java index e2ea992..2c47dab 100644 --- a/src/main/java/org/apache/nifi/components/ConfigurableComponent.java +++ b/src/main/java/org/apache/nifi/components/ConfigurableComponent.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.components; +import org.apache.nifi.annotation.lifecycle.OnConfigurationRestored; + import java.util.Collection; import java.util.List; -import org.apache.nifi.annotation.lifecycle.OnConfigurationRestored; public interface ConfigurableComponent { diff --git a/src/main/java/org/apache/nifi/components/PropertyValue.java b/src/main/java/org/apache/nifi/components/PropertyValue.java index 4e52c54..01c5500 100644 --- a/src/main/java/org/apache/nifi/components/PropertyValue.java +++ b/src/main/java/org/apache/nifi/components/PropertyValue.java @@ -16,9 +16,6 @@ */ package org.apache.nifi.components; -import java.time.Duration; -import java.util.Map; -import java.util.concurrent.TimeUnit; import org.apache.nifi.components.resource.ResourceReference; import org.apache.nifi.components.resource.ResourceReferences; import org.apache.nifi.controller.ControllerService; @@ -28,6 +25,10 @@ import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.registry.EnvironmentVariables; +import java.time.Duration; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** *

* A PropertyValue provides a mechanism whereby the currently configured value diff --git a/src/main/java/org/apache/nifi/components/state/exception/StateTooLargeException.java b/src/main/java/org/apache/nifi/components/state/exception/StateTooLargeException.java index 41c8b24..5461b40 100644 --- a/src/main/java/org/apache/nifi/components/state/exception/StateTooLargeException.java +++ b/src/main/java/org/apache/nifi/components/state/exception/StateTooLargeException.java @@ -17,9 +17,10 @@ package org.apache.nifi.components.state.exception; -import java.io.IOException; import org.apache.nifi.components.state.StateManager; +import java.io.IOException; + /** * Thrown when attempting to store state via the {@link StateManager} but the state being * stored is larger than is allowed by the backing storage mechanism. diff --git a/src/main/java/org/apache/nifi/context/PropertyContext.java b/src/main/java/org/apache/nifi/context/PropertyContext.java index 89ffb45..b8b6ccf 100644 --- a/src/main/java/org/apache/nifi/context/PropertyContext.java +++ b/src/main/java/org/apache/nifi/context/PropertyContext.java @@ -16,10 +16,11 @@ */ 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/src/main/java/org/apache/nifi/controller/VerifiableControllerService.java b/src/main/java/org/apache/nifi/controller/VerifiableControllerService.java index c9978f8..f0483cf 100644 --- a/src/main/java/org/apache/nifi/controller/VerifiableControllerService.java +++ b/src/main/java/org/apache/nifi/controller/VerifiableControllerService.java @@ -17,8 +17,8 @@ package org.apache.nifi.controller; -import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.components.ConfigVerificationResult; +import org.apache.nifi.logging.ComponentLog; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java b/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java index 24f74fe..23f9176 100644 --- a/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java +++ b/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java @@ -16,10 +16,11 @@ */ 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; public class ProcessorStatus implements Cloneable { diff --git a/src/main/java/org/apache/nifi/documentation/AbstractDocumentationWriter.java b/src/main/java/org/apache/nifi/documentation/AbstractDocumentationWriter.java index 5a4b555..4e28cbb 100644 --- a/src/main/java/org/apache/nifi/documentation/AbstractDocumentationWriter.java +++ b/src/main/java/org/apache/nifi/documentation/AbstractDocumentationWriter.java @@ -55,9 +55,9 @@ import org.apache.nifi.parameter.ParameterProvider; import org.apache.nifi.processor.Processor; import org.apache.nifi.processor.Relationship; +import org.apache.nifi.registry.flow.FlowRegistryClient; import org.apache.nifi.reporting.InitializationException; import org.apache.nifi.reporting.ReportingTask; -import org.apache.nifi.registry.flow.FlowRegistryClient; import java.io.IOException; import java.util.ArrayList; @@ -156,8 +156,7 @@ protected void writeBody(final ConfigurableComponent component, Map state, final Scope scope) { diff --git a/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java b/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java index 4b6c244..66aec1f 100644 --- a/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java +++ b/src/main/java/org/apache/nifi/documentation/xml/XmlDocumentationWriter.java @@ -16,21 +16,6 @@ */ package org.apache.nifi.documentation.xml; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.function.Function; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import org.apache.nifi.annotation.behavior.DynamicProperty; import org.apache.nifi.annotation.behavior.DynamicRelationship; import org.apache.nifi.annotation.behavior.InputRequirement; @@ -56,10 +41,10 @@ import org.apache.nifi.annotation.documentation.UseCase; import org.apache.nifi.components.AllowableValue; import org.apache.nifi.components.ConfigurableComponent; -import org.apache.nifi.components.listen.ListenPortDefinition; import org.apache.nifi.components.PropertyDependency; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.RequiredPermission; +import org.apache.nifi.components.listen.ListenPortDefinition; import org.apache.nifi.components.resource.ResourceDefinition; import org.apache.nifi.components.resource.ResourceType; import org.apache.nifi.documentation.AbstractDocumentationWriter; @@ -67,6 +52,22 @@ import org.apache.nifi.documentation.ServiceAPI; import org.apache.nifi.processor.Relationship; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.function.Function; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + /** * XML-based implementation of DocumentationWriter. * Please note that while this class lives within the nifi-api, it is provided primarily as a means for documentation components within diff --git a/src/main/java/org/apache/nifi/flow/BatchSize.java b/src/main/java/org/apache/nifi/flow/BatchSize.java index 05ba824..09c53ec 100644 --- a/src/main/java/org/apache/nifi/flow/BatchSize.java +++ b/src/main/java/org/apache/nifi/flow/BatchSize.java @@ -18,6 +18,7 @@ package org.apache.nifi.flow; import io.swagger.v3.oas.annotations.media.Schema; + import java.util.Objects; diff --git a/src/main/java/org/apache/nifi/flow/ConnectableComponent.java b/src/main/java/org/apache/nifi/flow/ConnectableComponent.java index c4264db..c6fd443 100644 --- a/src/main/java/org/apache/nifi/flow/ConnectableComponent.java +++ b/src/main/java/org/apache/nifi/flow/ConnectableComponent.java @@ -18,6 +18,7 @@ package org.apache.nifi.flow; import io.swagger.v3.oas.annotations.media.Schema; + import java.util.Objects; diff --git a/src/main/java/org/apache/nifi/flow/ControllerServiceAPI.java b/src/main/java/org/apache/nifi/flow/ControllerServiceAPI.java index ab28fc3..716b840 100644 --- a/src/main/java/org/apache/nifi/flow/ControllerServiceAPI.java +++ b/src/main/java/org/apache/nifi/flow/ControllerServiceAPI.java @@ -17,10 +17,10 @@ package org.apache.nifi.flow; -import java.util.Objects; - import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Objects; + public class ControllerServiceAPI { private String type; private Bundle bundle; diff --git a/src/main/java/org/apache/nifi/flow/VersionedLabel.java b/src/main/java/org/apache/nifi/flow/VersionedLabel.java index d0e8e24..db6be0c 100644 --- a/src/main/java/org/apache/nifi/flow/VersionedLabel.java +++ b/src/main/java/org/apache/nifi/flow/VersionedLabel.java @@ -17,10 +17,10 @@ package org.apache.nifi.flow; -import java.util.Map; - import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Map; + public class VersionedLabel extends VersionedComponent { private String label; private Long zIndex; diff --git a/src/main/java/org/apache/nifi/flow/resource/ExternalResourceProviderInitializationContext.java b/src/main/java/org/apache/nifi/flow/resource/ExternalResourceProviderInitializationContext.java index aafca70..196f689 100644 --- a/src/main/java/org/apache/nifi/flow/resource/ExternalResourceProviderInitializationContext.java +++ b/src/main/java/org/apache/nifi/flow/resource/ExternalResourceProviderInitializationContext.java @@ -16,9 +16,9 @@ */ package org.apache.nifi.flow.resource; -import javax.net.ssl.SSLContext; import java.util.Map; import java.util.function.Predicate; +import javax.net.ssl.SSLContext; /** * Contains necessary information for extensions of external resource provider functionality. diff --git a/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java b/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java index 2394805..f6bc1b4 100644 --- a/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java +++ b/src/main/java/org/apache/nifi/processor/AbstractSessionFactoryProcessor.java @@ -16,8 +16,6 @@ */ package org.apache.nifi.processor; -import java.util.Collections; -import java.util.Set; import org.apache.nifi.annotation.lifecycle.OnConfigurationRestored; import org.apache.nifi.annotation.lifecycle.OnScheduled; import org.apache.nifi.annotation.lifecycle.OnUnscheduled; @@ -26,6 +24,9 @@ import org.apache.nifi.controller.NodeTypeProvider; import org.apache.nifi.logging.ComponentLog; +import java.util.Collections; +import java.util.Set; + /** *

* Provides a standard partial implementation of a {@link Processor}. This diff --git a/src/main/java/org/apache/nifi/processor/DataUnit.java b/src/main/java/org/apache/nifi/processor/DataUnit.java index 4980b97..3cd51d8 100644 --- a/src/main/java/org/apache/nifi/processor/DataUnit.java +++ b/src/main/java/org/apache/nifi/processor/DataUnit.java @@ -25,172 +25,172 @@ public enum DataUnit { * Bytes */ B { - @Override - public double toB(double value) { - return value; - } - - @Override - public double toKB(double value) { - return value / POWERS[1]; - } - - @Override - public double toMB(double value) { - return value / POWERS[2]; - } - - @Override - public double toGB(double value) { - return value / POWERS[3]; - } - - @Override - public double toTB(double value) { - return value / POWERS[4]; - } - - @Override - public double convert(double sourceSize, DataUnit sourceUnit) { - return sourceUnit.toB(sourceSize); - } - }, + @Override + public double toB(double value) { + return value; + } + + @Override + public double toKB(double value) { + return value / POWERS[1]; + } + + @Override + public double toMB(double value) { + return value / POWERS[2]; + } + + @Override + public double toGB(double value) { + return value / POWERS[3]; + } + + @Override + public double toTB(double value) { + return value / POWERS[4]; + } + + @Override + public double convert(double sourceSize, DataUnit sourceUnit) { + return sourceUnit.toB(sourceSize); + } + }, /** * Kilobytes */ KB { - @Override - public double toB(double value) { - return value * POWERS[1]; - } - - @Override - public double toKB(double value) { - return value; - } - - @Override - public double toMB(double value) { - return value / POWERS[1]; - } - - @Override - public double toGB(double value) { - return value / POWERS[2]; - } - - @Override - public double toTB(double value) { - return value / POWERS[3]; - } - - @Override - public double convert(double sourceSize, DataUnit sourceUnit) { - return sourceUnit.toKB(sourceSize); - } - }, + @Override + public double toB(double value) { + return value * POWERS[1]; + } + + @Override + public double toKB(double value) { + return value; + } + + @Override + public double toMB(double value) { + return value / POWERS[1]; + } + + @Override + public double toGB(double value) { + return value / POWERS[2]; + } + + @Override + public double toTB(double value) { + return value / POWERS[3]; + } + + @Override + public double convert(double sourceSize, DataUnit sourceUnit) { + return sourceUnit.toKB(sourceSize); + } + }, /** * Megabytes */ MB { - @Override - public double toB(double value) { - return value * POWERS[2]; - } - - @Override - public double toKB(double value) { - return value * POWERS[1]; - } - - @Override - public double toMB(double value) { - return value; - } - - @Override - public double toGB(double value) { - return value / POWERS[1]; - } - - @Override - public double toTB(double value) { - return value / POWERS[2]; - } - - @Override - public double convert(double sourceSize, DataUnit sourceUnit) { - return sourceUnit.toMB(sourceSize); - } - }, + @Override + public double toB(double value) { + return value * POWERS[2]; + } + + @Override + public double toKB(double value) { + return value * POWERS[1]; + } + + @Override + public double toMB(double value) { + return value; + } + + @Override + public double toGB(double value) { + return value / POWERS[1]; + } + + @Override + public double toTB(double value) { + return value / POWERS[2]; + } + + @Override + public double convert(double sourceSize, DataUnit sourceUnit) { + return sourceUnit.toMB(sourceSize); + } + }, /** * Gigabytes */ GB { - @Override - public double toB(double value) { - return value * POWERS[3]; - } - - @Override - public double toKB(double value) { - return value * POWERS[2]; - } - - @Override - public double toMB(double value) { - return value * POWERS[1]; - } - - @Override - public double toGB(double value) { - return value; - } - - @Override - public double toTB(double value) { - return value / POWERS[1]; - } - - @Override - public double convert(double sourceSize, DataUnit sourceUnit) { - return sourceUnit.toGB(sourceSize); - } - }, + @Override + public double toB(double value) { + return value * POWERS[3]; + } + + @Override + public double toKB(double value) { + return value * POWERS[2]; + } + + @Override + public double toMB(double value) { + return value * POWERS[1]; + } + + @Override + public double toGB(double value) { + return value; + } + + @Override + public double toTB(double value) { + return value / POWERS[1]; + } + + @Override + public double convert(double sourceSize, DataUnit sourceUnit) { + return sourceUnit.toGB(sourceSize); + } + }, /** * Terabytes */ TB { - @Override - public double toB(double value) { - return value * POWERS[4]; - } - - @Override - public double toKB(double value) { - return value * POWERS[3]; - } - - @Override - public double toMB(double value) { - return value * POWERS[2]; - } - - @Override - public double toGB(double value) { - return value * POWERS[1]; - } - - @Override - public double toTB(double value) { - return value; - } - - @Override - public double convert(double sourceSize, DataUnit sourceUnit) { - return sourceUnit.toTB(sourceSize); - } - }; + @Override + public double toB(double value) { + return value * POWERS[4]; + } + + @Override + public double toKB(double value) { + return value * POWERS[3]; + } + + @Override + public double toMB(double value) { + return value * POWERS[2]; + } + + @Override + public double toGB(double value) { + return value * POWERS[1]; + } + + @Override + public double toTB(double value) { + return value; + } + + @Override + public double convert(double sourceSize, DataUnit sourceUnit) { + return sourceUnit.toTB(sourceSize); + } + }; public double convert(final double sourceSize, final DataUnit sourceUnit) { throw new AbstractMethodError(); diff --git a/src/main/java/org/apache/nifi/processor/ProcessSession.java b/src/main/java/org/apache/nifi/processor/ProcessSession.java index e0340a8..7028962 100644 --- a/src/main/java/org/apache/nifi/processor/ProcessSession.java +++ b/src/main/java/org/apache/nifi/processor/ProcessSession.java @@ -16,16 +16,6 @@ */ package org.apache.nifi.processor; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.file.Path; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Consumer; -import java.util.regex.Pattern; import org.apache.nifi.components.state.Scope; import org.apache.nifi.components.state.StateMap; import org.apache.nifi.controller.queue.QueueSize; @@ -38,8 +28,19 @@ import org.apache.nifi.processor.io.OutputStreamCallback; import org.apache.nifi.processor.io.StreamCallback; import org.apache.nifi.processor.metrics.CommitTiming; -import org.apache.nifi.provenance.ProvenanceReporter; import org.apache.nifi.provenance.ProvenanceEventType; +import org.apache.nifi.provenance.ProvenanceReporter; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Path; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; +import java.util.regex.Pattern; /** * A process session encompasses all the behaviors a processor can perform to diff --git a/src/main/java/org/apache/nifi/processor/exception/ProcessException.java b/src/main/java/org/apache/nifi/processor/exception/ProcessException.java index f162b14..e21fa43 100644 --- a/src/main/java/org/apache/nifi/processor/exception/ProcessException.java +++ b/src/main/java/org/apache/nifi/processor/exception/ProcessException.java @@ -25,7 +25,6 @@ public class ProcessException extends RuntimeException { private static final long serialVersionUID = 1L; public ProcessException() { - super(); } public ProcessException(final String message) { diff --git a/src/main/java/org/apache/nifi/processor/exception/TerminatedTaskException.java b/src/main/java/org/apache/nifi/processor/exception/TerminatedTaskException.java index df2c413..334a614 100644 --- a/src/main/java/org/apache/nifi/processor/exception/TerminatedTaskException.java +++ b/src/main/java/org/apache/nifi/processor/exception/TerminatedTaskException.java @@ -17,12 +17,13 @@ package org.apache.nifi.processor.exception; -import java.io.InputStream; -import java.io.OutputStream; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.ProcessSession; import org.apache.nifi.processor.ProcessSessionFactory; +import java.io.InputStream; +import java.io.OutputStream; + /** * This Exception is thrown whenever a user terminates a Processor and the * Processor subsequently attempts to call a method on a {@link ProcessSession}, diff --git a/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java b/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java index 0d212c2..918c638 100644 --- a/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java +++ b/src/main/java/org/apache/nifi/provenance/ProvenanceEventBuilder.java @@ -16,12 +16,13 @@ */ package org.apache.nifi.provenance; -import java.util.List; -import java.util.Map; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.processor.Processor; import org.apache.nifi.processor.Relationship; +import java.util.List; +import java.util.Map; + public interface ProvenanceEventBuilder { /** diff --git a/src/main/java/org/apache/nifi/registry/flow/AbstractFlowRegistryClient.java b/src/main/java/org/apache/nifi/registry/flow/AbstractFlowRegistryClient.java index eabb318..38aae15 100644 --- a/src/main/java/org/apache/nifi/registry/flow/AbstractFlowRegistryClient.java +++ b/src/main/java/org/apache/nifi/registry/flow/AbstractFlowRegistryClient.java @@ -19,8 +19,8 @@ import org.apache.nifi.components.AbstractConfigurableComponent; import org.apache.nifi.logging.ComponentLog; -import javax.net.ssl.SSLContext; import java.util.Optional; +import javax.net.ssl.SSLContext; public abstract class AbstractFlowRegistryClient extends AbstractConfigurableComponent implements FlowRegistryClient { diff --git a/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClientInitializationContext.java b/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClientInitializationContext.java index 06baef6..13bf9d9 100644 --- a/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClientInitializationContext.java +++ b/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClientInitializationContext.java @@ -18,8 +18,8 @@ import org.apache.nifi.logging.ComponentLog; -import javax.net.ssl.SSLContext; import java.util.Optional; +import javax.net.ssl.SSLContext; public interface FlowRegistryClientInitializationContext { diff --git a/src/main/java/org/apache/nifi/reporting/EventAccess.java b/src/main/java/org/apache/nifi/reporting/EventAccess.java index 3e2c907..3873b06 100644 --- a/src/main/java/org/apache/nifi/reporting/EventAccess.java +++ b/src/main/java/org/apache/nifi/reporting/EventAccess.java @@ -16,16 +16,16 @@ */ package org.apache.nifi.reporting; -import java.io.IOException; -import java.util.List; -import java.util.Map; - import org.apache.nifi.action.Action; import org.apache.nifi.controller.status.ProcessGroupStatus; import org.apache.nifi.diagnostics.StorageUsage; import org.apache.nifi.provenance.ProvenanceEventRecord; import org.apache.nifi.provenance.ProvenanceEventRepository; +import java.io.IOException; +import java.util.List; +import java.util.Map; + public interface EventAccess { /** diff --git a/src/main/java/org/apache/nifi/reporting/ReportingContext.java b/src/main/java/org/apache/nifi/reporting/ReportingContext.java index 85cf844..253089d 100644 --- a/src/main/java/org/apache/nifi/reporting/ReportingContext.java +++ b/src/main/java/org/apache/nifi/reporting/ReportingContext.java @@ -16,12 +16,13 @@ */ package org.apache.nifi.reporting; -import java.util.Map; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.state.StateManager; import org.apache.nifi.context.PropertyContext; import org.apache.nifi.controller.ControllerServiceLookup; +import java.util.Map; + /** * This interface provides a bridge between the NiFi Framework and a * {@link ReportingTask}. This context allows a ReportingTask to access diff --git a/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java b/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java index 978b421..8851eae 100644 --- a/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java +++ b/src/main/java/org/apache/nifi/reporting/ReportingInitializationContext.java @@ -16,13 +16,14 @@ */ package org.apache.nifi.reporting; -import java.util.concurrent.TimeUnit; import org.apache.nifi.controller.ControllerServiceLookup; import org.apache.nifi.controller.NodeTypeProvider; import org.apache.nifi.kerberos.KerberosContext; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.scheduling.SchedulingStrategy; +import java.util.concurrent.TimeUnit; + /** * A ReportingConfiguration provides configuration information to a * ReportingTask at the time of initialization diff --git a/src/main/java/org/apache/nifi/reporting/VerifiableReportingTask.java b/src/main/java/org/apache/nifi/reporting/VerifiableReportingTask.java index fe674be..dffa69c 100644 --- a/src/main/java/org/apache/nifi/reporting/VerifiableReportingTask.java +++ b/src/main/java/org/apache/nifi/reporting/VerifiableReportingTask.java @@ -17,9 +17,9 @@ package org.apache.nifi.reporting; +import org.apache.nifi.components.ConfigVerificationResult; import org.apache.nifi.controller.ConfigurationContext; import org.apache.nifi.logging.ComponentLog; -import org.apache.nifi.components.ConfigVerificationResult; import java.util.List; diff --git a/src/main/java/org/apache/nifi/search/SearchContext.java b/src/main/java/org/apache/nifi/search/SearchContext.java index 24b0c2a..29766b0 100644 --- a/src/main/java/org/apache/nifi/search/SearchContext.java +++ b/src/main/java/org/apache/nifi/search/SearchContext.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.search; -import java.util.Map; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.PropertyValue; +import java.util.Map; + public interface SearchContext { /**