diff --git a/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java b/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java index 03f6e9b29e..0144438f2f 100644 --- a/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java +++ b/nifi-api/src/main/java/org/apache/nifi/controller/ControllerServiceLookup.java @@ -37,7 +37,7 @@ public interface ControllerServiceLookup { boolean isControllerServiceEnabled(String serviceIdentifier); /** - * @param serviceIdentifier idenfitier of service to check + * @param serviceIdentifier identifier of service to check * @return true if the Controller Service with the given * identifier has been enabled but is still in the transitioning state, * otherwise returns false. If the given identifier is not diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java index 9d5d1a04cb..6cedbb127e 100644 --- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java +++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/ShutdownHook.java @@ -91,7 +91,7 @@ public class ShutdownHook extends Thread { System.err.println("Failed to delete status file " + statusFile.getAbsolutePath() + "; this file should be cleaned up manually"); } }catch (IOException ex){ - System.err.println("Failed to retrive status file " + ex); + System.err.println("Failed to retrieve status file " + ex); } } } diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ValueLookup.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ValueLookup.java index 44da5a3d2a..5b0cdda852 100644 --- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ValueLookup.java +++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/ValueLookup.java @@ -105,7 +105,7 @@ final class ValueLookup implements Map { if (value == null) { return false; } - //check entrySet then iterate through values (otherwise might find a value that was hidden/overriden + //check entrySet then iterate through values (otherwise might find a value that was hidden/overridden final Collection values = values(); return values.contains(value.toString()); } diff --git a/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java b/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java index f78f82b40c..d1f0e47750 100644 --- a/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java +++ b/nifi-commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java @@ -222,7 +222,7 @@ public class TestHL7Query { } @Test - public void testAndWithParens() throws HL7Exception, IOException { + public void testAndWithParents() throws HL7Exception, IOException { HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.7 = 'L' AND result.3.1 = 'GLU'"); QueryResult result = hl7Query.evaluate(createMessage(new File("src/test/resources/hypoglycemia"))); assertTrue(result.isMatch()); diff --git a/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java b/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java index 007034b79f..203d24a082 100644 --- a/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java +++ b/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/BufferPool.java @@ -73,14 +73,14 @@ public class BufferPool implements Runnable { private synchronized void computeRate() { final Calendar now = Calendar.getInstance(); final long measurementDurationMillis = now.getTimeInMillis() - lastRateSampleTime.getTimeInMillis(); - final double duractionSecs = ((double) measurementDurationMillis) / 1000.0; - if (duractionSecs >= 0.75) { //recompute every 3/4 second or when we're too fast - final long totalDuractionMillis = now.getTimeInMillis() - startTime.getTimeInMillis(); - final double totalDurationSecs = ((double) totalDuractionMillis) / 1000.0; + final double durationSecs = ((double) measurementDurationMillis) / 1000.0; + if (durationSecs >= 0.75) { //recompute every 3/4 second or when we're too fast + final long totalDurationMillis = now.getTimeInMillis() - startTime.getTimeInMillis(); + final double totalDurationSecs = ((double) totalDurationMillis) / 1000.0; final long differenceBytes = totalBytesExtracted - lastTotalBytesExtracted; lastTotalBytesExtracted = totalBytesExtracted; lastRateSampleTime = now; - final double bps = ((double) differenceBytes) / duractionSecs; + final double bps = ((double) differenceBytes) / durationSecs; final double totalBps = ((double) totalBytesExtracted / totalDurationSecs); lastRateSampleMBps = bps / ONE_MB; overallMBps = totalBps / ONE_MB; diff --git a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java index 9b4c3af4b7..1af25fa198 100644 --- a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java +++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/flowfile/attributes/CoreAttributes.java @@ -19,11 +19,11 @@ package org.apache.nifi.flowfile.attributes; public enum CoreAttributes implements FlowFileAttributeKey { /** - * The flowfile's path indicates the relative directory to which a FlowFile belongs and does not contain the filename + * The FlowFile's path indicates the relative directory to which a FlowFile belongs and does not contain the filename */ PATH("path"), /** - * The flowfile's absolute path indicates the absolute directory to which a FlowFile belongs and does not contain the filename + * The FlowFile's absolute path indicates the absolute directory to which a FlowFile belongs and does not contain the filename */ ABSOLUTE_PATH("absolute.path"), /** diff --git a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java b/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java index 1eaf366bf5..748835f801 100644 --- a/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java +++ b/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/ClientUtils.java @@ -95,7 +95,7 @@ public class ClientUtils { * * @param uri the uri to post to * @param formData the data to post - * @return the client reponse of the post + * @return the client response of the post */ public ClientResponse post(URI uri, Map formData) throws ClientHandlerException, UniformInterfaceException { // convert the form data diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/SwapSummary.java b/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/SwapSummary.java index ad01ccd108..416eccc02d 100644 --- a/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/SwapSummary.java +++ b/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/SwapSummary.java @@ -40,7 +40,7 @@ public interface SwapSummary { Long getMaxFlowFileId(); /** - * Returns a List of all ResoruceClaims that are referenced by the FlowFiles in the swap file. + * Returns a List of all ResourceClaims that are referenced by the FlowFiles in the swap file. * This List may well contain the same ResourceClaim many times. This indicates that many FlowFiles * reference the same ResourceClaim. * diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java b/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java index b430df0a7c..4fe523eebc 100644 --- a/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java +++ b/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java @@ -48,7 +48,7 @@ public interface ResourceClaimManager { * particular piece of FlowFile content and returns the new count * * @param claim to decrement claimants on - * @return new claimaint count + * @return new claimant count */ int decrementClaimantCount(ResourceClaim claim); diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java b/nifi-framework-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java index 5d0956eeae..5673299545 100644 --- a/nifi-framework-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java +++ b/nifi-framework-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java @@ -37,7 +37,7 @@ public interface LineageNode { * @return the timestamp that corresponds to this Node. The meaning of the * timestamp may differ between implementations. For example, a * {@link ProvenanceEventLineageNode}'s timestamp indicates the time at - * which the event occurred. However, for a Node that reperesents a + * which the event occurred. However, for a Node that represents a * FlowFile, for example, the timestamp may represent the time at which the * FlowFile was created */ 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 63b7781cf4..05124160d7 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 @@ -465,7 +465,7 @@ public interface TestRunner { * to the given relationship * * @param relationship to get flowfiles for - * @return flowfiles transfered to given relationship + * @return flowfiles transferred to given relationship */ List getFlowFilesForRelationship(String relationship); @@ -474,7 +474,7 @@ public interface TestRunner { * to the given relationship * * @param relationship to get flowfiles for - * @return flowfiles transfered to given relationship + * @return flowfiles transferred to given relationship */ List getFlowFilesForRelationship(Relationship relationship); @@ -757,7 +757,7 @@ public interface TestRunner { ValidationResult setProperty(ControllerService service, String propertyName, String value); /** - * Sets the annontation data of the given service to the provided annotation + * Sets the annotation data of the given service to the provided annotation * data. * * @param service to modify diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java index 293fa57e71..c64ed07b54 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java @@ -72,7 +72,7 @@ public abstract class AbstractAWSCredentialsProviderProcessor substitutionVariantFactories = new ArrayList<>(substitutionCount); for (long i = 0; i < substitutionCount; i++) { try { - int substitionSize = binaryReader.readWord(); + int substitutionSize = binaryReader.readWord(); int substitutionType = binaryReader.readWord(); - substitutionVariantFactories.add(new VariantTypeSizeAndFactory(substitionSize, ValueNode.factories.get(substitutionType))); + substitutionVariantFactories.add(new VariantTypeSizeAndFactory(substitutionSize, ValueNode.factories.get(substitutionType))); } catch (Exception e) { throw new IOException(e); } diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNode.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNode.java index 651dd2ca62..07067dfded 100644 --- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNode.java +++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNode.java @@ -25,7 +25,7 @@ import org.apache.nifi.processors.evtx.parser.bxml.BxmlNode; import java.io.IOException; /** - * Node contianing a signed 32 bit value + * Node containing a signed 32 bit value */ public class SignedDWordTypeNode extends VariantTypeNode { private final UnsignedInteger value; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java index 8a2f9e3b55..1e6739e49d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java @@ -157,7 +157,7 @@ public class RemoteProcessGroupDTO extends ComponentDTO { * @return the time period used for the timeout when communicating with this RemoteProcessGroup */ @ApiModelProperty( - value = "The time period used for the timeout when commicating with the target." + value = "The time period used for the timeout when communicating with the target." ) public String getCommunicationsTimeout() { return communicationsTimeout; @@ -213,7 +213,7 @@ public class RemoteProcessGroupDTO extends ComponentDTO { * @return number of active remote output ports */ @ApiModelProperty( - value = "The number of acitve remote output ports." + value = "The number of active remote output ports." ) public Integer getActiveRemoteOutputPortCount() { return activeRemoteOutputPortCount; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java index fdcd463944..e5afe6e9d7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java @@ -194,7 +194,7 @@ public class ReportingTaskDTO extends ComponentDTO { * @return currently configured annotation data for the reporting task */ @ApiModelProperty( - value = "The anntation data for the repoting task. This is how the custom UI relays configuration to the reporting task." + value = "The annotation data for the repoting task. This is how the custom UI relays configuration to the reporting task." ) public String getAnnotationData() { return annotationData; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java index d37452d9ec..fd82df385f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java @@ -128,7 +128,7 @@ public class ProvenanceResultsDTO { } /** - * @return time offset on the server thats used for event time + * @return time offset on the server that's used for event time */ @ApiModelProperty( value = "The time offset of the server that's used for event time." diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java index 0050bd4583..4eba583c82 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java @@ -213,7 +213,7 @@ public class ProcessGroupStatusSnapshotDTO implements Cloneable { * * @return The transferred status for this process group */ - @ApiModelProperty("The count/size transferred to/frome queues in the process group in the last 5 minutes.") + @ApiModelProperty("The count/size transferred to/from queues in the process group in the last 5 minutes.") public String getTransferred() { return transferred; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java index ba188814b7..80f50ec376 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InputPortsEntity.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement; import java.util.Set; /** - * A serialized representation of this class can be placed in the entity body of a response to the API. This particular entity holds a reference to a list of input InputPortEntitys. + * A serialized representation of this class can be placed in the entity body of a response to the API. This particular entity holds a reference to a list of input InputPortEntity's. */ @XmlRootElement(name = "inputPortsEntity") public class InputPortsEntity extends Entity { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java index fe3f54706a..54bf45b99a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java @@ -32,7 +32,7 @@ public class RemoteProcessGroupStatusSnapshotEntity extends Entity implements Re /** * @return The remote process group id */ - @ApiModelProperty("The id of the remote processo group.") + @ApiModelProperty("The id of the remote process group.") public String getId() { return id; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMerger.java index 1d19721a9f..512a0b3810 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMerger.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMerger.java @@ -209,7 +209,7 @@ public class StandardHttpResponseMerger implements HttpResponseMerger { private void drainResponses(final Set responses, final NodeResponse exclude) { responses.stream() - .parallel() // parallelize the draining of the responses, since we have multiple streams to consume + .parallel() // "parallelize" the draining of the responses, since we have multiple streams to consume .filter(response -> response != exclude) // don't include the explicitly excluded node .filter(response -> response.getStatus() != RequestReplicator.NODE_CONTINUE_STATUS_CODE) // don't include any 150-NodeContinue responses because they contain no content .forEach(response -> drainResponse(response)); // drain all node responses that didn't get filtered out diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java index 6838e39157..91dcd79e0c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ProvenanceQueryEndpointMerger.java @@ -140,7 +140,7 @@ public class ProvenanceQueryEndpointMerger implements EndpointResponseMerger { // Since we get back up to the maximum number of results from each node, we need to sort those values and then // grab only the first X number of them. We do a sort based on time, such that the newest are included. // If 2 events have the same timestamp, we do a secondary sort based on Cluster Node Identifier. If those are - // equal, we perform a terciary sort based on the the event id + // equal, we perform a tertiary sort based on the the event id Collections.sort(allResults, new Comparator() { @Override public int compare(final ProvenanceEventDTO o1, final ProvenanceEventDTO o2) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/replication/TestThreadPoolRequestReplicator.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/replication/TestThreadPoolRequestReplicator.java index 50d58919fd..edbc05b2da 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/replication/TestThreadPoolRequestReplicator.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/coordination/http/replication/TestThreadPoolRequestReplicator.java @@ -336,7 +336,7 @@ public class TestThreadPoolRequestReplicator { try { Thread.sleep(delayMillis); } catch (InterruptedException e) { - Assert.fail("Thread Interrupted durating test"); + Assert.fail("Thread Interrupted during test"); } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/web/revision/RevisionManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/web/revision/RevisionManager.java index e10454f5e5..54ccd56d8e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/web/revision/RevisionManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/web/revision/RevisionManager.java @@ -51,7 +51,7 @@ import org.apache.nifi.web.Revision; * *

* If the first phase of the above two-phase commit completes and all nodes indicate that the - * request may continue, this means that all nodes have agreed that the client's Revisios are + * request may continue, this means that all nodes have agreed that the client's Revisions are * acceptable. *

*/ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java index aa845945ef..759edb57fe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/TemplateUtils.java @@ -216,7 +216,7 @@ public class TemplateUtils { * so that if one of these things changes, the template itself changes, which makes it hard to * use a CM tool for versioning. So we remove all that we don't need. * - * @param descriptor the ProeprtyDescriptor to scrub + * @param descriptor the PropertyDescriptor to scrub */ private static void scrubPropertyDescriptor(final PropertyDescriptorDTO descriptor) { descriptor.setAllowableValues(null); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java index 7e247fdae9..21368e852c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java @@ -136,7 +136,7 @@ public class StandardStateManagerProvider implements StateManagerProvider{ if (providerId.trim().isEmpty()) { throw new IllegalStateException("Cannot create " + providerDescription + " because the '" + providerIdPropertyName + "' property in the NiFi Properties file has no value set. This is a required property and must reference the identifier of one of the " - + providerXmlElementName + " elements in the State Management Configuraiton File (" + configFile + ")"); + + providerXmlElementName + " elements in the State Management Configuration File (" + configFile + ")"); } final StateManagerConfiguration config = StateManagerConfiguration.parse(configFile); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java index 5e1838a2a0..08feff67bd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java @@ -232,7 +232,7 @@ public class ReflectionUtils { try { return invokeMethodsWithAnnotations(true, logger, instance, annotationArray, args); } catch (Exception e) { - LOG.error("Failed while attemptiing to invoke methods with '" + Arrays.asList(annotationArray) + "' annotations", e); + LOG.error("Failed while attempting to invoke methods with '" + Arrays.asList(annotationArray) + "' annotations", e); return false; } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/HttpRemoteSiteListener.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/HttpRemoteSiteListener.java index 7a001abc2b..c9c523ef26 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/HttpRemoteSiteListener.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/HttpRemoteSiteListener.java @@ -91,12 +91,12 @@ public class HttpRemoteSiteListener implements RemoteSiteListener { private class TransactionWrapper { private final FlowFileTransaction transaction; - private final HandshakeProperties handshakenProperties; + private final HandshakeProperties handshakeProperties; private long lastCommunicationAt; - private TransactionWrapper(final FlowFileTransaction transaction, final HandshakeProperties handshakenProperties) { + private TransactionWrapper(final FlowFileTransaction transaction, final HandshakeProperties handshakeProperties) { this.transaction = transaction; - this.handshakenProperties = handshakenProperties; + this.handshakeProperties = handshakeProperties; this.lastCommunicationAt = System.currentTimeMillis(); } @@ -197,7 +197,7 @@ public class HttpRemoteSiteListener implements RemoteSiteListener { public HandshakeProperties getHandshakenProperties(final String transactionId) { TransactionWrapper transaction = transactions.get(transactionId); if (isTransactionActive(transaction)) { - return transaction.handshakenProperties; + return transaction.handshakeProperties; } return null; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java index fe324add1c..2ba87a279e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/AbstractFlowFileServerProtocol.java @@ -63,7 +63,7 @@ public abstract class AbstractFlowFileServerProtocol implements ServerProtocol { protected boolean shutdown = false; protected FlowFileCodec negotiatedFlowFileCodec = null; - protected HandshakeProperties handshakenProperties; + protected HandshakeProperties handshakeProperties; protected static final long DEFAULT_BATCH_NANOS = TimeUnit.SECONDS.toNanos(5L); @@ -195,7 +195,7 @@ public abstract class AbstractFlowFileServerProtocol implements ServerProtocol { logger.debug("{} Handshaking with {}", this, peer); - this.handshakenProperties = doHandshake(peer); + this.handshakeProperties = doHandshake(peer); logger.debug("{} Finished handshake with {}", this, peer); handshakeCompleted = true; @@ -242,7 +242,7 @@ public abstract class AbstractFlowFileServerProtocol implements ServerProtocol { String calculatedCRC = ""; OutputStream os = new DataOutputStream(commsSession.getOutput().getOutputStream()); while (continueTransaction) { - final boolean useGzip = handshakenProperties.isUseGzip(); + final boolean useGzip = handshakeProperties.isUseGzip(); final OutputStream flowFileOutputStream = useGzip ? new CompressionOutputStream(os) : os; logger.debug("{} Sending {} to {}", new Object[]{this, flowFile, peer}); @@ -278,15 +278,15 @@ public abstract class AbstractFlowFileServerProtocol implements ServerProtocol { // determine if we should check for more data on queue. final long sendingNanos = System.nanoTime() - startNanos; boolean poll = true; - double batchDurationNanos = handshakenProperties.getBatchDurationNanos(); + double batchDurationNanos = handshakeProperties.getBatchDurationNanos(); if (sendingNanos >= batchDurationNanos && batchDurationNanos > 0L) { poll = false; } - double batchBytes = handshakenProperties.getBatchBytes(); + double batchBytes = handshakeProperties.getBatchBytes(); if (bytesSent >= batchBytes && batchBytes > 0L) { poll = false; } - double batchCount = handshakenProperties.getBatchCount(); + double batchCount = handshakeProperties.getBatchCount(); if (flowFilesSent.size() >= batchCount && batchCount > 0) { poll = false; } @@ -433,7 +433,7 @@ public abstract class AbstractFlowFileServerProtocol implements ServerProtocol { boolean continueTransaction = true; while (continueTransaction) { final long startNanos = System.nanoTime(); - final InputStream flowFileInputStream = handshakenProperties.isUseGzip() ? new CompressionInputStream(dis) : dis; + final InputStream flowFileInputStream = handshakeProperties.isUseGzip() ? new CompressionInputStream(dis) : dis; final CheckedInputStream checkedInputStream = new CheckedInputStream(flowFileInputStream, crc); final DataPacket dataPacket = codec.decode(checkedInputStream); @@ -551,12 +551,12 @@ public abstract class AbstractFlowFileServerProtocol implements ServerProtocol { @Override public long getRequestExpiration() { - return handshakenProperties.getExpirationMillis(); + return handshakeProperties.getExpirationMillis(); } @Override public String toString() { - String commid = handshakenProperties != null ? handshakenProperties.getCommsIdentifier() : null; + String commid = handshakeProperties != null ? handshakeProperties.getCommsIdentifier() : null; return getClass().getSimpleName() + "[CommsID=" + commid + "]"; } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/http/StandardHttpFlowFileServerProtocol.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/http/StandardHttpFlowFileServerProtocol.java index 0795b5d0a3..a35b160021 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/http/StandardHttpFlowFileServerProtocol.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/http/StandardHttpFlowFileServerProtocol.java @@ -181,7 +181,7 @@ public class StandardHttpFlowFileServerProtocol extends AbstractFlowFileServerPr HttpServerCommunicationsSession commSession = (HttpServerCommunicationsSession) peer.getCommunicationsSession(); String transactionId = commSession.getTransactionId(); logger.debug("{} Holding transaction. transactionId={}", this, transactionId); - transactionManager.holdTransaction(transactionId, transaction, handshakenProperties); + transactionManager.holdTransaction(transactionId, transaction, handshakeProperties); return transaction.getFlowFilesSent().size(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java index 8ecf96c83f..b67276ee6e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/main/java/org/apache/nifi/remote/protocol/socket/SocketFlowFileServerProtocol.java @@ -222,7 +222,7 @@ public class SocketFlowFileServerProtocol extends AbstractFlowFileServerProtocol @Override protected String createTransitUri(Peer peer, String sourceFlowFileIdentifier) { - String transitUriPrefix = handshakenProperties.getTransitUriPrefix(); + String transitUriPrefix = handshakeProperties.getTransitUriPrefix(); return (transitUriPrefix == null) ? peer.getUrl() : transitUriPrefix + sourceFlowFileIdentifier; } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/AccessPolicyAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/AccessPolicyAuditor.java index c84f7fdc99..90f562d544 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/AccessPolicyAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/AccessPolicyAuditor.java @@ -96,7 +96,7 @@ public class AccessPolicyAuditor extends NiFiAuditor { + "args(accessPolicyDTO) && " + "target(accessPolicyDAO)") public AccessPolicy updateAccessPolicyAdvice(ProceedingJoinPoint proceedingJoinPoint, AccessPolicyDTO accessPolicyDTO, AccessPolicyDAO accessPolicyDAO) throws Throwable { - // determine the initial values for each property/setting thats changing + // determine the initial values for each property/setting that's changing AccessPolicy accessPolicy = accessPolicyDAO.getAccessPolicy(accessPolicyDTO.getId()); final Map values = extractConfiguredPropertyValues(accessPolicy, accessPolicyDTO); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java index a122983192..b4af48ffe1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java @@ -102,7 +102,7 @@ public class ControllerServiceAuditor extends NiFiAuditor { + "args(controllerServiceDTO) && " + "target(controllerServiceDAO)") public Object updateControllerServiceAdvice(ProceedingJoinPoint proceedingJoinPoint, ControllerServiceDTO controllerServiceDTO, ControllerServiceDAO controllerServiceDAO) throws Throwable { - // determine the initial values for each property/setting thats changing + // determine the initial values for each property/setting that's changing ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceDTO.getId()); final Map values = extractConfiguredPropertyValues(controllerService, controllerServiceDTO); final boolean isDisabled = isDisabled(controllerService); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java index ee093deee2..4bae6a600d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java @@ -110,7 +110,7 @@ public class ProcessorAuditor extends NiFiAuditor { + "args(processorDTO) && " + "target(processorDAO)") public ProcessorNode updateProcessorAdvice(ProceedingJoinPoint proceedingJoinPoint, ProcessorDTO processorDTO, ProcessorDAO processorDAO) throws Throwable { - // determine the initial values for each property/setting thats changing + // determine the initial values for each property/setting that's changing ProcessorNode processor = processorDAO.getProcessor(processorDTO.getId()); final Map values = extractConfiguredPropertyValues(processor, processorDTO); final ScheduledState scheduledState = processor.getScheduledState(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserAuditor.java index 8582e19007..2caabf1561 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserAuditor.java @@ -90,7 +90,7 @@ public class UserAuditor extends NiFiAuditor { + "args(userDTO) && " + "target(userDAO)") public User updateUserAdvice(ProceedingJoinPoint proceedingJoinPoint, UserDTO userDTO, UserDAO userDAO) throws Throwable { - // determine the initial values for each property/setting thats changing + // determine the initial values for each property/setting that's changing User user = userDAO.getUser(userDTO.getId()); final Map values = extractConfiguredPropertyValues(user, userDTO); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserGroupAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserGroupAuditor.java index 2c0bbaba68..e77a158b20 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserGroupAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/UserGroupAuditor.java @@ -96,7 +96,7 @@ public class UserGroupAuditor extends NiFiAuditor { + "args(userGroupDTO) && " + "target(userGroupDAO)") public Group updateUserAdvice(ProceedingJoinPoint proceedingJoinPoint, UserGroupDTO userGroupDTO, UserGroupDAO userGroupDAO) throws Throwable { - // determine the initial values for each property/setting thats changing + // determine the initial values for each property/setting that's changing Group user = userGroupDAO.getUserGroup(userGroupDTO.getId()); final Map values = extractConfiguredPropertyValues(user, userGroupDTO); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java index 491d448ee4..b6fbe2adbe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java @@ -1902,7 +1902,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { } /** - * Creates entities for compnents referencing a ControllerServcie using the specified revisions. + * Creates entities for components referencing a ControllerServcie using the specified revisions. * * @param reference ControllerServiceReference * @param revisions The revisions @@ -2339,7 +2339,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { final ProcessorNode processor = processorDAO.getProcessor(id); PropertyDescriptor descriptor = processor.getPropertyDescriptor(property); - // return an invalid descriptor if the processor doesn't suppor this property + // return an invalid descriptor if the processor doesn't support this property if (descriptor == null) { descriptor = new PropertyDescriptor.Builder().name(property).addValidator(Validator.INVALID).dynamic(true).build(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java index 24112aab35..4333d5a76a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Maps mutal request exceptions into client responses. + * Maps mutual request exceptions into client responses. */ @Provider public class MutableRequestExceptionMapper implements ExceptionMapper { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java index bc6bce1905..c89521c8e7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java @@ -1058,7 +1058,7 @@ public class ControllerFacade implements Authorizable { provenanceDto.setResults(resultsDto); return provenanceDto; } catch (final IOException ioe) { - throw new NiFiCoreException("An error occured while searching the provenance events.", ioe); + throw new NiFiCoreException("An error occurred while searching the provenance events.", ioe); } } @@ -1220,7 +1220,7 @@ public class ControllerFacade implements Authorizable { // convert the event record return createProvenanceEventDto(event); } catch (final IOException ioe) { - throw new NiFiCoreException("An error occured while getting the specified event.", ioe); + throw new NiFiCoreException("An error occurred while getting the specified event.", ioe); } } @@ -1292,7 +1292,7 @@ public class ControllerFacade implements Authorizable { // convert the event return createProvenanceEventDto(event); } catch (final IOException ioe) { - throw new NiFiCoreException("An error occured while getting the specified event.", ioe); + throw new NiFiCoreException("An error occurred while getting the specified event.", ioe); } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java index 7d883e0bb0..0ffece88fb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/TemplateDAO.java @@ -25,7 +25,7 @@ import java.util.Set; public interface TemplateDAO { /** - * Verifies a new template can be created with the specifed name in the specified group. + * Verifies a new template can be created with the specified name in the specified group. * * @param name template name * @param groupId group id diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java index 099d4ece71..44e6996798 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java @@ -159,7 +159,7 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro // get the controller service final ControllerServiceNode controllerService = locateControllerService(controllerServiceId); - // this request is either acting upon referncing services or schedulable components + // this request is either acting upon referencing services or schedulable components if (controllerServiceState != null) { if (ControllerServiceState.ENABLED.equals(controllerServiceState)) { return serviceProvider.enableReferencingServices(controllerService); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITAccessTokenEndpoint.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITAccessTokenEndpoint.java index fb6fcd45ff..ee6f566fa7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITAccessTokenEndpoint.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ITAccessTokenEndpoint.java @@ -131,7 +131,7 @@ public class ITAccessTokenEndpoint { public void testCreateProcessorUsingToken() throws Exception { String url = BASE_URL + "/access/token"; - ClientResponse response = TOKEN_USER.testCreateToken(url, "user@nifi", "whateve"); + ClientResponse response = TOKEN_USER.testCreateToken(url, "user@nifi", "whatever"); // ensure the request is successful Assert.assertEquals(201, response.getStatus()); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java index cec7e8eb52..b1decd0e82 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java @@ -108,7 +108,7 @@ public class ContentViewerController extends HttpServlet { viewerContext.getRequestDispatcher("/message").forward(request, response); return; } catch (final AccessDeniedException ade) { - request.setAttribute("title", "Acess Denied"); + request.setAttribute("title", "Access Denied"); request.setAttribute("messages", "Unable to approve access to the specified content: " + ade.getMessage()); // forward to the error page diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java index 2886bf7e78..eeb3c1f3f0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/java/org/apache/nifi/web/filter/CatchAllFilter.java @@ -25,7 +25,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; /** - * Filter for foward all requests to index.jsp. + * Filter for forward all requests to index.jsp. */ public class CatchAllFilter implements Filter { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp index 79269d827c..d501f08f75 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp @@ -17,8 +17,8 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
- - + +
NiFi Data Provenance
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js index 9a7d3833d4..9526ff8348 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js @@ -199,7 +199,7 @@ nf.ng.Provenance = function (provenanceTableCtrl) { var searchTerms = {}; // look for a processor id in the query search - var initialComponentId = $('#intial-component-query').text(); + var initialComponentId = $('#initial-component-query').text(); if ($.trim(initialComponentId) !== '') { // populate initial search component $('input.searchable-component-id').val(initialComponentId); @@ -209,7 +209,7 @@ nf.ng.Provenance = function (provenanceTableCtrl) { } // look for a flowfile uuid in the query search - var initialFlowFileUuid = $('#intial-flowfile-query').text(); + var initialFlowFileUuid = $('#initial-flowfile-query').text(); if ($.trim(initialFlowFileUuid) !== '') { // populate initial search component $('input.searchable-flowfile-uuid').val(initialFlowFileUuid); diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java index 5f540994c2..8f8699e142 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestListHDFS.java @@ -102,7 +102,7 @@ public class TestListHDFS { } @Test - public void testListingWithInalidELFunction() throws InterruptedException { + public void testListingWithInvalidELFunction() throws InterruptedException { runner.setProperty(ListHDFS.DIRECTORY, "${literal('/test'):foo()}"); runner.assertNotValid(); } diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java index 78b70e543d..458ad22b5c 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/inotify/TestEventTypeValidator.java @@ -75,24 +75,24 @@ public class TestEventTypeValidator { @Test public void inputWithInvalidEventTypeShouldProperlyDisplayEventsInExplanation() throws Exception { String subject = "subject"; - String input = "append, CREATE, cllose, rename, metadata, unlink"; + String input = "append, CREATE, invalidValue1, rename, metadata, unlink"; ValidationResult result = eventTypeValidator.validate(subject, input, context); assertEquals("subject", result.getSubject()); - assertEquals("append, CREATE, cllose, rename, metadata, unlink", result.getInput()); - assertEquals("The following are not valid event types: [cllose]", result.getExplanation()); + assertEquals("append, CREATE, invalidValue1, rename, metadata, unlink", result.getInput()); + assertEquals("The following are not valid event types: [invalidValue1]", result.getExplanation()); assertFalse(result.isValid()); } @Test public void inputWithMultipleInvalidEventTypeShouldProperlyDisplayEventsInExplanation() throws Exception { String subject = "subject"; - String input = "append, CREATE, cllose, rename, metadata, unlink, unllink"; + String input = "append, CREATE, invalidValue1, rename, metadata, unlink, invalidValue2"; ValidationResult result = eventTypeValidator.validate(subject, input, context); assertEquals("subject", result.getSubject()); - assertEquals("append, CREATE, cllose, rename, metadata, unlink, unllink", result.getInput()); - assertEquals("The following are not valid event types: [cllose, unllink]", result.getExplanation()); + assertEquals("append, CREATE, invalidValue1, rename, metadata, unlink, invalidValue2", result.getInput()); + assertEquals("The following are not valid event types: [invalidValue1, invalidValue2]", result.getExplanation()); assertFalse(result.isValid()); } } diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/AbstractPutHBase.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/AbstractPutHBase.java index f5d11f1e4f..2dc92aec0f 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/AbstractPutHBase.java +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/AbstractPutHBase.java @@ -71,11 +71,11 @@ public abstract class AbstractPutHBase extends AbstractProcessor { protected static final AllowableValue ROW_ID_ENCODING_STRING = new AllowableValue(STRING_ENCODING_VALUE, STRING_ENCODING_VALUE, "Stores the value of row id as a UTF-8 String."); protected static final AllowableValue ROW_ID_ENCODING_BINARY = new AllowableValue(BINARY_ENCODING_VALUE, BINARY_ENCODING_VALUE, - "Stores the value of the rows id as a binary byte array. It expects that the row id is a binary formated string."); + "Stores the value of the rows id as a binary byte array. It expects that the row id is a binary formatted string."); static final PropertyDescriptor ROW_ID_ENCODING_STRATEGY = new PropertyDescriptor.Builder() .name("Row Identifier Encoding Strategy") - .description("Specifies the data type of Row ID used when inserting data into HBase. The default behaviror is" + + .description("Specifies the data type of Row ID used when inserting data into HBase. The default behavior is" + " to convert the row id to a UTF-8 byte array. Choosing Binary will convert a binary formatted string" + " to the correct byte[] representation. The Binary option should be used if you are using Binary row" + " keys in HBase") diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java index 2d9068f9e1..ee6a53f5be 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestPutHBaseCell.java @@ -83,7 +83,7 @@ public class TestPutHBaseCell { final MockHBaseClientService hBaseClient = getHBaseClientService(runner); final String content = "some content"; - final Map attributes = getAtrributeMapWithEL(tableName, row, columnFamily, columnQualifier); + final Map attributes = getAttributeMapWithEL(tableName, row, columnFamily, columnQualifier); runner.enqueue(content.getBytes("UTF-8"), attributes); runner.run(); @@ -144,7 +144,7 @@ public class TestPutHBaseCell { // this will go to success final String content2 = "some content2"; - final Map attributes = getAtrributeMapWithEL("table", "row", "cf", "cq"); + final Map attributes = getAttributeMapWithEL("table", "row", "cf", "cq"); runner.enqueue(content2.getBytes("UTF-8"), attributes); runner.run(); @@ -167,11 +167,11 @@ public class TestPutHBaseCell { final MockHBaseClientService hBaseClient = getHBaseClientService(runner); final String content1 = "some content1"; - final Map attributes1 = getAtrributeMapWithEL(tableName, row1, columnFamily, columnQualifier); + final Map attributes1 = getAttributeMapWithEL(tableName, row1, columnFamily, columnQualifier); runner.enqueue(content1.getBytes("UTF-8"), attributes1); final String content2 = "some content1"; - final Map attributes2 = getAtrributeMapWithEL(tableName, row2, columnFamily, columnQualifier); + final Map attributes2 = getAttributeMapWithEL(tableName, row2, columnFamily, columnQualifier); runner.enqueue(content2.getBytes("UTF-8"), attributes2); runner.run(); @@ -205,11 +205,11 @@ public class TestPutHBaseCell { hBaseClient.setThrowException(true); final String content1 = "some content1"; - final Map attributes1 = getAtrributeMapWithEL(tableName, row1, columnFamily, columnQualifier); + final Map attributes1 = getAttributeMapWithEL(tableName, row1, columnFamily, columnQualifier); runner.enqueue(content1.getBytes("UTF-8"), attributes1); final String content2 = "some content1"; - final Map attributes2 = getAtrributeMapWithEL(tableName, row2, columnFamily, columnQualifier); + final Map attributes2 = getAttributeMapWithEL(tableName, row2, columnFamily, columnQualifier); runner.enqueue(content2.getBytes("UTF-8"), attributes2); runner.run(); @@ -230,7 +230,7 @@ public class TestPutHBaseCell { final MockHBaseClientService hBaseClient = getHBaseClientService(runner); final String content1 = "some content1"; - final Map attributes1 = getAtrributeMapWithEL(tableName, row, columnFamily, columnQualifier); + final Map attributes1 = getAttributeMapWithEL(tableName, row, columnFamily, columnQualifier); runner.enqueue(content1.getBytes("UTF-8"), attributes1); final String content2 = "some content1"; @@ -299,7 +299,7 @@ public class TestPutHBaseCell { assertEquals(1, runner.getProvenanceEvents().size()); } - private Map getAtrributeMapWithEL(String tableName, String row, String columnFamily, String columnQualifier) { + private Map getAttributeMapWithEL(String tableName, String row, String columnFamily, String columnQualifier) { final Map attributes1 = new HashMap<>(); attributes1.put("hbase.tableName", tableName); attributes1.put("hbase.row", row); diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveQL.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveQL.java index 27a7f01b56..830031224d 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveQL.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/processors/hive/PutHiveQL.java @@ -64,9 +64,9 @@ import java.util.regex.Pattern; + "with the naming convention hiveql.args.N.type and hiveql.args.N.value, where N is a positive integer. The hiveql.args.N.type is expected to be " + "a number indicating the JDBC Type. The content of the FlowFile is expected to be in UTF-8 format.") @ReadsAttributes({ - @ReadsAttribute(attribute = "hiveql.args.N.type", description = "Incoming FlowFiles are expected to be parameterized HiveQL statements. The type of each Parameter is specified as an integer " + @ReadsAttribute(attribute = "hiveql.args.N.type", description = "Incoming FlowFiles are expected to be parametrized HiveQL statements. The type of each Parameter is specified as an integer " + "that represents the JDBC Type of the parameter."), - @ReadsAttribute(attribute = "hiveql.args.N.value", description = "Incoming FlowFiles are expected to be parameterized HiveQL statements. The value of the Parameters are specified as " + @ReadsAttribute(attribute = "hiveql.args.N.value", description = "Incoming FlowFiles are expected to be parametrized HiveQL statements. The value of the Parameters are specified as " + "hiveql.args.1.value, hiveql.args.2.value, hiveql.args.3.value, and so on. The type of the hiveql.args.1.value Parameter is specified by the hiveql.args.1.type attribute.") }) public class PutHiveQL extends AbstractHiveQLProcessor { diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHiveQL.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHiveQL.java index 8142e3f0d8..6ce21e97d0 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHiveQL.java +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHiveQL.java @@ -165,7 +165,7 @@ public class TestSelectHiveQL { stmt.execute("create table TEST_NO_ROWS (id integer)"); runner.setIncomingConnection(false); - // Try a valid SQL statment that will generate an error (val1 does not exist, e.g.) + // Try a valid SQL statement that will generate an error (val1 does not exist, e.g.) runner.setProperty(SelectHiveQL.HIVEQL_SELECT_QUERY, "SELECT val1 FROM TEST_NO_ROWS"); runner.run(); diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/main/java/org/apache/nifi/AbstractHTMLProcessor.java b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/main/java/org/apache/nifi/AbstractHTMLProcessor.java index 20dca29219..127f0d86a0 100644 --- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/main/java/org/apache/nifi/AbstractHTMLProcessor.java +++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/main/java/org/apache/nifi/AbstractHTMLProcessor.java @@ -102,7 +102,7 @@ public abstract class AbstractHTMLProcessor extends AbstractProcessor { public static final Relationship REL_NOT_FOUND = new Relationship.Builder() .name("element not found") .description("Element could not be found in the HTML document. The original HTML input will remain " + - "in the flowfile content unchanged. Relationship '" + REL_ORIGINAL + "' will not be invoked " + + "in the FlowFile content unchanged. Relationship '" + REL_ORIGINAL + "' will not be invoked " + "in this scenario.") .build(); diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/PutIgniteCache.java b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/PutIgniteCache.java index c61649f7b8..316ed8f9bf 100644 --- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/PutIgniteCache.java +++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/cache/PutIgniteCache.java @@ -59,7 +59,7 @@ import org.apache.nifi.stream.io.StreamUtils; @CapabilityDescription("Stream the contents of a FlowFile to Ignite Cache using DataStreamer. " + "The processor uses the value of FlowFile attribute (Ignite cache entry key) as the " + "cache key and the byte array of the FlowFile as the value of the cache entry value. Both the string key and a " + - " non-empty byte array value are required otherwise the FlowFile is transfered to the failure relation. " + + " non-empty byte array value are required otherwise the FlowFile is transferred to the failure relation. " + "Note - The Ignite Kernel periodically outputs node performance statistics to the logs. This message " + " can be turned off by setting the log level for logger 'org.apache.ignite' to WARN in the logback.xml configuration file.") @WritesAttributes({ @@ -208,7 +208,7 @@ public class PutIgniteCache extends AbstractIgniteCacheProcessor { * Initialize ignite cache */ @OnScheduled - public final void initilizeIgniteDataStreamer(ProcessContext context) throws ProcessException { + public final void initializeIgniteDataStreamer(ProcessContext context) throws ProcessException { super.initializeIgniteCache(context); if ( getIgniteDataStreamer() != null ) { diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/test/java/org/apache/nifi/processors/ignite/cache/TestPutIgniteCache.java b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/test/java/org/apache/nifi/processors/ignite/cache/TestPutIgniteCache.java index eebb2372ba..56397951ee 100644 --- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/test/java/org/apache/nifi/processors/ignite/cache/TestPutIgniteCache.java +++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/test/java/org/apache/nifi/processors/ignite/cache/TestPutIgniteCache.java @@ -92,8 +92,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_SUCCESS, 1); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(1, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(1, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(0, failureFlowFiles.size()); @@ -123,8 +123,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_SUCCESS, 1); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(1, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(1, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(0, failureFlowFiles.size()); @@ -156,8 +156,8 @@ public class TestPutIgniteCache { runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_SUCCESS, 2); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(2, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(2, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(0, failureFlowFiles.size()); @@ -201,8 +201,8 @@ public class TestPutIgniteCache { runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_SUCCESS, 2); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(2, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(2, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(0, failureFlowFiles.size()); @@ -245,8 +245,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_FAILURE, 1); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(0, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(0, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(1, failureFlowFiles.size()); @@ -277,8 +277,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_FAILURE, 1); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(0, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(0, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(1, failureFlowFiles.size()); @@ -310,8 +310,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_SUCCESS, 2); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(2, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(2, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(0, failureFlowFiles.size()); @@ -355,8 +355,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_FAILURE, 2); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(0, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(0, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(2, failureFlowFiles.size()); @@ -400,8 +400,8 @@ public class TestPutIgniteCache { runner.enqueue("test2".getBytes(),properties2); runner.run(1, false, true); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(1, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(1, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(1, failureFlowFiles.size()); @@ -445,8 +445,8 @@ public class TestPutIgniteCache { runner.enqueue("test2".getBytes()); runner.run(1, false, true); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(1, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(1, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(1, failureFlowFiles.size()); @@ -492,8 +492,8 @@ public class TestPutIgniteCache { runner.run(1, false, true); runner.assertAllFlowFilesTransferred(PutIgniteCache.REL_FAILURE, 2); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(0, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(0, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(2, failureFlowFiles.size()); @@ -538,8 +538,8 @@ public class TestPutIgniteCache { runner.enqueue("".getBytes(),properties2); runner.run(1, false, true); - List sucessfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); - assertEquals(1, sucessfulFlowFiles.size()); + List successfulFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_SUCCESS); + assertEquals(1, successfulFlowFiles.size()); List failureFlowFiles = runner.getFlowFilesForRelationship(PutIgniteCache.REL_FAILURE); assertEquals(2, failureFlowFiles.size()); diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java index c4608be116..32ff78c629 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java @@ -117,7 +117,7 @@ public class JMSConnectionFactoryProvider extends AbstractControllerService impl if (!this.configured) { if (logger.isInfoEnabled()) { logger.info("Configuring " + this.getClass().getSimpleName() + " for '" - + context.getProperty(CONNECTION_FACTORY_IMPL).evaluateAttributeExpressions().getValue() + "' to be conected to '" + + context.getProperty(CONNECTION_FACTORY_IMPL).evaluateAttributeExpressions().getValue() + "' to be connected to '" + BROKER_URI + "'"); } // will load user provided libraries/resources on the classpath diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java index aea6c9cb36..b76a1a777d 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java @@ -118,7 +118,7 @@ public class ConsumeJMS extends AbstractJMSProcessor { /** * Copies JMS attributes (i.e., headers and properties) as FF attributes. * Given that FF attributes mandate that values are of type String, the - * copied values of JMS attributes will be stringified via + * copied values of JMS attributes will be "stringified" via * String.valueOf(attribute). */ private FlowFile updateFlowFileAttributesWithJMSAttributes(Map jmsAttributes, FlowFile flowFile, diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka_0_10.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka_0_10.java index 41c8cc6521..b061fcc67b 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka_0_10.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka_0_10.java @@ -81,7 +81,7 @@ public class ConsumeKafka_0_10 extends AbstractProcessor { static final PropertyDescriptor TOPICS = new PropertyDescriptor.Builder() .name("topic") .displayName("Topic Name(s)") - .description("The name of the Kafka Topic(s) to pull from. More than one can be supplied if comma seperated.") + .description("The name of the Kafka Topic(s) to pull from. More than one can be supplied if comma separated.") .required(true) .addValidator(StandardValidators.NON_BLANK_VALIDATOR) .expressionLanguageSupported(true) diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java index c611fa2997..97ebfc6ee7 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java @@ -108,7 +108,7 @@ public abstract class ConsumerLease implements Closeable, ConsumerRebalanceListe @Override public void onPartitionsRevoked(final Collection partitions) { logger.debug("Rebalance Alert: Paritions '{}' revoked for lease '{}' with consumer '{}'", new Object[]{partitions, this, kafkaConsumer}); - //force a commit here. Can reuse the session and consumer after this but must commit now to avoid duplicates if kafka reassigns parittion + //force a commit here. Can reuse the session and consumer after this but must commit now to avoid duplicates if kafka reassigns partition commit(); } diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java index 76603059a2..eb833df4f3 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java @@ -80,7 +80,7 @@ import kafka.message.MessageAndMetadata; @DynamicProperty(name = "The name of a Kafka configuration property.", value = "The value of a given Kafka configuration property.", description = "These properties will be added on the Kafka configuration after loading any provided configuration properties." + " In the event a dynamic property represents a property that was already set as part of the static properties, its value wil be" - + " overriden with warning message describing the override." + + " overridden with warning message describing the override." + " For the list of available Kafka properties please refer to: http://kafka.apache.org/documentation.html#configuration.") public class GetKafka extends AbstractProcessor { diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaUtils.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaUtils.java index 8ddea61907..2fbc9aea62 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaUtils.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/KafkaUtils.java @@ -28,7 +28,7 @@ import kafka.utils.ZKStringSerializer; import scala.collection.JavaConversions; /** - * Utility class to support interruction with Kafka internals. + * Utility class to support interaction with Kafka internals. * */ class KafkaUtils { diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java index 4dc8d189a5..008c731c4d 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java @@ -272,9 +272,9 @@ public class PutKafka extends AbstractKafkaProcessor { * Will rendezvous with Kafka if {@link ProcessSession} contains {@link FlowFile} * producing a result {@link FlowFile}. *
- * The result {@link FlowFile} that is successful is then transfered to {@link #REL_SUCCESS} + * The result {@link FlowFile} that is successful is then transferred to {@link #REL_SUCCESS} *
- * The result {@link FlowFile} that is failed is then transfered to {@link #REL_FAILURE} + * The result {@link FlowFile} that is failed is then transferred to {@link #REL_FAILURE} * */ @Override diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/GetKafkaIntegrationTests.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/GetKafkaIntegrationTests.java index effc8e7a2d..09098ff4fe 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/GetKafkaIntegrationTests.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/GetKafkaIntegrationTests.java @@ -41,7 +41,7 @@ public class GetKafkaIntegrationTests { private static EmbeddedKafkaProducerHelper producerHelper; @BeforeClass - public static void bforeClass(){ + public static void beforeClass(){ kafkaLocal = new EmbeddedKafka(); kafkaLocal.start(); producerHelper = new EmbeddedKafkaProducerHelper(kafkaLocal); diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/resources/server.properties b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/resources/server.properties index 9c44acc522..ec4c25aee0 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/resources/server.properties +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/resources/server.properties @@ -54,7 +54,7 @@ socket.request.max.bytes=104857600 ############################# Log Basics ############################# -# A comma seperated list of directories under which to store log files +# A comma separated list of directories under which to store log files log.dirs=target/kafka-tmp/kafka-logs # The default number of log partitions per topic. More partitions allow greater diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka.java index c311e2a7bb..5792e64189 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka.java +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafka.java @@ -81,7 +81,7 @@ public class ConsumeKafka extends AbstractProcessor { static final PropertyDescriptor TOPICS = new PropertyDescriptor.Builder() .name("topic") .displayName("Topic Name(s)") - .description("The name of the Kafka Topic(s) to pull from. More than one can be supplied if comma seperated.") + .description("The name of the Kafka Topic(s) to pull from. More than one can be supplied if comma separated.") .required(true) .addValidator(StandardValidators.NON_BLANK_VALIDATOR) .expressionLanguageSupported(true) diff --git a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/test/java/org/apache/nifi/processors/lumberjack/handler/TestLumberjackFrameHandler.java b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/test/java/org/apache/nifi/processors/lumberjack/handler/TestLumberjackFrameHandler.java index aea5961dbc..4a73b30288 100644 --- a/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/test/java/org/apache/nifi/processors/lumberjack/handler/TestLumberjackFrameHandler.java +++ b/nifi-nar-bundles/nifi-lumberjack-bundle/nifi-lumberjack-processors/src/test/java/org/apache/nifi/processors/lumberjack/handler/TestLumberjackFrameHandler.java @@ -92,7 +92,7 @@ public class TestLumberjackFrameHandler { 0x00, 0x00, 0x00, 0x02, // Number of pairs 0x00, 0x00, 0x00, 0x04, // Length of first pair key ('line') 0x6C, 0x69, 0x6E, 0x65, // 'line' - 0x00, 0x00, 0x00, 0x0C, // Lenght of 'test-content' + 0x00, 0x00, 0x00, 0x0C, // Length of 'test-content' 0x74, 0x65, 0x73, 0x74, // 0x2d, 0x63, 0x6f, 0x6e, // 'test-content' 0x74, 0x65, 0x6e, 0x74, // diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java index 9dc340ada1..80a67ebd4b 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java @@ -1980,7 +1980,7 @@ public class TestPersistentProvenanceRepository { final ProvenanceEventRecord record = builder.build(); try { repo.registerEvent(record); - Assert.fail("Expected OutOfMmeoryError but was able to register event"); + Assert.fail("Expected OutOfMemoryError but was able to register event"); } catch (final OutOfMemoryError oome) { } } @@ -1991,7 +1991,7 @@ public class TestPersistentProvenanceRepository { final ProvenanceEventRecord record = builder.build(); try { repo.registerEvent(record); - Assert.fail("Expected OutOfMmeoryError but was able to register event"); + Assert.fail("Expected OutOfMemoryError but was able to register event"); } catch (final IllegalStateException ise) { } } diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/test/java/org/apache/nifi/ranger/authorization/TestRangerNiFiAuthorizer.java b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/test/java/org/apache/nifi/ranger/authorization/TestRangerNiFiAuthorizer.java index 1bfa1b3fcf..46084c4c43 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/test/java/org/apache/nifi/ranger/authorization/TestRangerNiFiAuthorizer.java +++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/test/java/org/apache/nifi/ranger/authorization/TestRangerNiFiAuthorizer.java @@ -139,7 +139,7 @@ public class TestRangerNiFiAuthorizer { Assert.fail("Should have thrown exception"); } catch (AuthorizerCreationException e) { // want to make sure this exception is from our authorizer code - veryifyOnlyAuthorizerCreationExceptions(e); + verifyOnlyAuthorizeCreationExceptions(e); } } @@ -159,7 +159,7 @@ public class TestRangerNiFiAuthorizer { Assert.fail("Should have thrown exception"); } catch (AuthorizerCreationException e) { // want to make sure this exception is from our authorizer code - veryifyOnlyAuthorizerCreationExceptions(e); + verifyOnlyAuthorizeCreationExceptions(e); } } @@ -180,11 +180,11 @@ public class TestRangerNiFiAuthorizer { Assert.fail("Should have thrown exception"); } catch (AuthorizerCreationException e) { // want to make sure this exception is from our authorizer code - veryifyOnlyAuthorizerCreationExceptions(e); + verifyOnlyAuthorizeCreationExceptions(e); } } - private void veryifyOnlyAuthorizerCreationExceptions(AuthorizerCreationException e) { + private void verifyOnlyAuthorizeCreationExceptions(AuthorizerCreationException e) { boolean foundOtherException = false; Throwable cause = e.getCause(); while (cause != null) { diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/test/java/org/apache/nifi/processors/twitter/TestGetTwitter.java b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/test/java/org/apache/nifi/processors/twitter/TestGetTwitter.java index 132fa178ba..e56be67e3d 100644 --- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/test/java/org/apache/nifi/processors/twitter/TestGetTwitter.java +++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/test/java/org/apache/nifi/processors/twitter/TestGetTwitter.java @@ -28,7 +28,7 @@ public class TestGetTwitter { runner.setProperty(GetTwitter.ENDPOINT, GetTwitter.ENDPOINT_FILTER); runner.setProperty(GetTwitter.CONSUMER_KEY, "consumerKey"); runner.setProperty(GetTwitter.CONSUMER_SECRET, "consumerSecret"); - runner.setProperty(GetTwitter.ACCESS_TOKEN, "acessToken"); + runner.setProperty(GetTwitter.ACCESS_TOKEN, "accessToken"); runner.setProperty(GetTwitter.ACCESS_TOKEN_SECRET, "accessTokenSecret"); runner.setProperty(GetTwitter.LOCATIONS, "-122.75,36.8,-121.75,37.8,-74,40,-73,41"); runner.assertValid(); @@ -40,7 +40,7 @@ public class TestGetTwitter { runner.setProperty(GetTwitter.ENDPOINT, GetTwitter.ENDPOINT_FILTER); runner.setProperty(GetTwitter.CONSUMER_KEY, "consumerKey"); runner.setProperty(GetTwitter.CONSUMER_SECRET, "consumerSecret"); - runner.setProperty(GetTwitter.ACCESS_TOKEN, "acessToken"); + runner.setProperty(GetTwitter.ACCESS_TOKEN, "accessToken"); runner.setProperty(GetTwitter.ACCESS_TOKEN_SECRET, "accessTokenSecret"); runner.setProperty(GetTwitter.LOCATIONS, "-122.75,36.8,-121.75,37.8,-74,40,-73,40"); runner.assertNotValid(); @@ -52,7 +52,7 @@ public class TestGetTwitter { runner.setProperty(GetTwitter.ENDPOINT, GetTwitter.ENDPOINT_FILTER); runner.setProperty(GetTwitter.CONSUMER_KEY, "consumerKey"); runner.setProperty(GetTwitter.CONSUMER_SECRET, "consumerSecret"); - runner.setProperty(GetTwitter.ACCESS_TOKEN, "acessToken"); + runner.setProperty(GetTwitter.ACCESS_TOKEN, "accessToken"); runner.setProperty(GetTwitter.ACCESS_TOKEN_SECRET, "accessTokenSecret"); runner.setProperty(GetTwitter.LOCATIONS, "-122.75,36.8,-121.75,37.8,-74,40,-74,41"); runner.assertNotValid(); @@ -64,7 +64,7 @@ public class TestGetTwitter { runner.setProperty(GetTwitter.ENDPOINT, GetTwitter.ENDPOINT_FILTER); runner.setProperty(GetTwitter.CONSUMER_KEY, "consumerKey"); runner.setProperty(GetTwitter.CONSUMER_SECRET, "consumerSecret"); - runner.setProperty(GetTwitter.ACCESS_TOKEN, "acessToken"); + runner.setProperty(GetTwitter.ACCESS_TOKEN, "accessToken"); runner.setProperty(GetTwitter.ACCESS_TOKEN_SECRET, "accessTokenSecret"); runner.setProperty(GetTwitter.LOCATIONS, "-122.75,36.8,-121.75,37.8,-74,40,-73,39"); runner.assertNotValid(); @@ -76,7 +76,7 @@ public class TestGetTwitter { runner.setProperty(GetTwitter.ENDPOINT, GetTwitter.ENDPOINT_FILTER); runner.setProperty(GetTwitter.CONSUMER_KEY, "consumerKey"); runner.setProperty(GetTwitter.CONSUMER_SECRET, "consumerSecret"); - runner.setProperty(GetTwitter.ACCESS_TOKEN, "acessToken"); + runner.setProperty(GetTwitter.ACCESS_TOKEN, "accessToken"); runner.setProperty(GetTwitter.ACCESS_TOKEN_SECRET, "accessTokenSecret"); runner.setProperty(GetTwitter.LOCATIONS, "-122.75,36.8,-121.75,37.8,-74,40,-75,41"); runner.assertNotValid(); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java index 5b9f5b46f3..054d1d871b 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java @@ -141,7 +141,7 @@ public abstract class PutFileTransfer extends AbstractPr stopWatch.stop(); final String dataRate = stopWatch.calculateDataRate(flowFile.getSize()); final long millis = stopWatch.getDuration(TimeUnit.MILLISECONDS); - logger.info("Successfully transfered {} to {} on remote host {} in {} milliseconds at a rate of {}", + logger.info("Successfully transferred {} to {} on remote host {} in {} milliseconds at a rate of {}", new Object[]{flowFile, fullPathRef.get(), hostname, millis, dataRate}); String fullPathWithSlash = fullPathRef.get(); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java index 8e87c56727..eb27d407f8 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java @@ -89,12 +89,12 @@ import java.util.regex.Pattern; + "are needed to complete the transaction."), @ReadsAttribute(attribute = "fragment.index", description = "If the property is true, this attribute is used to determine the order that the FlowFiles " + "in a transaction should be evaluated."), - @ReadsAttribute(attribute = "sql.args.N.type", description = "Incoming FlowFiles are expected to be parameterized SQL statements. The type of each Parameter is specified as an integer " + @ReadsAttribute(attribute = "sql.args.N.type", description = "Incoming FlowFiles are expected to be parametrized SQL statements. The type of each Parameter is specified as an integer " + "that represents the JDBC Type of the parameter."), - @ReadsAttribute(attribute = "sql.args.N.value", description = "Incoming FlowFiles are expected to be parameterized SQL statements. The value of the Parameters are specified as " + @ReadsAttribute(attribute = "sql.args.N.value", description = "Incoming FlowFiles are expected to be parametrized SQL statements. The value of the Parameters are specified as " + "sql.args.1.value, sql.args.2.value, sql.args.3.value, and so on. The type of the sql.args.1.value Parameter is specified by the sql.args.1.type attribute."), @ReadsAttribute(attribute = "sql.args.N.format", description = "This attribute is always optional, but default options may not always work for your data. " - + "Incoming FlowFiles are expected to be parameterized SQL statements. In some cases " + + "Incoming FlowFiles are expected to be parametrized SQL statements. In some cases " + "a format option needs to be specified, currently this is only applicable for binary data types. For binary data types " + "available options are 'ascii', 'base64' and 'hex'. In 'ascii' format each string character in your attribute value represents a single byte, this is the default format " + "and the format provided by Avro Processors. In 'base64' format your string is a Base64 encoded string. In 'hex' format the string is hex encoded with all " diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java index a542048df7..9b20ec6b31 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java @@ -93,7 +93,7 @@ public class ReplaceText extends AbstractProcessor { "Insert the Replacement Value at the beginning of the FlowFile or the beginning of each line (depending on the Evaluation Mode). For \"Line-by-Line\" Evaluation Mode, " + "the value will be prepended to each line. For \"Entire Text\" evaluation mode, the value will be prepended to the entire text."); static final AllowableValue APPEND = new AllowableValue(appendValue, appendValue, - "Insert the Replacement Value at the end of the FlowFile or the end of each line (depending on the Evluation Mode). For \"Line-by-Line\" Evaluation Mode, " + "Insert the Replacement Value at the end of the FlowFile or the end of each line (depending on the Evaluation Mode). For \"Line-by-Line\" Evaluation Mode, " + "the value will be appended to each line. For \"Entire Text\" evaluation mode, the value will be appended to the entire text."); static final AllowableValue LITERAL_REPLACE = new AllowableValue(literalReplaceValue, literalReplaceValue, "Search for all instances of the Search Value and replace the matches with the Replacement Value."); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java index 64877f2d6f..5e0b892694 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java @@ -64,7 +64,7 @@ import org.apache.nifi.stream.io.StreamUtils; + "content. User-Defined properties do support the Attribute Expression Language, but the results are interpreted as " + "literal values, not Regular Expressions") @DynamicProperty(name = "Relationship Name", value = "A Regular Expression", supportsExpressionLanguage = true, description = "Routes FlowFiles whose " - + "content matches the regular expressoin defined by Dynamic Property's value to the Relationship defined by the Dynamic Property's key") + + "content matches the regular expression defined by Dynamic Property's value to the Relationship defined by the Dynamic Property's key") @DynamicRelationship(name = "Name from Dynamic Property", description = "FlowFiles that match the Dynamic Property's Regular Expression") public class RouteOnContent extends AbstractProcessor { diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java index e90a3a1c69..cb5726a0bf 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java @@ -263,11 +263,11 @@ public class TransformXml extends AbstractProcessor { } else { String error = null; final File stylesheet = new File(input); - final TransformerFactory tfactory = new net.sf.saxon.TransformerFactoryImpl(); + final TransformerFactory tFactory = new net.sf.saxon.TransformerFactoryImpl(); final StreamSource styleSource = new StreamSource(stylesheet); try { - tfactory.newTransformer(styleSource); + tFactory.newTransformer(styleSource); } catch (final Exception e) { error = e.toString(); } diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PGPUtil.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PGPUtil.java index 74826400c7..8f6646195b 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PGPUtil.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/PGPUtil.java @@ -65,7 +65,7 @@ public class PGPUtil { } try { - // TODO: Can probably hardcode provider to BC and remove one method parameter + // TODO: Can probably hard-code provider to BC and remove one method parameter PGPEncryptedDataGenerator encryptedDataGenerator = new PGPEncryptedDataGenerator( new JcePGPDataEncryptorBuilder(cipher).setWithIntegrityPacket(true).setSecureRandom(new SecureRandom()).setProvider(provider)); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteSQL.java index 5e2a64a117..ebca87e09d 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteSQL.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteSQL.java @@ -189,7 +189,7 @@ public class TestExecuteSQL { stmt.execute("create table TEST_NO_ROWS (id integer)"); runner.setIncomingConnection(false); - // Try a valid SQL statment that will generate an error (val1 does not exist, e.g.) + // Try a valid SQL statement that will generate an error (val1 does not exist, e.g.) runner.setProperty(ExecuteSQL.SQL_SELECT_QUERY, "SELECT val1 FROM TEST_NO_ROWS"); runner.run(); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java index 84292cc5da..d08f0833ff 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java @@ -140,7 +140,7 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon { runner.run(); Assert.fail(); } catch (AssertionError e){ - // Expect assetion error when proxy port isn't set but host is. + // Expect assertion error when proxy port isn't set but host is. } runner.setProperty(InvokeHTTP.PROP_PROXY_PORT, String.valueOf(proxyURL.getPort())); @@ -150,7 +150,7 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon { runner.run(); Assert.fail(); } catch (AssertionError e){ - // Expect assetion error when proxy password isn't set but host is. + // Expect assertion error when proxy password isn't set but host is. } runner.setProperty(InvokeHTTP.PROP_PROXY_PASSWORD, "password"); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java index 413ac7c1c2..f96ff228c6 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenSyslog.java @@ -89,15 +89,15 @@ public class TestListenSyslog { // call onTrigger until we read all datagrams, or 30 seconds passed try { - int numTransfered = 0; + int numTransferred = 0; long timeout = System.currentTimeMillis() + 30000; - while (numTransfered < numMessages && System.currentTimeMillis() < timeout) { + while (numTransferred < numMessages && System.currentTimeMillis() < timeout) { Thread.sleep(10); proc.onTrigger(context, processSessionFactory); - numTransfered = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); + numTransferred = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); } - Assert.assertEquals("Did not process all the datagrams", numMessages, numTransfered); + Assert.assertEquals("Did not process all the datagrams", numMessages, numTransferred); MockFlowFile flowFile = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).get(0); checkFlowFile(flowFile, 0, ListenSyslog.UDP_VALUE.getValue()); @@ -142,15 +142,15 @@ public class TestListenSyslog { // call onTrigger until we read all messages, or 30 seconds passed try { - int numTransfered = 0; + int nubTransferred = 0; long timeout = System.currentTimeMillis() + 30000; - while (numTransfered < numMessages && System.currentTimeMillis() < timeout) { + while (nubTransferred < numMessages && System.currentTimeMillis() < timeout) { Thread.sleep(10); proc.onTrigger(context, processSessionFactory); - numTransfered = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); + nubTransferred = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); } - Assert.assertEquals("Did not process all the messages", numMessages, numTransfered); + Assert.assertEquals("Did not process all the messages", numMessages, nubTransferred); MockFlowFile flowFile = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).get(0); checkFlowFile(flowFile, 0, ListenSyslog.TCP_VALUE.getValue()); @@ -193,15 +193,15 @@ public class TestListenSyslog { // call onTrigger until we read all messages, or 30 seconds passed try { - int numTransfered = 0; + int nubTransferred = 0; long timeout = System.currentTimeMillis() + 30000; - while (numTransfered < numMessages && System.currentTimeMillis() < timeout) { + while (nubTransferred < numMessages && System.currentTimeMillis() < timeout) { Thread.sleep(10); proc.onTrigger(context, processSessionFactory); - numTransfered = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); + nubTransferred = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); } - Assert.assertEquals("Did not process all the messages", numMessages, numTransfered); + Assert.assertEquals("Did not process all the messages", numMessages, nubTransferred); MockFlowFile flowFile = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).get(0); checkFlowFile(flowFile, 0, ListenSyslog.TCP_VALUE.getValue()); @@ -244,15 +244,15 @@ public class TestListenSyslog { // call onTrigger until we read all messages, or 30 seconds passed try { - int numTransfered = 0; + int nubTransferred = 0; long timeout = System.currentTimeMillis() + 30000; - while (numTransfered < numMessages && System.currentTimeMillis() < timeout) { + while (nubTransferred < numMessages && System.currentTimeMillis() < timeout) { Thread.sleep(10); proc.onTrigger(context, processSessionFactory); - numTransfered = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); + nubTransferred = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).size(); } - Assert.assertEquals("Did not process all the messages", numMessages, numTransfered); + Assert.assertEquals("Did not process all the messages", numMessages, nubTransferred); MockFlowFile flowFile = runner.getFlowFilesForRelationship(ListenSyslog.REL_SUCCESS).get(0); checkFlowFile(flowFile, 0, ListenSyslog.TCP_VALUE.getValue()); @@ -347,17 +347,17 @@ public class TestListenSyslog { // call onTrigger until we read all messages, or 30 seconds passed try { - int numTransfered = 0; + int nubTransferred = 0; long timeout = System.currentTimeMillis() + 30000; - while (numTransfered < numMessages && System.currentTimeMillis() < timeout) { + while (nubTransferred < numMessages && System.currentTimeMillis() < timeout) { Thread.sleep(50); proc.onTrigger(context, processSessionFactory); - numTransfered = runner.getFlowFilesForRelationship(ListenSyslog.REL_INVALID).size(); + nubTransferred = runner.getFlowFilesForRelationship(ListenSyslog.REL_INVALID).size(); } // all messages should be transferred to invalid - Assert.assertEquals("Did not process all the messages", numMessages, numTransfered); + Assert.assertEquals("Did not process all the messages", numMessages, nubTransferred); } finally { // unschedule to close connections diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java index d94d4acbf4..b6c997e94a 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java @@ -172,7 +172,7 @@ public class TestListenUDP { } @Test - public void testRunWhenNoEventsAvailale() throws IOException, InterruptedException { + public void testRunWhenNoEventsAvailable() throws IOException, InterruptedException { final List mockEvents = new ArrayList<>(); MockListenUDP mockListenUDP = new MockListenUDP(mockEvents); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java index cd06ba060d..e738759049 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java @@ -107,7 +107,7 @@ public class TestMergeContent { final MockFlowFile bundle = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0); bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/avro-binary"); - // create a reader for the merged contet + // create a reader for the merged content byte[] data = runner.getContentAsByteArray(bundle); final Map users = getGenericRecordMap(data, schema, "name"); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java index 9e08e867e4..bd375e470d 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java @@ -223,7 +223,7 @@ public class TestMonitorActivity { List inactiveFlowFiles = runner.getFlowFilesForRelationship(MonitorActivity.REL_INACTIVE); if (inactiveFlowFiles.size() == 1) { // Seems Threshold was not sufficient, which has caused One inactive message. - // Step-up and rerun the test until successful or jUnit Timesout + // Step-up and rerun the test until successful or jUnit times out threshold += threshold; rerun = true; } else { diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutDistributedMapCache.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutDistributedMapCache.java index 05d4293661..9bd649b9f3 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutDistributedMapCache.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutDistributedMapCache.java @@ -53,7 +53,7 @@ public class TestPutDistributedMapCache { @Test public void testNoCacheKey() throws InitializationException { - runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${caheKeyAttribute}"); + runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${cacheKeyAttribute}"); runner.enqueue(new byte[] {}); runner.run(); @@ -66,10 +66,10 @@ public class TestPutDistributedMapCache { @Test public void testSingleFlowFile() throws InitializationException, IOException { - runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${caheKeyAttribute}"); + runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${cacheKeyAttribute}"); final Map props = new HashMap<>(); - props.put("caheKeyAttribute", "1"); + props.put("cacheKeyAttribute", "1"); String flowFileContent = "content"; runner.enqueue(flowFileContent.getBytes("UTF-8"), props); @@ -90,10 +90,10 @@ public class TestPutDistributedMapCache { @Test public void testNothingToCache() throws InitializationException, IOException { - runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${caheKeyAttribute}"); + runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${cacheKeyAttribute}"); final Map props = new HashMap<>(); - props.put("caheKeyAttribute", "2"); + props.put("cacheKeyAttribute", "2"); // flow file without content runner.enqueue(new byte[] {}, props); @@ -132,11 +132,11 @@ public class TestPutDistributedMapCache { @Test public void testCacheStrategyReplace() throws InitializationException, IOException { - runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${caheKeyAttribute}"); + runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${cacheKeyAttribute}"); runner.setProperty(PutDistributedMapCache.CACHE_UPDATE_STRATEGY, PutDistributedMapCache.CACHE_UPDATE_REPLACE.getValue()); final Map props = new HashMap<>(); - props.put("caheKeyAttribute", "replaceme"); + props.put("cacheKeyAttribute", "replaceme"); String original = "original"; runner.enqueue(original.getBytes("UTF-8"), props); @@ -176,11 +176,11 @@ public class TestPutDistributedMapCache { @Test public void testCacheStrategyKeepOriginal() throws InitializationException, IOException { - runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${caheKeyAttribute}"); + runner.setProperty(PutDistributedMapCache.CACHE_ENTRY_IDENTIFIER, "${cacheKeyAttribute}"); runner.setProperty(PutDistributedMapCache.CACHE_UPDATE_STRATEGY, PutDistributedMapCache.CACHE_UPDATE_KEEP_ORIGINAL.getValue()); final Map props = new HashMap<>(); - props.put("caheKeyAttribute", "replaceme"); + props.put("cacheKeyAttribute", "replaceme"); String original = "original"; runner.enqueue(original.getBytes("UTF-8"), props); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java index b65bff1016..94937deb7e 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java @@ -84,7 +84,7 @@ public class TestReplaceText { } @Test - public void testWithUnEscaped$InReplacemenmt() throws IOException { + public void testWithUnEscaped$InReplacement() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); runner.setProperty(ReplaceText.SEARCH_VALUE, "(?s:^.*$)"); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java index 4b87387fcc..e6fedd3309 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java @@ -81,7 +81,7 @@ public class TestScanContent { while (!runner.isQueueEmpty()) { runner.run(3); - try { //must insert this deley or flowfiles are made so close together they become out of order in the queu + try { //must insert this delay or flowfiles are made so close together they become out of order in the queue Thread.sleep(500); } catch (InterruptedException ex) { //moving on diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java index 81be148ccf..9817532333 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java @@ -456,7 +456,7 @@ public class StandardSSLContextService extends AbstractControllerService impleme final int numProtocols = supportedProtocols.size(); - // Sort for consistent presentation in configuraiton views + // Sort for consistent presentation in configuration views final List supportedProtocolList = new ArrayList<>(supportedProtocols); Collections.sort(supportedProtocolList); diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java index d267bf71b3..08f4ee9ebc 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java @@ -351,7 +351,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable { // is cloned for each matching rule. in 'use original' mode, this collection // will contain a single entry that maps a list of multiple rules. this is // because is the original flowfile is used for all matching rules. in this - // case the order of the matching rules is perserved in the list + // case the order of the matching rules is preserved in the list final Map> matchedRules = new HashMap<>(); for (FlowFile flowFile : flowFiles) {