This is an automated email from the ASF dual-hosted git repository.
pvillard31 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 03f58ff43f0 NIFI-16101 Fixed warnings resulting from Intellij "Null
Check Method is called with obviously non-null argument" check. (#11416)
03f58ff43f0 is described below
commit 03f58ff43f0a974adabb14be41b6c45817a46666
Author: dan-s1 <[email protected]>
AuthorDate: Sat Jul 11 00:48:13 2026 -0400
NIFI-16101 Fixed warnings resulting from Intellij "Null Check Method is
called with obviously non-null argument" check. (#11416)
---
.../main/java/org/apache/nifi/provenance/NamedSearchableField.java | 2 +-
.../nifi/kafka/processors/ConsumeKafkaInjectMetadataRecordIT.java | 3 +--
.../org/apache/nifi/kafka/processors/ConsumeKafkaWrapperRecordIT.java | 3 +--
.../org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java | 4 ++--
.../java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java | 4 ++--
.../nifi/registry/bundle/extract/nar/TestNarBundleExtractor.java | 2 +-
.../java/org/apache/nifi/registry/service/TestRegistryService.java | 3 +--
7 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
index e24cbc300c9..2ad658d5677 100644
---
a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
+++
b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/NamedSearchableField.java
@@ -41,7 +41,7 @@ public class NamedSearchableField implements SearchableField {
this.identifier = requireNonNull(identifier);
this.searchableName = requireNonNull(searchableName);
this.friendlyName = requireNonNull(friendlyName);
- this.attribute = requireNonNull(attribute);
+ this.attribute = attribute;
this.fieldType = requireNonNull(fieldType);
this.hash = 298347 + searchableName.hashCode() + (attribute ? 1 : 0);
}
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaInjectMetadataRecordIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaInjectMetadataRecordIT.java
index 1c4524c44e8..017efbdfd2e 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaInjectMetadataRecordIT.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaInjectMetadataRecordIT.java
@@ -55,7 +55,6 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ConsumeKafkaInjectMetadataRecordIT extends AbstractConsumeKafkaIT {
@@ -179,7 +178,7 @@ class ConsumeKafkaInjectMetadataRecordIT extends
AbstractConsumeKafkaIT {
assertEquals(topic,
metadata.get(InjectMetadataRecord.TOPIC).asText());
assertEquals(FIRST_PARTITION,
metadata.get(InjectMetadataRecord.PARTITION).asInt());
- assertNotNull(metadata.get(InjectMetadataRecord.OFFSET).asInt());
+
assertTrue(metadata.get(InjectMetadataRecord.OFFSET).isIntegralNumber());
assertTrue(metadata.get(InjectMetadataRecord.TIMESTAMP).isIntegralNumber());
}
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaWrapperRecordIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaWrapperRecordIT.java
index 46ee56e3488..34260f0d174 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaWrapperRecordIT.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/ConsumeKafkaWrapperRecordIT.java
@@ -55,7 +55,6 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
class ConsumeKafkaWrapperRecordIT extends AbstractConsumeKafkaIT {
@@ -179,7 +178,7 @@ class ConsumeKafkaWrapperRecordIT extends
AbstractConsumeKafkaIT {
final ObjectNode metadata = assertInstanceOf(ObjectNode.class,
wrapper.get("metadata"));
assertEquals(topic, metadata.get("topic").asText());
assertEquals(FIRST_PARTITION, metadata.get("partition").asInt());
- assertNotNull(metadata.get(InjectMetadataRecord.OFFSET).asInt());
+
assertTrue(metadata.get(InjectMetadataRecord.OFFSET).isIntegralNumber());
assertTrue(metadata.get("timestamp").isIntegralNumber());
}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
index 7145f3b3dec..bdfd73d0c85 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/RunMongoAggregationIT.java
@@ -128,7 +128,7 @@ public class RunMongoAggregationIT extends AbstractMongoIT {
List<MockFlowFile> flowFiles =
runner.getFlowFilesForRelationship(RunMongoAggregation.REL_RESULTS);
for (MockFlowFile mff : flowFiles) {
String val = mff.getAttribute(AGG_ATTR);
- assertNotNull("Missing query attribute", val);
+ assertNotNull(val, "Missing query attribute");
assertEquals(queryInput, val, "Value was wrong");
}
}
@@ -217,7 +217,7 @@ public class RunMongoAggregationIT extends AbstractMongoIT {
assertTrue(mappings.containsKey(read.get("_id")), "Value was not
found");
String queryAttr = mockFlowFile.getAttribute(AGG_ATTR);
- assertNotNull("Query attribute was null.", queryAttr);
+ assertNotNull(queryAttr, "Query attribute was null.");
assertTrue(queryAttr.contains("$project"), "Missing $project");
assertTrue(queryAttr.contains("$group"), "Missing $group");
}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
index 8a6a0218d8e..ea5c7d0dea0 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFSIT.java
@@ -129,7 +129,7 @@ public class FetchGridFSIT extends GridFSITTestBase {
runner.assertTransferCount(FetchGridFS.REL_SUCCESS, 1);
MockFlowFile mff =
runner.getFlowFilesForRelationship(FetchGridFS.REL_SUCCESS).get(0);
String attr = mff.getAttribute(queryAttr);
- assertNotNull("Query attribute was null.", attr);
+ assertNotNull(attr, "Query attribute was null.");
assertTrue(attr.contains("filename"), "Wrong content.");
runner.clearTransferState();
@@ -148,7 +148,7 @@ public class FetchGridFSIT extends GridFSITTestBase {
runner.assertTransferCount(FetchGridFS.REL_SUCCESS, 1);
mff =
runner.getFlowFilesForRelationship(FetchGridFS.REL_SUCCESS).get(0);
attr = mff.getAttribute(queryAttr);
- assertNotNull("Query attribute was null.", attr);
+ assertNotNull(attr, "Query attribute was null.");
assertTrue(attr.contains("metadata"), "Wrong content.");
}
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/java/org/apache/nifi/registry/bundle/extract/nar/TestNarBundleExtractor.java
b/nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/java/org/apache/nifi/registry/bundle/extract/nar/TestNarBundleExtractor.java
index 76342ea93c3..a7f18f22b6c 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/java/org/apache/nifi/registry/bundle/extract/nar/TestNarBundleExtractor.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/java/org/apache/nifi/registry/bundle/extract/nar/TestNarBundleExtractor.java
@@ -142,7 +142,7 @@ public class TestNarBundleExtractor {
assertEquals("HEAD", buildDetails.getBuildTag());
assertEquals("1a937b6", buildDetails.getBuildRevision());
assertEquals("jsmith", buildDetails.getBuiltBy());
- assertNotNull(buildDetails.getBuilt());
+ assertEquals(1544541725000L, buildDetails.getBuilt());
assertEquals("1.10.0-SNAPSHOT",
bundleDetails.getSystemApiVersion());
assertNotNull(bundleDetails.getExtensions());
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
index 07fc1346841..dd9df4bb739 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
@@ -109,7 +109,7 @@ public class TestRegistryService {
final Bucket createdBucket = registryService.createBucket(bucket);
assertNotNull(createdBucket);
assertNotNull(createdBucket.getIdentifier());
- assertNotNull(createdBucket.getCreatedTimestamp());
+ assertTrue(createdBucket.getCreatedTimestamp() > 0);
assertEquals(bucket.getIdentifier(), createdBucket.getIdentifier());
assertEquals(bucket.getName(), createdBucket.getName());
@@ -1261,7 +1261,6 @@ public class TestRegistryService {
final VersionedFlow versionedFlow = returnedSnapshot.getFlow();
assertNotNull(versionedFlow);
- assertNotNull(versionedFlow.getVersionCount());
assertTrue(versionedFlow.getVersionCount() > 0);
final Bucket bucket = returnedSnapshot.getBucket();
