diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ConfigSchema.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ConfigSchema.java index f6a0632dbab0..150f1696db9c 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ConfigSchema.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ConfigSchema.java @@ -134,7 +134,7 @@ public ConfigSchema(Map map, List validationIssues) { // Potential connection sources and destinations need to have unique ids CollectionOverlap overlapResults = new CollectionOverlap<>(new HashSet<>(allProcessorIds), new HashSet<>(allRemoteInputPortIds), new HashSet<>(allRemoteOutputPortIds), new HashSet<>(allInputPortIds), new HashSet<>(allOutputPortIds), new HashSet<>(allFunnelIds)); - if (overlapResults.getDuplicates().size() > 0) { + if (!overlapResults.getDuplicates().isEmpty()) { addValidationIssue(FOUND_THE_FOLLOWING_DUPLICATE_IDS + overlapResults.getDuplicates().stream().sorted().collect(Collectors.joining(", "))); } diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ProcessGroupSchema.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ProcessGroupSchema.java index c192406e05c8..4b644a91bb01 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ProcessGroupSchema.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/ProcessGroupSchema.java @@ -68,10 +68,10 @@ public ProcessGroupSchema(Map map, String wrapperName) { processGroupSchemas = getOptionalKeyAsList(map, PROCESS_GROUPS_KEY, m -> new ProcessGroupSchema(m, "ProcessGroup(id: {id}, name: {name})"), wrapperName); if (ConfigSchema.TOP_LEVEL_NAME.equals(wrapperName)) { - if (inputPortSchemas.size() > 0) { + if (!inputPortSchemas.isEmpty()) { addValidationIssue(INPUT_PORTS_KEY, wrapperName, "must be empty in root group as external input/output ports are currently unsupported"); } - if (outputPortSchemas.size() > 0) { + if (!outputPortSchemas.isEmpty()) { addValidationIssue(OUTPUT_PORTS_KEY, wrapperName, "must be empty in root group as external input/output ports are currently unsupported"); } } else if (ID_DEFAULT.equals(getId())) { diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchema.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchema.java index 30098cf13ccd..3b2a7457f3d3 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchema.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/RemoteProcessGroupSchema.java @@ -90,7 +90,7 @@ public RemoteProcessGroupSchema(Map map) { outputPorts = convertListToType(getOptionalKeyAsType(map, OUTPUT_PORTS_KEY, List.class, wrapperName, new ArrayList<>()), "output port", RemotePortSchema.class, OUTPUT_PORTS_KEY); addIssuesIfNotNull(outputPorts); - if (inputPorts.size() == 0 && outputPorts.size() == 0) { + if (inputPorts.isEmpty() && outputPorts.isEmpty()) { addValidationIssue("Expected either '" + INPUT_PORTS_KEY + "', '" + OUTPUT_PORTS_KEY + "' in section '" + wrapperName + "' to have value(s)"); } diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/common/BaseSchema.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/common/BaseSchema.java index 84b531a4f37d..102b2f59f40c 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/common/BaseSchema.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/common/BaseSchema.java @@ -216,7 +216,7 @@ public static void putListIfNotNull(Map valueMap, String key, List duplicateMessageConsumer, String errorMessagePrefix, List strings) { if (strings != null) { CollectionOverlap collectionOverlap = new CollectionOverlap<>(strings); - if (collectionOverlap.getDuplicates().size() > 0) { + if (!collectionOverlap.getDuplicates().isEmpty()) { duplicateMessageConsumer.accept(errorMessagePrefix + collectionOverlap.getDuplicates().stream().collect(Collectors.joining(", "))); } } diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v1/ConfigSchemaV1.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v1/ConfigSchemaV1.java index 43a9701f3423..e85556f873ee 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v1/ConfigSchemaV1.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v1/ConfigSchemaV1.java @@ -205,7 +205,7 @@ protected List getConnectionSchemas(List proc connectionSchemas.add(convert); } - if (problematicDuplicateNames.size() > 0) { + if (!problematicDuplicateNames.isEmpty()) { validationIssues.add(CANNOT_LOOK_UP_PROCESSOR_ID_FROM_PROCESSOR_NAME_DUE_TO_DUPLICATE_PROCESSOR_NAMES + problematicDuplicateNames.stream().collect(Collectors.joining(", "))); } diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ConfigSchemaV2.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ConfigSchemaV2.java index fa73b16b8ab1..270ee98fcf64 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ConfigSchemaV2.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ConfigSchemaV2.java @@ -125,7 +125,7 @@ public ConfigSchemaV2(Map map, List validationIssues) { // Potential connection sources and destinations need to have unique ids CollectionOverlap overlapResults = new CollectionOverlap<>(new HashSet<>(allProcessorIds), new HashSet<>(allRemoteInputPortIds), new HashSet<>(allInputPortIds), new HashSet<>(allOutputPortIds), new HashSet<>(allFunnelIds)); - if (overlapResults.getDuplicates().size() > 0) { + if (!overlapResults.getDuplicates().isEmpty()) { addValidationIssue(FOUND_THE_FOLLOWING_DUPLICATE_IDS + overlapResults.getDuplicates().stream().sorted().collect(Collectors.joining(", "))); } diff --git a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ProcessGroupSchemaV2.java b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ProcessGroupSchemaV2.java index 15918e676e89..9f44d1a76ab1 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ProcessGroupSchemaV2.java +++ b/minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/v2/ProcessGroupSchemaV2.java @@ -71,10 +71,10 @@ public ProcessGroupSchemaV2(Map map, String wrapperName) { processGroupSchemas = getOptionalKeyAsList(map, PROCESS_GROUPS_KEY, m -> new ProcessGroupSchemaV2(m, "ProcessGroup(id: {id}, name: {name})"), wrapperName); if (ConfigSchema.TOP_LEVEL_NAME.equals(wrapperName)) { - if (inputPortSchemas.size() > 0) { + if (!inputPortSchemas.isEmpty()) { addValidationIssue(INPUT_PORTS_KEY, wrapperName, "must be empty in root group as external input/output ports are currently unsupported"); } - if (outputPortSchemas.size() > 0) { + if (!outputPortSchemas.isEmpty()) { addValidationIssue(OUTPUT_PORTS_KEY, wrapperName, "must be empty in root group as external input/output ports are currently unsupported"); } } else if (ID_DEFAULT.equals(getId())) { diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java index be8c05bca42f..721262288068 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/SiteToSiteClient.java @@ -651,7 +651,7 @@ public SiteToSiteClient build() { * @return the configured URL for the remote NiFi instance */ public String getUrl() { - if (urls != null && urls.size() > 0) { + if (urls != null && !urls.isEmpty()) { return urls.iterator().next(); } return null; diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/http/HttpClient.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/http/HttpClient.java index b455fde0ff98..0c7c1cddc1c0 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/http/HttpClient.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/http/HttpClient.java @@ -117,7 +117,7 @@ private Set fetchRemotePeerStatuses(SiteToSiteRestApiClient apiClien // Each node should have the same URL structure and network reachability with the proxy configuration final Collection peers = apiClient.getPeers(); logger.debug("Retrieved {} peers from {}: {}", peers.size(), apiClient.getBaseUrl(), peers); - if (peers.size() == 0) { + if (peers.isEmpty()) { throw new IOException("Could not get any peer to communicate with. " + apiClient.getBaseUrl() + " returned zero peers."); } @@ -139,7 +139,7 @@ public Transaction createTransaction(final TransferDirection direction) throws I final String nodeApiUrl = resolveNodeApiUrl(peerStatus.getPeerDescription()); final StringBuilder clusterUrls = new StringBuilder(); config.getUrls().forEach(url -> { - if (clusterUrls.length() > 0) { + if (!clusterUrls.isEmpty()) { clusterUrls.append(","); clusterUrls.append(url); } diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java index c69def325a23..ca3b0780ecd7 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/util/SiteToSiteRestApiClient.java @@ -1266,17 +1266,17 @@ public static String getFirstUrl(final String clusterUrlStr) { */ public static Set parseClusterUrls(final String clusterUrlStr) { final Set urls = new LinkedHashSet<>(); - if (clusterUrlStr != null && clusterUrlStr.length() > 0) { + if (clusterUrlStr != null && !clusterUrlStr.isEmpty()) { Arrays.stream(clusterUrlStr.split(",")) .map(s -> s.trim()) - .filter(s -> s.length() > 0) + .filter(s -> !s.isEmpty()) .forEach(s -> { validateUriString(s); urls.add(resolveBaseUrl(s).intern()); }); } - if (urls.size() == 0) { + if (urls.isEmpty()) { throw new IllegalArgumentException("Cluster URL was not specified."); } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java index 27e821006f99..c79eec968840 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java @@ -94,7 +94,7 @@ protected List getSupportedPropertyDescriptors() { @Override public void onTrigger(final ProcessContext context, final ProcessSession session) { final List flowFiles = session.get(context.getProperty(BATCH_SIZE).evaluateAttributeExpressions().asInteger()); - if (flowFiles == null || flowFiles.size() == 0) { + if (flowFiles == null || flowFiles.isEmpty()) { return; } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java index 85485edb15e6..35fa4ababf97 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java @@ -201,7 +201,7 @@ public List verify(final ProcessContext context, final @Override public void onTrigger(final ProcessContext context, final ProcessSession session) { final List flowFiles = session.get(context.getProperty(BATCH_SIZE).evaluateAttributeExpressions().asInteger()); - if (flowFiles == null || flowFiles.size() == 0) { + if (flowFiles == null || flowFiles.isEmpty()) { return; } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java index dab333776535..65ac7fc22a83 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java @@ -105,7 +105,7 @@ protected List getSupportedPropertyDescriptors() { @Override public void onTrigger(final ProcessContext context, final ProcessSession session) { List flowFiles = session.get(context.getProperty(BATCH_SIZE).evaluateAttributeExpressions().asInteger()); - if (flowFiles == null || flowFiles.size() == 0) { + if (flowFiles == null || flowFiles.isEmpty()) { return; } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java index b3f19fdf592d..39e8f2cc112b 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java @@ -141,7 +141,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session final String streamName = entry.getKey(); final List records = entry.getValue(); - if (records.size() > 0) { + if (!records.isEmpty()) { // Send the batch final PutRecordBatchRequest putRecordBatchRequest = PutRecordBatchRequest.builder() .deliveryStreamName(streamName) @@ -174,11 +174,11 @@ public void onTrigger(final ProcessContext context, final ProcessSession session } } - if (failedFlowFiles.size() > 0) { + if (!failedFlowFiles.isEmpty()) { session.transfer(failedFlowFiles, REL_FAILURE); getLogger().error("Failed to publish to kinesis firehose {}", failedFlowFiles); } - if (successfulFlowFiles.size() > 0) { + if (!successfulFlowFiles.isEmpty()) { session.transfer(successfulFlowFiles, REL_SUCCESS); getLogger().info("Successfully published to kinesis firehose {}", successfulFlowFiles); } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java index 2cddeeceaee9..b89ef4084b9a 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java @@ -425,7 +425,7 @@ protected synchronized void persistLocalState(final String s3ObjectKey, final Mu props.remove(s3ObjectKey); } - if (props.size() > 0) { + if (!props.isEmpty()) { try (final FileOutputStream fos = new FileOutputStream(persistenceFile)) { props.store(fos, null); } catch (IOException ioe) { @@ -628,7 +628,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session } else { attributes.put(S3_STORAGECLASS_ATTR_KEY, StorageClass.Standard.toString()); } - if (userMetadata.size() > 0) { + if (!userMetadata.isEmpty()) { StringBuilder userMetaBldr = new StringBuilder(); for (String userKey : userMetadata.keySet()) { userMetaBldr.append(userKey).append("=").append(userMetadata.get(userKey)); @@ -652,7 +652,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session try { currentState = getLocalStateIfInS3(s3, bucket, cacheKey); if (currentState != null) { - if (currentState.getPartETags().size() > 0) { + if (!currentState.getPartETags().isEmpty()) { final PartETag lastETag = currentState.getPartETags().get( currentState.getPartETags().size() - 1); getLogger().info("Resuming upload for flowfile='{}' bucket='{}' key='{}' " + @@ -820,7 +820,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session if (currentState.getStorageClass() != null) { attributes.put(S3_STORAGECLASS_ATTR_KEY, currentState.getStorageClass().toString()); } - if (userMetadata.size() > 0) { + if (!userMetadata.isEmpty()) { StringBuilder userMetaBldr = new StringBuilder(); for (String userKey : userMetadata.keySet()) { userMetaBldr.append(userKey).append("=").append(userMetadata.get(userKey)); @@ -1059,7 +1059,7 @@ public String toString() { StringBuilder buf = new StringBuilder(); buf.append(uploadId).append(SEPARATOR) .append(filePosition.toString()).append(SEPARATOR); - if (partETags.size() > 0) { + if (!partETags.isEmpty()) { boolean first = true; for (PartETag tag : partETags) { if (!first) { diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java index ad06ae9620e9..9b0d825b141b 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java @@ -186,7 +186,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session batch = new ArrayList<>(); } } - if (!error && batch.size() > 0) { + if (!error && !batch.isEmpty()) { bulkInsert(batch); } } catch (SchemaNotFoundException | MalformedRecordException | IOException | CosmosException e) { diff --git a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/TestBinaryReaderBuilder.java b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/TestBinaryReaderBuilder.java index c03d63623b0b..785e60986c52 100644 --- a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/TestBinaryReaderBuilder.java +++ b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/TestBinaryReaderBuilder.java @@ -143,7 +143,7 @@ public BinaryReader build() throws IOException { } public byte[] toByteArray() throws IOException { - if (data.size() == 0) { + if (data.isEmpty()) { return new byte[0]; } else if (data.size() == 1) { return data.get(0); diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java index 699daa85d7fa..10de0a45610d 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java @@ -85,7 +85,7 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro // if the size is 0 then there was nothing to process so return // we don't need to yield here because we have a long poll in side of getBatches - if (batches.size() == 0) { + if (batches.isEmpty()) { return; } @@ -95,7 +95,7 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro FlowFile flowFile = entry.getValue().getFlowFile(); final List events = entry.getValue().getEvents(); - if (flowFile.getSize() == 0L || events.size() == 0) { + if (flowFile.getSize() == 0L || events.isEmpty()) { session.remove(flowFile); getLogger().debug("No data written to FlowFile from batch {}; removing FlowFile", entry.getKey()); continue; diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java b/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java index 41919562ea3f..c8a62317a114 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java @@ -686,7 +686,7 @@ public void listByTrackingTimestamps(final ProcessContext context, final Process int entitiesListed = 0; - if (orderedEntries.size() > 0) { + if (!orderedEntries.isEmpty()) { latestListedEntryTimestampThisCycleMillis = orderedEntries.lastKey(); // Determine target system time precision. diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListedEntityTracker.java b/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListedEntityTracker.java index a3d97b74d886..46fbdc199822 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListedEntityTracker.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListedEntityTracker.java @@ -268,7 +268,7 @@ public void trackEntities(ProcessContext context, ProcessSession session, final Collection listedEntities = listEntities.apply(minTimestampToList); - if (listedEntities.size() == 0) { + if (listedEntities.isEmpty()) { logger.debug("No entity is listed. Yielding."); context.yield(); return; diff --git a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/GroovyMethods.java b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/GroovyMethods.java index d77a193bf3d3..9ad95e40c10b 100644 --- a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/GroovyMethods.java +++ b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/GroovyMethods.java @@ -69,7 +69,7 @@ private Relationship leftShift(Relationship r, SessionFile f) { /** to support: REL_SUCCESS << sessionFileCollection */ @SuppressWarnings("unchecked") private Relationship leftShift(Relationship r, Collection sfl) { - if (sfl != null && sfl.size() > 0) { + if (sfl != null && !sfl.isEmpty()) { ProcessSessionWrap session = ((SessionFile) sfl.iterator().next()).session(); List ffl = session.unwrap(sfl); //assume all files has the same session diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java index 5e41a130688a..ed6ae26b8a03 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java @@ -293,7 +293,7 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro } finally { queueLock.unlock(); } - if (listedFiles.size() > 0) { + if (!listedFiles.isEmpty()) { logEmptyListing.set(3L); } if (logEmptyListing.getAndDecrement() > 0) { 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 3ad591c97b57..2dc43baba988 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 @@ -909,7 +909,7 @@ private StringBuilder toJsonString(StringBuilder sb) { appendProperty(sb, "status", this.error); } - if (this.getChildren() != null && this.getChildren().size() > 0) { + if (this.getChildren() != null && !this.getChildren().isEmpty()) { sb.append(",\"content\":["); for (HDFSObjectInfoDetails c : this.getChildren()) { c.toJsonString(sb).append(","); diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java index 41a58e99944b..120c9be421f6 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java @@ -296,7 +296,7 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro } finally { queueLock.unlock(); } - if (listedFiles.size() > 0) { + if (!listedFiles.isEmpty()) { logEmptyListing.set(3L); } if (logEmptyListing.getAndDecrement() > 0) { diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java index 7c2a863411e5..f59b2da41471 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java @@ -227,7 +227,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session sent++; } - if (batch.size() > 0) { + if (!batch.isEmpty()) { try { writeBatch(buildBatch(batch, jsonTypeSetting, usePrettyPrint), input, context, session, attributes, REL_SUCCESS); } catch (Exception e) { diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java index 7ef5d9c03d2d..63a831bee34d 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java @@ -247,7 +247,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session writeModels = new ArrayList<>(); } } - if (writeModels.size() > 0) { + if (!writeModels.isEmpty()) { collection.bulkWrite(writeModels, bulkWriteOptions); } } catch (ProcessException | SchemaNotFoundException | IOException | MalformedRecordException | MongoException e) { diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java index 39bd46d775f5..3a8c8ee7f768 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBLookupService.java @@ -131,7 +131,7 @@ public Optional lookup(Map coordinates, Map boolean replace(final AtomicCacheEntry entry, final final List results = redisConnection.exec(); // if we have a result then the replace succeeded - if (results != null && results.size() > 0) { + if (results != null && !results.isEmpty()) { replaced = true; } diff --git a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java index 4b93e5b73dac..35f1a31f3403 100644 --- a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java +++ b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java @@ -118,7 +118,7 @@ public V getAndPutIfAbsent(final K key, final V value, final Serializer 0) { + if (results != null && !results.isEmpty()) { final Object firstResult = results.get(0); if (firstResult instanceof Boolean) { final Boolean absent = (Boolean) firstResult; diff --git a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java index 641fcfad4b11..186a83e9cb81 100644 --- a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java +++ b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/state/RedisStateProvider.java @@ -261,7 +261,7 @@ public boolean replace(final StateMap oldValue, final Map newVal // if we have a result then the replace succeeded // results can be null if the transaction has been aborted - if (results != null && results.size() > 0) { + if (results != null && !results.isEmpty()) { replaced = true; } diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/lookup/script/BaseScriptedLookupService.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/lookup/script/BaseScriptedLookupService.java index 4a1f4b2bb61c..2f45ba9d7457 100644 --- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/lookup/script/BaseScriptedLookupService.java +++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/lookup/script/BaseScriptedLookupService.java @@ -224,7 +224,7 @@ protected Collection customValidate(ValidationContext context) ValidationContext innerValidationContext = new FilteredPropertiesValidationContextAdapter(context, innerPropertyDescriptor); final Collection instanceResults = instance.validate(innerValidationContext); - if (instanceResults != null && instanceResults.size() > 0) { + if (instanceResults != null && !instanceResults.isEmpty()) { // return the validation results from the underlying instance return instanceResults; } diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java index bf7f01e0860b..afb9308f1396 100644 --- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java +++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java @@ -522,7 +522,7 @@ protected Collection customValidate(final ValidationContext co ValidationContext innerValidationContext = new FilteredPropertiesValidationContextAdapter(context, innerPropertyDescriptor); final Collection instanceResults = instance.validate(innerValidationContext); - if (instanceResults != null && instanceResults.size() > 0) { + if (instanceResults != null && !instanceResults.isEmpty()) { // return the validation results from the underlying instance return instanceResults; } diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java index e635df57faaf..a62233828ed2 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java @@ -417,7 +417,7 @@ public void onTrigger(ProcessContext context, final ProcessSession session) thro args.add(argValue); } - if (argumentAttributeValue.size() > 0) { + if (!argumentAttributeValue.isEmpty()) { final StringBuilder builder = new StringBuilder(); for (String s : argumentAttributeValue) { builder.append(s).append("\t"); diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java index 74978fa86875..41c2f79c4bf0 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java @@ -412,7 +412,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session } final long elapsedMillis = stopWatch.getElapsed(TimeUnit.MILLISECONDS); - if (transformedFlowFiles.size() > 0) { + if (!transformedFlowFiles.isEmpty()) { session.getProvenanceReporter().fork(original, transformedFlowFiles.keySet(), elapsedMillis); for (final Map.Entry entry : transformedFlowFiles.entrySet()) { diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java index 5e093b7e777b..f5b426f08b09 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java @@ -295,7 +295,7 @@ public void testRedirectErrorStreamWithExpressions() { */ private boolean isCommandFailed(final TestRunner runner) { final List errorMessages = runner.getLogger().getErrorMessages(); - return (errorMessages.size() > 0 + return (!errorMessages.isEmpty() && errorMessages.stream() .anyMatch(m -> m.getMsg().contains("Failed to create process"))); } diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/JWTBearerOAuth2AccessTokenProviderTest.java b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/JWTBearerOAuth2AccessTokenProviderTest.java index f2315393c5b8..89ff808ea596 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/JWTBearerOAuth2AccessTokenProviderTest.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/JWTBearerOAuth2AccessTokenProviderTest.java @@ -56,6 +56,7 @@ import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -141,7 +142,7 @@ void testClaimsAreSetProperly() throws Exception { final List configVerifResults = runner.verify(provider, Map.of()); // all configuration results should be successful - assertTrue(configVerifResults.size() > 0); + assertFalse(configVerifResults.isEmpty()); assertEquals(0, configVerifResults.stream().filter(result -> !result.getOutcome().equals(Outcome.SUCCESSFUL)).count()); // Validate the claims are properly set diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokRecordReader.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokRecordReader.java index 51a9228b4582..a3f736b328a8 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokRecordReader.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokRecordReader.java @@ -145,7 +145,7 @@ private Record createRecord(final Map valueMap, final StringBuil if (rawValue instanceof List) { final List list = (List) rawValue; List nonNullElements = list.stream().filter(Objects::nonNull).collect(Collectors.toList()); - if (nonNullElements.size() == 0) { + if (nonNullElements.isEmpty()) { normalizedValue = null; } else if (nonNullElements.size() == 1) { normalizedValue = nonNullElements.get(0).toString(); 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 32ae77095bad..7872de39a4d6 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 @@ -480,7 +480,7 @@ private Record parseRecord(StartElement startElement, RecordSchema schema, boole } } - if (recordValues.size() > 0) { + if (!recordValues.isEmpty()) { return new MapRecord(schema, recordValues); } else { return null; 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 a899d47d4f0d..20599288cab9 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 @@ -234,7 +234,7 @@ private Object parseFieldForType(StartElement startElement, String fieldName, Da } } - if (embeddedMap.size() > 0) { + if (!embeddedMap.isEmpty()) { return embeddedMap; } else { return null; @@ -314,8 +314,8 @@ private Object parseUnknownField(StartElement startElement, boolean dropUnknown, } } - final boolean hasContent = content.length() > 0; - final boolean hasFields = recordValues.size() > 0; + final boolean hasContent = !content.isEmpty(); + final boolean hasFields = !recordValues.isEmpty(); if (hasContent) { if (!hasFields) { @@ -466,7 +466,7 @@ private Record parseRecord(StartElement startElement, RecordSchema schema, boole } } - if (recordValues.size() > 0) { + if (!recordValues.isEmpty()) { return new MapRecord(schema, recordValues); } else { return null; diff --git a/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java b/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java index 083c51f99c69..663076049326 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java +++ b/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java @@ -246,7 +246,7 @@ private UserGroupProvider createUserGroupProvider(final String identifier, final // get the classloader for the specified user group provider final List userGroupProviderBundles = extensionManager.getBundles(userGroupProviderClassName); - if (userGroupProviderBundles.size() == 0) { + if (userGroupProviderBundles.isEmpty()) { throw new Exception(String.format("The specified user group provider class '%s' is not known to this nifi.", userGroupProviderClassName)); } @@ -289,7 +289,7 @@ private AccessPolicyProvider createAccessPolicyProvider(final String identifier, // get the classloader for the specified access policy provider final List accessPolicyProviderBundles = extensionManager.getBundles(accessPolicyProviderClassName); - if (accessPolicyProviderBundles.size() == 0) { + if (accessPolicyProviderBundles.isEmpty()) { throw new Exception(String.format("The specified access policy provider class '%s' is not known to this nifi.", accessPolicyProviderClassName)); } @@ -332,7 +332,7 @@ private Authorizer createAuthorizer(final String identifier, final String author // get the classloader for the specified authorizer final List authorizerBundles = extensionManager.getBundles(authorizerClassName); - if (authorizerBundles.size() == 0) { + if (authorizerBundles.isEmpty()) { throw new Exception(String.format("The specified authorizer class '%s' is not known to this nifi.", authorizerClassName)); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMapper.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMapper.java index de9e206f64cf..2331d470f85b 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMapper.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMapper.java @@ -230,7 +230,7 @@ public NodeResponse mapResponses(final URI uri, final String httpMethod, final S final Set problematicResponses = nodeResponses.stream().filter(p -> !p.is2xx()).collect(Collectors.toSet()); final NodeResponse clientResponse; - if ("GET".equalsIgnoreCase(httpMethod) && problematicResponses.size() > 0) { + if ("GET".equalsIgnoreCase(httpMethod) && !problematicResponses.isEmpty()) { // If there are problematic responses, at least one of the nodes couldn't complete the request clientResponse = problematicResponses.stream().filter(p -> p.getStatus() >= 400 && p.getStatus() < 500).findFirst().orElse( problematicResponses.stream().filter(p -> p.getStatus() > 500).findFirst().orElse(problematicResponses.iterator().next())); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java index b780bfbb165f..f1434f56dcdb 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java @@ -174,7 +174,7 @@ protected void mergeResponses(ProvenanceDTO clientDto, Map 0) { + if (!errors.isEmpty()) { results.setErrors(errors); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java index 10b6665aa2cc..2275c08df11d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java @@ -385,7 +385,7 @@ private static StateProvider instantiateStateProvider(final ExtensionManager ext final ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); try { final List bundles = extensionManager.getBundles(type); - if (bundles.size() == 0) { + if (bundles.isEmpty()) { throw new IllegalStateException(String.format("The specified class '%s' is not known to this nifi.", type)); } if (bundles.size() > 1) { diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java index 320b3f11a371..f5093737a3f5 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java @@ -662,8 +662,8 @@ public boolean hasReferencingComponents(final Parameter parameter) { } final String parameterName = parameter.getDescriptor().getName(); - return parameterReferenceManager.getProcessorsReferencing(this, parameterName).size() > 0 - || parameterReferenceManager.getControllerServicesReferencing(this, parameterName).size() > 0; + return !parameterReferenceManager.getProcessorsReferencing(this, parameterName).isEmpty() + || !parameterReferenceManager.getControllerServicesReferencing(this, parameterName).isEmpty(); } @Override diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java index ac3ddf71a8ff..2a0c9bfae168 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java @@ -300,7 +300,7 @@ public FlowFilePrioritizer createPrioritizer(final String type) throws Instantia final ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); try { final List prioritizerBundles = flowController.getExtensionManager().getBundles(type); - if (prioritizerBundles.size() == 0) { + if (prioritizerBundles.isEmpty()) { throw new IllegalStateException(String.format("The specified class '%s' is not known to this nifi.", type)); } if (prioritizerBundles.size() > 1) { diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/models/OrdinaryLeastSquares.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/models/OrdinaryLeastSquares.java index ecd830b87d11..f0a087cc41e1 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/models/OrdinaryLeastSquares.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/analytics/models/OrdinaryLeastSquares.java @@ -79,7 +79,7 @@ public Double predictVariable(Integer predictVariableIndex, Map final double intercept = olsModel.isNoIntercept() ? 0 : coefficients[0]; final double predictorCoeff = coefficients[predictVariableIndex + 1]; double sumX = 0; - if (knownVariablesWithIndex.size() > 0) { + if (!knownVariablesWithIndex.isEmpty()) { sumX = knownVariablesWithIndex.entrySet().stream().map(featureTuple -> coefficients[olsModel.isNoIntercept() ? featureTuple.getKey() : featureTuple.getKey() + 1] * featureTuple.getValue()).mapToDouble(Double::doubleValue).sum(); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java index 0238fd389d60..03ef81b83d6c 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepository.java @@ -186,7 +186,7 @@ public StatusHistory getNodeStatusHistory(final Date start, final Date end) { // Uses the first measurement (if any) as reference for repository metrics descriptors. The reference will be used // as a schema for creating descriptors. This is needed as the number of repositories are not predictable. - if (nodeStatusList.size() > 0) { + if (!nodeStatusList.isEmpty()) { final NodeStatus referenceNodeStatus = nodeStatusList.get(0); for (int i = 0; i < referenceNodeStatus.getContentRepositories().size(); i++) { @@ -203,7 +203,7 @@ public StatusHistory getNodeStatusHistory(final Date start, final Date end) { // Uses the first measurement (if any) as reference for GC metrics descriptors. The reference will be used // as a schema for creating descriptors. This is needed as the exact details of the garbage collector statuses // are not predictable. - if (gcStatusList.size() > 0) { + if (!gcStatusList.isEmpty()) { final List gcStatuses = gcStatusList.get(0); for (int i = 0; i < gcStatuses.size(); i++) { diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java index 748db9ea2089..66396f8f1db5 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestFileSystemRepository.java @@ -238,7 +238,7 @@ private void recreateRepositoryWithPropertyOverrides(final Map p @Test public void testUnreferencedFilesAreArchivedOnCleanup() throws IOException { final Map containerPaths = nifiProperties.getContentRepositoryPaths(); - assertTrue(containerPaths.size() > 0); + assertFalse(containerPaths.isEmpty()); for (final Map.Entry entry : containerPaths.entrySet()) { final String containerName = entry.getKey(); @@ -263,7 +263,7 @@ public void testAlreadyArchivedFilesCounted() throws IOException { repository.shutdown(); final Map containerPaths = nifiProperties.getContentRepositoryPaths(); - assertTrue(containerPaths.size() > 0); + assertFalse(containerPaths.isEmpty()); for (final Path containerPath : containerPaths.values()) { final Path section1 = containerPath.resolve("1"); 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 2bb20bf5afe8..d402acde8654 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 @@ -285,7 +285,7 @@ private InitContext load(final ClassLoader rootClassloader, final File framework } while (narCount != narDetails.size()); // Ensure exactly one NiFiServer implementation, otherwise report none or multiples found - if (niFiServers.size() == 0) { + if (niFiServers.isEmpty()) { serverInstance = null; } else if (niFiServers.size() > 1) { String sb = "Expected exactly one implementation of NiFiServer but found " + niFiServers.size() + ": " + diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/metrics/FilteringMetricFamilySamplesEnumeration.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/metrics/FilteringMetricFamilySamplesEnumeration.java index f9f2e4041c51..5da225c37b03 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/metrics/FilteringMetricFamilySamplesEnumeration.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/metrics/FilteringMetricFamilySamplesEnumeration.java @@ -87,7 +87,7 @@ private void setNextElement() { while (metricFamilySamples.hasMoreElements()) { final Collector.MetricFamilySamples possibleNextElement = metricFamilySamples.nextElement(); possibleNextElement.samples.removeIf(this::isSampleNotMatched); - if (possibleNextElement.samples.size() == 0) { + if (possibleNextElement.samples.isEmpty()) { continue; } nextElement = possibleNextElement; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/spring/LoginIdentityProviderFactoryBean.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/spring/LoginIdentityProviderFactoryBean.java index 5d6206e449d7..3401af6cf366 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/spring/LoginIdentityProviderFactoryBean.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/spring/LoginIdentityProviderFactoryBean.java @@ -156,7 +156,7 @@ private LoginIdentityProvider createLoginIdentityProvider(final String identifie // get the classloader for the specified login identity provider final List loginIdentityProviderBundles = extensionManager.getBundles(loginIdentityProviderClassName); - if (loginIdentityProviderBundles.size() == 0) { + if (loginIdentityProviderBundles.isEmpty()) { throw new Exception(String.format("The specified login identity provider class '%s' is not known to this nifi.", loginIdentityProviderClassName)); } diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/RegistryService.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/RegistryService.java index 7f886bbc2dd1..218659c36e43 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/RegistryService.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/RegistryService.java @@ -104,7 +104,7 @@ public RegistryService(final MetadataService metadataService, private void validate(T t, String invalidMessage) { final Set> violations = validator.validate(t); - if (violations.size() > 0) { + if (!violations.isEmpty()) { throw new ConstraintViolationException(invalidMessage, violations); } } @@ -130,7 +130,7 @@ public Bucket createBucket(final Bucket bucket) { validate(bucket, "Cannot create Bucket"); final List bucketsWithSameName = metadataService.getBucketsByName(bucket.getName()); - if (bucketsWithSameName.size() > 0) { + if (!bucketsWithSameName.isEmpty()) { throw new IllegalStateException("A bucket with the same name already exists"); } @@ -351,7 +351,7 @@ public VersionedFlow createFlow(final String bucketIdentifier, final VersionedFl // ensure another flow with the same name doesn't exist final List flowsWithSameName = metadataService.getFlowsByName(existingBucket.getId(), versionedFlow.getName()); - if (flowsWithSameName != null && flowsWithSameName.size() > 0) { + if (flowsWithSameName != null && !flowsWithSameName.isEmpty()) { throw new IllegalStateException("A versioned flow with the same name already exists in the selected bucket"); } @@ -582,7 +582,7 @@ public VersionedFlowSnapshot createFlowSnapshot(final VersionedFlowSnapshot flow } // if we already have snapshots we need to verify the new one has the correct version - if (sortedSnapshots.size() > 0) { + if (!sortedSnapshots.isEmpty()) { final VersionedFlowSnapshotMetadata lastSnapshot = sortedSnapshots.last(); // if we have existing versions and a client sends -1, then make this the latest version diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/StandardExtensionService.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/StandardExtensionService.java index e48db5ce5397..40ba81066412 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/StandardExtensionService.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/StandardExtensionService.java @@ -129,7 +129,7 @@ public StandardExtensionService(final Serializer extensionSerializer, private void validate(T t, String invalidMessage) { final Set> violations = validator.validate(t); - if (violations.size() > 0) { + if (!violations.isEmpty()) { throw new ConstraintViolationException(invalidMessage, violations); } } diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java index 6c1a7606f848..e941919161e7 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/extension/docs/HtmlExtensionDocWriter.java @@ -227,7 +227,7 @@ private void writeDeprecationWarning(final Extension extension, final XMLStreamW xmlStreamWriter.writeCharacters("Please consider using one of the following alternatives: "); final List alternatives = deprecationNotice.getAlternatives(); - if (alternatives != null && alternatives.size() > 0) { + if (alternatives != null && !alternatives.isEmpty()) { xmlStreamWriter.writeStartElement("ul"); for (final String alternative : alternatives) { xmlStreamWriter.writeStartElement("li"); @@ -288,7 +288,7 @@ protected void writeProperties(final Extension extension, final XMLStreamWriter final List properties = extension.getProperties(); writeSimpleElement(xmlStreamWriter, "h3", "Properties: "); - if (properties != null && properties.size() > 0) { + if (properties != null && !properties.isEmpty()) { final boolean containsExpressionLanguage = containsExpressionLanguage(extension); final boolean containsSensitiveProperties = containsSensitiveProperties(extension); xmlStreamWriter.writeStartElement("p"); @@ -409,7 +409,7 @@ private boolean containsSensitiveProperties(final Extension extension) { } protected void writeValidValues(final XMLStreamWriter xmlStreamWriter, final Property property) throws XMLStreamException { - if (property.getAllowableValues() != null && property.getAllowableValues().size() > 0) { + if (property.getAllowableValues() != null && !property.getAllowableValues().isEmpty()) { xmlStreamWriter.writeStartElement("ul"); for (AllowableValue value : property.getAllowableValues()) { xmlStreamWriter.writeStartElement("li"); @@ -460,7 +460,7 @@ private void writeDynamicProperties(final Extension extension, final XMLStreamWr final List dynamicProperties = extension.getDynamicProperties(); - if (dynamicProperties != null && dynamicProperties.size() > 0) { + if (dynamicProperties != null && !dynamicProperties.isEmpty()) { writeSimpleElement(xmlStreamWriter, "h3", "Dynamic Properties: "); xmlStreamWriter.writeStartElement("p"); xmlStreamWriter.writeCharacters("Dynamic Properties allow the user to specify both the name and value of a property."); @@ -563,7 +563,7 @@ private void writeRestrictedInfo(final Extension extension, final XMLStreamWrite } final List restrictions = restricted.getRestrictions(); - if (restrictions != null && restrictions.size() > 0) { + if (restrictions != null && !restrictions.isEmpty()) { xmlStreamWriter.writeStartElement("table"); xmlStreamWriter.writeAttribute("id", "restrictions"); xmlStreamWriter.writeStartElement("tr"); @@ -621,7 +621,7 @@ private void writeSystemResourceConsiderationInfo(final Extension extension, fin List systemResourceConsiderations = extension.getSystemResourceConsiderations(); writeSimpleElement(xmlStreamWriter, "h3", "System Resource Considerations:"); - if (systemResourceConsiderations != null && systemResourceConsiderations.size() > 0) { + if (systemResourceConsiderations != null && !systemResourceConsiderations.isEmpty()) { xmlStreamWriter.writeStartElement("table"); xmlStreamWriter.writeAttribute("id", "system-resource-considerations"); xmlStreamWriter.writeStartElement("tr"); @@ -649,7 +649,7 @@ private void writeSystemResourceConsiderationInfo(final Extension extension, fin private void writeProvidedServiceApis(final Extension extension, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException { final List serviceAPIS = extension.getProvidedServiceAPIs(); - if (serviceAPIS != null && serviceAPIS.size() > 0) { + if (serviceAPIS != null && !serviceAPIS.isEmpty()) { writeSimpleElement(xmlStreamWriter, "h3", "Provided Service APIs:"); xmlStreamWriter.writeStartElement("ul"); @@ -673,7 +673,7 @@ private void writeProvidedServiceApis(final Extension extension, final XMLStream private void writeSeeAlso(final Extension extension, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException { final List seeAlsos = extension.getSeeAlso(); - if (seeAlsos != null && seeAlsos.size() > 0) { + if (seeAlsos != null && !seeAlsos.isEmpty()) { writeSimpleElement(xmlStreamWriter, "h3", "See Also:"); xmlStreamWriter.writeStartElement("ul"); diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/database/TestDatabaseAccessPolicyProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/database/TestDatabaseAccessPolicyProvider.java index ba571b6e6b80..ba1464201169 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/database/TestDatabaseAccessPolicyProvider.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/database/TestDatabaseAccessPolicyProvider.java @@ -379,7 +379,7 @@ public void testGetPolicyByIdentifierWhenExists() { final Set policies = policyProvider.getAccessPolicies(); assertNotNull(policies); - assertTrue(policies.size() > 0); + assertFalse(policies.isEmpty()); final AccessPolicy existingPolicy = policies.stream().findFirst().get(); final AccessPolicy retrievedPolicy = policyProvider.getAccessPolicy(existingPolicy.getIdentifier()); @@ -400,7 +400,7 @@ public void testGetPolicyByResourceAndActionWhenExists() { final Set policies = policyProvider.getAccessPolicies(); assertNotNull(policies); - assertTrue(policies.size() > 0); + assertFalse(policies.isEmpty()); final AccessPolicy existingPolicy = policies.stream().findFirst().get(); final AccessPolicy retrievedPolicy = policyProvider.getAccessPolicy(existingPolicy.getResource(), existingPolicy.getAction()); diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/serialization/TestFlowContentSerializer.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/serialization/TestFlowContentSerializer.java index a53ba13f43dd..085764ce3d21 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/serialization/TestFlowContentSerializer.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/serialization/TestFlowContentSerializer.java @@ -190,7 +190,7 @@ public void testDeserializeVer1() throws IOException { assertNotNull(processGroup); assertNotNull(processGroup.getProcessors()); - assertTrue(processGroup.getProcessors().size() > 0); + assertFalse(processGroup.getProcessors().isEmpty()); //System.out.printf("processGroup=" + processGroup); } @@ -212,7 +212,7 @@ public void testDeserializeVer2() throws IOException { assertNotNull(processGroup); assertNotNull(processGroup.getProcessors()); - assertTrue(processGroup.getProcessors().size() > 0); + assertFalse(processGroup.getProcessors().isEmpty()); //System.out.printf("processGroup=" + processGroup); } diff --git a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/hook/WhitelistFilteringEventHookProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/hook/WhitelistFilteringEventHookProvider.java index 8c467daaea07..829f3d82d928 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/hook/WhitelistFilteringEventHookProvider.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/hook/WhitelistFilteringEventHookProvider.java @@ -56,7 +56,7 @@ public void onConfigured(ProviderConfigurationContext configurationContext) thro */ @Override public boolean shouldHandle(EventType eventType) { - if (whiteListEvents != null && whiteListEvents.size() > 0) { + if (whiteListEvents != null && !whiteListEvents.isEmpty()) { if (whiteListEvents.contains(eventType)) { return true; } diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/AbstractNiFiActivateCommand.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/AbstractNiFiActivateCommand.java index 920192f130e8..8ed13f901706 100644 --- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/AbstractNiFiActivateCommand.java +++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/AbstractNiFiActivateCommand.java @@ -77,7 +77,7 @@ protected void activate(final NiFiClient client, final Properties properties, } } - if (exceptions.size() > 0) { + if (!exceptions.isEmpty()) { throw new CommandException(exceptions.size() + " components could not be " + state.toLowerCase() + ", " + "run command with -verbose to obtain more details"); } diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/bucket/DeleteBucket.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/bucket/DeleteBucket.java index e4556e8add15..0c404db180d8 100644 --- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/bucket/DeleteBucket.java +++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/bucket/DeleteBucket.java @@ -61,7 +61,7 @@ public OkResult doExecute(final NiFiRegistryClient client, final Properties prop final FlowClient flowClient = client.getFlowClient(); final List flowsInBucket = flowClient.getByBucket(bucketId); - if (flowsInBucket != null && flowsInBucket.size() > 0 && !forceDelete) { + if (flowsInBucket != null && !flowsInBucket.isEmpty() && !forceDelete) { throw new NiFiRegistryException("Bucket is not empty, use --" + CommandOption.FORCE.getLongName() + " to delete"); } else { final BucketClient bucketClient = client.getBucketClient(); diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DeleteFlow.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DeleteFlow.java index d18ab2ed7ee8..f561ed8e533f 100644 --- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DeleteFlow.java +++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DeleteFlow.java @@ -65,7 +65,7 @@ public OkResult doExecute(final NiFiRegistryClient client, final Properties prop final FlowSnapshotClient flowSnapshotClient = client.getFlowSnapshotClient(); final List snapshotMetadata = flowSnapshotClient.getSnapshotMetadata(flowId); - if (snapshotMetadata != null && snapshotMetadata.size() > 0 && !forceDelete) { + if (snapshotMetadata != null && !snapshotMetadata.isEmpty() && !forceDelete) { throw new NiFiRegistryException("Flow has versions, use --" + CommandOption.FORCE.getLongName() + " to delete"); } else { flowClient.delete(versionedFlow.getBucketIdentifier(), versionedFlow.getIdentifier()); diff --git a/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/TestCLICompleter.java b/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/TestCLICompleter.java index 022772486eaf..1506ff3e2303 100644 --- a/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/TestCLICompleter.java +++ b/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/TestCLICompleter.java @@ -50,6 +50,7 @@ import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @DisabledOnOs(OS.WINDOWS) @@ -130,7 +131,7 @@ public void testCompletionWithWordIndexTwoAndMatching() { final List candidates = new ArrayList<>(); completer.complete(lineReader, parsedLine, candidates); - assertTrue(candidates.size() > 0); + assertFalse(candidates.isEmpty()); assertEquals(completer.getOptions(subCommand).size(), candidates.size()); } @@ -155,7 +156,7 @@ public void testCompletionWithMultipleArguments() { final List candidates = new ArrayList<>(); completer.complete(lineReader, parsedLine, candidates); - assertTrue(candidates.size() > 0); + assertFalse(candidates.isEmpty()); assertEquals(completer.getOptions(subCommand).size(), candidates.size()); } @@ -182,7 +183,7 @@ public void testCompletionForSessionVariableNames() { final List candidates = new ArrayList<>(); completer.complete(lineReader, parsedLine, candidates); - assertTrue(candidates.size() > 0); + assertFalse(candidates.isEmpty()); assertEquals(SessionVariable.values().length, candidates.size()); } diff --git a/pmd-ruleset.xml b/pmd-ruleset.xml index 156d2e7ade61..60f15acdb675 100644 --- a/pmd-ruleset.xml +++ b/pmd-ruleset.xml @@ -40,6 +40,7 @@ under the License. +