NIFI-13238 Added Checkstyle rules for whitespace

This closes #8832

Signed-off-by: David Handermann <exceptionfactory@apache.org>

c2/c2-client-bundle/c2-client-service/src/test/java/org/apache/nifi/c2/client/service/operation/C2OperationHandlerProviderTest.java

@@ -39,7 +39,7 @@ public class C2OperationHandlerProviderTest {
     private static C2OperationAck operationAck;
 
     @BeforeAll
-    public static void setup(){
+    public static void setup() {
         operationAck = new C2OperationAck();
         operationAck.setOperationId("12345");
     }

c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/MultiProcessorUseCase.java

@@ -28,7 +28,7 @@ public class MultiProcessorUseCase implements Serializable {
     private List<String> keywords;
     private List<ProcessorConfiguration> configurations;
 
-    @Schema(description="A description of the use case")
+    @Schema(description = "A description of the use case")
     public String getDescription() {
         return description;
     }
@@ -37,7 +37,7 @@ public void setDescription(final String description) {
         this.description = description;
     }
 
-    @Schema(description="Any pertinent notes about the use case")
+    @Schema(description = "Any pertinent notes about the use case")
     public String getNotes() {
         return notes;
     }
@@ -46,7 +46,7 @@ public void setNotes(final String notes) {
         this.notes = notes;
     }
 
-    @Schema(description="Keywords that pertain to the use csae")
+    @Schema(description = "Keywords that pertain to the use csae")
     public List<String> getKeywords() {
         return keywords;
     }
@@ -55,7 +55,7 @@ public void setKeywords(final List<String> keywords) {
         this.keywords = keywords;
     }
 
-    @Schema(description="A description of how to configure the Processor to perform the task described in the use case")
+    @Schema(description = "A description of how to configure the Processor to perform the task described in the use case")
     public List<ProcessorConfiguration> getConfigurations() {
         return configurations;
     }

c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ProcessorConfiguration.java

@@ -26,7 +26,7 @@ public class ProcessorConfiguration implements Serializable {
     private String processorClassName;
     private String configuration;
 
-    @Schema(description="The fully qualified classname of the Processor that should be used to accomplish the use case")
+    @Schema(description = "The fully qualified classname of the Processor that should be used to accomplish the use case")
     public String getProcessorClassName() {
         return processorClassName;
     }
@@ -35,7 +35,7 @@ public void setProcessorClassName(final String processorClassName) {
         this.processorClassName = processorClassName;
     }
 
-    @Schema(description="A description of how the Processor should be configured in order to accomplish the use case")
+    @Schema(description = "A description of how the Processor should be configured in order to accomplish the use case")
     public String getConfiguration() {
         return configuration;
     }

c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/ProcessorDefinition.java

@@ -55,7 +55,7 @@ public class ProcessorDefinition extends ConfigurableExtensionDefinition {
     private List<MultiProcessorUseCase> multiProcessorUseCases;
 
 
-    @Schema(description="Any input requirements this processor has.")
+    @Schema(description = "Any input requirements this processor has.")
     public InputRequirement.Requirement getInputRequirement() {
         return inputRequirement;
     }
@@ -230,7 +230,7 @@ public void setWritesAttributes(List<Attribute> writesAttributes) {
         this.writesAttributes = writesAttributes;
     }
 
-    @Schema(description="A list of use cases that have been documented for this Processor")
+    @Schema(description = "A list of use cases that have been documented for this Processor")
     public List<UseCase> getUseCases() {
         return useCases;
     }
@@ -239,7 +239,7 @@ public void setUseCases(final List<UseCase> useCases) {
         this.useCases = useCases;
     }
 
-    @Schema(description="A list of use cases that have been documented that involve this Processor in conjunction with other Processors")
+    @Schema(description = "A list of use cases that have been documented that involve this Processor in conjunction with other Processors")
     public List<MultiProcessorUseCase> getMultiProcessorUseCases() {
         return multiProcessorUseCases;
     }

c2/c2-protocol/c2-protocol-component-api/src/main/java/org/apache/nifi/c2/protocol/component/api/UseCase.java

@@ -30,7 +30,7 @@ public class UseCase implements Serializable {
     private String configuration;
     private InputRequirement.Requirement inputRequirement;
 
-    @Schema(description="A description of the use case")
+    @Schema(description = "A description of the use case")
     public String getDescription() {
         return description;
     }
@@ -39,7 +39,7 @@ public void setDescription(final String description) {
         this.description = description;
     }
 
-    @Schema(description="Any pertinent notes about the use case")
+    @Schema(description = "Any pertinent notes about the use case")
     public String getNotes() {
         return notes;
     }
@@ -48,7 +48,7 @@ public void setNotes(final String notes) {
         this.notes = notes;
     }
 
-    @Schema(description="Keywords that pertain to the use case")
+    @Schema(description = "Keywords that pertain to the use case")
     public List<String> getKeywords() {
         return keywords;
     }
@@ -57,7 +57,7 @@ public void setKeywords(final List<String> keywords) {
         this.keywords = keywords;
     }
 
-    @Schema(description="A description of how to configure the Processor to perform the task described in the use case")
+    @Schema(description = "A description of how to configure the Processor to perform the task described in the use case")
     public String getConfiguration() {
         return configuration;
     }
@@ -66,7 +66,7 @@ public void setConfiguration(final String configuration) {
         this.configuration = configuration;
     }
 
-    @Schema(description="Specifies whether an incoming FlowFile is expected for this use case")
+    @Schema(description = "Specifies whether an incoming FlowFile is expected for this use case")
     public InputRequirement.Requirement getInputRequirement() {
         return inputRequirement;
     }

checkstyle.xml

@@ -27,6 +27,10 @@
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
     </module>
     <module name="TreeWalker">
+        <module name="WhitespaceAfter"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="WhitespaceAround"/>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\s+$"/>
             <property name="message" value="Line has trailing whitespace."/>

minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/FlowStatusRunner.java

@@ -38,7 +38,7 @@ public FlowStatusRunner(PeriodicStatusReporterManager periodicStatusReporterMana
      */
     @Override
     public int runCommand(String[] args) {
-        if(args.length == 2) {
+        if (args.length == 2) {
             CMD_LOGGER.info(periodicStatusReporterManager.statusReport(args[1]).toString());
             return OK.getStatusCode();
         } else {

minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/status/PeriodicStatusReporter.java

@@ -44,7 +44,7 @@ public abstract class PeriodicStatusReporter {
      * 'reportRunner' prior to this method being called.
      */
     public void start() {
-        if (reportRunner == null){
+        if (reportRunner == null) {
             throw new IllegalStateException("Programmatic error, the reportRunner is still NULL when 'start' was called.");
         }
         scheduledExecutorService.scheduleAtFixedRate(reportRunner, period, period, TimeUnit.MILLISECONDS);

minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/OrderedProperties.java

@@ -68,7 +68,7 @@ public synchronized void store(OutputStream out, String comments) throws IOExcep
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         super.store(byteArrayOutputStream, comments);
 
-        try(BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()), "8859_1"));
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(byteArrayOutputStream.toByteArray()), "8859_1"));
             BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(out, "8859_1"))) {
             String line;
             while ((line = bufferedReader.readLine()) != null) {

minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/OrderedPropertiesTest.java

@@ -46,7 +46,7 @@ public void testOrderedProperties() throws IOException {
         try (BufferedReader actualReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(byteArrayOutputStream.toByteArray())));
              BufferedReader expectedReader = new BufferedReader(new InputStreamReader(OrderedPropertiesTest.class.getClassLoader().getResourceAsStream("orderedPropertiesExpected.properties")))) {
             String expectedLine;
-            while((expectedLine = expectedReader.readLine()) != null) {
+            while ((expectedLine = expectedReader.readLine()) != null) {
                 String actualLine = actualReader.readLine();
                 if (!"#Tue Feb 21 11:03:08 EST 2017".equals(expectedLine)) {
                     assertEquals(expectedLine, actualLine);

minifi/minifi-commons/minifi-flow-status-report/src/main/java/org/apache/nifi/minifi/commons/status/FlowStatusReport.java

@@ -145,7 +145,7 @@ public int hashCode() {
     public String toString() {
 
         StringWriter jsonString = new StringWriter();
-        try(JsonGenerator generator = objectMapper.getFactory().createGenerator(jsonString)){
+        try (JsonGenerator generator = objectMapper.getFactory().createGenerator(jsonString)) {
             generator.writeStartObject();
             generator.writeObjectField("controllerServiceStatusList", controllerServiceStatusList);
             generator.writeObjectField("processorStatusList", processorStatusList);

minifi/minifi-commons/minifi-flow-status-report/src/main/java/org/apache/nifi/minifi/commons/status/processor/ProcessorStatusBean.java

@@ -78,7 +78,7 @@ public int hashCode() {
     @Override
     public String toString() {
         return "{" +
-                "id='" + getId()+ '\'' +
+                "id='" + getId() + '\'' +
                 "name='" + getName() + '\'' +
                 ", processorHealth=" + processorHealth +
                 ", processorStats=" + processorStats +

minifi/minifi-integration-tests/src/test/java/org/apache/nifi/minifi/integration/util/LogUtil.java

@@ -43,7 +43,10 @@ public static void verifyLogEntries(String expectedJsonFilename, Container conta
         List<ExpectedLogEntry> expectedLogEntries;
         try (InputStream inputStream = LogUtil.class.getClassLoader().getResourceAsStream(expectedJsonFilename)) {
             List<Map<String, Object>> expected = new ObjectMapper().readValue(inputStream, List.class);
-            expectedLogEntries = expected.stream().map(map -> new ExpectedLogEntry(Pattern.compile((String)map.get("pattern")), (int) map.getOrDefault("occurrences", 1))).collect(Collectors.toList());
+            expectedLogEntries = expected
+                    .stream()
+                    .map(map -> new ExpectedLogEntry(Pattern.compile((String) map.get("pattern")), (int) map.getOrDefault("occurrences", 1)))
+                    .collect(Collectors.toList());
         }
         DockerPort dockerPort = container.port(8000);
         logger.info("Connecting to external port {} for docker internal port of {}", new Object[]{dockerPort.getExternalPort(), dockerPort.getInternalPort()});

minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/test/java/org/apache/nifi/minifi/c2/command/PropertiesPersisterTest.java

@@ -132,7 +132,7 @@ void shouldModifyProperties() {
     }
 
     private void writeBootstrapFile(String property) {
-        try(BufferedWriter writer = new BufferedWriter(new FileWriter(bootstrapConfigFileLocation))) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(bootstrapConfigFileLocation))) {
             writer.write(property + System.lineSeparator());
             writer.write(EXTRA_PROPERTY_KEY + "=" + EXTRA_PROPERTY_VALUE);
         } catch (IOException e) {

minifi/minifi-toolkit/minifi-toolkit-encrypt-config/src/test/java/org/apache/nifi/minifi/toolkit/config/transformer/BootstrapConfigurationFileTransformerTest.java

@@ -38,7 +38,7 @@ class BootstrapConfigurationFileTransformerTest {
     private static final String BOOTSTRAP_ROOT_KEY_PROPERTY = "minifi.bootstrap.sensitive.key";
     private static final String MOCK_KEY = "mockKey";
     private static final String BOOTSTRAP_CONF_FILE_WITHOUT_KEY = "/transformer/bootstrap_without_key.conf";
-    private static final String BOOTSTRAP_CONF_TRANSFORMED= "transformed.conf";
+    private static final String BOOTSTRAP_CONF_TRANSFORMED = "transformed.conf";
 
     @TempDir
     private Path tempDir;

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ControllerServiceSchema.java

@@ -48,7 +48,7 @@ public Map<String, Object> toMap() {
         result.put(TYPE_KEY, serviceClass);
         result.put(PROPERTIES_KEY, new TreeMap<>(properties));
 
-        if(annotationData != null && !annotationData.isEmpty()) {
+        if (annotationData != null && !annotationData.isEmpty()) {
             result.put(ANNOTATION_DATA_KEY, annotationData);
         }
 

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ProcessorSchema.java

@@ -99,7 +99,7 @@ public Map<String, Object> toMap() {
         result.put(AUTO_TERMINATED_RELATIONSHIPS_LIST_KEY, autoTerminatedRelationshipsList);
         result.put(PROPERTIES_KEY, new TreeMap<>(properties));
 
-        if(annotationData != null && !annotationData.isEmpty()) {
+        if (annotationData != null && !annotationData.isEmpty()) {
             result.put(ANNOTATION_DATA_KEY, annotationData);
         }
 

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ProvenanceRepositorySchema.java

@@ -48,8 +48,7 @@ public class ProvenanceRepositorySchema extends BaseSchema implements WritableSc
     private String provenanceRepoMaxStorageTime = DEFAULT_PROVENANCE_REPO_MAX_STORAGE_TIME;
     private Integer provenanceRepoBufferSize = DEFAULT_PROVENANCE_REPO_BUFFER_SIZE;
 
-    public ProvenanceRepositorySchema(){
-    }
+    public ProvenanceRepositorySchema() { }
 
     public ProvenanceRepositorySchema(Map map) {
         provenanceRepoRolloverTime = getOptionalKeyAsType(map, PROVENANCE_REPO_ROLLOVER_TIME_KEY, String.class,

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchema.java

@@ -56,7 +56,7 @@ public static boolean valid(String input) {
     public static final String DEFAULT_COMMENT = "";
     public static final String DEFAULT_TIMEOUT = "30 secs";
     public static final String DEFAULT_YIELD_PERIOD = "10 sec";
-    public static final String DEFAULT_TRANSPORT_PROTOCOL= "RAW";
+    public static final String DEFAULT_TRANSPORT_PROTOCOL = "RAW";
     public static final String DEFAULT_PROXY_HOST = "";
     public static final Integer DEFAULT_PROXY_PORT = null;
     public static final String DEFAULT_PROXY_USER = "";
@@ -99,7 +99,7 @@ public RemoteProcessGroupSchema(Map map) {
         yieldPeriod = getOptionalKeyAsType(map, YIELD_PERIOD_KEY, String.class, wrapperName, DEFAULT_YIELD_PERIOD);
         transportProtocol = getOptionalKeyAsType(map, TRANSPORT_PROTOCOL_KEY, String.class, wrapperName, DEFAULT_TRANSPORT_PROTOCOL);
 
-        if (!TransportProtocolOptions.valid(transportProtocol)){
+        if (!TransportProtocolOptions.valid(transportProtocol)) {
             addValidationIssue(TRANSPORT_PROTOCOL_KEY, wrapperName, "it must be either 'RAW' or 'HTTP' but is '" + transportProtocol + "'");
         }
 

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/common/BaseSchema.java

@@ -58,6 +58,7 @@ public List<String> getValidationIssues() {
         return validationIssues.stream().sorted().collect(Collectors.toList());
     }
 
+    @Override
     public void addValidationIssue(String issue) {
         validationIssues.add(issue);
     }
@@ -96,7 +97,7 @@ <T> T getKeyAsType(Map valueMap, String key, Class<T> targetClass, String wrappe
         if (value == null || (targetClass != String.class && "".equals(value))) {
             if (defaultValue != null) {
                 return defaultValue;
-            } else if(required) {
+            } else if (required) {
                 addValidationIssue(key, wrapperName, IT_WAS_NOT_FOUND_AND_IT_IS_REQUIRED);
             }
         } else {
@@ -120,7 +121,7 @@ public <T> T getMapAsType(Map valueMap, String key, Class targetClass, String wr
         return interpretValueAsType(obj, key, targetClass, wrapperName, required, instantiateIfNull);
     }
 
-    public <InputT, OutputT> List<OutputT> convertListToType(List<InputT> list, String simpleListType, Class<? extends OutputT> targetClass, String wrapperName){
+    public <InputT, OutputT> List<OutputT> convertListToType(List<InputT> list, String simpleListType, Class<? extends OutputT> targetClass, String wrapperName) {
         if (list == null) {
             return new ArrayList<>();
         }
@@ -170,10 +171,10 @@ private <InputT, OutputT> OutputT interpretValueAsType(Class<InputT> inputType,
 
     private <T> T interpretValueAsType(Object obj, String key, Class targetClass, String wrapperName, boolean required, boolean instantiateIfNull) {
         if (obj == null || (targetClass != String.class && "".equals(obj))) {
-            if (required){
+            if (required) {
                 addValidationIssue(key, wrapperName, "it is a required property but was not found");
             } else {
-                if(instantiateIfNull) {
+                if (instantiateIfNull) {
                     try {
                         return (T) targetClass.getDeclaredConstructor().newInstance();
                     } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v1/ConfigSchemaV1.java

@@ -214,7 +214,7 @@ protected List<ConnectionSchema> getConnectionSchemas(List<ProcessorSchema> proc
 
     protected List<RemoteProcessGroupSchema> getRemoteProcessGroupSchemas() {
         Set<UUID> ids = new HashSet<>();
-        List<RemoteProcessGroupSchema> rpgSchemas= new ArrayList<>(remoteProcessingGroups.size());
+        List<RemoteProcessGroupSchema> rpgSchemas = new ArrayList<>(remoteProcessingGroups.size());
 
         for (RemoteProcessGroupSchemaV1 rpg : remoteProcessingGroups) {
             RemoteProcessGroupSchema rpgSchema = rpg.convert();

minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/RemoteProcessGroupSchemaV2.java

@@ -66,7 +66,7 @@ public RemoteProcessGroupSchemaV2(Map map) {
         yieldPeriod = getOptionalKeyAsType(map, YIELD_PERIOD_KEY, String.class, wrapperName, DEFAULT_YIELD_PERIOD);
         transportProtocol = getOptionalKeyAsType(map, TRANSPORT_PROTOCOL_KEY, String.class, wrapperName, DEFAULT_TRANSPORT_PROTOCOL);
 
-        if (!TransportProtocolOptions.valid(transportProtocol)){
+        if (!TransportProtocolOptions.valid(transportProtocol)) {
             addValidationIssue(TRANSPORT_PROTOCOL_KEY, wrapperName, "it must be either 'RAW' or 'HTTP' but is '" + transportProtocol + "'");
         }
     }

minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchemaTest.java

@@ -63,7 +63,7 @@ public void testTransportProtocol() {
 
         map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "RAW");
         RemoteProcessGroupSchema first =  new RemoteProcessGroupSchema(map);
-        validateIssuesNumMatches(0,first);
+        validateIssuesNumMatches(0, first);
         assertEquals(first.getTransportProtocol(), "RAW");
 
         map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "HTTP");
@@ -81,7 +81,7 @@ public void testLocalNetworkInterface() {
 
         map.put(RemoteProcessGroupSchema.LOCAL_NETWORK_INTERFACE_KEY, "eth1");
         RemoteProcessGroupSchema first =  new RemoteProcessGroupSchema(map);
-        validateIssuesNumMatches(0,first);
+        validateIssuesNumMatches(0, first);
         assertEquals(first.getLocalNetworkInterface(), "eth1");
     }
     @Test

minifi/minifi-toolkit/minifi-toolkit-schema/src/test/java/org/apache/nifi/minifi/toolkit/schema/v2/RemoteProcessGroupSchemaV2Test.java

@@ -58,7 +58,7 @@ public void testTransportProtocol() {
 
         map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "RAW");
         RemoteProcessGroupSchemaV2 first =  new RemoteProcessGroupSchemaV2(map);
-        validateIssuesNumMatches(0,first);
+        validateIssuesNumMatches(0, first);
         assertEquals(first.getTransportProtocol(), "RAW");
 
         map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, "HTTP");

nifi-api/src/main/java/org/apache/nifi/context/PropertyContext.java

@@ -35,6 +35,6 @@ public interface PropertyContext {
     PropertyValue getProperty(PropertyDescriptor descriptor);
 
 
-    Map<String,String> getAllProperties();
+    Map<String, String> getAllProperties();
 
 }

nifi-api/src/main/java/org/apache/nifi/controller/status/analytics/QueryWindow.java

@@ -55,7 +55,7 @@ public Date getEndDateTime() {
         return new Date(endTimeMillis);
     }
 
-    public long getTimeDifferenceMillis(){
+    public long getTimeDifferenceMillis() {
         return endTimeMillis - startTimeMillis;
     }
 

nifi-api/src/main/java/org/apache/nifi/controller/status/analytics/StatusAnalytics.java

@@ -34,7 +34,7 @@ public interface StatusAnalytics {
      * is the value for the prediction
      * @return map
      */
-    Map<String,Long> getPredictions();
+    Map<String, Long> getPredictions();
 
     /**
      * Return if analytics object supports online learning