This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 c8d45fd47d NIFI-15638 Add Checkstyle Rules UnusedLocalVariable,
InnerAssignment and AvoidNestedBlocks (#10928)
c8d45fd47d is described below
commit c8d45fd47d2860dafd247c598b46249657c7057b
Author: Pierre Villard <[email protected]>
AuthorDate: Tue Feb 24 03:10:08 2026 +0100
NIFI-15638 Add Checkstyle Rules UnusedLocalVariable, InnerAssignment and
AvoidNestedBlocks (#10928)
Signed-off-by: David Handermann <[email protected]>
---
checkstyle.xml | 5 +
.../nifi/provenance/StandardLineageResult.java | 4 +-
.../nifi/serialization/SimpleRecordSchema.java | 3 +-
.../protocol/http/HttpClientTransaction.java | 5 +-
.../nifi/processors/hadoop/GetHDFSFileInfo.java | 35 +++---
.../hadoop/util/TestFileStatusIterator.java | 4 +-
.../kafka/processors/ConsumeKafkaRebalanceIT.java | 13 ++-
.../consumer/Kafka3ConsumerServiceTest.java | 18 ++--
.../nifi/processors/network/ParseNetflowv5.java | 4 +-
.../processors/salesforce/PutSalesforceObject.java | 38 +++----
.../datasources/ConnectionStatusDataSource.java | 3 +-
.../ConnectionStatusPredictionDataSource.java | 3 +-
.../datasources/ProcessGroupStatusDataSource.java | 3 +-
.../sql/datasources/ProcessorStatusDataSource.java | 3 +-
.../processors/standard/TestEvaluateXQuery.java | 120 ++++++++++-----------
.../nifi/processors/standard/TestPutTCP.java | 3 +-
.../windowsevent/WindowsEventLogRecordReader.java | 8 +-
.../java/org/apache/nifi/xml/XMLRecordReader.java | 8 +-
.../provenance/expiration/FileRemovalAction.java | 5 +-
.../index/lucene/MigrateDefunctIndex.java | 5 +-
.../provenance/store/WriteAheadStorePartition.java | 5 +-
.../store/TestPartitionedWriteAheadEventStore.java | 5 +-
.../nifi/controller/StandardProcessorNode.java | 4 +-
.../apache/nifi/controller/TestStandardFunnel.java | 44 ++++----
.../java/org/apache/nifi/nar/NarClassLoaders.java | 3 +-
.../org/apache/nifi/audit/ProcessorAuditor.java | 4 +-
.../org/apache/nifi/util/MockProcessContext.java | 4 +-
.../nifi/registry/bootstrap/BootstrapCodec.java | 4 +-
.../processors/tests/system/VerifyEvenThenOdd.java | 5 +-
29 files changed, 187 insertions(+), 181 deletions(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index 8c676b74a5..0782170db0 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -134,5 +134,10 @@
<module name="GenericWhitespace"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
+ <module name="UnusedLocalVariable"/>
+ <module name="InnerAssignment"/>
+ <module name="AvoidNestedBlocks">
+ <property name="allowInSwitchCase" value="true"/>
+ </module>
</module>
</module>
diff --git
a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
index cfd3415ca2..718255768d 100644
---
a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
+++
b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardLineageResult.java
@@ -270,8 +270,8 @@ public class StandardLineageResult implements
ComputeLineageResult, ProgressiveR
lastEventMap.put(parentUuid, lineageNode);
}
- }
break;
+ }
case RECEIVE:
case CREATE: {
// for a receive event, we want to create a FlowFile Node
that represents the FlowFile received
@@ -287,8 +287,8 @@ public class StandardLineageResult implements
ComputeLineageResult, ProgressiveR
}
edges.add(new EdgeNode(record.getFlowFileUuid(),
lineageNode, flowFileNode));
lastEventMap.put(record.getFlowFileUuid(), flowFileNode);
- }
break;
+ }
default:
break;
}
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/SimpleRecordSchema.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/SimpleRecordSchema.java
index e1ebab447b..8a82e74c30 100644
---
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/SimpleRecordSchema.java
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/SimpleRecordSchema.java
@@ -192,7 +192,8 @@ public class SimpleRecordSchema implements RecordSchema {
public int hashCode() {
int computed = this.hashCode;
if (computed == 0) {
- computed = this.hashCode = calculateHashCode();
+ computed = calculateHashCode();
+ this.hashCode = computed;
}
return computed;
diff --git
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java
index f87655af50..d28d6bac21 100644
---
a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java
+++
b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/protocol/http/HttpClientTransaction.java
@@ -145,9 +145,8 @@ public class HttpClientTransaction extends
AbstractTransaction {
} else {
logger.warn("{} BAD_CHECKSUM, Expected the transaction
is canceled on server, but received {}.", this, badChecksumCancelResponse);
}
-
- }
break;
+ }
case CONFIRM_TRANSACTION:
// The actual HTTP request will be sent in
readTransactionResponse.
logger.debug("{} Transaction is confirmed.", this);
@@ -161,8 +160,8 @@ public class HttpClientTransaction extends
AbstractTransaction {
} else {
logger.warn("{} CANCEL_TRANSACTION, Expected the
transaction is canceled on server, but received {}.", this, cancelResponse);
}
- }
break;
+ }
}
}
}
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java
index 8ff2e14856..c071e6e4fa 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java
@@ -602,23 +602,28 @@ public class GetHDFSFileInfo extends
AbstractHadoopProcessor {
req.setFullPath(fullPath);
req.setRecursive(context.getProperty(RECURSE_SUBDIRS).asBoolean());
- PropertyValue pv;
- String v;
-
- if (context.getProperty(DIR_FILTER).isSet() && (pv =
context.getProperty(DIR_FILTER).evaluateAttributeExpressions(ff)) != null) {
- v = pv.getValue();
- req.setDirFilter(v == null ? null : Pattern.compile(v));
+ if (context.getProperty(DIR_FILTER).isSet()) {
+ final PropertyValue pv =
context.getProperty(DIR_FILTER).evaluateAttributeExpressions(ff);
+ if (pv != null) {
+ final String v = pv.getValue();
+ req.setDirFilter(v == null ? null : Pattern.compile(v));
+ }
}
- if (context.getProperty(FILE_FILTER).isSet() && (pv =
context.getProperty(FILE_FILTER).evaluateAttributeExpressions(ff)) != null) {
- v = pv.getValue();
- req.setFileFilter(v == null ? null : Pattern.compile(v));
+ if (context.getProperty(FILE_FILTER).isSet()) {
+ final PropertyValue pv =
context.getProperty(FILE_FILTER).evaluateAttributeExpressions(ff);
+ if (pv != null) {
+ final String v = pv.getValue();
+ req.setFileFilter(v == null ? null : Pattern.compile(v));
+ }
}
- if (context.getProperty(FILE_EXCLUDE_FILTER).isSet()
- && (pv =
context.getProperty(FILE_EXCLUDE_FILTER).evaluateAttributeExpressions(ff)) !=
null) {
- v = pv.getValue();
- req.setFileExcludeFilter(v == null ? null : Pattern.compile(v));
+ if (context.getProperty(FILE_EXCLUDE_FILTER).isSet()) {
+ final PropertyValue pv =
context.getProperty(FILE_EXCLUDE_FILTER).evaluateAttributeExpressions(ff);
+ if (pv != null) {
+ final String v = pv.getValue();
+ req.setFileExcludeFilter(v == null ? null :
Pattern.compile(v));
+ }
}
req.setIgnoreDotFiles(context.getProperty(IGNORE_DOTTED_FILES).asBoolean());
@@ -627,9 +632,9 @@ public class GetHDFSFileInfo extends
AbstractHadoopProcessor {
req.setGrouping(HDFSFileInfoRequest.Grouping.getEnum(context.getProperty(GROUPING).getValue()));
req.setBatchSize(context.getProperty(BATCH_SIZE).asInteger() != null ?
context.getProperty(BATCH_SIZE).asInteger() : 1);
- v = context.getProperty(DESTINATION).getValue();
+ final String destination = context.getProperty(DESTINATION).getValue();
- req.setDestContent(DESTINATION_CONTENT.getValue().equals(v));
+ req.setDestContent(DESTINATION_CONTENT.getValue().equals(destination));
return req;
}
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/util/TestFileStatusIterator.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/util/TestFileStatusIterator.java
index a717b3271c..ee31953a85 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/util/TestFileStatusIterator.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/util/TestFileStatusIterator.java
@@ -108,9 +108,7 @@ class TestFileStatusIterator {
assertEquals(0, fileStatusIterable.getTotalFileCount());
- for (FileStatus ignored : fileStatusIterable) {
- // count files
- }
+ fileStatusIterable.forEach(status -> { });
assertEquals(3, fileStatusIterable.getTotalFileCount());
}
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaRebalanceIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaRebalanceIT.java
index d4a8103abe..f37c52523c 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaRebalanceIT.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaRebalanceIT.java
@@ -40,6 +40,7 @@ import org.junit.jupiter.api.Timeout;
import java.time.Duration;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -172,7 +173,9 @@ class ConsumeKafkaRebalanceIT extends
AbstractConsumeKafkaIT {
int polledCount = 0;
int maxAttempts = 20;
while (polledCount < 15 && maxAttempts-- > 0) {
- for (ByteRecord ignored : service.poll(Duration.ofSeconds(2)))
{
+ final Iterator<ByteRecord> iterator =
service.poll(Duration.ofSeconds(2)).iterator();
+ while (iterator.hasNext()) {
+ iterator.next();
polledCount++;
}
}
@@ -239,7 +242,9 @@ class ConsumeKafkaRebalanceIT extends
AbstractConsumeKafkaIT {
// Poll and iterate through records - this tracks offsets
internally
int maxAttempts = 20;
while (recordsPolledByFirstConsumer < totalMessages &&
maxAttempts-- > 0) {
- for (ByteRecord ignored :
service1.poll(Duration.ofSeconds(2))) {
+ final Iterator<ByteRecord> iterator =
service1.poll(Duration.ofSeconds(2)).iterator();
+ while (iterator.hasNext()) {
+ iterator.next();
recordsPolledByFirstConsumer++;
}
}
@@ -268,7 +273,9 @@ class ConsumeKafkaRebalanceIT extends
AbstractConsumeKafkaIT {
int emptyPolls = 0;
while (emptyPolls < 5) {
boolean hasRecords = false;
- for (ByteRecord ignored :
service2.poll(Duration.ofSeconds(2))) {
+ final Iterator<ByteRecord> iterator =
service2.poll(Duration.ofSeconds(2)).iterator();
+ while (iterator.hasNext()) {
+ iterator.next();
hasRecords = true;
recordsPolledBySecondConsumer++;
}
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerServiceTest.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerServiceTest.java
index 4463c499df..0f59500515 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerServiceTest.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/test/java/org/apache/nifi/kafka/service/consumer/Kafka3ConsumerServiceTest.java
@@ -92,8 +92,7 @@ class Kafka3ConsumerServiceTest {
when(consumer.poll(any(Duration.class))).thenReturn(consumerRecords);
final Iterable<ByteRecord> polledRecords =
consumerService.poll(Duration.ofMillis(100));
- for (ByteRecord ignored : polledRecords) {
- }
+ polledRecords.forEach(record -> { });
assertFalse(consumerService.hasRevokedPartitions());
@@ -121,8 +120,7 @@ class Kafka3ConsumerServiceTest {
when(consumer.poll(any(Duration.class))).thenReturn(consumerRecords);
final Iterable<ByteRecord> polledRecords =
consumerService.poll(Duration.ofMillis(100));
- for (ByteRecord ignored : polledRecords) {
- }
+ polledRecords.forEach(record -> { });
consumerService.onPartitionsRevoked(List.of(partition0, partition1));
consumerService.commitOffsetsForRevokedPartitions();
@@ -160,8 +158,7 @@ class Kafka3ConsumerServiceTest {
when(consumer.poll(any(Duration.class))).thenReturn(consumerRecords);
final Iterable<ByteRecord> polledRecords =
consumerService.poll(Duration.ofMillis(100));
- for (ByteRecord ignored : polledRecords) {
- }
+ polledRecords.forEach(record -> { });
consumerService.onPartitionsRevoked(List.of(partition0));
consumerService.commitOffsetsForRevokedPartitions();
@@ -189,8 +186,7 @@ class Kafka3ConsumerServiceTest {
when(consumer.poll(any(Duration.class))).thenReturn(consumerRecords);
final Iterable<ByteRecord> polledRecords =
consumerService.poll(Duration.ofMillis(100));
- for (ByteRecord ignored : polledRecords) {
- }
+ polledRecords.forEach(record -> { });
consumerService.onPartitionsRevoked(List.of(partition0));
consumerService.commitOffsetsForRevokedPartitions();
@@ -217,8 +213,7 @@ class Kafka3ConsumerServiceTest {
when(consumer.committed(any())).thenReturn(Collections.singletonMap(partition0,
new OffsetAndMetadata(0L)));
final Iterable<ByteRecord> polledRecords =
consumerService.poll(Duration.ofMillis(100));
- for (ByteRecord ignored : polledRecords) {
- }
+ polledRecords.forEach(record -> { });
consumerService.onPartitionsRevoked(List.of(partition0));
assertTrue(consumerService.hasRevokedPartitions());
@@ -243,8 +238,7 @@ class Kafka3ConsumerServiceTest {
when(consumer.poll(any(Duration.class))).thenReturn(consumerRecords);
final Iterable<ByteRecord> polledRecords =
consumerService.poll(Duration.ofMillis(100));
- for (ByteRecord ignored : polledRecords) {
- }
+ polledRecords.forEach(record -> { });
consumerService.onPartitionsRevoked(List.of(partition0));
assertTrue(consumerService.hasRevokedPartitions());
diff --git
a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java
b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java
index 1902213edb..6445ee9a1b 100644
---
a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java
+++
b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java
@@ -216,8 +216,8 @@ public class ParseNetflowv5 extends AbstractProcessor {
}
private OptionalInt resolvePort(final FlowFile flowFile) {
- final String port;
- if ((port = flowFile.getAttribute("udp.port")) != null) {
+ final String port = flowFile.getAttribute("udp.port");
+ if (port != null) {
return OptionalInt.of(Integer.parseInt(port));
}
return OptionalInt.empty();
diff --git
a/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java
b/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java
index b8438f9b1b..161bd14a66 100644
---
a/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java
+++
b/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java
@@ -171,32 +171,32 @@ public class PutSalesforceObject extends
AbstractProcessor {
private void processRecords(FlowFile flowFile, String objectType,
ProcessContext context, ProcessSession session) throws IOException,
MalformedRecordException, SchemaNotFoundException {
RecordReaderFactory readerFactory =
context.getProperty(RECORD_READER_FACTORY).asControllerService(RecordReaderFactory.class);
int count = 0;
- RecordExtender recordExtender;
try (InputStream in = session.read(flowFile);
RecordReader reader = readerFactory.createRecordReader(flowFile,
in, getLogger());
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- WriteJsonResult writer = getWriter(recordExtender =
getExtender(reader), out)) {
-
- Record record;
- while ((record = reader.nextRecord()) != null) {
- count++;
- if (!writer.isActiveRecordSet()) {
- writer.beginRecordSet();
+ ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ RecordExtender recordExtender = getExtender(reader);
+ try (WriteJsonResult writer = getWriter(recordExtender, out)) {
+ Record record;
+ while ((record = reader.nextRecord()) != null) {
+ count++;
+ if (!writer.isActiveRecordSet()) {
+ writer.beginRecordSet();
+ }
+
+ MapRecord extendedRecord =
recordExtender.getExtendedRecord(objectType, count, record);
+ writer.write(extendedRecord);
+
+ if (count == maxRecordCount) {
+ count = 0;
+ postRecordBatch(objectType, out, writer,
recordExtender);
+ out.reset();
+ }
}
-
- MapRecord extendedRecord =
recordExtender.getExtendedRecord(objectType, count, record);
- writer.write(extendedRecord);
-
- if (count == maxRecordCount) {
- count = 0;
+ if (writer.isActiveRecordSet()) {
postRecordBatch(objectType, out, writer, recordExtender);
- out.reset();
}
}
- if (writer.isActiveRecordSet()) {
- postRecordBatch(objectType, out, writer, recordExtender);
- }
}
}
diff --git
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusDataSource.java
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusDataSource.java
index 3e6775e483..19c67dfdb9 100644
---
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusDataSource.java
+++
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusDataSource.java
@@ -75,7 +75,8 @@ public class ConnectionStatusDataSource implements
ResettableDataSource {
if (groupStatus == lastFetchedStatus) {
connectionStatuses = lastConnectionStatuses;
} else {
- connectionStatuses = lastConnectionStatuses =
gatherConnectionStatuses(groupStatus);
+ lastConnectionStatuses = gatherConnectionStatuses(groupStatus);
+ connectionStatuses = lastConnectionStatuses;
}
lastFetchedStatus = groupStatus;
diff --git
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusPredictionDataSource.java
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusPredictionDataSource.java
index 803c301f65..98bfd1fbe9 100644
---
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusPredictionDataSource.java
+++
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ConnectionStatusPredictionDataSource.java
@@ -65,7 +65,8 @@ public class ConnectionStatusPredictionDataSource implements
ResettableDataSourc
if (groupStatus == lastFetchedStatus) {
connectionStatuses = lastConnectionStatuses;
} else {
- connectionStatuses = lastConnectionStatuses =
gatherConnectionStatuses(groupStatus);
+ lastConnectionStatuses = gatherConnectionStatuses(groupStatus);
+ connectionStatuses = lastConnectionStatuses;
}
lastFetchedStatus = groupStatus;
diff --git
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessGroupStatusDataSource.java
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessGroupStatusDataSource.java
index 13052c062e..2a5e4fcf0b 100644
---
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessGroupStatusDataSource.java
+++
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessGroupStatusDataSource.java
@@ -81,7 +81,8 @@ public class ProcessGroupStatusDataSource implements
ResettableDataSource {
if (groupStatus == lastFetchedStatus) {
groupStatuses = lastStatuses;
} else {
- groupStatuses = lastStatuses =
gatherProcessGroupStatuses(groupStatus);
+ lastStatuses = gatherProcessGroupStatuses(groupStatus);
+ groupStatuses = lastStatuses;
}
lastFetchedStatus = groupStatus;
diff --git
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessorStatusDataSource.java
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessorStatusDataSource.java
index b382c2adf2..5b321ecfa1 100644
---
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessorStatusDataSource.java
+++
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/src/main/java/org/apache/nifi/reporting/sql/datasources/ProcessorStatusDataSource.java
@@ -84,7 +84,8 @@ public class ProcessorStatusDataSource implements
ResettableDataSource {
if (groupStatus == lastFetchedStatus) {
processorStatuses = lastStatuses;
} else {
- processorStatuses = lastStatuses =
gatherProcessorStatuses(groupStatus);
+ lastStatuses = gatherProcessorStatuses(groupStatus);
+ processorStatuses = lastStatuses;
}
lastFetchedStatus = groupStatus;
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
index 7085efe8a1..2002b5e7d1 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
@@ -77,70 +77,64 @@ public class TestEvaluateXQuery {
}
}
}
- {
- formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "xml", false, false);
- assertEquals(1, formattedResults.size());
- String expectedXml
- = """
- <?xml version="1.0" encoding="UTF-8"?><fruit
xmlns:ns="http://namespace/1"; taste="crisp">
+ formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "xml", false, false);
+ assertEquals(1, formattedResults.size());
+ String expectedXml
+ = """
+ <?xml version="1.0" encoding="UTF-8"?><fruit
xmlns:ns="http://namespace/1"; taste="crisp">
+ <!-- Apples are my favorite -->
+ <name>apple</name>
+ <color>red</color>
+ </fruit>""";
+ assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
+
+ formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "html", false, false);
+ assertEquals(1, formattedResults.size());
+ expectedXml
+ = """
+ <fruit xmlns:ns="http://namespace/1"; taste="crisp">
<!-- Apples are my favorite -->
- <name>apple</name>
- <color>red</color>
- </fruit>""";
- assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
- }
- {
- formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "html", false, false);
- assertEquals(1, formattedResults.size());
- String expectedXml
- = """
- <fruit xmlns:ns="http://namespace/1"; taste="crisp">
- <!-- Apples are my favorite -->
- <name>apple</name>
- <color>red</color>
- </fruit>""";
- assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
- }
- {
- formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "text", false, false);
- assertEquals(1, formattedResults.size());
- String expectedXml
- = """
-
- \s
- apple
- red
- \
- """;
- assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
- }
- {
- formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "xml", true, false);
- assertEquals(1, formattedResults.size());
- String expectedXml
- = """
- <?xml version="1.0" encoding="UTF-8"?>
- <fruit xmlns:ns="http://namespace/1"; taste="crisp">
- <!-- Apples are my favorite -->
- <name>apple</name>
- <color>red</color>
- </fruit>
- """;
- assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
- }
- {
- formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "xml", true, true);
- assertEquals(1, formattedResults.size());
- String expectedXml
- = """
- <fruit xmlns:ns="http://namespace/1"; taste="crisp">
- <!-- Apples are my favorite -->
- <name>apple</name>
- <color>red</color>
- </fruit>
- """;
- assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
- }
+ <name>apple</name>
+ <color>red</color>
+ </fruit>""";
+ assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
+
+ formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "text", false, false);
+ assertEquals(1, formattedResults.size());
+ expectedXml
+ = """
+
+ \s
+ apple
+ red
+ \
+ """;
+ assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
+
+ formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "xml", true, false);
+ assertEquals(1, formattedResults.size());
+ expectedXml
+ = """
+ <?xml version="1.0" encoding="UTF-8"?>
+ <fruit xmlns:ns="http://namespace/1"; taste="crisp">
+ <!-- Apples are my favorite -->
+ <name>apple</name>
+ <color>red</color>
+ </fruit>
+ """;
+ assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
+
+ formattedResults = getFormattedResult(XML_SNIPPET,
singleElementNodeQuery, "xml", true, true);
+ assertEquals(1, formattedResults.size());
+ expectedXml
+ = """
+ <fruit xmlns:ns="http://namespace/1"; taste="crisp">
+ <!-- Apples are my favorite -->
+ <name>apple</name>
+ <color>red</color>
+ </fruit>
+ """;
+ assertEquals(spaceTrimmed(expectedXml),
spaceTrimmed(formattedResults.getFirst()));
}
private String spaceTrimmed(String str) {
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutTCP.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutTCP.java
index d07dbe474f..b102e78f6c 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutTCP.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutTCP.java
@@ -352,7 +352,8 @@ public class TestPutTCP {
private void assertMessagesReceived(final String[] sentData, final int
iterations) throws Exception {
for (int i = 0; i < iterations; i++) {
- for (String ignored : sentData) {
+ final int expectedMessageCount = sentData.length;
+ for (int j = 0; j < expectedMessageCount; j++) {
final ByteArrayMessage message = messages.take();
assertNotNull(message, String.format("Message [%d] not found",
i));
assertTrue(Arrays.asList(sentData).contains(new
String(message.getMessage())));
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/windowsevent/WindowsEventLogRecordReader.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/windowsevent/WindowsEventLogRecordReader.java
index 04c8b5b139..d213de5484 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/windowsevent/WindowsEventLogRecordReader.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/windowsevent/WindowsEventLogRecordReader.java
@@ -374,9 +374,9 @@ public class WindowsEventLogRecordReader implements
RecordReader {
// dropUnknown == true && coerceTypes == true
if (coerceTypes) {
- final Object value;
final DataType dataType = field.get().getDataType();
- if ((value = parseStringForType(attribute.getValue(),
targetFieldName, dataType)) != null) {
+ final Object value =
parseStringForType(attribute.getValue(), targetFieldName, dataType);
+ if (value != null) {
recordValues.put(targetFieldName, value);
}
@@ -389,10 +389,10 @@ public class WindowsEventLogRecordReader implements
RecordReader {
// dropUnknown == false && coerceTypes == true
if (coerceTypes) {
- final Object value;
final Optional<RecordField> field =
schema.getField(targetFieldName);
if (field.isPresent()) {
- if ((value = parseStringForType(attribute.getValue(),
targetFieldName, field.get().getDataType())) != null) {
+ final Object value =
parseStringForType(attribute.getValue(), targetFieldName,
field.get().getDataType());
+ if (value != null) {
recordValues.put(targetFieldName, value);
}
} else {
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordReader.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordReader.java
index b870559253..7d99fda894 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordReader.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordReader.java
@@ -485,9 +485,9 @@ public class XMLRecordReader implements RecordReader {
final Optional<RecordField> fieldRaw =
schema.getField(attributeName);
if (fieldPrefixed.isPresent() || fieldRaw.isPresent()) {
if (coerceTypes) {
- final Object value;
final DataType dataType =
fieldPrefixed.map(RecordField::getDataType).orElseGet(() ->
fieldRaw.get().getDataType());
- if ((value = parseStringForType(attribute.getValue(),
targetFieldName, dataType)) != null) {
+ final Object value =
parseStringForType(attribute.getValue(), targetFieldName, dataType);
+ if (value != null) {
recordValues.put(targetFieldName, value);
}
} else {
@@ -498,12 +498,12 @@ public class XMLRecordReader implements RecordReader {
// dropUnknown == false && coerceTypes == true
if (coerceTypes) {
- final Object value;
final Optional<RecordField> fieldPrefixed =
schema.getField(targetFieldName);
final Optional<RecordField> fieldRaw =
schema.getField(attributeName);
if (fieldPrefixed.isPresent() || fieldRaw.isPresent()) {
final DataType dataType =
fieldPrefixed.map(RecordField::getDataType).orElseGet(() ->
fieldRaw.get().getDataType());
- if ((value = parseStringForType(attribute.getValue(),
targetFieldName, dataType)) != null) {
+ final Object value =
parseStringForType(attribute.getValue(), targetFieldName, dataType);
+ if (value != null) {
recordValues.put(targetFieldName, value);
}
} else {
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
index 620914b9e4..c1e6199b51 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
@@ -47,9 +47,8 @@ public class FileRemovalAction implements ExpirationAction {
}
private boolean remove(final File file) {
- boolean removed = false;
- for (int i = 0; i < 10 && !removed; i++) {
- if (removed = file.delete()) {
+ for (int i = 0; i < 10; i++) {
+ if (file.delete()) {
return true;
}
}
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/MigrateDefunctIndex.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/MigrateDefunctIndex.java
index faa0f70ed9..02b26b5b8e 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/MigrateDefunctIndex.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/MigrateDefunctIndex.java
@@ -128,13 +128,14 @@ public class MigrateDefunctIndex implements Runnable {
final StopWatch stopWatch = new StopWatch(true);
- Optional<ProvenanceEventRecord> optionalEvent;
- while ((optionalEvent = eventIterator.nextEvent()).isPresent()) {
+ Optional<ProvenanceEventRecord> optionalEvent =
eventIterator.nextEvent();
+ while (optionalEvent.isPresent()) {
final ProvenanceEventRecord event = optionalEvent.get();
final Document document = eventConverter.convert(event,
event.getEventId());
writer.index(document, Integer.MAX_VALUE);
successCount++;
+ optionalEvent = eventIterator.nextEvent();
}
writer.commit();
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/WriteAheadStorePartition.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/WriteAheadStorePartition.java
index 18f133ab6b..104079b36c 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/WriteAheadStorePartition.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/WriteAheadStorePartition.java
@@ -405,12 +405,13 @@ public class WriteAheadStorePartition implements
EventStorePartition {
public List<ProvenanceEventRecord> getEvents(final long firstRecordId,
final int maxEvents, final EventAuthorizer authorizer) throws IOException {
final List<ProvenanceEventRecord> events = new
ArrayList<>(Math.min(maxEvents, 1000));
try (final EventIterator iterator =
createEventIterator(firstRecordId)) {
- Optional<ProvenanceEventRecord> eventOption;
- while ((eventOption = iterator.nextEvent()).isPresent() &&
events.size() < maxEvents) {
+ Optional<ProvenanceEventRecord> eventOption = iterator.nextEvent();
+ while (eventOption.isPresent() && events.size() < maxEvents) {
final ProvenanceEventRecord event = eventOption.get();
if (authorizer.isAuthorized(event)) {
events.add(event);
}
+ eventOption = iterator.nextEvent();
}
}
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/store/TestPartitionedWriteAheadEventStore.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/store/TestPartitionedWriteAheadEventStore.java
index 18d4fa8fbd..876a8867f1 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/store/TestPartitionedWriteAheadEventStore.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/store/TestPartitionedWriteAheadEventStore.java
@@ -475,13 +475,14 @@ public class TestPartitionedWriteAheadEventStore {
final EventIterator iterator = store.getEventsByTimestamp(200, 799);
int count = 0;
- Optional<ProvenanceEventRecord> optionalRecord;
- while ((optionalRecord = iterator.nextEvent()).isPresent()) {
+ Optional<ProvenanceEventRecord> optionalRecord = iterator.nextEvent();
+ while (optionalRecord.isPresent()) {
final ProvenanceEventRecord event = optionalRecord.get();
final long timestamp = event.getEventTime();
assertTrue(timestamp >= 200);
assertTrue(timestamp <= 799);
count++;
+ optionalRecord = iterator.nextEvent();
}
assertEquals(600, count);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index ea4b5e3ef2..6d1876a3d2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1173,8 +1173,8 @@ public class StandardProcessorNode extends ProcessorNode
implements Connectable
.explanation("Scheduling Period is not a
valid cron expression")
.build());
}
+ break;
}
- break;
case TIMER_DRIVEN: {
try {
final long schedulingNanos =
FormatUtils.getTimeDuration(Objects.requireNonNull(evaluatedSchedulingPeriod),
@@ -1199,8 +1199,8 @@ public class StandardProcessorNode extends ProcessorNode
implements Connectable
.explanation("Scheduling Period is not a
valid time duration")
.build());
}
+ break;
}
- break;
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/test/java/org/apache/nifi/controller/TestStandardFunnel.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/test/java/org/apache/nifi/controller/TestStandardFunnel.java
index 75f1e12069..e48c117e02 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/test/java/org/apache/nifi/controller/TestStandardFunnel.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/test/java/org/apache/nifi/controller/TestStandardFunnel.java
@@ -25,31 +25,25 @@ public class TestStandardFunnel {
@Test
public void testSetFlowFileLimit() {
- {
- StandardFunnel funnel = getStandardFunnel(1, 100000);
- assertEquals(1, funnel.getMaxConcurrentTasks());
- assertEquals(100, funnel.maxIterations);
- }
- {
- StandardFunnel funnel = getStandardFunnel(1, 100001);
- assertEquals(1, funnel.getMaxConcurrentTasks());
- assertEquals(101, funnel.maxIterations);
- }
- {
- StandardFunnel funnel = getStandardFunnel(1, 99999);
- assertEquals(1, funnel.getMaxConcurrentTasks());
- assertEquals(100, funnel.maxIterations);
- }
- {
- StandardFunnel funnel = getStandardFunnel(1, 0);
- assertEquals(1, funnel.getMaxConcurrentTasks());
- assertEquals(1, funnel.maxIterations);
- }
- {
- StandardFunnel funnel = getStandardFunnel(1, 1);
- assertEquals(1, funnel.getMaxConcurrentTasks());
- assertEquals(1, funnel.maxIterations);
- }
+ StandardFunnel funnel = getStandardFunnel(1, 100000);
+ assertEquals(1, funnel.getMaxConcurrentTasks());
+ assertEquals(100, funnel.maxIterations);
+
+ funnel = getStandardFunnel(1, 100001);
+ assertEquals(1, funnel.getMaxConcurrentTasks());
+ assertEquals(101, funnel.maxIterations);
+
+ funnel = getStandardFunnel(1, 99999);
+ assertEquals(1, funnel.getMaxConcurrentTasks());
+ assertEquals(100, funnel.maxIterations);
+
+ funnel = getStandardFunnel(1, 0);
+ assertEquals(1, funnel.getMaxConcurrentTasks());
+ assertEquals(1, funnel.maxIterations);
+
+ funnel = getStandardFunnel(1, 1);
+ assertEquals(1, funnel.getMaxConcurrentTasks());
+ assertEquals(1, funnel.maxIterations);
}
private StandardFunnel getStandardFunnel(final int maxConcurrentTasks,
final int maxBatchSize) {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
index 01ed56553f..0c1ba9db48 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
@@ -136,7 +136,8 @@ public final class NarClassLoaders {
synchronized (this) {
ic = initContext;
if (ic == null) {
- initContext = ic = load(rootClassloader,
frameworkWorkingDir, extensionsWorkingDir, frameworkNarId, logDetails);
+ ic = load(rootClassloader, frameworkWorkingDir,
extensionsWorkingDir, frameworkNarId, logDetails);
+ initContext = ic;
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
index dffc610b6c..7abf60f4dc 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
@@ -474,8 +474,8 @@ public class ProcessorAuditor extends NiFiAuditor {
private void getItemPaths(NodeList nl, String path, Map<String, Node> map)
{
if (nl != null) {
for (int i = 0; i < nl.getLength(); i++) {
- Node n;
- if ((n = nl.item(i)) != null) {
+ final Node n = nl.item(i);
+ if (n != null) {
if (n.getNodeType() == Node.ELEMENT_NODE ||
n.getNodeType() == Node.TEXT_NODE) {
if (n.hasChildNodes()) {
if (n.getNodeType() == Node.ELEMENT_NODE) {
diff --git
a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
index 8951200e0a..aeedf780bf 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -307,9 +307,9 @@ public class MockProcessContext extends
MockControllerServiceLookup implements P
public boolean removeProperty(final String property) {
Objects.requireNonNull(property);
final PropertyDescriptor fullyPopulatedDescriptor =
component.getPropertyDescriptor(property);
- String value = null;
+ final String value = properties.remove(fullyPopulatedDescriptor);
- if ((value = properties.remove(fullyPopulatedDescriptor)) != null) {
+ if (value != null) {
if (!value.equals(fullyPopulatedDescriptor.getDefaultValue())) {
component.onPropertyModified(fullyPopulatedDescriptor, value,
null);
}
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/BootstrapCodec.java
b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/BootstrapCodec.java
index abbad28261..f63990d9af 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/BootstrapCodec.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-bootstrap/src/main/java/org/apache/nifi/registry/bootstrap/BootstrapCodec.java
@@ -85,8 +85,8 @@ public class BootstrapCodec {
writer.write("OK");
writer.newLine();
writer.flush();
+ break;
}
- break;
case "STARTED": {
if (args.length != 1) {
throw new InvalidCommandException("STARTED command must
contain a status argument");
@@ -101,8 +101,8 @@ public class BootstrapCodec {
writer.write("OK");
writer.newLine();
writer.flush();
+ break;
}
- break;
}
}
}
diff --git
a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/VerifyEvenThenOdd.java
b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/VerifyEvenThenOdd.java
index 5adf559cda..0641865e8f 100644
---
a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/VerifyEvenThenOdd.java
+++
b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/processors/tests/system/VerifyEvenThenOdd.java
@@ -71,9 +71,10 @@ public class VerifyEvenThenOdd extends AbstractProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession
session) throws ProcessException {
final List<FlowFile> allFlowFiles = new ArrayList<>();
- List<FlowFile> batch;
- while (!(batch = session.get(1000)).isEmpty()) {
+ List<FlowFile> batch = session.get(1000);
+ while (!batch.isEmpty()) {
allFlowFiles.addAll(batch);
+ batch = session.get(1000);
}
boolean oddSeen = false;
