You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2026/06/24 07:44:05 UTC

(nifi) branch main updated: NIFI-16037 Corrected legitimate spelling mistakes (#11364)

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 eae30cdcaa4 NIFI-16037 Corrected legitimate spelling mistakes (#11364)
eae30cdcaa4 is described below

commit eae30cdcaa427c2178e2794c9cb83564e0b9a2d5
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Wed Jun 24 03:43:59 2026 -0400

    NIFI-16037 Corrected legitimate spelling mistakes (#11364)
---
 .../org/apache/nifi/c2/serializer/C2Serializer.java    |  2 +-
 .../c2/client/http/url/ProxyAwareC2ProviderTest.java   | 18 +++++++++---------
 .../configuration/differentiators/Differentiator.java  |  2 +-
 .../hashicorp/config/HashiCorpVaultProperties.java     |  2 +-
 .../java/org/apache/nifi/record/path/FieldValue.java   |  2 +-
 .../nifi/record/path/functions/UnescapeJson.java       |  2 +-
 .../org/apache/nifi/record/path/TestRecordPath.java    |  8 ++++----
 .../apache/nifi/serialization/record/RecordSchema.java |  2 +-
 .../nifi/serialization/record/TestDataTypeUtils.java   |  2 +-
 .../nifi/stream/io/util/StreamDemarcatorTest.java      |  2 +-
 .../org/apache/nifi/wali/LengthDelimitedJournal.java   |  6 +++---
 .../src/main/java/org/wali/SyncListener.java           | 10 +++++-----
 .../jasn1/convert/converters/BerArrayConverter.java    |  2 +-
 .../record/TestKinesisRecordProcessorRecord.java       |  4 ++--
 .../aws/ml/textract/GetAwsTextractJobStatusTest.java   |  6 +++---
 .../azure/storage/DeleteAzureBlobStorage_v12.java      |  8 ++++----
 .../processors/azure/cosmos/document/MockTestBase.java |  2 +-
 .../cosmos/document/PutAzureCosmosDBRecordTest.java    |  2 +-
 .../azure/storage/TestClientSideEncryptionSupport.java |  4 ++--
 .../AzureLogAnalyticsProvenanceReportingTask.java      |  2 +-
 .../loganalytics/AzureLogAnalyticsReportingTask.java   |  2 +-
 .../nifi/reporting/azure/loganalytics/Metric.java      |  2 +-
 .../couchbase/StandardCouchbaseConnectionService.java  |  2 +-
 .../processors/elasticsearch/SearchElasticsearch.java  |  4 ++--
 .../nifi/processors/email/ExtractEmailHeaders.java     |  2 +-
 .../nifi/processors/evtx/parser/BinaryReader.java      |  2 +-
 .../evtx/parser/bxml/value/Hex32TypeNode.java          |  2 +-
 .../nifi/processors/evtx/ResultProcessorTest.java      |  2 +-
 .../listen/AbstractListenEventBatchingProcessor.java   |  2 +-
 .../nifi/processor/util/listen/EventBatcher.java       |  2 +-
 .../processor/util/list/AbstractListProcessor.java     |  2 +-
 .../schema/validation/TestStandardSchemaValidator.java |  4 ++--
 .../nifi/syslog/utils/NifiStructuredDataPolicy.java    |  2 +-
 .../gcp/credentials/factory/DelegationStrategy.java    |  2 +-
 .../nifi/processors/gcp/storage/FetchGCSObjectIT.java  |  2 +-
 .../processors/graph/ExecuteGraphQueryRecordTest.java  | 10 +++++-----
 .../processors/graph/util/InMemoryGraphClient.java     |  2 +-
 .../nifi/graph/InMemoryJanusGraphClientService.java    |  2 +-
 .../apache/nifi/graph/Neo4JCypherClientService.java    |  2 +-
 .../org/apache/nifi/graph/TinkerpopClientService.java  |  2 +-
 .../processors/groovyx/flow/ProcessSessionWrap.java    |  2 +-
 .../org/apache/nifi/processors/hadoop/DeleteHDFS.java  |  2 +-
 .../apache/nifi/processors/hadoop/GetHDFSFileInfo.java |  6 +++---
 .../nifi/jms/processors/JMSPublisherConsumerIT.java    |  2 +-
 .../nifi/processors/mongodb/gridfs/PutGridFS.java      |  2 +-
 .../org/apache/nifi/processors/mqtt/ConsumeMQTT.java   |  2 +-
 .../apache/nifi/processors/network/pcap/TestPCAP.java  | 18 +++++++++---------
 .../services/TestAvroSchemaRegistry.java               |  2 +-
 .../org/apache/nifi/snmp/dto/SNMPTreeResponse.java     |  2 +-
 .../java/org/apache/nifi/snmp/processors/GetSNMP.java  |  2 +-
 .../java/org/apache/nifi/snmp/processors/SetSNMP.java  |  2 +-
 .../nifi/processors/standard/EvaluateXQuery.java       |  2 +-
 .../nifi/processors/standard/HandleHttpRequest.java    |  4 ++--
 .../nifi/processors/standard/ListDatabaseTables.java   |  2 +-
 .../apache/nifi/processors/standard/ParseSyslog.java   |  2 +-
 .../apache/nifi/processors/standard/UnpackContent.java |  4 ++--
 .../standard/db/impl/Oracle12DatabaseAdapter.java      |  2 +-
 .../standard/AbstractTestTailFileScenario.java         |  6 +++---
 .../processors/standard/TestAbstractExecuteSQL.java    |  8 ++++----
 .../nifi/processors/standard/TestAttributesToCSV.java  |  4 ++--
 .../nifi/processors/standard/TestMergeContent.java     |  2 +-
 .../nifi/processors/standard/TestSplitRecord.java      |  2 +-
 .../standard/TestTailFileGeneratedScenarios.java       |  2 +-
 ...RuleTest.java => AbstractFlowAnalysisRuleTest.java} |  2 +-
 .../rules/RequireServerSSLContextServiceTest.java      |  2 +-
 .../rules/RestrictBackpressureSettingsTest.java        |  2 +-
 .../rules/RestrictFlowFileExpirationTest.java          |  2 +-
 .../org/apache/nifi/dbcp/HikariCPConnectionPool.java   |  2 +-
 .../main/java/org/apache/nifi/syslog/SyslogReader.java |  2 +-
 .../java/org/apache/nifi/csv/TestCSVRecordReader.java  | 10 +++++-----
 .../nifi/schema/inference/TestVolatileSchemaCache.java |  2 +-
 .../java/org/apache/nifi/xml/TestWriteXMLResult.java   |  6 +++---
 .../stateful/analysis/AttributeRollingWindow.java      |  2 +-
 .../nifi/websocket/jetty/RoutingWebSocketListener.java |  2 +-
 .../nifi/authorization/AccessPolicyProvider.java       |  2 +-
 .../nifi/provenance/index/lucene/LuceneEventIndex.java |  4 ++--
 .../nifi/provenance/store/PartitionedEventStore.java   |  2 +-
 .../provenance/store/WriteAheadStorePartition.java     |  6 +++---
 .../embedded/SimpleEmbeddedDatabaseManagerContext.java |  8 ++++----
 .../apache/nifi/web/api/dto/ControllerServiceDTO.java  |  2 +-
 .../org/apache/nifi/web/api/dto/DocumentedTypeDTO.java |  2 +-
 .../java/org/apache/nifi/web/api/dto/FlowFileDTO.java  |  2 +-
 .../apache/nifi/web/api/dto/ProcessorConfigDTO.java    |  4 ++--
 .../org/apache/nifi/web/api/dto/ReportingTaskDTO.java  |  2 +-
 .../web/api/dto/provenance/ProvenanceEventDTO.java     |  4 ++--
 .../web/api/dto/status/ProcessorStatusSnapshotDTO.java |  4 ++--
 .../StandardClusterCoordinationProtocolSender.java     |  2 +-
 .../java/org/apache/nifi/io/socket/SocketListener.java |  2 +-
 .../http/replication/ReplicationHeaderUtils.java       |  2 +-
 .../http/replication/RequestReplicator.java            |  4 ++--
 .../coordination/node/NodeClusterCoordinator.java      |  2 +-
 .../apache/nifi/controller/StandardProcessorNode.java  |  2 +-
 .../repository/AbstractRepositoryContext.java          |  2 +-
 .../org/apache/nifi/groups/StandardProcessGroup.java   | 10 +++++-----
 .../java/org/apache/nifi/util/ReflectionUtilsTest.java |  4 ++--
 .../apache/nifi/controller/AbstractComponentNode.java  |  2 +-
 .../controller/reporting/ReportingTaskProvider.java    |  2 +-
 .../main/java/org/apache/nifi/groups/ProcessGroup.java |  2 +-
 .../main/java/org/apache/nifi/lifecycle/LifeCycle.java |  4 ++--
 .../org/apache/nifi/controller/FlowController.java     |  2 +-
 .../apache/nifi/controller/queue/QueuePrioritizer.java |  6 +++---
 .../nifi/controller/queue/SwappablePriorityQueue.java  |  2 +-
 .../clustered/SocketLoadBalancedFlowFileQueue.java     |  4 ++--
 .../async/nio/NioAsyncLoadBalanceClientTask.java       |  2 +-
 .../queue/clustered/partition/QueuePartition.java      |  2 +-
 .../clustered/partition/RebalancingPartition.java      |  2 +-
 .../clustered/server/StandardLoadBalanceProtocol.java  |  2 +-
 .../controller/repository/FileSystemRepository.java    |  6 +++---
 .../configuration/FlowControllerConfiguration.java     |  2 +-
 .../scheduling/TestStandardProcessScheduler.java       |  4 ++--
 .../processors/FailOnScheduledProcessor.java           |  2 +-
 .../flow/mapping/VersionedComponentFlowMapperTest.java |  2 +-
 .../CollisionAwareResourceProviderWorkerTest.java      |  4 ++--
 .../java/org/apache/nifi/nar/ExtensionManager.java     |  2 +-
 .../test/java/org/apache/nifi/nar/NarUnpackerTest.java |  8 ++++----
 .../src/main/java/org/apache/nifi/nar/NarUnpacker.java |  2 +-
 .../org/apache/nifi/remote/RemoteResourceManager.java  |  4 ++--
 .../org/apache/nifi/audit/FlowAnalysisRuleAuditor.java |  2 +-
 .../apache/nifi/audit/ParameterProviderAuditor.java    |  2 +-
 .../org/apache/nifi/audit/RelationshipAuditor.java     |  4 ++--
 .../org/apache/nifi/audit/ReportingTaskAuditor.java    |  2 +-
 .../authorization/AuthorizeParameterReference.java     |  2 +-
 .../org/apache/nifi/web/api/InputPortResource.java     |  8 ++++----
 .../java/org/apache/nifi/web/api/LabelResource.java    |  2 +-
 .../nifi/web/dao/impl/StandardConnectionDAO.java       |  2 +-
 .../attributematchers/PrioritiesMatcherTest.java       |  4 ++--
 .../web/security/x509/X509AuthenticationFilter.java    |  2 +-
 .../src/main/java/org/apache/nifi/util/TestRunner.java |  2 +-
 .../org/apache/nifi/registry/client/AccessClient.java  |  2 +-
 .../provider/flow/git/GitFlowPersistenceProvider.java  |  4 ++--
 .../database/DatabaseAccessPolicyProvider.java         |  4 ++--
 .../authorization/file/FileAccessPolicyProvider.java   |  8 ++++----
 .../service/extension/docs/HtmlExtensionDocWriter.java |  4 ++--
 .../authorization/TestStandardAuthorizableLookup.java  |  2 +-
 .../apache/nifi/registry/metadata/BucketMetadata.java  |  2 +-
 .../apache/nifi/registry/metadata/FlowMetadata.java    |  2 +-
 .../nifi/registry/metadata/FlowSnapshotMetadata.java   |  2 +-
 .../security/authorization/AccessPolicyProvider.java   |  2 +-
 .../nifi/registry/web/api/BucketFlowResource.java      |  4 ++--
 .../apache/nifi/registry/web/api/BundleResource.java   |  2 +-
 .../authentication/x509/X509IdentityProvider.java      |  2 +-
 .../apache/nifi/registry/web/link/TestLinkService.java |  2 +-
 .../nifi/registry/aws/S3BundlePersistenceProvider.java |  6 +++---
 .../apache/nifi/stateless/engine/NarUnpackLock.java    |  2 +-
 .../nifi/stateless/bootstrap/RunStatelessFlow.java     |  2 +-
 .../nifi/stateless/engine/ExecutionProgress.java       |  4 ++--
 .../nifi/flowanalysis/StatefulFlowAnalysisRule.java    | 14 +++++++-------
 .../tests/system/nar/NarProviderAndAutoLoaderIT.java   |  2 +-
 .../tests/system/parameters/ParameterContextIT.java    |  2 +-
 .../command/composite/AbstractCompositeCommand.java    |  2 +-
 .../toolkit/cli/impl/command/nifi/pg/PGCreate.java     |  2 +-
 .../impl/command/nifi/policies/UpdateAccessPolicy.java | 14 +++++++-------
 .../nifi/processors/ChangeVersionProcessor.java        |  2 +-
 .../apache/nifi/toolkit/client/ConnectionClient.java   |  2 +-
 .../client/impl/JerseyControllerServicesClient.java    |  8 ++++----
 .../nifi/toolkit/client/impl/JerseyPoliciesClient.java |  2 +-
 .../toolkit/client/impl/JerseyProcessGroupClient.java  | 10 +++++-----
 .../toolkit/client/impl/JerseyProcessorClient.java     |  6 +++---
 .../client/impl/JerseyReportingTasksClient.java        |  2 +-
 159 files changed, 276 insertions(+), 276 deletions(-)

diff --git a/c2/c2-client-bundle/c2-client-base/src/main/java/org/apache/nifi/c2/serializer/C2Serializer.java b/c2/c2-client-bundle/c2-client-base/src/main/java/org/apache/nifi/c2/serializer/C2Serializer.java
index 2e1f6fe6ef5..79de09bf222 100644
--- a/c2/c2-client-bundle/c2-client-base/src/main/java/org/apache/nifi/c2/serializer/C2Serializer.java
+++ b/c2/c2-client-bundle/c2-client-base/src/main/java/org/apache/nifi/c2/serializer/C2Serializer.java
@@ -41,7 +41,7 @@ public interface C2Serializer {
      * @param content   the string representation of the object to be deserialized
      * @param valueType the class of the target object
      * @param <T>       the type of the target object
-     * @return the deserialised object if successful empty otherwise
+     * @return the deserialized object if successful empty otherwise
      */
     <T> Optional<T> deserialize(String content, Class<T> valueType);
 
diff --git a/c2/c2-client-bundle/c2-client-http/src/test/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2ProviderTest.java b/c2/c2-client-bundle/c2-client-http/src/test/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2ProviderTest.java
index c60ef8c6c39..469fac10617 100644
--- a/c2/c2-client-bundle/c2-client-http/src/test/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2ProviderTest.java
+++ b/c2/c2-client-bundle/c2-client-http/src/test/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2ProviderTest.java
@@ -69,17 +69,17 @@ public class ProxyAwareC2ProviderTest {
     }
 
     private static Stream<Arguments> testValidProviderConstructorArguments() {
-        String expectedHearbeatUrl = "http://c2/api/path1";
+        String expectedHeartbeatUrl = "http://c2/api/path1";
         String expectedAckUrl = "http://c2/api/path2";
         return Stream.of(
-            Arguments.of("http://c2/api", "path1", "path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api", "/path1", "path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api", "path1", "/path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api", "/path1", "/path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api/", "path1", "path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api/", "/path1", "path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api/", "path1", "/path2", expectedHearbeatUrl, expectedAckUrl),
-            Arguments.of("http://c2/api/", "/path1", "/path2", expectedHearbeatUrl, expectedAckUrl)
+            Arguments.of("http://c2/api", "path1", "path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api", "/path1", "path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api", "path1", "/path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api", "/path1", "/path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api/", "path1", "path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api/", "/path1", "path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api/", "path1", "/path2", expectedHeartbeatUrl, expectedAckUrl),
+            Arguments.of("http://c2/api/", "/path1", "/path2", expectedHeartbeatUrl, expectedAckUrl)
         );
     }
 
diff --git a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/differentiators/Differentiator.java b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/differentiators/Differentiator.java
index 8933de85ef0..7a9dc3a5b0a 100644
--- a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/differentiators/Differentiator.java
+++ b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/differentiators/Differentiator.java
@@ -38,7 +38,7 @@ public interface Differentiator<T> {
     /**
      * Determine whether the config file changed
      *
-     * @param input the conetnt of the new config file
+     * @param input the content of the new config file
      * @return true if changed and false if not
      * @throws IOException when there is a config file reading related error
      */
diff --git a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultProperties.java b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultProperties.java
index c6cd4d801a4..ef1af7a641c 100644
--- a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultProperties.java
+++ b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/config/HashiCorpVaultProperties.java
@@ -188,7 +188,7 @@ public class HashiCorpVaultProperties {
         }
 
         /**
-         * Sets the trustStore passsword.
+         * Sets the trustStore password.
          * @param trustStorePassword TrustStore password
          * @return Builder
          */
diff --git a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/FieldValue.java b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/FieldValue.java
index c0807fb37dc..10f6e5f3df4 100644
--- a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/FieldValue.java
+++ b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/FieldValue.java
@@ -56,7 +56,7 @@ public interface FieldValue {
     /**
      * Updates the record to which the field belongs, so that it now has the given value. If the FieldValue
      * points to a Field that does not currently exist in the Record, the field will be created in the Record Schema
-     * as an 'inactive field', which can then be incoporated into the Record's schema by calling {@link Record#incorporateInactiveFields()}.
+     * as an 'inactive field', which can then be incorporated into the Record's schema by calling {@link Record#incorporateInactiveFields()}.
      *
      * @param newValue the value to set for the field
      * @param dataType the data type to use if the Record's schema does not already include this field
diff --git a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
index cad9f24dd86..a7dc511aa23 100644
--- a/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
+++ b/nifi-commons/nifi-record-path/src/main/java/org/apache/nifi/record/path/functions/UnescapeJson.java
@@ -90,7 +90,7 @@ public class UnescapeJson extends RecordPathSegment {
                                     fv.getField(), fv.getParent().orElse(null)
                             );
                         } catch (IOException e) {
-                            throw new RecordPathException("Unable to deserialise JSON String into Record Path value", e);
+                            throw new RecordPathException("Unable to deserialize JSON String into Record Path value", e);
                         }
                     } else {
                         throw new IllegalArgumentException("Argument supplied to unescapeJson must be a String");
diff --git a/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java b/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java
index 97d307e7bfd..3f370f2c32e 100644
--- a/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java
+++ b/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java
@@ -2379,7 +2379,7 @@ public class TestRecordPath {
                 record.setValue("name", "<xml>value</xml>");
                 Exception exception =
                         assertThrows(Exception.class, () -> evaluateSingleFieldValue("unescapeJson(/name)", record));
-                assertEquals("Unable to deserialise JSON String into Record Path value", exception.getMessage());
+                assertEquals("Unable to deserialize JSON String into Record Path value", exception.getMessage());
             }
         }
 
@@ -2763,9 +2763,9 @@ public class TestRecordPath {
                 assertEquals(expected, fieldValue.getValue().toString());
             }
             @Test
-            public void supportsPostiveDoubleOverflow() {
-                final String subtractionWithPostiveDoubleOverflow = "subtract('%s', '%s')".formatted(Double.MAX_VALUE, -1.0e308);
-                final FieldValue fieldValue = evaluateSingleFieldValue(subtractionWithPostiveDoubleOverflow, record);
+            public void supportsPositiveDoubleOverflow() {
+                final String subtractionWithPositiveDoubleOverflow = "subtract('%s', '%s')".formatted(Double.MAX_VALUE, -1.0e308);
+                final FieldValue fieldValue = evaluateSingleFieldValue(subtractionWithPositiveDoubleOverflow, record);
 
                 assertEquals(RecordFieldType.DOUBLE, fieldValue.getField().getDataType().getFieldType());
                 assertEquals("Infinity", fieldValue.getValue().toString());
diff --git a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/RecordSchema.java b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/RecordSchema.java
index c085fde4216..18fa0b1b772 100644
--- a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/RecordSchema.java
+++ b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/RecordSchema.java
@@ -33,7 +33,7 @@ public interface RecordSchema {
 
     /**
      * @param index the 0-based index of which field to return
-     * @return the index'th field
+     * @return the field at the given index
      *
      * @throws IndexOutOfBoundsException if the index is < 0 or >= the number of fields (determined by {@link #getFieldCount()}).
      */
diff --git a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index 5d5b2531d9f..e6cbc557faf 100644
--- a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++ b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -768,7 +768,7 @@ public class TestDataTypeUtils {
                     @Override
                     public String getFormat() {
                         exceptionThrown.set(true);
-                        throw new RuntimeException("maching error");
+                        throw new RuntimeException("matching error");
                     }
                 };
             } else if (type.equals(matchingType)) {
diff --git a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
index d9e1f71135a..a77a5a527ce 100644
--- a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
+++ b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
@@ -64,7 +64,7 @@ public class StreamDemarcatorTest {
     }
 
     @Test
-    public void vaidateOnPartialMatchThenSubsequentPartialMatch() throws IOException {
+    public void validateOnPartialMatchThenSubsequentPartialMatch() throws IOException {
         final byte[] inputData = "A Great Big Boy".getBytes(StandardCharsets.UTF_8);
         final byte[] delimBytes = "AB".getBytes(StandardCharsets.UTF_8);
 
diff --git a/nifi-commons/nifi-write-ahead-log/src/main/java/org/apache/nifi/wali/LengthDelimitedJournal.java b/nifi-commons/nifi-write-ahead-log/src/main/java/org/apache/nifi/wali/LengthDelimitedJournal.java
index 9b9428539e4..460de17a393 100644
--- a/nifi-commons/nifi-write-ahead-log/src/main/java/org/apache/nifi/wali/LengthDelimitedJournal.java
+++ b/nifi-commons/nifi-write-ahead-log/src/main/java/org/apache/nifi/wali/LengthDelimitedJournal.java
@@ -193,7 +193,7 @@ public class LengthDelimitedJournal<T> implements WriteAheadJournal<T> {
         final int encodingVersion = in.readInt();
         logger.debug("Encoding version for {} is {}", journalFile, encodingVersion);
         if (encodingVersion > JOURNAL_ENCODING_VERSION) {
-            throw new IOException("Cannot read journal file " + journalFile + " because it is encoded using veresion " + encodingVersion
+            throw new IOException("Cannot read journal file " + journalFile + " because it is encoded using version " + encodingVersion
                 + " but this version of the code only understands version " + JOURNAL_ENCODING_VERSION + " and below");
         }
 
@@ -210,7 +210,7 @@ public class LengthDelimitedJournal<T> implements WriteAheadJournal<T> {
         final int serdeVersion = in.readInt();
         logger.debug("Serde version is {}", serdeVersion);
         if (serdeVersion > serde.getVersion()) {
-            throw new IOException("Cannot read journal file " + journalFile + " because it is encoded using veresion " + encodingVersion
+            throw new IOException("Cannot read journal file " + journalFile + " because it is encoded using version " + encodingVersion
                 + " of the serializer/deserializer but this version of the code only understands version " + serde.getVersion() + " and below");
         }
 
@@ -319,7 +319,7 @@ public class LengthDelimitedJournal<T> implements WriteAheadJournal<T> {
                     baos.writeTo(out);
                     out.flush();
                 } catch (final Throwable t) {
-                    // While the outter Throwable that wraps this "catch" will call Poison, it is imperative that we call poison()
+                    // While the outer Throwable that wraps this "catch" will call Poison, it is imperative that we call poison()
                     // before the synchronized block is excited. Otherwise, another thread could potentially corrupt the journal before
                     // the poison method closes the file.
                     poison(t);
diff --git a/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/SyncListener.java b/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/SyncListener.java
index 84df2d183b3..f1851fa71cb 100644
--- a/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/SyncListener.java
+++ b/nifi-commons/nifi-write-ahead-log/src/main/java/org/wali/SyncListener.java
@@ -19,9 +19,9 @@ package org.wali;
 /**
  * <p>
  * Provides a callback mechanism by which applicable listeners can be notified
- * when a WriteAheadRepository is synched (via the
+ * when a WriteAheadRepository is synced (via the
  * {@link WriteAheadRepository#sync()} method) or one of its partitions is
- * synched via
+ * synced via
  * {@link WriteAheadRepository#update(java.util.Collection, boolean)} with a
  * value of <code>true</code> for the second argument.
  * </p>
@@ -46,16 +46,16 @@ package org.wali;
 public interface SyncListener {
 
     /**
-     * This method is called whenever a specific partition is synched via the
+     * This method is called whenever a specific partition is synced via the
      * {@link WriteAheadRepository#update(java.util.Collection, boolean)} method
      *
-     * @param partitionIndex the index of the partition that was synched
+     * @param partitionIndex the index of the partition that was synced
      */
     void onSync(int partitionIndex);
 
     /**
      * This method is called whenever the entire
-     * <code>WriteAheadRepository</code> is synched via the
+     * <code>WriteAheadRepository</code> is synced via the
      * {@link WriteAheadRepository#sync()} method.
      */
     void onGlobalSync();
diff --git a/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/BerArrayConverter.java b/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/BerArrayConverter.java
index b1b2ede3f9c..b924a528f35 100644
--- a/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/BerArrayConverter.java
+++ b/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/src/main/java/org/apache/nifi/jasn1/convert/converters/BerArrayConverter.java
@@ -50,7 +50,7 @@ public class BerArrayConverter implements JASN1TypeAndValueConverter {
 
     @Override
     public Object convertValue(BerType value, DataType dataType, JASN1Converter converter) {
-        // If the field is declared with a direct SEQUENCE OF, then this value is a Parent$Children innerclass,
+        // If the field is declared with a direct SEQUENCE OF, then this value is a Parent$Children inner class,
         // in such a case, use the parent instance to get the seqOfContainer.
         // Otherwise, the value is a separated class holding only seqOf field.
 
diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestKinesisRecordProcessorRecord.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestKinesisRecordProcessorRecord.java
index d0ba226a6c8..b16058a7a9a 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestKinesisRecordProcessorRecord.java
+++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestKinesisRecordProcessorRecord.java
@@ -151,7 +151,7 @@ public class TestKinesisRecordProcessorRecord {
     }
 
     private static Stream<Arguments.ArgumentSet> testProcessRecordsArgs() {
-        final List<Pair<String, Boolean>> endpointOverriden = List.of(
+        final List<Pair<String, Boolean>> endpointOverridden = List.of(
                 Pair.of("Overriden Endpoint", true),
                 Pair.of("Default Endpoint", false)
         );
@@ -162,7 +162,7 @@ public class TestKinesisRecordProcessorRecord {
         final List<Pair<String, SchemaDifferenceHandlingStrategy>> schemaChangeStrategy = Arrays.stream(SchemaDifferenceHandlingStrategy.values())
                 .map(strategy -> Pair.of(strategy.name(), strategy))
                 .toList();
-        return endpointOverriden.stream()
+        return endpointOverridden.stream()
                 .flatMap(endpoint -> schemaChangeStrategy.stream()
                         .flatMap(strategy -> usingWrapper.stream()
                                 .map(wrapper -> Arguments.argumentSet(
diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
index cfa5b5897f3..4e0879565d9 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
+++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
@@ -108,7 +108,7 @@ public class GetAwsTextractJobStatusTest {
     }
 
     @Test
-    public void testTextractDocAnalysisTaskUnkownStatus() {
+    public void testTextractDocAnalysisTaskUnknownStatus() {
         testTextractDocAnalysis(JobStatus.UNKNOWN_TO_SDK_VERSION, REL_FAILURE);
     }
 
@@ -146,7 +146,7 @@ public class GetAwsTextractJobStatusTest {
     }
 
     @Test
-    public void testTextractExpenseAnalysisTaskUnkownStatus() {
+    public void testTextractExpenseAnalysisTaskUnknownStatus() {
         testTextractExpenseAnalysis(JobStatus.UNKNOWN_TO_SDK_VERSION, REL_FAILURE);
     }
 
@@ -195,7 +195,7 @@ public class GetAwsTextractJobStatusTest {
     }
 
     @Test
-    public void testTextractDocumentTextDetectionTaskUnkownStatus() {
+    public void testTextractDocumentTextDetectionTaskUnknownStatus() {
         testTextractDocumentTextDetection(JobStatus.UNKNOWN_TO_SDK_VERSION, REL_FAILURE);
     }
 
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
index d7f9bfdf4bd..6aba8a81d9f 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
@@ -103,19 +103,19 @@ public class DeleteAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 {
             BlobContainerClient containerClient = storageClient.getBlobContainerClient(containerName);
             BlobClient blobClient = containerClient.getBlobClient(blobName);
 
-            String provenanceMesage;
+            String provenanceMessage;
             if (blobClient.exists()) {
                 DeleteSnapshotsOptionType deleteSnapshotsOptionType = getDeleteSnapshotsOptionType(deleteSnapshotsOption);
                 blobClient.deleteWithResponse(deleteSnapshotsOptionType, null, null, null);
-                provenanceMesage = getProvenanceMessage(deleteSnapshotsOptionType);
+                provenanceMessage = getProvenanceMessage(deleteSnapshotsOptionType);
             } else {
-                provenanceMesage = "Blob does not exist, nothing to delete";
+                provenanceMessage = "Blob does not exist, nothing to delete";
             }
 
             session.transfer(flowFile, REL_SUCCESS);
 
             long transferMillis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
-            session.getProvenanceReporter().invokeRemoteProcess(flowFile, blobClient.getBlobUrl(), String.format("%s (%d ms)", provenanceMesage, transferMillis));
+            session.getProvenanceReporter().invokeRemoteProcess(flowFile, blobClient.getBlobUrl(), String.format("%s (%d ms)", provenanceMessage, transferMillis));
         } catch (Exception e) {
             getLogger().error("Failed to delete the specified blob ({}) from Azure Blob Storage. Routing to failure", blobName, e);
             flowFile = session.penalize(flowFile);
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/MockTestBase.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/MockTestBase.java
index e354fc6254b..1cb89645e25 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/MockTestBase.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/MockTestBase.java
@@ -42,7 +42,7 @@ public class MockTestBase {
             testRunner.setProperty(AbstractAzureCosmosDBProcessor.CONTAINER_ID, MOCK_CONTAINER_ID);
             testRunner.setProperty(AbstractAzureCosmosDBProcessor.PARTITION_KEY, MOCK_PARTITION_FIELD_NAME);
             if (withConnectionService) {
-                // setup connnection controller service
+                // setup connection controller service
                 AzureCosmosDBClientService service = new MockConnectionService();
                 testRunner.addControllerService("connService", service);
                 testRunner.setProperty(service, AzureCosmosDBUtils.URI, MOCK_URI);
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecordTest.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecordTest.java
index 924423cc276..4a5460973b0 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecordTest.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecordTest.java
@@ -235,7 +235,7 @@ public class PutAzureCosmosDBRecordTest extends MockTestBase {
         testRunner.enableControllerService(registry);
         testRunner.enableControllerService(reader);
         prepareMockTest();
-        // override partiton key for this test case
+        // override partition key for this test case
         testRunner.setProperty(PutAzureCosmosDBRecord.PARTITION_KEY, "sport");
 
         Map<String, String> attrs = new HashMap<>();
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestClientSideEncryptionSupport.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestClientSideEncryptionSupport.java
index 23a605c20eb..3fd37fbb96f 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestClientSideEncryptionSupport.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestClientSideEncryptionSupport.java
@@ -159,8 +159,8 @@ public class TestClientSideEncryptionSupport {
         assertFalse(result.isEmpty(), "There should be validation error");
     }
 
-    private void assertContains(Collection<ValidationResult> result, String explaination) {
+    private void assertContains(Collection<ValidationResult> result, String explanation) {
         assertFalse(result.isEmpty(), "There should be validation error");
-        assertTrue(result.stream().anyMatch(v -> v.getExplanation().contains(explaination)));
+        assertTrue(result.stream().anyMatch(v -> v.getExplanation().contains(explanation)));
     }
 }
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java
index e4ae30959fc..6eaddcf8216 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-@Tags({ "azure", "provenace", "reporting", "log analytics" })
+@Tags({ "azure", "provenance", "reporting", "log analytics" })
 @CapabilityDescription("Publishes Provenance events to to a Azure Log Analytics workspace.")
 public class AzureLogAnalyticsProvenanceReportingTask extends AbstractAzureLogAnalyticsReportingTask {
 
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
index 33460cee957..a1883e9336c 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java
@@ -125,7 +125,7 @@ public class AzureLogAnalyticsReportingTask extends AbstractAzureLogAnalyticsRep
      * @param linuxPrimaryKey your azure log analytics workspace key
      * @param allMetrics      collected metrics to be sent
      * @throws IOException              when there is an error in https url
-     *                                  connection or read/write to the onnection
+     *                                  connection or read/write to the connection
      * @throws IllegalArgumentException when there a exception in converting metrics
      *                                  to json string with Gson.toJson
      * @throws RuntimeException         when httpPost fails with none 200 status
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/Metric.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/Metric.java
index 0f1a1dbc6b9..5ea2e54b1f7 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/Metric.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/Metric.java
@@ -57,7 +57,7 @@ public class Metric {
     public String getComputer() {
         return computer;
     }
-    public void setCoumputer(String computer) {
+    public void setComputer(String computer) {
         this.computer = computer;
     }
 
diff --git a/nifi-extension-bundles/nifi-couchbase-bundle/nifi-couchbase-standard-services/src/main/java/org/apache/nifi/services/couchbase/StandardCouchbaseConnectionService.java b/nifi-extension-bundles/nifi-couchbase-bundle/nifi-couchbase-standard-services/src/main/java/org/apache/nifi/services/couchbase/StandardCouchbaseConnectionService.java
index 1b0140f0d55..bdd9234bf47 100644
--- a/nifi-extension-bundles/nifi-couchbase-bundle/nifi-couchbase-standard-services/src/main/java/org/apache/nifi/services/couchbase/StandardCouchbaseConnectionService.java
+++ b/nifi-extension-bundles/nifi-couchbase-bundle/nifi-couchbase-standard-services/src/main/java/org/apache/nifi/services/couchbase/StandardCouchbaseConnectionService.java
@@ -49,7 +49,7 @@ public class StandardCouchbaseConnectionService extends AbstractControllerServic
 
     public static final PropertyDescriptor CONNECTION_STRING = new PropertyDescriptor.Builder()
             .name("Connection String")
-            .description("The hostnames or ip addresses of the bootstraping nodes and optional parameters."
+            .description("The hostnames or ip addresses of the bootstrapping nodes and optional parameters."
                     + " Syntax: couchbase://node1,node2,nodeN?param1=value1&param2=value2&paramN=valueN")
             .required(true)
             .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
index c33cb8b7ebc..644e2f7b7fc 100644
--- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
+++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearch.java
@@ -223,9 +223,9 @@ public class SearchElasticsearch extends AbstractPaginatedJsonQueryElasticsearch
     void resetQueryParamsIfRequired(final PaginatedJsonQueryParameters paginatedJsonQueryParameters, final ProcessContext context) throws IOException {
         final boolean expiredQuery = this.paginationType.hasExpiry() && StringUtils.isNotEmpty(paginatedJsonQueryParameters.getPageExpirationTimestamp())
                 && Instant.ofEpochMilli(Long.parseLong(paginatedJsonQueryParameters.getPageExpirationTimestamp())).isBefore(Instant.now());
-        final boolean restaredQuery = paginatedJsonQueryParameters.isFinished() && this.restartOnFinish;
+        final boolean restartedQuery = paginatedJsonQueryParameters.isFinished() && this.restartOnFinish;
 
-        if (expiredQuery || restaredQuery) {
+        if (expiredQuery || restartedQuery) {
             getLogger().debug("Existing paginated query has expired or restarted, resetting for new query");
 
             final Map<String, String> newStateMap = new HashMap<>(1, 1);
diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
index 2d882be041c..a6eb17d0599 100644
--- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
+++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java
@@ -99,7 +99,7 @@ public class ExtractEmailHeaders extends AbstractProcessor {
             .build();
 
     private static final AllowableValue STRICT_ADDRESSING = new AllowableValue("true", "Strict Address Parsing",
-        "Strict email address format will be enforced. FlowFiles will be transfered to the failure relationship if the email address is invalid.");
+        "Strict email address format will be enforced. FlowFiles will be transferred to the failure relationship if the email address is invalid.");
     private static final AllowableValue NONSTRICT_ADDRESSING = new AllowableValue("false", "Non-Strict Address Parsing",
         "Accept emails, even if the address is poorly formed and doesn't strictly comply with RFC Validation.");
     public static final PropertyDescriptor STRICT_PARSING = new PropertyDescriptor.Builder()
diff --git a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
index 4ee0ac39826..1d67a65b2b9 100644
--- a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
+++ b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
@@ -188,7 +188,7 @@ public class BinaryReader {
     }
 
     /**
-     * Reads 8 bytes in litte endian order and returns the UnsignedLong value
+     * Reads 8 bytes in little endian order and returns the UnsignedLong value
      *
      * @return the value
      */
diff --git a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNode.java b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNode.java
index 70df156e7a0..6dd306d45c2 100644
--- a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNode.java
+++ b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNode.java
@@ -24,7 +24,7 @@ import org.apache.nifi.processors.evtx.parser.bxml.BxmlNode;
 import java.io.IOException;
 
 /**
- * Node containging a 32 bit hex value
+ * Node containing a 32 bit hex value
  */
 public class Hex32TypeNode extends VariantTypeNode {
     private final String value;
diff --git a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/ResultProcessorTest.java b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/ResultProcessorTest.java
index 66c7a329ef3..69638af37a9 100644
--- a/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/ResultProcessorTest.java
+++ b/nifi-extension-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/ResultProcessorTest.java
@@ -68,7 +68,7 @@ public class ResultProcessorTest {
     }
 
     @Test
-    public void testProcessResultFileFalure() {
+    public void testProcessResultFileFailure() {
         ProcessSession processSession = mock(ProcessSession.class);
         ComponentLog componentLog = mock(ComponentLog.class);
         FlowFile flowFile = mock(FlowFile.class);
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 d9b8ce727b2..d6948725841 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
@@ -149,7 +149,7 @@ public abstract class AbstractListenEventBatchingProcessor<E extends Event> exte
 
     /**
      * Batches together up to the batchSize events. Events are grouped together based on a batch key which
-     * by default is the sender of the event, but can be overriden by sub-classes.
+     * by default is the sender of the event, but can be overridden by subclasses.
      *
      * This method will return when batchSize has been reached, or when no more events are available on the queue.
      *
diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/EventBatcher.java b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/EventBatcher.java
index e4e5ca4ddba..9e13340632e 100644
--- a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/EventBatcher.java
+++ b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/EventBatcher.java
@@ -43,7 +43,7 @@ public abstract class EventBatcher<E extends ByteArrayMessage> {
 
     /**
      * Batches together up to the batchSize events. Events are grouped together based on a batch key which
-     * by default is the sender of the event, but can be overriden by sub-classes.
+     * by default is the sender of the event, but can be overridden by subclasses.
      * <p>
      * This method will return when batchSize has been reached, or when no more events are available on the queue.
      *
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 d483968d5d5..9a84b2c61a3 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
@@ -456,7 +456,7 @@ public abstract class AbstractListProcessor<T extends ListableEntity> extends Ab
 
         try {
             // minTimestamp = 0L by default on this strategy to ignore any future
-            // comparision in lastModifiedMap to the same entity.
+            // comparison in lastModifiedMap to the same entity.
             entityList = performListing(context, IGNORE_MIN_TIMESTAMP_VALUE, ListingMode.EXECUTION);
         } catch (final IOException pe) {
             getLogger().error("Failed to perform listing on remote host due to {}", pe.getMessage(), pe);
diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/test/java/org/apache/nifi/schema/validation/TestStandardSchemaValidator.java b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/test/java/org/apache/nifi/schema/validation/TestStandardSchemaValidator.java
index 3db885ace5b..6971cd1b1dd 100644
--- a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/test/java/org/apache/nifi/schema/validation/TestStandardSchemaValidator.java
+++ b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/test/java/org/apache/nifi/schema/validation/TestStandardSchemaValidator.java
@@ -222,7 +222,7 @@ public class TestStandardSchemaValidator {
     }
 
     @Test
-    public void testValidateWrongButCoerceableType() {
+    public void testValidateWrongButCoercibleType() {
         final List<RecordField> fields = new ArrayList<>();
         fields.add(new RecordField("id", RecordFieldType.INT.getDataType()));
         final RecordSchema schema = new SimpleRecordSchema(fields);
@@ -248,7 +248,7 @@ public class TestStandardSchemaValidator {
         assertNotNull(result.getValidationErrors());
         assertTrue(result.getValidationErrors().isEmpty());
 
-        // Update Map to set value to a String that is coerceable to an int
+        // Update Map to set value to a String that is coercible to an int
         valueMap.put("id", "1");
         record = new MapRecord(schema, valueMap);
 
diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/utils/NifiStructuredDataPolicy.java b/nifi-extension-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/utils/NifiStructuredDataPolicy.java
index 5af2191f46a..a8589a2eb7c 100644
--- a/nifi-extension-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/utils/NifiStructuredDataPolicy.java
+++ b/nifi-extension-bundles/nifi-extension-utils/nifi-syslog-utils/src/main/java/org/apache/nifi/syslog/utils/NifiStructuredDataPolicy.java
@@ -27,7 +27,7 @@ public enum NifiStructuredDataPolicy {
      */
     FLATTEN,
     /**
-     * The Structued Data will be returned as a Map field named structuredData.
+     * The Structured Data will be returned as a Map field named structuredData.
      * Each map entry will have the value of the Structured Data ID, and a value
      * of a map of each element param name and value
      */
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/DelegationStrategy.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/DelegationStrategy.java
index bf0fbc7aac3..690fa1b3b78 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/DelegationStrategy.java
+++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/factory/DelegationStrategy.java
@@ -21,7 +21,7 @@ import org.apache.nifi.components.DescribedValue;
 public enum DelegationStrategy implements DescribedValue {
     SERVICE_ACCOUNT("Service Account", "The service account should access data using it's own identity and permissions."),
     DELEGATED_ACCOUNT("Delegated Account", "The service account should access data on behalf of a specified user account." +
-            " This setting requires domain-wide delgation to be enabled for the service account for the scopes that it will be used in.");
+            " This setting requires domain-wide delegation to be enabled for the service account for the scopes that it will be used in.");
 
     private final String displayName;
     private final String description;
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java
index d7fd7e9b3ce..49d993086f8 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java
+++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java
@@ -100,7 +100,7 @@ public class FetchGCSObjectIT extends AbstractGCSIT {
     }
 
     @Test
-    public void testFetchNonexistantFile() throws Exception {
+    public void testFetchNonexistentFile() throws Exception {
         final TestRunner runner = buildNewRunner(new FetchGCSObject());
         runner.setProperty(FetchGCSObject.BUCKET, BUCKET);
         runner.enqueue(new byte[0], Collections.singletonMap(
diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java
index 2ae06736227..0d445fcac4f 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java
@@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ExecuteGraphQueryRecordTest {
     private TestRunner runner;
-    Map<String, String> enqueProperties = new HashMap<>();
+    Map<String, String> enqueueProperties = new HashMap<>();
 
     @BeforeEach
     public void setup() throws InitializationException {
@@ -74,7 +74,7 @@ public class ExecuteGraphQueryRecordTest {
 
         runner.setProperty(ExecuteGraphQueryRecord.SUBMISSION_SCRIPT, submissionScript);
         runner.setProperty("M", "/M");
-        runner.enqueue(json, enqueProperties);
+        runner.enqueue(json, enqueueProperties);
 
         runner.run();
         runner.assertTransferCount(ExecuteGraphQueryRecord.GRAPH, 1);
@@ -100,7 +100,7 @@ public class ExecuteGraphQueryRecordTest {
 
         runner.setProperty(ExecuteGraphQueryRecord.SUBMISSION_SCRIPT, submissionScript);
         runner.setProperty("M", "/M");
-        runner.enqueue(json, enqueProperties);
+        runner.enqueue(json, enqueueProperties);
 
         runner.run();
         runner.assertTransferCount(ExecuteGraphQueryRecord.GRAPH, 1);
@@ -169,7 +169,7 @@ public class ExecuteGraphQueryRecordTest {
 
         runner.setProperty(ExecuteGraphQueryRecord.SUBMISSION_SCRIPT, submissionScript);
         runner.setProperty("M", "/M");
-        runner.enqueue(json, enqueProperties);
+        runner.enqueue(json, enqueueProperties);
 
         runner.run();
         runner.assertTransferCount(ExecuteGraphQueryRecord.GRAPH, 0);
@@ -198,6 +198,6 @@ public class ExecuteGraphQueryRecordTest {
         runner.enableControllerService(graphClient);
         runner.setProperty(ExecuteGraphQueryRecord.SUBMISSION_SCRIPT, "[ 'testProperty': 'testResponse' ]");
         runner.assertValid();
-        enqueProperties.put("graph.name", "graph");
+        enqueueProperties.put("graph.name", "graph");
     }
 }
diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/util/InMemoryGraphClient.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/util/InMemoryGraphClient.java
index 051174a1190..d77ced53abc 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/util/InMemoryGraphClient.java
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/util/InMemoryGraphClient.java
@@ -81,7 +81,7 @@ public class InMemoryGraphClient extends AbstractControllerService implements Gr
             //The below logic helps with the handling of complex Map<String, Object> relationships
             Map resultMap = (Map) response;
             if (!resultMap.isEmpty()) {
-                // Convertex a resultMap to an entrySet iterator
+                // Convert a resultMap to an entrySet iterator
                 Iterator outerResultSet = resultMap.entrySet().iterator();
                 // this loops over the outermost map
                 while (outerResultSet.hasNext()) {
diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/main/java/org/apache/nifi/graph/InMemoryJanusGraphClientService.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/main/java/org/apache/nifi/graph/InMemoryJanusGraphClientService.java
index a2cdc9334ae..047f05d8280 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/main/java/org/apache/nifi/graph/InMemoryJanusGraphClientService.java
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/main/java/org/apache/nifi/graph/InMemoryJanusGraphClientService.java
@@ -50,7 +50,7 @@ public class InMemoryJanusGraphClientService extends AbstractControllerService i
      * @param query A gremlin query (Groovy syntax)
      * @param parameters A map of parameters to be injected into the script. This can be structured the way you would
      *                   expect a REST API call to Gremlin Server.
-     * @param handler The callback for parsing the rsponse.
+     * @param handler The callback for parsing the response.
      * @return Empty map. This API feature is only filled with values typically when dealing with Cypher clients, Neo4J
      * in particular.
      */
diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java
index a3f0e6a30f1..0ea5984d3bc 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java
@@ -61,7 +61,7 @@ import static org.neo4j.driver.Config.TrustStrategy.trustCustomCertificateSigned
 public class Neo4JCypherClientService extends AbstractControllerService implements GraphClientService {
     public static final PropertyDescriptor CONNECTION_URL = new PropertyDescriptor.Builder()
             .name("Neo4j Connection URL")
-            .description("Neo4J endpoing to connect to.")
+            .description("Neo4J endpoint to connect to.")
             .required(true)
             .defaultValue("bolt://localhost:7687")
             .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
index 482e4599776..4f782735a6f 100644
--- a/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
+++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
@@ -89,7 +89,7 @@ public class TinkerpopClientService extends AbstractControllerService implements
 
     private static final AllowableValue SERVICE_SETTINGS = new AllowableValue("service-settings", "Service-Defined Settings",
             "Connection to the gremlin server will be specified via values on this controller (simpler). " +
-                    "Only recommended for testing and development with a simple grpah instance. ");
+                    "Only recommended for testing and development with a simple graph instance. ");
 
     public static final PropertyDescriptor SUBMISSION_TYPE = new PropertyDescriptor.Builder()
             .name("Script Submission Type")
diff --git a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/ProcessSessionWrap.java b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/ProcessSessionWrap.java
index 2cde23f1590..a227f81fd29 100644
--- a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/ProcessSessionWrap.java
+++ b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/ProcessSessionWrap.java
@@ -963,7 +963,7 @@ public abstract class ProcessSessionWrap implements ProcessSession {
      * of the FlowFile is destroyed.
      * @throws FlowFileAccessException if some IO problem occurs accessing
      * FlowFile content; if an attempt is made to access the OutputStream
-     * provided to the given OutputStreamCallaback after this method completed
+     * provided to the given OutputStreamCallback after this method completed
      * its execution
      */
     @Override
diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java
index 7b1580db440..2d72225d83b 100644
--- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java
+++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java
@@ -54,7 +54,7 @@ import java.util.stream.Stream;
         + "or a statically set path that is periodically removed. If this processor has an incoming connection, it"
         + "will ignore running on a periodic basis and instead rely on incoming FlowFiles to trigger a delete. "
         + "Note that you may use a wildcard character to match multiple files or directories. If there are"
-        + " no incoming connections no FlowFiles will be transfered to any output relationships.  If there is an incoming"
+        + " no incoming connections no FlowFiles will be transferred to any output relationships.  If there is an incoming"
         + " FlowFile then provided there are no detected failures it will be transferred to success otherwise it will be sent to false. If"
         + " knowledge of globbed files deleted is necessary use ListHDFS first to produce a specific list of files to delete. ")
 
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 86d975ea918..903c335847d 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
@@ -79,7 +79,7 @@ import static org.apache.nifi.processors.hadoop.GetHDFSFileInfo.HDFSFileInfoRequ
         @WritesAttribute(attribute = "hdfs.lastModified", description = "The timestamp of when the object in HDFS was last modified, as milliseconds since midnight Jan 1, 1970 UTC"),
         @WritesAttribute(attribute = "hdfs.length", description =
                 "In case of files: The number of bytes in the file in HDFS.  "
-                + "In case of dirs: Retuns storage space consumed by directory. "
+                + "In case of dirs: Returns storage space consumed by directory. "
                 ),
         @WritesAttribute(attribute = "hdfs.count.files", description = "In case of type='directory' will represent total count of files under this dir. "
                 + "Won't be populated to other types of HDFS objects. "),
@@ -89,7 +89,7 @@ import static org.apache.nifi.processors.hadoop.GetHDFSFileInfo.HDFSFileInfoRequ
         @WritesAttribute(attribute = "hdfs.permissions", description = "The permissions for the object in HDFS. This is formatted as 3 characters for the owner, "
                 + "3 for the group, and 3 for other users. For example rw-rw-r--"),
         @WritesAttribute(attribute = "hdfs.status", description = "The status contains comma separated list of file/dir paths, which couldn't be listed/accessed. "
-                + "Status won't be set if no errors occured."),
+                + "Status won't be set if no errors occurred."),
         @WritesAttribute(attribute = "hdfs.full.tree", description = "When destination is 'attribute', will be populated with full tree of HDFS directory in JSON format."
                 + "WARNING: In case when scan finds thousands or millions of objects, having huge values in attribute could impact flow file repo and GC/heap usage. "
                 + "Use content destination for such cases")
@@ -194,7 +194,7 @@ public class GetHDFSFileInfo extends AbstractHadoopProcessor {
 
     public static final PropertyDescriptor DESTINATION = new PropertyDescriptor.Builder()
             .name("Destination")
-            .description("Sets the destination for the resutls. When set to 'Content', attributes of FlowFile won't be used for storing results. ")
+            .description("Sets the destination for the results. When set to 'Content', attributes of FlowFile won't be used for storing results. ")
             .required(true)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .allowableValues(DESTINATION_ATTRIBUTES, DESTINATION_CONTENT)
diff --git a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java
index ccf9f6e13d8..cf6a80d8ef1 100644
--- a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java
+++ b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java
@@ -286,7 +286,7 @@ public class JMSPublisherConsumerIT {
             /*
              * https://github.com/spring-projects/spring-framework/issues/24144
              * Suggests we cannot rely on the value being specifically what was set
-             * and on a per message level so instead checking experitation is set
+             * and on a per message level so instead checking expiration is set
              * rather than a specific value
              */
             assertTrue(receivedMessage.getJMSExpiration() > 0);
diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java
index c0de1f11d87..55439f0c77b 100644
--- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java
+++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java
@@ -82,7 +82,7 @@ public class PutGridFS extends AbstractGridFSProcessor {
         .build();
     static final PropertyDescriptor HASH_ATTRIBUTE = new PropertyDescriptor.Builder()
         .name("Hash Attribute")
-        .description("If uniquness enforcement is enabled and the file hash is part of the constraint, this must be set to an attribute that " +
+        .description("If uniqueness enforcement is enabled and the file hash is part of the constraint, this must be set to an attribute that " +
                 "exists on all incoming FlowFiles.")
         .defaultValue("hash.value")
         .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
diff --git a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java
index 8c3075c46fc..7763eb8a4c9 100644
--- a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java
+++ b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java
@@ -392,7 +392,7 @@ public class ConsumeMQTT extends AbstractMQTTProcessor {
             mqttClient.subscribe(topicPrefix + topicFilter, qos, this::handleReceivedMessage);
         } catch (Exception e) {
             logger.error("Connection failed to {}. Yielding processor", clientProperties.getRawBrokerUris(), e);
-            mqttClient = null; // prevent stucked processor when subscribe fails
+            mqttClient = null; // prevent stuck processor when subscribe fails
             context.yield();
         }
     }
diff --git a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
index 6080264abd2..b01e9e9d119 100644
--- a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
+++ b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/test/java/org/apache/nifi/processors/network/pcap/TestPCAP.java
@@ -82,23 +82,23 @@ public class TestPCAP {
         // Assert the expected byte array values
         ByteBuffer buffer = ByteBuffer.wrap(result);
         assertEquals(0xa1b2c3d4, buffer.getInt());
-        ByteBuffer litteEndianBuffer = ByteBuffer.wrap(result).order(ByteOrder.LITTLE_ENDIAN);
-        litteEndianBuffer.position(4);
+        ByteBuffer littleEndianBuffer = ByteBuffer.wrap(result).order(ByteOrder.LITTLE_ENDIAN);
+        littleEndianBuffer.position(4);
 
         for (int[] value : PCAP_HEADER_VALUES) {
             if (value[1] == 2) {
-                assertEquals(value[0], litteEndianBuffer.getShort());
+                assertEquals(value[0], littleEndianBuffer.getShort());
             } else {
-                assertEquals(value[0], litteEndianBuffer.getInt());
+                assertEquals(value[0], littleEndianBuffer.getInt());
             }
         }
 
-        assertEquals(packetHeaderValues.get("tsSec"), litteEndianBuffer.getInt());
-        assertEquals(packetHeaderValues.get("tsUsec"), litteEndianBuffer.getInt());
-        assertEquals(packetHeaderValues.get("inclLen"), litteEndianBuffer.getInt());
-        assertEquals(packetHeaderValues.get("origLen"), litteEndianBuffer.getInt());
+        assertEquals(packetHeaderValues.get("tsSec"), littleEndianBuffer.getInt());
+        assertEquals(packetHeaderValues.get("tsUsec"), littleEndianBuffer.getInt());
+        assertEquals(packetHeaderValues.get("inclLen"), littleEndianBuffer.getInt());
+        assertEquals(packetHeaderValues.get("origLen"), littleEndianBuffer.getInt());
         byte[] body = new byte[30];
-        litteEndianBuffer.get(40, body, 0, 30);
+        littleEndianBuffer.get(40, body, 0, 30);
         assertArrayEquals(PACKET_DATA, body);
     }
 }
diff --git a/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/test/java/org/apache/nifi/schemaregistry/services/TestAvroSchemaRegistry.java b/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/test/java/org/apache/nifi/schemaregistry/services/TestAvroSchemaRegistry.java
index b2851df6f2b..776e26f008c 100644
--- a/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/test/java/org/apache/nifi/schemaregistry/services/TestAvroSchemaRegistry.java
+++ b/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/test/java/org/apache/nifi/schemaregistry/services/TestAvroSchemaRegistry.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
 public class TestAvroSchemaRegistry {
 
     @Test
-    public void validateSchemaRegistrationFromrDynamicProperties() throws Exception {
+    public void validateSchemaRegistrationFromDynamicProperties() throws Exception {
         String schemaName = "fooSchema";
 
         PropertyDescriptor fooSchema = new PropertyDescriptor.Builder()
diff --git a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/dto/SNMPTreeResponse.java b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/dto/SNMPTreeResponse.java
index d58116d71a1..b33d3a29250 100644
--- a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/dto/SNMPTreeResponse.java
+++ b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/dto/SNMPTreeResponse.java
@@ -55,7 +55,7 @@ public class SNMPTreeResponse {
     public void logErrors(final ComponentLog logger) {
         events.stream()
                 .filter(TreeEvent::isError)
-                .forEach(event -> logger.error("Error occured in SNMP walk event: {}", event.getErrorMessage()));
+                .forEach(event -> logger.error("Error occurred in SNMP walk event: {}", event.getErrorMessage()));
     }
 
     public boolean isError() {
diff --git a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
index 8e5325e7227..d4bbe72c964 100644
--- a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
+++ b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
@@ -62,7 +62,7 @@ import java.util.Set;
         " in attributes and without any content")
 @WritesAttributes({
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "<OID>", description = "Response variable binding: OID (e.g. 1.3.6.1.4.1.343) and its value."),
-        @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorIndex", description = "Denotes the variable binding in which the error occured."),
+        @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorIndex", description = "Denotes the variable binding in which the error occurred."),
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorStatus", description = "The snmp4j error status of the PDU."),
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorStatusText", description = "The description of error status."),
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "nonRepeaters", description = "The number of non repeater variable bindings in a GETBULK PDU (currently not supported)."),
diff --git a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
index 133366f5fe4..cdb22ad7ff0 100644
--- a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
+++ b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
@@ -55,7 +55,7 @@ import java.util.Set;
         " the attribute to the corresponding OID given in the attribute name.")
 @WritesAttributes({
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "<OID>", description = "Response variable binding: OID (e.g. 1.3.6.1.4.1.343) and its value."),
-        @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorIndex", description = "Denotes the variable binding in which the error occured."),
+        @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorIndex", description = "Denotes the variable binding in which the error occurred."),
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorStatus", description = "The snmp4j error status of the PDU."),
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "errorStatusText", description = "The description of error status."),
         @WritesAttribute(attribute = SNMPUtils.SNMP_PROP_PREFIX + "nonRepeaters", description = "The number of non repeater variable bindings in a GETBULK PDU (currently not supported)."),
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
index 44d9ec1c114..569b4027159 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
@@ -86,7 +86,7 @@ import javax.xml.transform.stream.StreamResult;
         + "respectively) will be created for each result (attributes will have a '.n' one-up number appended to the "
         + "specified attribute name).  If any provided XQuery returns a result, the FlowFile(s) will be routed to "
         + "'matched'. If no provided XQuery returns a result, the FlowFile will be routed to 'unmatched'.  If the "
-        + "Destination is 'flowfile-attribute' and the XQueries matche nothing, no attributes will be applied to the "
+        + "Destination is 'flowfile-attribute' and the XQueries match nothing, no attributes will be applied to the "
         + "FlowFile.")
 @WritesAttribute(attribute = "user-defined", description = "This processor adds user-defined attributes if the <Destination> property is set to flowfile-attribute .")
 @DynamicProperty(name = "A FlowFile attribute(if <Destination> is set to 'flowfile-attribute'", value = "An XQuery", description = "If <Destination>='flowfile-attribute' "
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
index 0c0b6ec4a7c..9b11a30617c 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
@@ -448,8 +448,8 @@ public class HandleHttpRequest extends AbstractProcessor implements ListenCompon
         final Set<String> parametersToMakeAttributes = new HashSet<>();
         final String parametersToAttributesPropertyValue = context.getProperty(PARAMETERS_TO_ATTRIBUTES).getValue();
         if (parametersToAttributesPropertyValue != null) {
-            for (final String paremeterName : parametersToAttributesPropertyValue.split(",")) {
-                final String trimmed = paremeterName.trim();
+            for (final String parameterName : parametersToAttributesPropertyValue.split(",")) {
+                final String trimmed = parameterName.trim();
                 if (!trimmed.isEmpty()) {
                     parametersToMakeAttributes.add(trimmed);
                 }
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java
index a99d48d9875..908a7a6073b 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java
@@ -84,7 +84,7 @@ import java.util.stream.Stream;
         @WritesAttribute(attribute = "db.table.name", description = "Contains the name of a database table from the connection"),
         @WritesAttribute(attribute = "db.table.catalog", description = "Contains the name of the catalog to which the table belongs (may be null)"),
         @WritesAttribute(attribute = "db.table.schema", description = "Contains the name of the schema to which the table belongs (may be null)"),
-        @WritesAttribute(attribute = "db.table.fullname", description = "Contains the fully-qualifed table name (possibly including catalog, schema, etc.)"),
+        @WritesAttribute(attribute = "db.table.fullname", description = "Contains the fully-qualified table name (possibly including catalog, schema, etc.)"),
         @WritesAttribute(attribute = "db.table.type",
                 description = "Contains the type of the database table from the connection. Typical types are \"TABLE\", \"VIEW\", \"SYSTEM TABLE\", "
                         + "\"GLOBAL TEMPORARY\", \"LOCAL TEMPORARY\", \"ALIAS\", \"SYNONYM\""),
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java
index d8fbb5c187e..0b4e30c86d4 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java
@@ -51,7 +51,7 @@ import java.util.Set;
 @Tags({"logs", "syslog", "attributes", "system", "event", "message"})
 @CapabilityDescription("Attempts to parses the contents of a Syslog message in accordance to RFC5424 and RFC3164 " +
         "formats and adds attributes to the FlowFile for each of the parts of the Syslog message." +
-        "Note: Be mindfull that RFC3164 is informational and a wide range of different implementations are present in" +
+        "Note: Be mindful that RFC3164 is informational and a wide range of different implementations are present in" +
         " the wild. If messages fail parsing, considering using RFC5424 or using a generic parsing processors such as " +
         "ExtractGrok.")
 @WritesAttributes({@WritesAttribute(attribute = "syslog.priority", description = "The priority of the Syslog message."),
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
index 81cbfc2a22b..f1980640076 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
@@ -435,8 +435,8 @@ public class UnpackContent extends AbstractProcessor {
                             }
 
                             if (tarEntry.getLastAccessTime() != null) {
-                                final String lastAccesTime = DATE_TIME_FORMATTER.format(tarEntry.getLastAccessTime().toInstant());
-                                attributes.put(FILE_LAST_ACCESS_TIME_ATTRIBUTE, lastAccesTime);
+                                final String lastAccessTime = DATE_TIME_FORMATTER.format(tarEntry.getLastAccessTime().toInstant());
+                                attributes.put(FILE_LAST_ACCESS_TIME_ATTRIBUTE, lastAccessTime);
                             }
 
                             attributes.put(FRAGMENT_ID, fragmentId);
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
index deb8d64aca2..d41d05a6802 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
@@ -166,7 +166,7 @@ public class Oracle12DatabaseAdapter implements DatabaseAdapter {
                         uniqueKey -> column.equalsIgnoreCase(getColumnAssignment(table, uniqueKey, newTableAlias))))
                 .collect(Collectors.toList());
 
-        // Compare list sizes instead of emptyness
+        // Compare list sizes instead of emptiness
         if (conflictColumnsClause.size() != uniqueKeyColumnNames.size()) {
 
             // Try it with normalized columns
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/AbstractTestTailFileScenario.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/AbstractTestTailFileScenario.java
index cb364581d5a..329473434ee 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/AbstractTestTailFileScenario.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/AbstractTestTailFileScenario.java
@@ -41,7 +41,7 @@ public class AbstractTestTailFileScenario {
     public static final String TEST_DIRECTORY = "testTailFileScenario";
     public static final String TARGET_FILE_PATH = "target/" + TEST_DIRECTORY + "/in.txt";
     public static final String NUL_SUBSTITUTE = "X";
-    public static final Long POST_ROLLOVER_WAIT_PERSIOD_SECONDS = 100L;
+    public static final Long POST_ROLLOVER_WAIT_PERIOD_SECONDS = 100L;
 
     protected File file;
     protected RandomAccessFile randomAccessFile;
@@ -83,7 +83,7 @@ public class AbstractTestTailFileScenario {
         runner.setProperty(TailFile.FILENAME, TARGET_FILE_PATH);
         runner.setProperty(TailFile.ROLLING_FILENAME_PATTERN, "in.txt*");
         runner.setProperty(TailFile.REREAD_ON_NUL, "true");
-        runner.setProperty(TailFile.POST_ROLLOVER_TAIL_PERIOD, POST_ROLLOVER_WAIT_PERSIOD_SECONDS + " sec");
+        runner.setProperty(TailFile.POST_ROLLOVER_TAIL_PERIOD, POST_ROLLOVER_WAIT_PERIOD_SECONDS + " sec");
         runner.assertValid();
 
         runner.run(1, false, true);
@@ -232,7 +232,7 @@ public class AbstractTestTailFileScenario {
     }
 
     private void expireRolloverWaitPeriod() throws Exception {
-        long waitPeriod = POST_ROLLOVER_WAIT_PERSIOD_SECONDS * 1000 + 100;
+        long waitPeriod = POST_ROLLOVER_WAIT_PERIOD_SECONDS * 1000 + 100;
         timeAdjustment.set(timeAdjustment.get() + waitPeriod);
     }
 
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractExecuteSQL.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractExecuteSQL.java
index 79797605b7d..7895b73e879 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractExecuteSQL.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAbstractExecuteSQL.java
@@ -46,11 +46,11 @@ public class TestAbstractExecuteSQL {
     public void testGetQueries() {
         // GIVEN
         String queriesString = "SOME kind of PRE-QUERY statement;\n" +
-            "AND another PRE-QUERY statment;";
+            "AND another PRE-QUERY statement;";
 
         List<String> expected = Arrays.asList(
             "SOME kind of PRE-QUERY statement",
-            "AND another PRE-QUERY statment"
+            "AND another PRE-QUERY statement"
         );
 
         // WHEN
@@ -65,12 +65,12 @@ public class TestAbstractExecuteSQL {
         // GIVEN
         String queriesString = "SET COMPLEX_KEY = 'KEYPART_1=value1\\;KEYPART_2=<valuePart2>\\;’ FOR SESSION;\n" +
             "SOME other PRE-QUERY statement;\n" +
-            "AND another PRE-QUERY statment;";
+            "AND another PRE-QUERY statement;";
 
         List<String> expected = Arrays.asList(
             "SET COMPLEX_KEY = 'KEYPART_1=value1;KEYPART_2=<valuePart2>;’ FOR SESSION",
             "SOME other PRE-QUERY statement",
-            "AND another PRE-QUERY statment"
+            "AND another PRE-QUERY statement"
         );
 
         // WHEN
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
index c513e9d74eb..e6aa0066247 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestAttributesToCSV.java
@@ -696,7 +696,7 @@ public class TestAttributesToCSV {
     }
 
     @Test
-    public void testSchemaWithCoreAttribuesToAttribute() {
+    public void testSchemaWithCoreAttributesToAttribute() {
         testRunner.setProperty(AttributesToCSV.DESTINATION, OUTPUT_NEW_ATTRIBUTE);
         testRunner.setProperty(AttributesToCSV.INCLUDE_CORE_ATTRIBUTES, "true");
         testRunner.setProperty(AttributesToCSV.NULL_VALUE_FOR_EMPTY_STRING, "false");
@@ -727,7 +727,7 @@ public class TestAttributesToCSV {
     }
 
     @Test
-    public void testSchemaWithCoreAttribuesToContent() {
+    public void testSchemaWithCoreAttributesToContent() {
         //set the destination of the csv string to be an attribute
         testRunner.setProperty(AttributesToCSV.DESTINATION, OUTPUT_OVERWRITE_CONTENT);
         testRunner.setProperty(AttributesToCSV.INCLUDE_CORE_ATTRIBUTES, "true");
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
index 274d07302ed..0d727f4b6bb 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
@@ -416,7 +416,7 @@ public class TestMergeContent {
     }
 
     private Map<String, GenericRecord> getGenericRecordMap(byte[] data, Schema schema, String key) throws IOException {
-        // create a reader for the merged contet
+        // create a reader for the merged content
         DatumReader<GenericRecord> datumReader = new GenericDatumReader<>(schema);
         SeekableByteArrayInput input = new SeekableByteArrayInput(data);
         DataFileReader<GenericRecord> dataFileReader = new DataFileReader<>(input, datumReader);
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
index 5225fd51c6e..f232e40bac1 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
@@ -131,7 +131,7 @@ public class TestSplitRecord {
     }
 
     @Test
-    public void testAllSplitsOneDesintation() throws InitializationException {
+    public void testAllSplitsOneDestination() throws InitializationException {
         final MockRecordParser readerService = new MockRecordParser();
         final MockRecordWriter writerService = new MockRecordWriter("header", false);
 
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFileGeneratedScenarios.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFileGeneratedScenarios.java
index 330fe21e8b1..d9240275b27 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFileGeneratedScenarios.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTailFileGeneratedScenarios.java
@@ -30,7 +30,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Stream;
 
-@EnabledIfSystemProperty(named = "nifi.test.performance", matches = "true", disabledReason = "Stress test - longrunning. For manual testing.")
+@EnabledIfSystemProperty(named = "nifi.test.performance", matches = "true", disabledReason = "Stress test - long running. For manual testing.")
 public class TestTailFileGeneratedScenarios extends AbstractTestTailFileScenario {
     private static List<Arguments> parameters = new ArrayList<>();
 
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/AbstractFlowAnalaysisRuleTest.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/AbstractFlowAnalysisRuleTest.java
similarity index 98%
rename from nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/AbstractFlowAnalaysisRuleTest.java
rename to nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/AbstractFlowAnalysisRuleTest.java
index e638ddc36c8..7ff7431c658 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/AbstractFlowAnalaysisRuleTest.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/AbstractFlowAnalysisRuleTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.mockito.ArgumentMatchers.any;
 
 @ExtendWith(MockitoExtension.class)
-public abstract class AbstractFlowAnalaysisRuleTest<T extends AbstractFlowAnalysisRule> {
+public abstract class AbstractFlowAnalysisRuleTest<T extends AbstractFlowAnalysisRule> {
 
     private static final ObjectMapper FLOW_MAPPER = new ObjectMapper();
     protected Map<PropertyDescriptor, PropertyValue> properties = new HashMap<>();
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RequireServerSSLContextServiceTest.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RequireServerSSLContextServiceTest.java
index 0ebd0e1d695..194b09ecc8f 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RequireServerSSLContextServiceTest.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RequireServerSSLContextServiceTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-public class RequireServerSSLContextServiceTest extends AbstractFlowAnalaysisRuleTest<RequireServerSSLContextService> {
+public class RequireServerSSLContextServiceTest extends AbstractFlowAnalysisRuleTest<RequireServerSSLContextService> {
 
     public static final PropertyDescriptor SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
             .name("SSL Context Service")
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictBackpressureSettingsTest.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictBackpressureSettingsTest.java
index 7d25d54494d..8275118581c 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictBackpressureSettingsTest.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictBackpressureSettingsTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class RestrictBackpressureSettingsTest extends AbstractFlowAnalaysisRuleTest<RestrictBackpressureSettings> {
+public class RestrictBackpressureSettingsTest extends AbstractFlowAnalysisRuleTest<RestrictBackpressureSettings> {
 
     @Override
     protected RestrictBackpressureSettings initializeRule() {
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictFlowFileExpirationTest.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictFlowFileExpirationTest.java
index 0b62a8594b0..3ccc96b51f5 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictFlowFileExpirationTest.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-rules/src/test/java/org/apache/nifi/flowanalysis/rules/RestrictFlowFileExpirationTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class RestrictFlowFileExpirationTest extends AbstractFlowAnalaysisRuleTest<RestrictFlowFileExpiration> {
+public class RestrictFlowFileExpirationTest extends AbstractFlowAnalysisRuleTest<RestrictFlowFileExpiration> {
     @Override
     protected RestrictFlowFileExpiration initializeRule() {
         return new RestrictFlowFileExpiration();
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
index bce1fe09f93..b8a8ecd9d83 100644
--- a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
@@ -530,7 +530,7 @@ public class HikariCPConnectionPool extends AbstractControllerService implements
         try {
             final Driver driver = DriverManager.getDriver(url);
             // Ensure drivers that register themselves during class loading can be set as the registeredDriver.
-            // This ensures drivers that register themselves can be deregisterd when the componet is removed.
+            // This ensures drivers that register themselves can be deregistered when the component is removed.
             // These drivers should be loaded in the same InstanceClassloader that load this component
             if (driver != registeredDriver
                     && driver.getClass().getClassLoader().equals(getClass().getClassLoader())) {
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/syslog/SyslogReader.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/syslog/SyslogReader.java
index 827906b399f..afb9e25679f 100644
--- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/syslog/SyslogReader.java
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/syslog/SyslogReader.java
@@ -55,7 +55,7 @@ import java.util.Set;
 @Tags({"syslog", "logs", "logfiles", "parse", "text", "record", "reader"})
 @CapabilityDescription("Attempts to parses the contents of a Syslog message in accordance to RFC5424 and RFC3164. In the " +
         "case of RFC5424 formatted messages, structured data is not supported, and will be returned as part of the message." +
-        "Note: Be mindfull that RFC3164 is informational and a wide range of different implementations are present in" +
+        "Note: Be mindful that RFC3164 is informational and a wide range of different implementations are present in" +
         " the wild.")
 public class SyslogReader extends SchemaRegistryService implements RecordReaderFactory {
 
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java
index a469fdd2819..33318c46c97 100644
--- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestCSVRecordReader.java
@@ -134,7 +134,7 @@ public class TestCSVRecordReader {
     }
 
     @Test
-    public void testDateNoCoersionExpectedFormat() throws IOException, MalformedRecordException {
+    public void testDateNoCoercionExpectedFormat() throws IOException, MalformedRecordException {
         final String dateValue = "1983-11-30";
         final String text = "date\n11/30/1983";
 
@@ -153,7 +153,7 @@ public class TestCSVRecordReader {
     }
 
     @Test
-    public void testDateNoCoersionUnexpectedFormat() throws IOException, MalformedRecordException {
+    public void testDateNoCoercionUnexpectedFormat() throws IOException, MalformedRecordException {
         final String text = "date\n11/30/1983";
 
         final List<RecordField> fields = new ArrayList<>();
@@ -205,7 +205,7 @@ public class TestCSVRecordReader {
     }
 
     @Test
-    public void testTimeNoCoersionExpectedFormat() throws IOException, MalformedRecordException {
+    public void testTimeNoCoercionExpectedFormat() throws IOException, MalformedRecordException {
         final String timeFormat = "HH!mm!ss";
         final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat);
         final String timeVal = "19!02!03";
@@ -228,7 +228,7 @@ public class TestCSVRecordReader {
     }
 
     @Test
-    public void testTimeNoCoersionUnexpectedFormat() throws IOException, MalformedRecordException {
+    public void testTimeNoCoercionUnexpectedFormat() throws IOException, MalformedRecordException {
         final String text = "time\n01:02:03";
 
         final List<RecordField> fields = new ArrayList<>();
@@ -279,7 +279,7 @@ public class TestCSVRecordReader {
     }
 
     @Test
-    public void testTimestampNoCoersionUnexpectedFormat() throws IOException, MalformedRecordException {
+    public void testTimestampNoCoercionUnexpectedFormat() throws IOException, MalformedRecordException {
         final String text = "timestamp\n01:02:03";
 
         final List<RecordField> fields = new ArrayList<>();
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/schema/inference/TestVolatileSchemaCache.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/schema/inference/TestVolatileSchemaCache.java
index 4b65e30ec62..c7159f8806a 100644
--- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/schema/inference/TestVolatileSchemaCache.java
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/schema/inference/TestVolatileSchemaCache.java
@@ -76,7 +76,7 @@ public class TestVolatileSchemaCache {
     }
 
     @Test
-    public void testIdentifierCollission() throws InitializationException {
+    public void testIdentifierCollision() throws InitializationException {
         final List<RecordField> stringFields = new ArrayList<>();
         final List<RecordField> intFields = new ArrayList<>();
 
diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/xml/TestWriteXMLResult.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/xml/TestWriteXMLResult.java
index 172a5fe4f0f..0930cba48fc 100644
--- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/xml/TestWriteXMLResult.java
+++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/xml/TestWriteXMLResult.java
@@ -258,7 +258,7 @@ public class TestWriteXMLResult {
     }
 
     @Test
-    public void testSimpleRecordWithNullValuesSuppressMissings() throws IOException {
+    public void testSimpleRecordWithNullValuesSuppressMissing() throws IOException {
         OutputStream out = new ByteArrayOutputStream();
         RecordSet recordSet = getSimpleRecordsWithNullValues();
         WriteXMLResult writer = new WriteXMLResult(recordSet.getSchema(), new SchemaNameAsAttribute(),
@@ -373,7 +373,7 @@ public class TestWriteXMLResult {
     }
 
     @Test
-    public void testNestedRecordWithNullValuesSuppressMissings() throws IOException {
+    public void testNestedRecordWithNullValuesSuppressMissing() throws IOException {
         OutputStream out = new ByteArrayOutputStream();
         RecordSet recordSet = getNestedRecordsWithNullValues();
         WriteXMLResult writer = new WriteXMLResult(recordSet.getSchema(), new SchemaNameAsAttribute(),
@@ -865,7 +865,7 @@ public class TestWriteXMLResult {
     }
 
     @Test
-    public void testWriteWithoutSchemaSimpleRecordWithNullValuesSuppressMissings() throws IOException {
+    public void testWriteWithoutSchemaSimpleRecordWithNullValuesSuppressMissing() throws IOException {
         OutputStream out = new ByteArrayOutputStream();
         RecordSet recordSet = getSimpleRecordsWithNullValues();
         WriteXMLResult writer = new WriteXMLResult(recordSet.getSchema(), new SchemaNameAsAttribute(),
diff --git a/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java b/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
index 6155d750ab3..b0eaba95b08 100644
--- a/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
+++ b/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
@@ -112,7 +112,7 @@ public class AttributeRollingWindow extends AbstractProcessor {
             .name("Subwindow Length")
             .description("When set, values will be batched into sub-windows of the set length. This allows for much larger length total windows to be set but sacrifices some precision. If this is " +
                     "not set (or is 0) then each value is stored in state with the timestamp of when it was received. After the length of time stated in " + TIME_WINDOW.getDisplayName() +
-                    " elaspes the value will be removed. If this is set, values will be batched together every X amount of time (where X is the time period set for this property) and removed " +
+                    " elapses the value will be removed. If this is set, values will be batched together every X amount of time (where X is the time period set for this property) and removed " +
                     "all at once.")
             .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
             .required(false)
diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
index b410ab2cb71..3c019866d7c 100644
--- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
+++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
@@ -38,7 +38,7 @@ public class RoutingWebSocketListener extends AbstractAutoDemanding {
         super.onWebSocketOpen(session);
         if (sessionId == null || sessionId.isEmpty()) {
             // If sessionId is already assigned to this instance, don't publish new one.
-            // So that existing sesionId can be reused when reconnecting.
+            // So that existing sessionId can be reused when reconnecting.
             sessionId = UUID.randomUUID().toString();
         }
         final boolean secureConnection = secure || isSessionSecure(session);
diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/authorization/AccessPolicyProvider.java b/nifi-framework-api/src/main/java/org/apache/nifi/authorization/AccessPolicyProvider.java
index 59ada242659..88516844ec8 100644
--- a/nifi-framework-api/src/main/java/org/apache/nifi/authorization/AccessPolicyProvider.java
+++ b/nifi-framework-api/src/main/java/org/apache/nifi/authorization/AccessPolicyProvider.java
@@ -54,7 +54,7 @@ public interface AccessPolicyProvider {
      *
      * @param resourceIdentifier the resource identifier
      * @param action the request action
-     * @return the policy matching the resouce and action, or null if no matching policy exists
+     * @return the policy matching the resource and action, or null if no matching policy exists
      * @throws AuthorizationAccessException if there was any unexpected error performing the operation
      */
     AccessPolicy getAccessPolicy(String resourceIdentifier, RequestAction action) throws AuthorizationAccessException;
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/LuceneEventIndex.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/LuceneEventIndex.java
index 5c18829eb2d..4681f122e1a 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/LuceneEventIndex.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/LuceneEventIndex.java
@@ -831,7 +831,7 @@ public class LuceneEventIndex implements EventIndex {
             final long earliestEventTime;
             if (firstEvents.isEmpty()) {
                 earliestEventTime = System.currentTimeMillis();
-                logger.debug("Found no events in the Provenance Repository. In order to perform maintenace of the indices, "
+                logger.debug("Found no events in the Provenance Repository. In order to perform maintenance of the indices, "
                     + "will assume that the first event time is now ({})", System.currentTimeMillis());
             } else {
                 final ProvenanceEventRecord firstEvent = firstEvents.get(0);
@@ -881,7 +881,7 @@ public class LuceneEventIndex implements EventIndex {
             directoryManager.removeDirectory(indexDirectory);
             logger.info("Successfully removed expired Lucene Index {}", indexDirectory);
         } else {
-            logger.warn("The Lucene Index located at {} has expired and contains no Provenance Events that still exist in the respository. "
+            logger.warn("The Lucene Index located at {} has expired and contains no Provenance Events that still exist in the repository. "
                 + "However, the directory could not be deleted because it is still actively being used. Will continue to try to delete "
                 + "in a subsequent maintenance cycle.", indexDirectory);
         }
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/PartitionedEventStore.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedEventStore.java
index 72ad0ff198c..7d329f5b042 100644
--- a/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedEventStore.java
+++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/store/PartitionedEventStore.java
@@ -277,7 +277,7 @@ public abstract class PartitionedEventStore implements EventStore {
         } catch (final Exception e) {
             logger.error("Failed to perform periodic maintenance", e);
             eventReporter.reportEvent(Severity.ERROR, EVENT_CATEGORY,
-                "Failed to perform periodic maintenace for Provenance Repository. See logs for more information.");
+                "Failed to perform periodic maintenance for Provenance Repository. See logs for more information.");
         }
     }
 
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 1ccc25beb28..1eec9de83f2 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
@@ -686,7 +686,7 @@ public class WriteAheadStorePartition implements EventStorePartition {
             reindexedCount.get(), eventFilesToReindex.size(), partitionDirectory, seconds, millisRemainder);
     }
 
-    EventIterator getEventsByTimestamp(final long minTimestmap, final long maxTimestamp) throws IOException {
+    EventIterator getEventsByTimestamp(final long minTimestamp, final long maxTimestamp) throws IOException {
         // Get a list of all Files and order them based on their ID such that the largest ID is first.
         // This allows us to step through the event files in order and read the first event in the file.
         // If the first event comes after out maxTimestamp, then we know that all other events do as well,
@@ -714,13 +714,13 @@ public class WriteAheadStorePartition implements EventStorePartition {
 
             relevantEventFiles.add(eventFile);
 
-            if (eventTime < minTimestmap) {
+            if (eventTime < minTimestamp) {
                 break;
             }
         }
 
         final EventIterator rawEventIterator = new SequentialRecordReaderEventIterator(relevantEventFiles, recordReaderFactory, 0, config.getMaxAttributeChars());
-        return rawEventIterator.filter(event -> event.getEventTime() >= minTimestmap && event.getEventTime() <= maxTimestamp);
+        return rawEventIterator.filter(event -> event.getEventTime() >= minTimestamp && event.getEventTime() <= maxTimestamp);
     }
 
     private ProvenanceEventRecord getFirstEvent(final File eventFile) throws IOException {
diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/SimpleEmbeddedDatabaseManagerContext.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/SimpleEmbeddedDatabaseManagerContext.java
index fd9db13d496..932602299b1 100644
--- a/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/SimpleEmbeddedDatabaseManagerContext.java
+++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-questdb-bundle/nifi-questdb/src/main/java/org/apache/nifi/questdb/embedded/SimpleEmbeddedDatabaseManagerContext.java
@@ -29,7 +29,7 @@ final class SimpleEmbeddedDatabaseManagerContext implements EmbeddedDatabaseMana
     private String backupLocation;
     private int numberOfAttemptedRetries;
     private Duration lockAttemptDuration;
-    private Duration rolloverFrequnecyDuration;
+    private Duration rolloverFrequencyDuration;
 
     @Override
     public String getPersistLocation() {
@@ -63,7 +63,7 @@ final class SimpleEmbeddedDatabaseManagerContext implements EmbeddedDatabaseMana
 
     @Override
     public Duration getRolloverFrequency() {
-        return rolloverFrequnecyDuration;
+        return rolloverFrequencyDuration;
     }
 
     @Override
@@ -88,7 +88,7 @@ final class SimpleEmbeddedDatabaseManagerContext implements EmbeddedDatabaseMana
     }
 
     void setRolloverFrequencyDuration(final Duration rolloverFreqencyDuration) {
-        this.rolloverFrequnecyDuration = rolloverFreqencyDuration;
+        this.rolloverFrequencyDuration = rolloverFreqencyDuration;
     }
 
     void addTableDefinition(final ManagedTableDefinition tableDefinition) {
@@ -103,7 +103,7 @@ final class SimpleEmbeddedDatabaseManagerContext implements EmbeddedDatabaseMana
                 ", backupLocation='" + backupLocation + '\'' +
                 ", numberOfAttemptedRetries=" + numberOfAttemptedRetries +
                 ", lockAttemptDuration=" + lockAttemptDuration +
-                ", rolloverFrequnecyDuration=" + rolloverFrequnecyDuration +
+                ", rolloverFrequencyDuration=" + rolloverFrequencyDuration +
                 '}';
     }
 }
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
index 9583fb6f207..fbe06fd8e1d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
@@ -171,7 +171,7 @@ public class ControllerServiceDTO extends ComponentDTO {
     /**
      * @return Whether the controller service has been deprecated.
      */
-    @Schema(description = "Whether the ontroller service has been deprecated."
+    @Schema(description = "Whether the controller service has been deprecated."
     )
     public Boolean getDeprecated() {
         return deprecated;
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
index a06fffeb566..9e57bf317a9 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
@@ -68,7 +68,7 @@ public class DocumentedTypeDTO {
     /**
      * @return An optional collection of explicit restrictions
      */
-    @Schema(description = "An optional collection of explicit restrictions. If specified, these explicit restrictions will be enfored."
+    @Schema(description = "An optional collection of explicit restrictions. If specified, these explicit restrictions will be enforced."
     )
     public Set<ExplicitRestrictionDTO> getExplicitRestrictions() {
         return explicitRestrictions;
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java
index db4a3d633a8..ae53bfc496b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java
@@ -86,7 +86,7 @@ public class FlowFileDTO extends FlowFileSummaryDTO {
     }
 
     /**
-     * @return the offset into the the Content Claim where the FlowFile's content begins, or <code>null</code> if no Content Claim exists
+     * @return the offset into the Content Claim where the FlowFile's content begins, or <code>null</code> if no Content Claim exists
      */
     @Schema(description = "The offset into the content claim where the flowfile's content begins."
     )
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
index 2433f471d19..80dbe2b193e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
@@ -147,7 +147,7 @@ public class ProcessorConfigDTO {
      *
      * @return the concurrently schedulable task count
      */
-    @Schema(description = "The number of tasks that should be concurrently schedule for the processor. If the processor doesn't allow parallol processing then any positive input will be ignored."
+    @Schema(description = "The number of tasks that should be concurrently schedule for the processor. If the processor doesn't allow parallel processing then any positive input will be ignored."
     )
     public Integer getConcurrentlySchedulableTaskCount() {
         return concurrentlySchedulableTaskCount;
@@ -230,7 +230,7 @@ public class ProcessorConfigDTO {
      *
      * @return The annotation data
      */
-    @Schema(description = "The annotation data for the processor used to relay configuration between a custom UI and the procesosr."
+    @Schema(description = "The annotation data for the processor used to relay configuration between a custom UI and the processor."
     )
     public String getAnnotationData() {
         return annotationData;
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
index f6878adbf6c..89e46073c0b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
@@ -288,7 +288,7 @@ public class ReportingTaskDTO extends ComponentDTO {
     /**
      * @return currently configured annotation data for the reporting task
      */
-    @Schema(description = "The annotation data for the repoting task. This is how the custom UI relays configuration to the reporting task."
+    @Schema(description = "The annotation data for the reporting task. This is how the custom UI relays configuration to the reporting task."
     )
     public String getAnnotationData() {
         return annotationData;
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
index 88eeaa8a818..dc47f6b6317 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
@@ -102,7 +102,7 @@ public class ProvenanceEventDTO {
     /**
      * @return event id
      */
-    @Schema(description = "The event id. This is a one up number thats unique per node."
+    @Schema(description = "The event id. This is a one up number that's unique per node."
     )
     public Long getEventId() {
         return eventId;
@@ -638,7 +638,7 @@ public class ProvenanceEventDTO {
      * @return identifier of the FlowFile Queue / Connection from which the FlowFile was pulled to generate this event, or <code>null</code> if either the queue is unknown or the FlowFile was created
      * by this event
      */
-    @Schema(description = "The identifier of the queue/connection from which the flowfile was pulled to genereate this event. May be null if the queue/connection is unknown or the "
+    @Schema(description = "The identifier of the queue/connection from which the flowfile was pulled to generate this event. May be null if the queue/connection is unknown or the "
                     + "flowfile was generated from this event."
     )
     public String getSourceConnectionIdentifier() {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java
index d1604c73866..04c1fdab252 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java
@@ -71,7 +71,7 @@ public class ProcessorStatusSnapshotDTO implements Cloneable {
     /**
      * @return The processor name
      */
-    @Schema(description = "The name of the prcessor.")
+    @Schema(description = "The name of the processor.")
     public String getName() {
         return name;
     }
@@ -225,7 +225,7 @@ public class ProcessorStatusSnapshotDTO implements Cloneable {
         this.tasksDuration = tasksDuration;
     }
 
-    @Schema(description = "The number of bytes read by this Processor in the last 5 mintues")
+    @Schema(description = "The number of bytes read by this Processor in the last 5 minutes")
     public Long getBytesRead() {
         return bytesRead;
     }
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/StandardClusterCoordinationProtocolSender.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/StandardClusterCoordinationProtocolSender.java
index f28f8d7a333..9eb98372dfd 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/StandardClusterCoordinationProtocolSender.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/StandardClusterCoordinationProtocolSender.java
@@ -251,7 +251,7 @@ public class StandardClusterCoordinationProtocolSender implements ClusterCoordin
                 throw new ProtocolException("Expected message type '" + MessageType.NODE_CONNECTION_STATUS_RESPONSE + "' but found '" + response.getType() + "'");
             }
         } catch (final IOException ioe) {
-            throw new ProtocolException("Failed to request Node Identifer from " + hostname + ":" + port, ioe);
+            throw new ProtocolException("Failed to request Node Identifier from " + hostname + ":" + port, ioe);
         }
     }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/io/socket/SocketListener.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/io/socket/SocketListener.java
index 196013a037a..04682c9f3b7 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/io/socket/SocketListener.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/io/socket/SocketListener.java
@@ -168,7 +168,7 @@ public abstract class SocketListener {
             if (executorService.isTerminated()) {
                 logger.info("Socket Listener has been terminated successfully.");
             } else {
-                logger.warn("Socket Listener has not terminated properly.  There exists an uninterruptable thread that will take an indeterminate amount of time to stop.");
+                logger.warn("Socket Listener has not terminated properly.  There exists an uninterruptible thread that will take an indeterminate amount of time to stop.");
             }
         }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ReplicationHeaderUtils.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ReplicationHeaderUtils.java
index c4165eb5ceb..60be20e5cb4 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ReplicationHeaderUtils.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ReplicationHeaderUtils.java
@@ -34,7 +34,7 @@ import java.util.stream.Stream;
 /**
  * Shared header-preparation logic for cluster request replication. Both {@link ThreadPoolRequestReplicator}
  * and {@link StandardUploadRequestReplicator} use these utilities so that credential stripping, proxied-entity
- * injection, and replication-header sanitisation follow the same policy.
+ * injection, and replication-header sanitization follow the same policy.
  */
 public final class ReplicationHeaderUtils {
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/RequestReplicator.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/RequestReplicator.java
index 49b84b64389..f375aa2e62e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/RequestReplicator.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/RequestReplicator.java
@@ -81,7 +81,7 @@ public interface RequestReplicator {
      * @param indicateReplicated if <code>true</code>, will add a header indicating to the receiving nodes that the request
      *            has already been replicated, so the receiving node will not replicate the request itself.
      * @param performVerification if <code>true</code>, and the request is mutable, will verify that all nodes are connected before
-     *            making the request and that all nodes are able to perform the request before acutally attempting to perform the task.
+     *            making the request and that all nodes are able to perform the request before actually attempting to perform the task.
      *            If false, will perform no such verification
      * @return an AsyncClusterResponse that indicates the current status of the request and provides an identifier for obtaining an updated response later
      */
@@ -102,7 +102,7 @@ public interface RequestReplicator {
      * @param indicateReplicated if <code>true</code>, will add a header indicating to the receiving nodes that the request
      *            has already been replicated, so the receiving node will not replicate the request itself.
      * @param performVerification if <code>true</code>, and the request is mutable, will verify that all nodes are connected before
-     *            making the request and that all nodes are able to perform the request before acutally attempting to perform the task.
+     *            making the request and that all nodes are able to perform the request before actually attempting to perform the task.
      *            If false, will perform no such verification
      * @return an AsyncClusterResponse that indicates the current status of the request and provides an identifier for obtaining an updated response later
      */
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
index e811fb95336..666712b196a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
@@ -189,7 +189,7 @@ public class NodeClusterCoordinator implements ClusterCoordinator, ProtocolHandl
                         localNodeId = nodeId;
                     } else {
                         logger.warn("When recovering state, determined that two Node Identifiers claim to be the local Node Identifier: {} and {}. Will ignore both of these and wait until " +
-                            "connecting to cluster to determine which Node Identiifer is the local Node Identifier", localNodeId.getFullDescription(), nodeId.getFullDescription());
+                            "connecting to cluster to determine which Node Identifier is the local Node Identifier", localNodeId.getFullDescription(), nodeId.getFullDescription());
                         localNodeId = null;
                     }
                 }
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 3fdb7296793..25ac4f379a4 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
@@ -1475,7 +1475,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
      * Similar to {@link #start(ScheduledExecutorService, long, long, Supplier, SchedulingAgentCallback, boolean, boolean)}, except for the following:
      * <ul>
      *     <li>
-     *         Once the {@link Processor#onTrigger(ProcessContext, ProcessSessionFactory)} method has been invoked successfully, the processor is scehduled to be stopped immediately.
+     *         Once the {@link Processor#onTrigger(ProcessContext, ProcessSessionFactory)} method has been invoked successfully, the processor is scheduled to be stopped immediately.
      *         All appropriate lifecycle methods will be executed as well.
      *     </li>
      *     <li>
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/AbstractRepositoryContext.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/AbstractRepositoryContext.java
index 7f0a87d0a95..75e3bdea780 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/AbstractRepositoryContext.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/AbstractRepositoryContext.java
@@ -209,7 +209,7 @@ public abstract class AbstractRepositoryContext implements RepositoryContext {
      * A Relationship is said to be Available if and only if all Connections for that Relationship are either self-loops or have non-full queues.
      *
      * @param requiredNumber minimum number of relationships that must have availability
-     * @return Checks if at least <code>requiredNumber</code> of Relationationships are "available." If so, returns <code>true</code>, otherwise returns <code>false</code>
+     * @return Checks if at least <code>requiredNumber</code> of Relationships are "available." If so, returns <code>true</code>, otherwise returns <code>false</code>
      */
     @Override
     public boolean isRelationshipAvailabilitySatisfied(final int requiredNumber) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 610eb3f6413..2551baafe36 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -3439,7 +3439,7 @@ public final class StandardProcessGroup implements ProcessGroup {
             }
         }
 
-        // For each Parameter that was in the previous parameter context that is not in the updated Paramter Context, add a ParameterUpdate to our map with `null` for the updated value
+        // For each Parameter that was in the previous parameter context that is not in the updated Parameter Context, add a ParameterUpdate to our map with `null` for the updated value
         for (final Map.Entry<ParameterDescriptor, Parameter> entry : previousParameterContext.getEffectiveParameters().entrySet()) {
             final ParameterDescriptor previousDescriptor = entry.getKey();
             final Parameter previousParameter = entry.getValue();
@@ -4067,8 +4067,8 @@ public final class StandardProcessGroup implements ProcessGroup {
         }
     }
 
-    private String generateUuid(final String propposedId, final String destinationGroupId, final String seed) {
-        long msb = UUID.nameUUIDFromBytes((propposedId + destinationGroupId).getBytes(StandardCharsets.UTF_8)).getMostSignificantBits();
+    private String generateUuid(final String proposedId, final String destinationGroupId, final String seed) {
+        long msb = UUID.nameUUIDFromBytes((proposedId + destinationGroupId).getBytes(StandardCharsets.UTF_8)).getMostSignificantBits();
 
         UUID uuid;
         if (StringUtils.isBlank(seed)) {
@@ -4076,10 +4076,10 @@ public final class StandardProcessGroup implements ProcessGroup {
             // since msb is extracted from type-one UUID, the type-one semantics will be preserved
             uuid = new UUID(msb, lsb);
         } else {
-            UUID seedId = UUID.nameUUIDFromBytes((propposedId + destinationGroupId + seed).getBytes(StandardCharsets.UTF_8));
+            UUID seedId = UUID.nameUUIDFromBytes((proposedId + destinationGroupId + seed).getBytes(StandardCharsets.UTF_8));
             uuid = new UUID(msb, seedId.getLeastSignificantBits());
         }
-        LOG.debug("Generating UUID {} from currentId={}, seed={}", uuid, propposedId, seed);
+        LOG.debug("Generating UUID {} from currentId={}, seed={}", uuid, proposedId, seed);
         return uuid.toString();
     }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
index 59c2a2212bc..e577ddfaa49 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/ReflectionUtilsTest.java
@@ -61,7 +61,7 @@ public class ReflectionUtilsTest {
     }
 
     @Test
-    public void ensureOnlyOverridenMethodIsCalled() throws Exception {
+    public void ensureOnlyOverriddenMethodIsCalled() throws Exception {
         ReflectionUtils.invokeMethodsWithAnnotation(OnStopped.class, new D(), "String");
         assertEquals(1, this.invocations.size());
         assertEquals("D", this.invocations.get(0));
@@ -95,7 +95,7 @@ public class ReflectionUtilsTest {
     }
 
     @Test
-    public void validateNoFailureIfQuiatelyIfOneOfArgumentsWrongTypeAndProcessLog() throws Exception {
+    public void validateNoFailureIfQuietlyIfOneOfArgumentsWrongTypeAndProcessLog() throws Exception {
         ComponentLog pl = mock(ComponentLog.class);
         ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, new E(), pl, 3, "hjk", "hjk");
         verify(pl, Mockito.atMost(1)).error(Mockito.anyString());
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
index c506cb0ba72..cf79b342681 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
@@ -362,7 +362,7 @@ public abstract class AbstractComponentNode implements ComponentNode {
                 logger.debug("Resetting Validation State of {} due to setting properties", this);
                 resetValidationState();
             } else {
-                logger.debug("Properties set for {} but not resettingn validation state because validation is paused", this);
+                logger.debug("Properties set for {} but not resetting validation state because validation is paused", this);
             }
         } finally {
             lock.unlock();
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskProvider.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskProvider.java
index 93ffba720ec..96893d43de3 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskProvider.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/reporting/ReportingTaskProvider.java
@@ -101,7 +101,7 @@ public interface ReportingTaskProvider {
     void enableReportingTask(ReportingTaskNode reportingTask);
 
     /**
-     * Disables the ability to schedul the reporting task to run
+     * Disables the ability to schedule the reporting task to run
      *
      * @param reportingTask to disable
      *
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
index 976004b514b..32a261a8064 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
@@ -763,7 +763,7 @@ public interface ProcessGroup extends ComponentAuthorizable, Positionable, Versi
 
     /**
      * @return a List of all Labels that are children or descendants of this
-     * ProcessGroup. This performsn a recursive search of all descendant
+     * ProcessGroup. This performs a recursive search of all descendant
      * ProcessGroups
      */
     List<Label> findAllLabels();
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
index 8633dd99ab1..c12e6ce3f0d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
@@ -17,13 +17,13 @@
 package org.apache.nifi.lifecycle;
 
 /**
- * Represents a start/stop lifecyle for a component.  <code>start</code> should only be called once per lifecyle unless otherwise documented by implementing classes.
+ * Represents a start/stop lifecycle for a component.  <code>start</code> should only be called once per lifecycle unless otherwise documented by implementing classes.
  *
  */
 public interface LifeCycle {
 
     /**
-     * Initiates the start state of the lifecyle. Should not throw an exception if the component is already running.
+     * Initiates the start state of the lifecycle. Should not throw an exception if the component is already running.
      *
      * @throws LifeCycleStartException if startup or initialization failed
      */
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 5c7cfe540d5..53e35cc442a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -1990,7 +1990,7 @@ public class FlowController implements ReportingTaskProvider, FlowAnalysisRulePr
             if (this.timerDrivenEngineRef.get().isTerminated()) {
                 LOG.info("Controller has been terminated successfully.");
             } else {
-                LOG.warn("Controller hasn't terminated properly.  There exists an uninterruptable thread that "
+                LOG.warn("Controller hasn't terminated properly.  There exists an uninterruptible thread that "
                         + "will take an indeterminate amount of time to stop.  Might need to kill the program manually.");
             }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
index 56aeb2f2cfd..9232bf1d8a5 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
@@ -54,9 +54,9 @@ public class QueuePrioritizer implements Comparator<FlowFileRecord>, Serializabl
             }
         }
 
-        final int claimComparisionResult = claimComparator.compare(f1, f2);
-        if (claimComparisionResult != 0) {
-            return claimComparisionResult;
+        final int claimComparisonResult = claimComparator.compare(f1, f2);
+        if (claimComparisonResult != 0) {
+            return claimComparisonResult;
         }
 
         return idComparator.compare(f1, f2);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
index 827a2a29fef..a469c2a1a09 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
@@ -1146,7 +1146,7 @@ public class SwappablePriorityQueue {
                 logger.error("", ioe);
                 if (eventReporter != null) {
                     eventReporter.reportEvent(Severity.ERROR, "FlowFile Swapping", "Failed to determine whether or not any Swap Files exist for FlowFile Queue " +
-                        getQueueIdentifier() + "; see logs for more detials");
+                        getQueueIdentifier() + "; see logs for more details");
                 }
                 return null;
             }
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java
index 937bedcf27a..7d9c63e95e4 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java
@@ -445,7 +445,7 @@ public class SocketLoadBalancedFlowFileQueue extends AbstractFlowFileQueue imple
                 logger.error("Failed to determine the names of the Partitions that have swapped FlowFiles for queue with ID {}.", getIdentifier(), ioe);
                 if (eventReporter != null) {
                     eventReporter.reportEvent(Severity.ERROR, "FlowFile Swapping", "Failed to determine the names of Partitions that have swapped FlowFiles for queue with ID " +
-                            getIdentifier() + "; see logs for more detials");
+                            getIdentifier() + "; see logs for more details");
                 }
 
                 partitionNamesToRecover = Collections.emptySet();
@@ -495,7 +495,7 @@ public class SocketLoadBalancedFlowFileQueue extends AbstractFlowFileQueue imple
                     logger.error("Failed to determine whether or not any Swap Files exist for FlowFile Queue {} and Partition {}", getIdentifier(), partitionName, e);
                     if (eventReporter != null) {
                         eventReporter.reportEvent(Severity.ERROR, "FlowFile Swapping", "Failed to determine whether or not any Swap Files exist for FlowFile Queue " +
-                                getIdentifier() + "; see logs for more detials");
+                                getIdentifier() + "; see logs for more details");
                     }
                 }
             }
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClientTask.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClientTask.java
index b6990529d3f..2c0b15e8211 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClientTask.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClientTask.java
@@ -100,7 +100,7 @@ public class NioAsyncLoadBalanceClientTask implements Runnable {
                 return;
             } catch (final Exception e) {
                 logger.error("Failed to communicate with peer while trying to load balance data across the cluster", e);
-                eventReporter.reportEvent(Severity.ERROR, EVENT_CATEGORY, "Failed to comunicate with Peer while trying to load balance data across the cluster due to " + e);
+                eventReporter.reportEvent(Severity.ERROR, EVENT_CATEGORY, "Failed to communicate with Peer while trying to load balance data across the cluster due to " + e);
             }
         }
     }
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/QueuePartition.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/QueuePartition.java
index 2bf59de2808..5b0e0d1889f 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/QueuePartition.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/QueuePartition.java
@@ -114,7 +114,7 @@ public interface QueuePartition {
     QueueSize size();
 
     /**
-     * @param fromTimestamp The timestamp in miliiseconds from which to calculate durations. This will typically be the current timestamp.
+     * @param fromTimestamp The timestamp in milliseconds from which to calculate durations. This will typically be the current timestamp.
      * @return the sum in milliseconds of how long all FlowFiles within this queue have currently been in this queue.
      */
     long getTotalActiveQueuedDuration(long fromTimestamp);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/RebalancingPartition.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/RebalancingPartition.java
index 97138146c43..12bd49ce9d6 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/RebalancingPartition.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/RebalancingPartition.java
@@ -36,7 +36,7 @@ public interface RebalancingPartition extends QueuePartition {
     void rebalance(FlowFileQueueContents queueContents);
 
     /**
-     * Inherits all of the givne FlowFiles in order to redistribute them across the cluster
+     * Inherits all the given FlowFiles in order to redistribute them across the cluster
      *
      * @param flowFiles the FlowFiles to redistribute
      */
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java
index b187badce3e..d3f9470663c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/StandardLoadBalanceProtocol.java
@@ -268,7 +268,7 @@ public class StandardLoadBalanceProtocol implements LoadBalanceProtocol {
                 }
             }
 
-            // When the Content Claim is created initially, it has a Claimaint Count of 1. We then increment the Claimant Count for each FlowFile that we add to the Content Claim,
+            // When the Content Claim is created initially, it has a Claimant Count of 1. We then increment the Claimant Count for each FlowFile that we add to the Content Claim,
             // which means that the claimant count is currently 1 larger than it needs to be. So we will decrement the claimant count now. If that results in a count of 0, then
             // we can go ahead and remove the Content Claim, since we know it's not being referenced.
             final int count = contentRepository.decrementClaimantCount(contentClaim);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index d1a51c9bed4..b3e00ec8889 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -141,8 +141,8 @@ public class FileSystemRepository implements ContentRepository {
     public FileSystemRepository(final NiFiProperties nifiProperties) throws IOException {
         this.nifiProperties = nifiProperties;
         // determine the file repository paths and ensure they exist
-        final Map<String, Path> fileRespositoryPaths = nifiProperties.getContentRepositoryPaths();
-        for (final Path path : fileRespositoryPaths.values()) {
+        final Map<String, Path> fileRepositoryPaths = nifiProperties.getContentRepositoryPaths();
+        for (final Path path : fileRepositoryPaths.values()) {
             Files.createDirectories(path);
         }
         this.writableClaimQueue = new LinkedBlockingQueue<>(1024);
@@ -160,7 +160,7 @@ public class FileSystemRepository implements ContentRepository {
         }
         this.minTruncatableClaimLength = Math.min(1_000_000L, this.maxAppendableClaimLength);
 
-        this.containers = new HashMap<>(fileRespositoryPaths);
+        this.containers = new HashMap<>(fileRepositoryPaths);
         this.containerNames = new ArrayList<>(containers.keySet());
         index = new AtomicLong(0L);
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java
index 63aff7636a6..04d75012247 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java
@@ -465,7 +465,7 @@ public class FlowControllerConfiguration {
     }
 
     /**
-     * Parameter Conext Asset Synchronizer depends on ClusterCoordinator, WebClientService, and NiFiProperties
+     * Parameter Context Asset Synchronizer depends on ClusterCoordinator, WebClientService, and NiFiProperties
      *
      * @return Asset Synchronizer
      */
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestStandardProcessScheduler.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestStandardProcessScheduler.java
index fad7b11af00..a858bdf86e3 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestStandardProcessScheduler.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/TestStandardProcessScheduler.java
@@ -567,7 +567,7 @@ public class TestStandardProcessScheduler {
         rootGroup.addProcessor(procNode);
 
         scheduler.startProcessor(procNode, true);
-        while (!proc.isSucceess()) {
+        while (!proc.isSucceeded()) {
             Thread.sleep(5L);
         }
 
@@ -595,7 +595,7 @@ public class TestStandardProcessScheduler {
 
         procNode.performValidation();
         scheduler.startProcessor(procNode, true);
-        while (!proc.isSucceess()) {
+        while (!proc.isSucceeded()) {
             Thread.sleep(5L);
         }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/processors/FailOnScheduledProcessor.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/processors/FailOnScheduledProcessor.java
index 1f7c00a5b7b..767cd248c3a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/processors/FailOnScheduledProcessor.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/scheduling/processors/FailOnScheduledProcessor.java
@@ -79,7 +79,7 @@ public class FailOnScheduledProcessor extends AbstractProcessor {
         return invocationCount;
     }
 
-    public boolean isSucceess() {
+    public boolean isSucceeded() {
         return succeeded.get();
     }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/registry/flow/mapping/VersionedComponentFlowMapperTest.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/registry/flow/mapping/VersionedComponentFlowMapperTest.java
index 196fdc8cc64..8dab58db98c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/registry/flow/mapping/VersionedComponentFlowMapperTest.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/registry/flow/mapping/VersionedComponentFlowMapperTest.java
@@ -314,7 +314,7 @@ public class VersionedComponentFlowMapperTest {
     /**
      * Test mapping a versioned ProcessGroup model to a non-versioned VersionedProcessGroup. Version info is ignored.
      * Most elements are exercised here... including labels, ports, processors, connections, funnels, nested process groups,
-     * remote process groups, congtroller services, external controller service references and variable registries.
+     * remote process groups, controller services, external controller service references and variable registries.
      */
     @Test
     public void testMapNonVersionedProcessGroups() {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-external-resource-utils/src/test/java/org/apache/nifi/flow/resource/CollisionAwareResourceProviderWorkerTest.java b/nifi-framework-bundle/nifi-framework/nifi-framework-external-resource-utils/src/test/java/org/apache/nifi/flow/resource/CollisionAwareResourceProviderWorkerTest.java
index 073c7b2e494..53979e1933c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-external-resource-utils/src/test/java/org/apache/nifi/flow/resource/CollisionAwareResourceProviderWorkerTest.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-external-resource-utils/src/test/java/org/apache/nifi/flow/resource/CollisionAwareResourceProviderWorkerTest.java
@@ -87,7 +87,7 @@ public class CollisionAwareResourceProviderWorkerTest {
         runningTestSubject();
 
         assertOperationsAreFinished();
-        verifyConflictResulotionWasNotNeeded();
+        verifyConflictResolutionWasNotNeeded();
         assertTargetFolderIsEmpty();
     }
 
@@ -317,7 +317,7 @@ public class CollisionAwareResourceProviderWorkerTest {
         Assertions.assertEquals(actions.numberOfFetches(), provider.getFetchCounter());
     }
 
-    private void verifyConflictResulotionWasNotNeeded() {
+    private void verifyConflictResolutionWasNotNeeded() {
         Mockito.verify(conflictResolutionStrategy, Mockito.never()).shouldBeFetched(Mockito.any(File.class), Mockito.any(ExternalResourceDescriptor.class));
     }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
index 568b93f98ea..09df244c43f 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
@@ -156,7 +156,7 @@ public interface ExtensionManager {
      * (i.e getExtensions(Processor.class)
      *
      * @param definition the extension definition, such as Processor.class
-     * @return the set of extension definitions that describe the the extensions implementing the defintion
+     * @return the set of extension definitions that describe the extensions implementing the definition
      */
     Set<ExtensionDefinition> getExtensions(Class<?> definition);
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
index d62cf4dc010..deb8d6f0f88 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
@@ -146,12 +146,12 @@ public class NarUnpackerTest {
     }
 
     @Test
-    public void testUnpackNarsFromNonExistantDir() {
-        final File nonExistantDir = new File("./target/this/dir/should/not/exist/");
-        nonExistantDir.deleteOnExit();
+    public void testUnpackNarsFromNonExistentDir() {
+        final File nonExistentDir = new File("./target/this/dir/should/not/exist/");
+        nonExistentDir.deleteOnExit();
 
         final Map<String, String> others = new HashMap<>();
-        others.put("nifi.nar.library.directory.alt", nonExistantDir.toString());
+        others.put("nifi.nar.library.directory.alt", nonExistentDir.toString());
         NiFiProperties properties = loadSpecifiedProperties(others);
 
         final ExtensionMapping extensionMapping = NarUnpacker.unpackNars(properties, SystemBundle.create(properties), NarUnpackMode.UNPACK_INDIVIDUAL_JARS);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
index 9268bffe8b9..53672cb019c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
@@ -467,7 +467,7 @@ public final class NarUnpacker {
                 // Spring Handler configuration
                 //
                 // Of these, the License/Notice isn't particularly critical because this is a temporary file that's being created and loaded, not a file that is
-                // distributed. The Service Loader configurtion, Spring Handler, etc. can be dealt with by simply concatenating the contents together.
+                // distributed. The Service Loader configuration, Spring Handler, etc. can be dealt with by simply concatenating the contents together.
                 // But the MANIFEST.MF file is special. If it's not properly formed, it will prefer the ClassLoader from loading the JAR file, and we can't simply
                 // concatenate the files together. However, it's not required and generally contains information that we don't care about in this context. So we can
                 // simply ignore it.
diff --git a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java
index 00712e64b71..7b5b0c77736 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/RemoteResourceManager.java
@@ -175,7 +175,7 @@ public class RemoteResourceManager {
     public static ServerProtocol createServerProtocol(final String protocolName) {
         final Set<Class<? extends ServerProtocol>> classSet = getServerProtocolClasses(protocolName);
         if (classSet.isEmpty()) {
-            throw new IllegalArgumentException("Unknkown Server Protocol: " + protocolName);
+            throw new IllegalArgumentException("Unknown Server Protocol: " + protocolName);
         }
 
         Class<? extends ServerProtocol> desiredClass = desiredServerProtocolClassMap.get(protocolName);
@@ -201,7 +201,7 @@ public class RemoteResourceManager {
     public static ClientProtocol createClientProtocol(final String protocolName) {
         final Set<Class<? extends ClientProtocol>> classSet = getClientProtocolClasses(protocolName);
         if (classSet.isEmpty()) {
-            throw new IllegalArgumentException("Unknkown Client Protocol: " + protocolName);
+            throw new IllegalArgumentException("Unknown Client Protocol: " + protocolName);
         }
 
         Class<? extends ClientProtocol> desiredClass = desiredClientProtocolClassMap.get(protocolName);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java
index dcec256b87e..7533181537a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java
@@ -101,7 +101,7 @@ public class FlowAnalysisRuleAuditor extends NiFiAuditor {
             + "args(flowAnalysisRuleDTO) && "
             + "target(flowAnalysisRuleDAO)")
     public Object updateFlowAnalysisRuleAdvice(ProceedingJoinPoint proceedingJoinPoint, FlowAnalysisRuleDTO flowAnalysisRuleDTO, FlowAnalysisRuleDAO flowAnalysisRuleDAO) throws Throwable {
-        // determine the initial values for each property/setting thats changing
+        // determine the initial values for each property/setting that's changing
         FlowAnalysisRuleNode flowAnalysisRule = flowAnalysisRuleDAO.getFlowAnalysisRule(flowAnalysisRuleDTO.getId());
         final Map<String, String> values = extractConfiguredPropertyValues(flowAnalysisRule, flowAnalysisRuleDTO);
         final FlowAnalysisRuleState state = flowAnalysisRule.getState();
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ParameterProviderAuditor.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ParameterProviderAuditor.java
index b85cb5f5334..7d79f67cbc9 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ParameterProviderAuditor.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ParameterProviderAuditor.java
@@ -96,7 +96,7 @@ public class ParameterProviderAuditor extends NiFiAuditor {
             + "target(parameterProviderDAO)")
     public Object updateParameterProviderAdvice(final ProceedingJoinPoint proceedingJoinPoint, final ParameterProviderDTO parameterProviderDTO, final ParameterProviderDAO parameterProviderDAO)
             throws Throwable {
-        // determine the initial values for each property/setting thats changing
+        // determine the initial values for each property/setting that's changing
         ParameterProviderNode parameterProvider = parameterProviderDAO.getParameterProvider(parameterProviderDTO.getId());
         final Map<String, String> values = extractConfiguredPropertyValues(parameterProvider, parameterProviderDTO);
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java
index b7357a28492..f8a7eda384e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java
@@ -246,7 +246,7 @@ public class RelationshipAuditor extends NiFiAuditor {
      */
     public ConnectDetails createConnectDetails(final Connection connection, final Connectable source, final Collection<Relationship> relationships, final Connectable destination) {
         final Component sourceType = determineConnectableType(source);
-        final Component destiantionType = determineConnectableType(destination);
+        final Component destinationType = determineConnectableType(destination);
 
         // format the relationship names
         Collection<String> relationshipNames = new HashSet<>(connection.getRelationships().size());
@@ -263,7 +263,7 @@ public class RelationshipAuditor extends NiFiAuditor {
         connectDetails.setRelationship(formattedRelationships);
         connectDetails.setDestinationId(destination.getIdentifier());
         connectDetails.setDestinationName(destination.getName());
-        connectDetails.setDestinationType(destiantionType);
+        connectDetails.setDestinationType(destinationType);
         return connectDetails;
     }
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java
index 0d853b89743..1533406151e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java
@@ -98,7 +98,7 @@ public class ReportingTaskAuditor extends NiFiAuditor {
             + "args(reportingTaskDTO) && "
             + "target(reportingTaskDAO)")
     public Object updateReportingTaskAdvice(ProceedingJoinPoint proceedingJoinPoint, ReportingTaskDTO reportingTaskDTO, ReportingTaskDAO reportingTaskDAO) throws Throwable {
-        // determine the initial values for each property/setting thats changing
+        // determine the initial values for each property/setting that's changing
         ReportingTaskNode reportingTask = reportingTaskDAO.getReportingTask(reportingTaskDTO.getId());
         final Map<String, String> values = extractConfiguredPropertyValues(reportingTask, reportingTaskDTO);
         final ScheduledState scheduledState = reportingTask.getScheduledState();
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java
index e6a33bf308d..47f535a8b58 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizeParameterReference.java
@@ -132,7 +132,7 @@ public class AuthorizeParameterReference {
 
     /**
      * Ensures that any Parameter Context that is referenced by the given VersionedParameterContext is readable by the given user. If the Versioned Parameter Context references a Parameter Context
-     * (by name) that does not exist in the current flow, ensures that the user has persmissions to create a new Parameter Context. If the Versioned Parameter Context contains any Parameters that
+     * (by name) that does not exist in the current flow, ensures that the user has permissions to create a new Parameter Context. If the Versioned Parameter Context contains any Parameters that
      * do not currently exist in the Parameter Context that is referenced, ensures that the usre has permissions to WRITE to the Parameter Context so that the additional Parameter can be added.
      *
      * @param versionedParameterContext the Versioned Parameter Context
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java
index c53c950c9ff..7a5acb19dde 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java
@@ -74,14 +74,14 @@ public class InputPortResource extends ApplicationResource {
     /**
      * Populates the uri for the specified input ports.
      *
-     * @param inputPortEntites ports
+     * @param inputPortEntities ports
      * @return ports
      */
-    public Set<PortEntity> populateRemainingInputPortEntitiesContent(Set<PortEntity> inputPortEntites) {
-        for (PortEntity inputPortEntity : inputPortEntites) {
+    public Set<PortEntity> populateRemainingInputPortEntitiesContent(Set<PortEntity> inputPortEntities) {
+        for (PortEntity inputPortEntity : inputPortEntities) {
             populateRemainingInputPortEntityContent(inputPortEntity);
         }
-        return inputPortEntites;
+        return inputPortEntities;
     }
 
     /**
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
index baa673bd74b..439716c8c67 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java
@@ -67,7 +67,7 @@ public class LabelResource extends ApplicationResource {
      * Populates the uri for the specified labels.
      *
      * @param labelEntities labels
-     * @return entites
+     * @return entities
      */
     public Set<LabelEntity> populateRemainingLabelEntitiesContent(Set<LabelEntity> labelEntities) {
         for (LabelEntity labelEntity : labelEntities) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
index 78bad62d9e0..8b949cb6da9 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
@@ -289,7 +289,7 @@ public class StandardConnectionDAO extends ComponentDAO implements ConnectionDAO
                 return validationErrors;
             }
 
-            // attempt to location the proprosed destination
+            // attempt to locate the proposed destination
             final ProcessGroup destinationParentGroup = locateProcessGroup(flowController, groupId);
             final RemoteProcessGroup remoteProcessGroup = destinationParentGroup.getRemoteProcessGroup(proposedDestination.getGroupId());
             if (remoteProcessGroup == null) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/PrioritiesMatcherTest.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/PrioritiesMatcherTest.java
index 4d1b56e5765..a6f9463a040 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/PrioritiesMatcherTest.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/search/attributematchers/PrioritiesMatcherTest.java
@@ -41,7 +41,7 @@ public class PrioritiesMatcherTest extends AbstractAttributeMatcherTest {
     public void setUp() {
         super.setUp();
         Mockito.when(component.getFlowFileQueue()).thenReturn(flowFileQueue);
-        Mockito.when(flowFileQueue.getPriorities()).thenReturn(givenPriorizers());
+        Mockito.when(flowFileQueue.getPriorities()).thenReturn(givenPrioritizers());
     }
 
     @Test
@@ -59,7 +59,7 @@ public class PrioritiesMatcherTest extends AbstractAttributeMatcherTest {
                 "Prioritizer: org.apache.nifi.web.search.attributematchers.PrioritiesMatcherTest$FlowFilePrioritizerTwo");
     }
 
-    private List<FlowFilePrioritizer> givenPriorizers() {
+    private List<FlowFilePrioritizer> givenPrioritizers() {
         final List<FlowFilePrioritizer> result = new ArrayList<>();
         result.add(new FlowFilePrioritizerOne());
         result.add(new FlowFilePrioritizerTwo());
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java
index 4a3abbe7805..3cd356afe9f 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/X509AuthenticationFilter.java
@@ -38,7 +38,7 @@ public class X509AuthenticationFilter extends NiFiAuthenticationFilter {
 
     @Override
     public Authentication attemptAuthentication(final HttpServletRequest request) {
-        // only suppport x509 login when running securely
+        // only support x509 login when running securely
         if (!request.isSecure()) {
             return null;
         }
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
index 1b6a26f2837..d678b46df95 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
@@ -248,7 +248,7 @@ public interface TestRunner {
      * unit test to fail
      *
      * @param descriptor descriptor
-     * @param value allowable valu
+     * @param value allowable value
      * @return result
      */
     ValidationResult setProperty(PropertyDescriptor descriptor, DescribedValue value);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java b/nifi-registry/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java
index 23cbcbcf2ea..af81fa64c09 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 public interface AccessClient {
 
     /**
-     * Get an access token by authenticating with a username and password aginst the configured identity provider.
+     * Get an access token by authenticating with a username and password against the configured identity provider.
      *
      * @param username the username
      * @param password the password
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
index 7af2d010246..d7d94814cf1 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
@@ -335,14 +335,14 @@ public class GitFlowPersistenceProvider implements MetadataAwareFlowPersistenceP
                 flowMetadata.setIdentifier(flowId);
                 flowMetadata.setName(flowName);
                 flowMetadata.setDescription(latestFlowPointer.getFlowDescription());
-                flowMetadata.setFlowSnapshotMetadata(createFlowSnapshotMetdata(flow));
+                flowMetadata.setFlowSnapshotMetadata(createFlowSnapshotMetadata(flow));
                 flowMetadataList.add(flowMetadata);
             }
         }
         return flowMetadataList;
     }
 
-    private List<FlowSnapshotMetadata> createFlowSnapshotMetdata(final Flow flow) {
+    private List<FlowSnapshotMetadata> createFlowSnapshotMetadata(final Flow flow) {
         final List<FlowSnapshotMetadata> flowSnapshotMetadataList = new ArrayList<>();
 
         final Map<Integer, Flow.FlowPointer> versions = flow.getVersions();
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/database/DatabaseAccessPolicyProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/database/DatabaseAccessPolicyProvider.java
index 525534bd357..65882d8cf34 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/database/DatabaseAccessPolicyProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/database/DatabaseAccessPolicyProvider.java
@@ -183,7 +183,7 @@ public class DatabaseAccessPolicyProvider extends AbstractConfigurableAccessPoli
         Objects.requireNonNull(accessPolicy);
 
         // determine if policy exists
-        final DatabaseAccessPolicy existingPolicy = getDatabaseAcessPolicy(accessPolicy.getIdentifier());
+        final DatabaseAccessPolicy existingPolicy = getDatabaseAccessPolicy(accessPolicy.getIdentifier());
         if (existingPolicy == null) {
             return null;
         }
@@ -300,7 +300,7 @@ public class DatabaseAccessPolicyProvider extends AbstractConfigurableAccessPoli
         refreshAccessPolicyHolder();
     }
 
-    protected DatabaseAccessPolicy getDatabaseAcessPolicy(final String policyIdentifier) {
+    protected DatabaseAccessPolicy getDatabaseAccessPolicy(final String policyIdentifier) {
         final String sql = "SELECT * FROM APP_POLICY WHERE IDENTIFIER = ?";
         return queryForObject(sql, new DatabaseAccessPolicyRowMapper(), policyIdentifier);
     }
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
index 46e3e48a988..7153c572ba9 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
@@ -242,13 +242,13 @@ public class FileAccessPolicyProvider extends AbstractConfigurableAccessPolicyPr
         return deleteAccessPolicy(accessPolicy.getIdentifier());
     }
 
-    private synchronized AccessPolicy deleteAccessPolicy(String accessPolicyIdentifer) throws AuthorizationAccessException {
-        if (accessPolicyIdentifer == null) {
+    private synchronized AccessPolicy deleteAccessPolicy(String accessPolicyIdentifier) throws AuthorizationAccessException {
+        if (accessPolicyIdentifier == null) {
             throw new IllegalArgumentException("Access policy identifier cannot be null");
         }
 
         final AuthorizationsHolder holder = this.authorizationsHolder.get();
-        AccessPolicy deletedPolicy = holder.getPoliciesById().get(accessPolicyIdentifer);
+        AccessPolicy deletedPolicy = holder.getPoliciesById().get(accessPolicyIdentifier);
         if (deletedPolicy == null) {
             return null;
         }
@@ -258,7 +258,7 @@ public class FileAccessPolicyProvider extends AbstractConfigurableAccessPolicyPr
         Iterator<Policy> policyIter = authorizations.getPolicies().getPolicy().iterator();
         while (policyIter.hasNext()) {
             final Policy policy = policyIter.next();
-            if (policy.getIdentifier().equals(accessPolicyIdentifer)) {
+            if (policy.getIdentifier().equals(accessPolicyIdentifier)) {
                 policyIter.remove();
                 break;
             }
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 dafa6607d97..74ed3fcedc3 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
@@ -146,7 +146,7 @@ public class HtmlExtensionDocWriter implements ExtensionDocWriter {
     private void writeBundleInfo(final ExtensionMetadata extensionMetadata, final XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
         final BundleInfo bundleInfo = extensionMetadata.getBundleInfo();
 
-        final String extenstionType = switch (extensionMetadata.getType()) {
+        final String extensionType = switch (extensionMetadata.getType()) {
             case PROCESSOR -> "Processor";
             case CONTROLLER_SERVICE -> "Controller Service";
             case REPORTING_TASK -> "Reporting Task";
@@ -167,7 +167,7 @@ public class HtmlExtensionDocWriter implements ExtensionDocWriter {
 
         xmlStreamWriter.writeStartElement("tr");
         writeSimpleElement(xmlStreamWriter, "td", "Type", true, "bundle-info");
-        writeSimpleElement(xmlStreamWriter, "td", extenstionType);
+        writeSimpleElement(xmlStreamWriter, "td", extensionType);
         xmlStreamWriter.writeEndElement();
 
         xmlStreamWriter.writeStartElement("tr");
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/TestStandardAuthorizableLookup.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/TestStandardAuthorizableLookup.java
index b14678ea9ac..36e2dd86494 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/TestStandardAuthorizableLookup.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/security/authorization/TestStandardAuthorizableLookup.java
@@ -371,7 +371,7 @@ public class TestStandardAuthorizableLookup {
     }
 
     /**
-     * ArugmentMatcher for AuthorizationRequest.
+     * ArgumentMatcher for AuthorizationRequest.
      */
     private static class AuthorizationRequestMatcher implements ArgumentMatcher<AuthorizationRequest> {
 
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/BucketMetadata.java b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/BucketMetadata.java
index 1e47c1b85a7..b75230af4fd 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/BucketMetadata.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/BucketMetadata.java
@@ -19,7 +19,7 @@ package org.apache.nifi.registry.metadata;
 import java.util.List;
 
 /**
- * Meatadata about a bucket returned from MetadataAwareFlowPersistenceProvider.
+ * Metadata about a bucket returned from MetadataAwareFlowPersistenceProvider.
  */
 public class BucketMetadata {
 
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowMetadata.java b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowMetadata.java
index 5ea73382192..8a5b5c92a58 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowMetadata.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowMetadata.java
@@ -19,7 +19,7 @@ package org.apache.nifi.registry.metadata;
 import java.util.List;
 
 /**
- * Meatadata about a flow returned from MetadataAwareFlowPersistenceProvider.
+ * Metadata about a flow returned from MetadataAwareFlowPersistenceProvider.
  */
 public class FlowMetadata {
 
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowSnapshotMetadata.java b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowSnapshotMetadata.java
index 93d4a1fbaa1..baafc72c5dd 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowSnapshotMetadata.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-provider-api/src/main/java/org/apache/nifi/registry/metadata/FlowSnapshotMetadata.java
@@ -17,7 +17,7 @@
 package org.apache.nifi.registry.metadata;
 
 /**
- * Meatadata about a snapshot returned from MetadataAwareFlowPersistenceProvider.
+ * Metadata about a snapshot returned from MetadataAwareFlowPersistenceProvider.
  */
 public class FlowSnapshotMetadata {
 
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-security-api/src/main/java/org/apache/nifi/registry/security/authorization/AccessPolicyProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-security-api/src/main/java/org/apache/nifi/registry/security/authorization/AccessPolicyProvider.java
index 214787de815..e034a298a40 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-security-api/src/main/java/org/apache/nifi/registry/security/authorization/AccessPolicyProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-security-api/src/main/java/org/apache/nifi/registry/security/authorization/AccessPolicyProvider.java
@@ -54,7 +54,7 @@ public interface AccessPolicyProvider {
      *
      * @param resourceIdentifier the resource identifier
      * @param action the request action
-     * @return the policy matching the resouce and action, or null if no matching policy exists
+     * @return the policy matching the resource and action, or null if no matching policy exists
      * @throws AuthorizationAccessException if there was any unexpected error performing the operation
      */
     AccessPolicy getAccessPolicy(String resourceIdentifier, RequestAction action) throws AuthorizationAccessException;
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketFlowResource.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketFlowResource.java
index 9981e972bc9..06d9f161a99 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketFlowResource.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketFlowResource.java
@@ -285,7 +285,7 @@ public class BucketFlowResource extends ApplicationResource {
         verifyPathParamsMatchBody(bucketId, flowId, snapshot);
 
         // bucketId and flowId fields are optional in the body parameter, but required before calling the service layer
-        setSnaphotMetadataIfMissing(bucketId, flowId, snapshot);
+        setSnapshotMetadataIfMissing(bucketId, flowId, snapshot);
 
         if (preserveSourceProperties) {
             if (StringUtils.isBlank(snapshot.getSnapshotMetadata().getAuthor())) {
@@ -616,7 +616,7 @@ public class BucketFlowResource extends ApplicationResource {
         }
     }
 
-    private static void setSnaphotMetadataIfMissing(
+    private static void setSnapshotMetadataIfMissing(
             @NotNull String bucketIdParam,
             @NotNull String flowIdParam,
             @NotNull VersionedFlowSnapshot flowSnapshot) {
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BundleResource.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BundleResource.java
index 410d4bbc0d0..d5651198b18 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BundleResource.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BundleResource.java
@@ -193,7 +193,7 @@ public class BundleResource extends ApplicationResource {
             ) final String artifactId,
             @QueryParam("version")
             @Parameter(
-                    description = "Optional version to filter results. The value maye be an exact match, or a wildcard, " +
+                    description = "Optional version to filter results. The value may be an exact match, or a wildcard, " +
                             "such as '1.0.%' to select all bundle versions where the version starts with '1.0.'."
             ) final String version
     ) {
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/x509/X509IdentityProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/x509/X509IdentityProvider.java
index 1bf3596cea4..1276055872c 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/x509/X509IdentityProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/x509/X509IdentityProvider.java
@@ -123,7 +123,7 @@ public class X509IdentityProvider implements IdentityProvider {
     /**
      * For a given {@link AuthenticationRequest}, this validates the client certificate and creates a populated {@link AuthenticationResponse}.
      *
-     * The {@link AuthenticationRequest} authenticationRequest paramenter is expected to be populated as:
+     * The {@link AuthenticationRequest} authenticationRequest parameter is expected to be populated as:
      *  - username: principal DN from first client cert
      *  - credentials: first client certificate (X509Certificate)
      *  - details: proxied-entities chain (String)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/link/TestLinkService.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/link/TestLinkService.java
index 28523481ff8..46da671f1e0 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/link/TestLinkService.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/link/TestLinkService.java
@@ -347,7 +347,7 @@ public class TestLinkService {
     }
 
     @Test
-    public void testPopulateExtensionRepoExtensionMetdataFullLinks() {
+    public void testPopulateExtensionRepoExtensionMetadataFullLinks() {
         extensionRepoExtensionMetadata.forEach(i -> assertNull(i.getLink()));
         extensionRepoExtensionMetadata.forEach(i -> assertNull(i.getLinkDocs()));
 
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/src/main/java/org/apache/nifi/registry/aws/S3BundlePersistenceProvider.java b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/src/main/java/org/apache/nifi/registry/aws/S3BundlePersistenceProvider.java
index 1d2d17cf6f0..776bfa6efbc 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/src/main/java/org/apache/nifi/registry/aws/S3BundlePersistenceProvider.java
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/src/main/java/org/apache/nifi/registry/aws/S3BundlePersistenceProvider.java
@@ -165,16 +165,16 @@ public class S3BundlePersistenceProvider implements BundlePersistenceProvider {
         }
 
         if (CredentialProvider.STATIC == credentialProvider) {
-            final String accesKeyValue = configurationContext.getProperties().get(ACCESS_KEY_PROP);
+            final String accessKeyValue = configurationContext.getProperties().get(ACCESS_KEY_PROP);
             final String secretAccessKey = configurationContext.getProperties().get(SECRET_ACCESS_KEY_PROP);
 
-            if (StringUtils.isBlank(accesKeyValue) || StringUtils.isBlank(secretAccessKey)) {
+            if (StringUtils.isBlank(accessKeyValue) || StringUtils.isBlank(secretAccessKey)) {
                 throw new ProviderCreationException("The properties '" + ACCESS_KEY_PROP + "' and '" + SECRET_ACCESS_KEY_PROP
                         + "' must be provided when using " + CredentialProvider.STATIC + " credentials provider");
             }
 
             LOGGER.debug("Creating StaticCredentialsProvider");
-            final AwsCredentials awsCredentials = AwsBasicCredentials.create(accesKeyValue, secretAccessKey);
+            final AwsCredentials awsCredentials = AwsBasicCredentials.create(accessKeyValue, secretAccessKey);
             return StaticCredentialsProvider.create(awsCredentials);
 
         } else {
diff --git a/nifi-stateless/nifi-stateless-api/src/main/java/org/apache/nifi/stateless/engine/NarUnpackLock.java b/nifi-stateless/nifi-stateless-api/src/main/java/org/apache/nifi/stateless/engine/NarUnpackLock.java
index 129274477c9..f2536d7cabe 100644
--- a/nifi-stateless/nifi-stateless-api/src/main/java/org/apache/nifi/stateless/engine/NarUnpackLock.java
+++ b/nifi-stateless/nifi-stateless-api/src/main/java/org/apache/nifi/stateless/engine/NarUnpackLock.java
@@ -28,7 +28,7 @@ import java.util.concurrent.locks.ReentrantLock;
  * do not stomp on one another when unpacking NAR's. To do that, we need a mechanism by which a single lock can be shared
  * across multiple classes, as the Extension Repository as well as the bootstrap logic may attempt to unpack NARs.
  * Because these classes exist across multiple modules, and because statically defined locks at that level may not be enough
- * (due to multiple classloders being used for the 'stateless nar'), we define a singleton Lock within the nifi-stateless-api module.
+ * (due to multiple classloaders being used for the 'stateless nar'), we define a singleton Lock within the nifi-stateless-api module.
  * This lock should always be obtained before attempting to unpack nars.
  */
 public class NarUnpackLock {
diff --git a/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/RunStatelessFlow.java b/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/RunStatelessFlow.java
index 2b637dd6ec4..cd6d933be8f 100644
--- a/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/RunStatelessFlow.java
+++ b/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/RunStatelessFlow.java
@@ -44,7 +44,7 @@ public class RunStatelessFlow {
         try {
             bootstrapConfiguration = BootstrapConfiguration.fromCommandLineArgs(args);
         } catch (final IllegalArgumentException iae) {
-            System.out.println("* " + iae.getMessage()); // There may be a lot of output to the console; Use an astrisk at the front just to make this line stand out.
+            System.out.println("* " + iae.getMessage()); // There may be a lot of output to the console; Use an asterisk at the front just to make this line stand out.
             System.out.println();
             BootstrapConfiguration.printUsage();
             System.exit(1);
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ExecutionProgress.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ExecutionProgress.java
index 748815512ce..387931d9ad2 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ExecutionProgress.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ExecutionProgress.java
@@ -47,8 +47,8 @@ public interface ExecutionProgress {
     CompletionAction awaitCompletionAction() throws InterruptedException;
 
     /**
-     * Enqueues a TriggerResult so that the result can be acknowledged or canceled but does not block waiting for the acknowledgment or cancelation.
-     * Instead, provides callsbacks for the appropriate actions
+     * Enqueues a TriggerResult so that the result can be acknowledged or canceled but does not block waiting for the acknowledgment or cancellation.
+     * Instead, provides callbacks for the appropriate actions
      * @param onAcknowledge the callback to perform when the result is acknowledged
      * @param onFailure the callback to perform when failure occurs
      */
diff --git a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/flowanalysis/StatefulFlowAnalysisRule.java b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/flowanalysis/StatefulFlowAnalysisRule.java
index 0c211920b6b..cd422f35210 100644
--- a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/flowanalysis/StatefulFlowAnalysisRule.java
+++ b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/flowanalysis/StatefulFlowAnalysisRule.java
@@ -30,30 +30,30 @@ import java.util.Map;
 
 @Stateful(scopes = Scope.LOCAL, description = "Stores the timestamp of the last initialization")
 public class StatefulFlowAnalysisRule extends AbstractFlowAnalysisRule {
-    private static final String LAST_ANALYIZE_COMPONENT_TIMESTAMP = "last.analyze.component.timestamp";
-    private static final String LAST_ANALYIZE_PROCESS_GROUP_TIMESTAMP = "last.analyze.component.timestamp";
+    private static final String LAST_ANALYZE_COMPONENT_TIMESTAMP = "last.analyze.component.timestamp";
+    private static final String LAST_ANALYZE_PROCESS_GROUP_TIMESTAMP = "last.analyze.component.timestamp";
 
     @Override
     public Collection<ComponentAnalysisResult> analyzeComponent(VersionedComponent component, FlowAnalysisRuleContext context) {
-        final String lastAnalyizeTimestampKey = LAST_ANALYIZE_COMPONENT_TIMESTAMP;
+        final String lastAnalyzeTimestampKey = LAST_ANALYZE_COMPONENT_TIMESTAMP;
 
-        updateState(context, lastAnalyizeTimestampKey);
+        updateState(context, lastAnalyzeTimestampKey);
 
         return super.analyzeComponent(component, context);
     }
 
     @Override
     public Collection<GroupAnalysisResult> analyzeProcessGroup(VersionedProcessGroup processGroup, FlowAnalysisRuleContext context) {
-        updateState(context, LAST_ANALYIZE_PROCESS_GROUP_TIMESTAMP);
+        updateState(context, LAST_ANALYZE_PROCESS_GROUP_TIMESTAMP);
 
         return super.analyzeProcessGroup(processGroup, context);
     }
 
-    private void updateState(FlowAnalysisRuleContext context, String lastAnalyizeTimestampKey) {
+    private void updateState(FlowAnalysisRuleContext context, String lastAnalyzeTimestampKey) {
         final StateManager stateManager = context.getStateManager();
 
         final Map<String, String> state = new HashMap<>();
-        state.put(lastAnalyizeTimestampKey, System.currentTimeMillis() + "");
+        state.put(lastAnalyzeTimestampKey, System.currentTimeMillis() + "");
 
         try {
             stateManager.setState(state, Scope.LOCAL);
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/nar/NarProviderAndAutoLoaderIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/nar/NarProviderAndAutoLoaderIT.java
index 95d6fda0f99..3299dd2477e 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/nar/NarProviderAndAutoLoaderIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/nar/NarProviderAndAutoLoaderIT.java
@@ -54,7 +54,7 @@ public class NarProviderAndAutoLoaderIT extends NiFiSystemIT {
     }
 
     @Test
-    public void testProviedNarsLoadedAndLinkedCorrectly() throws IOException, NiFiClientException, InterruptedException {
+    public void testProvidedNarsLoadedAndLinkedCorrectly() throws IOException, NiFiClientException, InterruptedException {
         final ControllerServiceEntity classLoaderInfoService = getClientUtil().createControllerService(CLASSLOADER_INFO_SERVICE_CLASS_NAME,
                 ROOT_GROUP_ID, NIFI_GROUP_ID, CLASSLOADER_INFO_SERVICE_NAR_ARTIFACT, getNiFiVersion());
 
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java
index 7a9e8314236..82105dbefec 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java
@@ -1128,7 +1128,7 @@ public class ParameterContextIT extends NiFiSystemIT {
         final File assetFile1 = new File("src/test/resources/sample-assets/helloworld.txt");
         final AssetEntity asset = createAsset(paramContext.getId(), assetFile1);
 
-        // Uupdate the parameter to reference the asset
+        // Update the parameter to reference the asset
         final ParameterContextUpdateRequestEntity referenceAssetUpdateRequest = getClientUtil().updateParameterAssetReferences(
                 paramContext, Map.of("fileToIngest", List.of(asset.getAsset().getId())));
         getClientUtil().waitForParameterContextRequestToComplete(paramContext.getId(), referenceAssetUpdateRequest.getRequest().getRequestId());
diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/composite/AbstractCompositeCommand.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/composite/AbstractCompositeCommand.java
index 0ec990f5401..27161342f10 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/composite/AbstractCompositeCommand.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/composite/AbstractCompositeCommand.java
@@ -99,7 +99,7 @@ public abstract class AbstractCompositeCommand<R extends Result> extends Abstrac
     private Properties createProperties(final CommandLine commandLine, final CommandOption propertyOption, final SessionVariable sessionVariable)
             throws IOException, SessionException {
 
-        // use the properties file specified by the properyOption if it exists
+        // use the properties file specified by the propertyOption if it exists
         if (commandLine.hasOption(propertyOption.getLongName())) {
             final String propertiesFile = commandLine.getOptionValue(propertyOption.getLongName());
             if (!StringUtils.isBlank(propertiesFile)) {
diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/pg/PGCreate.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/pg/PGCreate.java
index e377d03bdb1..67536cc19c7 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/pg/PGCreate.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/pg/PGCreate.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.util.Properties;
 
 /**
- * Command to create process-groups childs of the root process group.
+ * Command to create process-groups child of the root process group.
  */
 public class PGCreate extends AbstractNiFiCommand<StringResult> {
 
diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
index 7ece57c6886..de7760fdbdb 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
@@ -90,17 +90,17 @@ public class UpdateAccessPolicy extends AbstractNiFiCommand<VoidResult> {
             userEntities.addAll(generateTenantEntities(userIds));
         }
 
-        final Set<TenantEntity> groupEntites = new LinkedHashSet<>();
+        final Set<TenantEntity> groupEntities = new LinkedHashSet<>();
 
         if (StringUtils.isNotBlank(groups)) {
-            groupEntites.addAll(generateTenantEntities(groups, tenantsClient.getUserGroups()));
+            groupEntities.addAll(generateTenantEntities(groups, tenantsClient.getUserGroups()));
         }
 
         if (StringUtils.isNotBlank(groupIds)) {
-            groupEntites.addAll(generateTenantEntities(groupIds));
+            groupEntities.addAll(generateTenantEntities(groupIds));
         }
 
-        if (userEntities.isEmpty() && groupEntites.isEmpty()) {
+        if (userEntities.isEmpty() && groupEntities.isEmpty()) {
             throw new CommandException("Users and groups were blank, nothing to update");
         }
 
@@ -129,7 +129,7 @@ public class UpdateAccessPolicy extends AbstractNiFiCommand<VoidResult> {
             policyEntity = new AccessPolicyEntity();
             policyEntity.setComponent(policyDTO);
             policyEntity.setRevision(getInitialRevisionDTO());
-            setTenant(policyEntity, userEntities, groupEntites, overwrite, properties);
+            setTenant(policyEntity, userEntities, groupEntities, overwrite, properties);
 
             final AccessPolicyEntity createdEntity = policiesClient.createAccessPolicy(policyEntity);
 
@@ -152,7 +152,7 @@ public class UpdateAccessPolicy extends AbstractNiFiCommand<VoidResult> {
             policyEntity = new AccessPolicyEntity();
             policyEntity.setComponent(policyDTO);
             policyEntity.setRevision(getInitialRevisionDTO());
-            setTenant(policyEntity, userEntities, groupEntites, overwrite, properties);
+            setTenant(policyEntity, userEntities, groupEntities, overwrite, properties);
 
             final AccessPolicyEntity createdEntity = policiesClient.createAccessPolicy(policyEntity);
 
@@ -163,7 +163,7 @@ public class UpdateAccessPolicy extends AbstractNiFiCommand<VoidResult> {
         } else {
             final String clientId = getContext().getSession().getNiFiClientID();
             policyEntity.getRevision().setClientId(clientId);
-            setTenant(policyEntity, userEntities, groupEntites, overwrite, properties);
+            setTenant(policyEntity, userEntities, groupEntities, overwrite, properties);
 
             policiesClient.updateAccessPolicy(policyEntity);
 
diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/processors/ChangeVersionProcessor.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/processors/ChangeVersionProcessor.java
index 071978531ab..40eed4e2656 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/processors/ChangeVersionProcessor.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/processors/ChangeVersionProcessor.java
@@ -52,7 +52,7 @@ public class ChangeVersionProcessor extends AbstractNiFiCommand<ProcessorsResult
     @Override
     public String getDescription() {
         return "Recursively changes the version of the instances of the specified processor. If the process group is specified, the changes "
-                + "will be scoped to that process group and its childs ; if not specified the changes will recursively apply to the root process "
+                + "will be scoped to that process group and its child's ; if not specified the changes will recursively apply to the root process "
                 + "group. If the source version is specified, only instances with this version will be updated to the new version.";
     }
 
diff --git a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/ConnectionClient.java b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/ConnectionClient.java
index 928e8b72cc1..f59c458534e 100644
--- a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/ConnectionClient.java
+++ b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/ConnectionClient.java
@@ -29,7 +29,7 @@ public interface ConnectionClient {
 
     ConnectionEntity deleteConnection(ConnectionEntity connectionEntity) throws NiFiClientException, IOException;
 
-    ConnectionEntity deleteConnection(String id, String clientId, long verison) throws NiFiClientException, IOException;
+    ConnectionEntity deleteConnection(String id, String clientId, long version) throws NiFiClientException, IOException;
 
     ConnectionEntity createConnection(String parentGroupId, ConnectionEntity connectionEntity) throws NiFiClientException, IOException;
 
diff --git a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyControllerServicesClient.java b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyControllerServicesClient.java
index 067607868db..ba5b6cf3309 100644
--- a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyControllerServicesClient.java
+++ b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyControllerServicesClient.java
@@ -72,7 +72,7 @@ public class JerseyControllerServicesClient extends AbstractJerseyClient impleme
         }
 
         if (runStatusEntity == null) {
-            throw new IllegalArgumentException("Entity cannnot be null");
+            throw new IllegalArgumentException("Entity cannot be null");
         }
 
         return executeAction("Error enabling or disabling controller service", () -> {
@@ -86,8 +86,8 @@ public class JerseyControllerServicesClient extends AbstractJerseyClient impleme
     }
 
     @Override
-    public ControllerServiceEntity createControllerService(final String parentGroupdId, final ControllerServiceEntity controllerServiceEntity) throws NiFiClientException, IOException {
-        if (StringUtils.isBlank(parentGroupdId)) {
+    public ControllerServiceEntity createControllerService(final String parentGroupId, final ControllerServiceEntity controllerServiceEntity) throws NiFiClientException, IOException {
+        if (StringUtils.isBlank(parentGroupId)) {
             throw new IllegalArgumentException("Parent process group id cannot be null or blank");
         }
 
@@ -98,7 +98,7 @@ public class JerseyControllerServicesClient extends AbstractJerseyClient impleme
         return executeAction("Error creating Controller Service", () -> {
             final WebTarget target = processGroupTarget
                     .path("/controller-services")
-                    .resolveTemplate("pgId", parentGroupdId);
+                    .resolveTemplate("pgId", parentGroupId);
 
             return getRequestBuilder(target).post(
                     Entity.entity(controllerServiceEntity, MediaType.APPLICATION_JSON_TYPE),
diff --git a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyPoliciesClient.java b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyPoliciesClient.java
index b22164ba052..5d06ddaa455 100644
--- a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyPoliciesClient.java
+++ b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyPoliciesClient.java
@@ -46,7 +46,7 @@ public class JerseyPoliciesClient extends AbstractJerseyClient implements Polici
     @Override
     public AccessPolicyEntity getAccessPolicy(final String resource, final String action) throws NiFiClientException, IOException {
         if (StringUtils.isBlank(resource) || StringUtils.isBlank(action)) {
-            throw new IllegalArgumentException("Resouce and action cannot be null");
+            throw new IllegalArgumentException("Resource and action cannot be null");
         }
 
         return executeAction("Error retrieving configuration of access policy", () -> {
diff --git a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessGroupClient.java b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessGroupClient.java
index f5e294e0030..8c4b0cead8f 100644
--- a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessGroupClient.java
+++ b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessGroupClient.java
@@ -63,16 +63,16 @@ public class JerseyProcessGroupClient extends AbstractJerseyClient implements Pr
     }
 
     @Override
-    public ProcessGroupEntity createProcessGroup(final String parentGroupdId, final ProcessGroupEntity entity)
+    public ProcessGroupEntity createProcessGroup(final String parentGroupId, final ProcessGroupEntity entity)
             throws NiFiClientException, IOException {
-        return createProcessGroup(parentGroupdId, entity, true);
+        return createProcessGroup(parentGroupId, entity, true);
     }
 
     @Override
-    public ProcessGroupEntity createProcessGroup(final String parentGroupdId, final ProcessGroupEntity entity, boolean keepExisting)
+    public ProcessGroupEntity createProcessGroup(final String parentGroupId, final ProcessGroupEntity entity, boolean keepExisting)
             throws NiFiClientException, IOException {
 
-        if (StringUtils.isBlank(parentGroupdId)) {
+        if (StringUtils.isBlank(parentGroupId)) {
             throw new IllegalArgumentException("Parent process group id cannot be null or blank");
         }
 
@@ -84,7 +84,7 @@ public class JerseyProcessGroupClient extends AbstractJerseyClient implements Pr
             final WebTarget target = processGroupsTarget
                     .path("{id}/process-groups")
                     .queryParam("parameterContextHandlingStrategy", keepExisting ? "KEEP_EXISTING" : "REPLACE")
-                    .resolveTemplate("id", parentGroupdId);
+                    .resolveTemplate("id", parentGroupId);
 
             return getRequestBuilder(target).post(
                     Entity.entity(entity, MediaType.APPLICATION_JSON_TYPE),
diff --git a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessorClient.java b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessorClient.java
index 2b09be03145..a194e3c6237 100644
--- a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessorClient.java
+++ b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyProcessorClient.java
@@ -54,8 +54,8 @@ public class JerseyProcessorClient extends AbstractJerseyClient implements Proce
     }
 
     @Override
-    public ProcessorEntity createProcessor(final String parentGroupdId, final ProcessorEntity processorEntity) throws NiFiClientException, IOException {
-        if (StringUtils.isBlank(parentGroupdId)) {
+    public ProcessorEntity createProcessor(final String parentGroupId, final ProcessorEntity processorEntity) throws NiFiClientException, IOException {
+        if (StringUtils.isBlank(parentGroupId)) {
             throw new IllegalArgumentException("Parent process group id cannot be null or blank");
         }
 
@@ -66,7 +66,7 @@ public class JerseyProcessorClient extends AbstractJerseyClient implements Proce
         return executeAction("Error creating Processor", () -> {
             final WebTarget target = processGroupTarget
                     .path("/processors")
-                    .resolveTemplate("pgId", parentGroupdId);
+                    .resolveTemplate("pgId", parentGroupId);
 
             return getRequestBuilder(target).post(
                     Entity.entity(processorEntity, MediaType.APPLICATION_JSON_TYPE),
diff --git a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyReportingTasksClient.java b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyReportingTasksClient.java
index 791bebafcbe..d2b2b33eee3 100644
--- a/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyReportingTasksClient.java
+++ b/nifi-toolkit/nifi-toolkit-client/src/main/java/org/apache/nifi/toolkit/client/impl/JerseyReportingTasksClient.java
@@ -86,7 +86,7 @@ public class JerseyReportingTasksClient extends AbstractJerseyClient implements
         }
 
         if (runStatusEntity == null) {
-            throw new IllegalArgumentException("Entity cannnot be null");
+            throw new IllegalArgumentException("Entity cannot be null");
         }
 
         return executeAction("Error starting or stopping report task", () -> {