You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2016/09/26 15:57:31 UTC
[1/2] nifi git commit: NIFI-2816 - Clean typos across the code
Repository: nifi
Updated Branches:
refs/heads/master 1b88552b4 -> 446cd4470
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
index 84bf7b3..33c162a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/StandardAuthorizableLookup.java
@@ -392,8 +392,8 @@ class StandardAuthorizableLookup implements AuthorizableLookup {
}
@Override
- public Authorizable getControllerServiceReferencingComponent(String controllerSeriveId, String id) {
- final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerSeriveId);
+ public Authorizable getControllerServiceReferencingComponent(String controllerServiceId, String id) {
+ final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceId);
final ControllerServiceReference referencingComponents = controllerService.getReferences();
final ConfiguredComponent reference = findControllerServiceReferencingComponent(referencingComponents, id);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
----------------------------------------------------------------------
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/StandardReportingTaskDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
index e3cf89b..ac3d9d5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
@@ -276,7 +276,7 @@ public class StandardReportingTaskDAO extends ComponentDAO implements ReportingT
reportingTask.setName(name);
}
if (isNotNull(schedulingPeriod)) {
- reportingTask.setScheduldingPeriod(schedulingPeriod);
+ reportingTask.setSchedulingPeriod(schedulingPeriod);
}
if (isNotNull(annotationData)) {
reportingTask.setAnnotationData(annotationData);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
index 967f652..508a0d1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestLoginIdentityProvider.java
@@ -41,7 +41,7 @@ public class NiFiTestLoginIdentityProvider implements LoginIdentityProvider {
*/
public NiFiTestLoginIdentityProvider() {
users = new HashMap<>();
- users.put("user@nifi", "whateve");
+ users.put("user@nifi", "whatever");
users.put("unregistered-user@nifi", "password");
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
index 5a34cbc..ee3bc4f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
@@ -54,7 +54,7 @@ public final class DownloadableContent {
/**
* The content stream.
*
- * @return the intput stream of the content
+ * @return the input stream of the content
*/
public InputStream getContent() {
return content;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/java/org/apache/nifi/web/ContentViewerController.java
----------------------------------------------------------------------
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 00dc06f..cec7e8e 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
@@ -117,7 +117,7 @@ public class ContentViewerController extends HttpServlet {
return;
} catch (final Exception e) {
request.setAttribute("title", "Error");
- request.setAttribute("messages", "An unexcepted error has occurred: " + e.getMessage());
+ request.setAttribute("messages", "An unexpected error has occurred: " + e.getMessage());
// forward to the error page
final ServletContext viewerContext = servletContext.getContext("/nifi");
@@ -147,7 +147,7 @@ public class ContentViewerController extends HttpServlet {
return;
}
- // buffer the content to support reseting in case we need to detect the content type or char encoding
+ // buffer the content to support resetting in case we need to detect the content type or char encoding
try (final BufferedInputStream bis = new BufferedInputStream(downloadableContent.getContent());) {
final String mimeType;
final String normalizedMimeType;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
index 58a30f5..0145b3b 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/ByteFilteringOutputStream.java
@@ -130,9 +130,9 @@ public class ByteFilteringOutputStream extends FilterOutputStream {
}
public boolean matches(final byte[] candidate, final int offset, final int length) {
- final boolean finsihedReplacing = (numMatches >= maxMatches && maxMatches > -1);
+ final boolean finishedReplacing = (numMatches >= maxMatches && maxMatches > -1);
- if (finsihedReplacing || (length != toReplace.length)) {
+ if (finishedReplacing || (length != toReplace.length)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/AuthenticationFailedException.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/AuthenticationFailedException.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/AuthenticationFailedException.java
index 2b19f2a..70cc6c1 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/AuthenticationFailedException.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/util/hive/AuthenticationFailedException.java
@@ -16,9 +16,6 @@
*/
package org.apache.nifi.util.hive;
-/**
- * Created by mburgess on 5/4/16.
- */
public class AuthenticationFailedException extends Exception {
public AuthenticationFailedException(String reason, Exception cause) {
super(reason, cause);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
index 9c455af..1feaf83 100644
--- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
+++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/src/main/java/org/apache/nifi/processors/ignite/AbstractIgniteProcessor.java
@@ -64,7 +64,7 @@ public abstract class AbstractIgniteProcessor extends AbstractProcessor {
/**
* Get ignite instance
- * @return iginte instance
+ * @return ignite instance
*/
protected Ignite getIgnite() {
return ignite;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
index b812587..9f3493c 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/resources/docs/org.apache.nifi.jms.processors.PublishJMS/additionalDetails.html
@@ -30,9 +30,9 @@
Once message is constructed it is sent to a pre-configured JMS Destination.
Standard <a href="http://docs.spring.io/spring-integration/api/org/springframework/integration/jms/JmsHeaders.html">JMS Headers</a>
will be extracted from the FlowFile and set on <i>javax.jms.Message</i> as JMS headers while other
- FlowFile attributes will be set as properties of <i>javax.jms.Message</i>. Upon success the incoming FlowFile is transfered
+ FlowFile attributes will be set as properties of <i>javax.jms.Message</i>. Upon success the incoming FlowFile is transferred
to the <i>success</i> Relationship and upon failure FlowFile is
- penalized and transfered to the <i>failure</i> Relationship.
+ penalized and transferred to the <i>failure</i> Relationship.
</p>
<h2>Configuration Details</h2>
<p>
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
index dfd92b3..e776d12 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
@@ -38,7 +38,7 @@
If the property is not set, the entire contents of the FlowFile
will be sent as a single message. When using the demarcator, if some messages are
successfully sent but other messages fail to send, the resulting FlowFile will be
- considered a failed FlowFuile and will have additional attributes to that effect.
+ considered a failed FlowFile and will have additional attributes to that effect.
One of such attributes is 'failed.last.idx' which indicates the index of the last message
that was successfully ACKed by Kafka. (if no demarcator is used the value of this index will be -1).
This will allow PublishKafka to only re-send un-ACKed messages on the next re-try.
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
index 802f889..a720b11 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
@@ -121,7 +121,7 @@ public class EmbeddedKafka {
logger.info("Starting Kafka server");
this.kafkaServer.startup();
- logger.info("Embeded Kafka is started at localhost:" + this.kafkaServer.serverConfig().port()
+ logger.info("Embedded Kafka is started at localhost:" + this.kafkaServer.serverConfig().port()
+ ". Zookeeper connection string: " + this.kafkaConfig.getProperty("zookeeper.connect"));
this.started = true;
}
@@ -137,7 +137,7 @@ public class EmbeddedKafka {
this.kafkaServer.awaitShutdown();
logger.info("Shutting down Zookeeper server");
this.shutdownZookeeper();
- logger.info("Embeded Kafka is shut down.");
+ logger.info("Embedded Kafka is shut down.");
this.cleanupKafkaWorkDir();
this.started = false;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
index 802f889..a720b11 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
@@ -121,7 +121,7 @@ public class EmbeddedKafka {
logger.info("Starting Kafka server");
this.kafkaServer.startup();
- logger.info("Embeded Kafka is started at localhost:" + this.kafkaServer.serverConfig().port()
+ logger.info("Embedded Kafka is started at localhost:" + this.kafkaServer.serverConfig().port()
+ ". Zookeeper connection string: " + this.kafkaConfig.getProperty("zookeeper.connect"));
this.started = true;
}
@@ -137,7 +137,7 @@ public class EmbeddedKafka {
this.kafkaServer.awaitShutdown();
logger.info("Shutting down Zookeeper server");
this.shutdownZookeeper();
- logger.info("Embeded Kafka is shut down.");
+ logger.info("Embedded Kafka is shut down.");
this.cleanupKafkaWorkDir();
this.started = false;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java
index ad66bb2..cd9365d 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/ConsumerLease.java
@@ -227,7 +227,7 @@ public abstract class ConsumerLease implements Closeable, ConsumerRebalanceListe
if (bundleMap.size() > 200) { //a magic number - the number of simultaneous bundles to track
return false;
} else {
- return totalFlowFiles < 15000;//admittedlly a magic number - good candidate for processor property
+ return totalFlowFiles < 15000;//admittedly a magic number - good candidate for processor property
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
index 20ce03c..c235b08 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/main/resources/docs/org.apache.nifi.processors.kafka.pubsub.PublishKafka/additionalDetails.html
@@ -38,7 +38,7 @@
If the property is not set, the entire contents of the FlowFile
will be sent as a single message. When using the demarcator, if some messages are
successfully sent but other messages fail to send, the resulting FlowFile will be
- considered a failed FlowFuile and will have additional attributes to that effect.
+ considered a failed FlowFile and will have additional attributes to that effect.
One of such attributes is 'failed.last.idx' which indicates the index of the last message
that was successfully ACKed by Kafka. (if no demarcator is used the value of this index will be -1).
This will allow PublishKafka to only re-send un-ACKed messages on the next re-try.
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
index 802f889..a720b11 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/src/test/java/org/apache/nifi/processors/kafka/test/EmbeddedKafka.java
@@ -121,7 +121,7 @@ public class EmbeddedKafka {
logger.info("Starting Kafka server");
this.kafkaServer.startup();
- logger.info("Embeded Kafka is started at localhost:" + this.kafkaServer.serverConfig().port()
+ logger.info("Embedded Kafka is started at localhost:" + this.kafkaServer.serverConfig().port()
+ ". Zookeeper connection string: " + this.kafkaConfig.getProperty("zookeeper.connect"));
this.started = true;
}
@@ -137,7 +137,7 @@ public class EmbeddedKafka {
this.kafkaServer.awaitShutdown();
logger.info("Shutting down Zookeeper server");
this.shutdownZookeeper();
- logger.info("Embeded Kafka is shut down.");
+ logger.info("Embedded Kafka is shut down.");
this.cleanupKafkaWorkDir();
this.started = false;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html
index 3a9add6..83bfd32 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.GetSNMP/additionalDetails.html
@@ -29,7 +29,7 @@
<p>
When the processor is triggered, it sends the SNMP request and gets the information associated to request OID(s). Once response is received
from the SNMP agent, a FlowFile is constructed. The FlowFile content is empty, all the information is written in the FlowFile attributes.
- In case of a single GET request, the properties associated to the received PDU are transfered into the FlowFile as attributes. In case of a
+ In case of a single GET request, the properties associated to the received PDU are transferred into the FlowFile as attributes. In case of a
WALK request, only the couples "OID/value" are transferred into the FlowFile as attributes. SNMP attributes names are prefixed with
<i>snmp$</i> prefix.
</p>
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html
index 3e0fb25..cb31526 100644
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/resources/docs/org.apache.nifi.snmp.processors.SetSNMP/additionalDetails.html
@@ -28,7 +28,7 @@
</p>
<p>
The processor constructs SNMP Set requests by extracting information from FlowFile attributes. The processor is looking for attributes
- prefixed with <i>snmp$</i>. If such an attribute is found, the attribute name is splitted using the $ character. The second element must
+ prefixed with <i>snmp$</i>. If such an attribute is found, the attribute name is split using the $ character. The second element must
respect the OID format to be considered as a valid OID. If there is a third element, it must represents the SMI Syntax integer value of
the type of data associated to the given OID to allow a correct conversion. If there is no third element, the value is considered as a String
and the value will be sent as an OctetString object.
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/LocationUtil.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/LocationUtil.java b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/LocationUtil.java
index 63e881a..6882b60 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/LocationUtil.java
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/LocationUtil.java
@@ -42,7 +42,7 @@ public class LocationUtil {
static final Pattern LOCATION_PATTERN = Pattern.compile(LOCATION);
/**
- * One or more locations separated by a comma, exampple: lon,lat,lon,lat,lon,lat,lon,lat
+ * One or more locations separated by a comma, example: lon,lat,lon,lat,lon,lat,lon,lat
*/
static final Pattern LOCATIONS_PATTERN = Pattern.compile("(?:" + LOCATION + ")(?:,\\s*" + LOCATION + ")*");
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html
index 7c4c67d..4500b72 100644
--- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html
@@ -35,7 +35,7 @@
In this case NiFi simply plays the role of the runtime host.</li>
<li><i>One way (NiFi -> Spring or Spring -> NiFi). </i> - This depends on existence of pre-defined message channel in Spring
Application Context. The name of the channel should be \u201cfromNiFi\u201d and the type <i>org.springframework.messaging.MessageChannel.</i></li>
- <li><i>By-directional (NiFi -> Spring -> Nifi or Spring -> NiFi -> Spring)</i> - This depends on existence of two channels
+ <li><i>By-directional (NiFi -> Spring -> NiFi or Spring -> NiFi -> Spring)</i> - This depends on existence of two channels
in Spring Application Context. One channel receives messages from NiFi with name \u201cfromNiFi\u201d and type <i>org.springframework.messaging.MessageChannel</i>i>
and another is to receive messages from Spring with name \u201ctoNiFi\u201d and type <i>org.springframework.messaging.PollableChannel.</i></li>
</ul>
@@ -87,7 +87,7 @@
Defaults to 0 (don't wait). FlowFiles that were successfully sent to Spring will be removed from session while FlowFiles that could not be sent to
Spring will be routed to <i>failure</i> relationship.</li>
<li><i>Receive Timeout</i> - [OPTIONAL] - the wait time for receiving messages from Spring Application Context. Only required if NiFi plans to receive data from Spring.
- Defaults to 0 (don't wait). FlowFile is created if and only if a message is successfully received from Spring. It is then transfered to <i>success</i> relationship.</li>
+ Defaults to 0 (don't wait). FlowFile is created if and only if a message is successfully received from Spring. It is then transferred to <i>success</i> relationship.</li>
</ul>
</p>
</body>
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
index c1f76a4..50ac358 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
/**
* <p>
- * This processor reads files in as text according to the specified character set and it outputs another text file according to the given characeter set. The character sets supported depend on the
+ * This processor reads files in as text according to the specified character set and it outputs another text file according to the given character set. The character sets supported depend on the
* version of the JRE and is platform specific. In addition, the JVM can be expanded with additional character sets to support. More information on which character sets are supported can be found in
* the JDK documentation under the docs directory in the following path: ....\technotes\guides\intl\encoding.doc.html</p>
*
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
index 194aa19..48da57f 100755
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
@@ -86,10 +86,10 @@ import org.codehaus.jackson.node.JsonNodeFactory;
@WritesAttribute(attribute="fragment.index", description="The position of this FlowFile in the list of outgoing FlowFiles that were all derived from the same incoming FlowFile. This can be "
+ "used in conjunction with the fragment.identifier and fragment.count attributes to know which FlowFiles originated from the same incoming FlowFile and in what order the SQL "
+ "FlowFiles were produced"),
- @WritesAttribute(attribute="sql.args.N.type", description="The output SQL statements are parameterized in order to avoid SQL Injection Attacks. The types of the Parameters "
+ @WritesAttribute(attribute="sql.args.N.type", description="The output SQL statements are parametrized in order to avoid SQL Injection Attacks. The types of the Parameters "
+ "to use are stored in attributes named sql.args.1.type, sql.args.2.type, sql.args.3.type, and so on. The type is a number representing a JDBC Type constant. "
+ "Generally, this is useful only for software to read and interpret but is added so that a processor such as PutSQL can understand how to interpret the values."),
- @WritesAttribute(attribute="sql.args.N.value", description="The output SQL statements are parameterized in order to avoid SQL Injection Attacks. The values of the Parameters "
+ @WritesAttribute(attribute="sql.args.N.value", description="The output SQL statements are parametrized in order to avoid SQL Injection Attacks. The values of the Parameters "
+ "to use are stored in the attributes named sql.args.1.value, sql.args.2.value, sql.args.3.value, and so on. Each of these attributes has a corresponding "
+ "sql.args.N.type attribute that indicates how the value should be interpreted when inserting it into the database.")
})
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
index e1d641d..c4e55e7 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
@@ -119,7 +119,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor CASE_INSENSITIVE = new PropertyDescriptor.Builder()
.name("Enable Case-insensitive Matching")
- .description("Indicates that two characters match even if they are in a different case. Can also be specified via the embeded flag (?i).")
+ .description("Indicates that two characters match even if they are in a different case. Can also be specified via the embedded flag (?i).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
@@ -127,7 +127,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor COMMENTS = new PropertyDescriptor.Builder()
.name("Permit Whitespace and Comments in Pattern")
- .description("In this mode, whitespace is ignored, and embedded comments starting with # are ignored until the end of a line. Can also be specified via the embeded flag (?x).")
+ .description("In this mode, whitespace is ignored, and embedded comments starting with # are ignored until the end of a line. Can also be specified via the embedded flag (?x).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
@@ -135,7 +135,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor DOTALL = new PropertyDescriptor.Builder()
.name("Enable DOTALL Mode")
- .description("Indicates that the expression '.' should match any character, including a line terminator. Can also be specified via the embeded flag (?s).")
+ .description("Indicates that the expression '.' should match any character, including a line terminator. Can also be specified via the embedded flag (?s).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
@@ -152,7 +152,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor MULTILINE = new PropertyDescriptor.Builder()
.name("Enable Multiline Mode")
.description("Indicates that '^' and '$' should match just after and just before a line terminator or end of sequence, instead of "
- + "only the begining or end of the entire input. Can also be specified via the embeded flag (?m).")
+ + "only the beginning or end of the entire input. Can also be specified via the embeded flag (?m).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
@@ -161,7 +161,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor UNICODE_CASE = new PropertyDescriptor.Builder()
.name("Enable Unicode-aware Case Folding")
.description("When used with 'Enable Case-insensitive Matching', matches in a manner consistent with the Unicode Standard. Can also "
- + "be specified via the embeded flag (?u).")
+ + "be specified via the embedded flag (?u).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
@@ -170,7 +170,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor UNICODE_CHARACTER_CLASS = new PropertyDescriptor.Builder()
.name("Enable Unicode Predefined Character Classes")
.description("Specifies conformance with the Unicode Technical Standard #18: Unicode Regular Expression Annex C: Compatibility "
- + "Properties. Can also be specified via the embeded flag (?U).")
+ + "Properties. Can also be specified via the embedded flag (?U).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
@@ -179,7 +179,7 @@ public class ExtractText extends AbstractProcessor {
public static final PropertyDescriptor UNIX_LINES = new PropertyDescriptor.Builder()
.name("Enable Unix Lines Mode")
.description("Indicates that only the '\n' line terminator is recognized in the behavior of '.', '^', and '$'. Can also be specified "
- + "via the embeded flag (?d).")
+ + "via the embedded flag (?d).")
.required(true)
.allowableValues("true", "false")
.defaultValue("false")
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
index 9d13d5b..04675c9 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
@@ -103,7 +103,7 @@ public class FetchFile extends AbstractProcessor {
.build();
static final PropertyDescriptor FILE_NOT_FOUND_LOG_LEVEL = new PropertyDescriptor.Builder()
.name("Log level when file not found")
- .description("Log level to use in case the file does not exist when the processor is trigerred")
+ .description("Log level to use in case the file does not exist when the processor is triggered")
.allowableValues(LogLevel.values())
.defaultValue(LogLevel.ERROR.toString())
.required(true)
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
index 7347db1..00dfccf 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileTransfer.java
@@ -117,7 +117,7 @@ public abstract class GetFileTransfer extends AbstractProcessor {
BlockingQueue<FileInfo> fileQueue = fileQueueRef.get();
final ComponentLog logger = getLogger();
- // dont do the listing if there are already 100 or more items in our queue
+ // do not do the listing if there are already 100 or more items in our queue
// 100 is really just a magic number that seems to work out well in practice
FileTransfer transfer = null;
if (System.currentTimeMillis() >= nextPollTime && (fileQueue == null || fileQueue.size() < 100) && listingLock.tryLock()) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
index 0090024..d9aeb67 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
@@ -184,7 +184,7 @@ public class FTPUtils {
* @param client - the ftp client with an already active connection
* @param dirPath - the path to change or create directories to
* @param createDirs - if true will attempt to create any missing directories
- * @param processor - used solely for targetting logging output.
+ * @param processor - used solely for targeting logging output.
* @throws IOException if any access problem occurs
*/
public static void changeWorkingDirectory(final FTPClient client, final String dirPath, final boolean createDirs, final Processor processor) throws IOException {
@@ -204,7 +204,7 @@ public class FTPUtils {
} catch (final IOException ioe) {
logger.debug(processor + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
}
- if (!dirExists) { //coulnd't navigate directly...begin hard work
+ if (!dirExists) { //couldn't navigate directly...begin hard work
final Deque<String> stack = new LinkedList<>();
File fakeFile = new File(dir.getPath());
do {
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/crypto/bcrypt/BCrypt.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/crypto/bcrypt/BCrypt.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/crypto/bcrypt/BCrypt.java
index 8912d92..a578917 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/crypto/bcrypt/BCrypt.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/crypto/bcrypt/BCrypt.java
@@ -25,7 +25,7 @@ import java.security.SecureRandom;
* This password hashing system tries to thwart off-line password
* cracking using a computationally-intensive hashing algorithm,
* based on Bruce Schneier's Blowfish cipher. The work factor of
- * the algorithm is parameterised, so it can be increased as
+ * the algorithm is parametrized, so it can be increased as
* computers get faster.
* <p/>
* Usage is really simple. To hash a password for the first time,
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java
index 52db337..3a10c1c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/test/java/org/apache/nifi/controller/MonitorMemoryTest.java
@@ -90,7 +90,7 @@ public class MonitorMemoryTest {
public void doValidate(String threshold) throws Exception {
CapturingLogger capturingLogger = this.wrapAndReturnCapturingLogger();
ReportingTaskNode reportingTask = fc.createReportingTask(MonitorMemory.class.getName());
- reportingTask.setScheduldingPeriod("1 sec");
+ reportingTask.setSchedulingPeriod("1 sec");
reportingTask.setProperty(MonitorMemory.MEMORY_POOL_PROPERTY.getName(), "PS Old Gen");
reportingTask.setProperty(MonitorMemory.REPORTING_INTERVAL.getName(), "100 millis");
reportingTask.setProperty(MonitorMemory.THRESHOLD_PROPERTY.getName(), threshold);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/src/main/java/org/apache/nifi/update/attributes/Criteria.java b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
index 345a923..d5f9e41 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/src/main/java/org/apache/nifi/update/attributes/Criteria.java
@@ -102,7 +102,7 @@ public class Criteria {
throw new IllegalArgumentException("New rule order does not account for all known rules or contains unknown rules.");
}
- // create the new rule lookup - using a LinkedHashMap to perserve insertion order
+ // create the new rule lookup - using a LinkedHashMap to preserve insertion order
final Map<String, Rule> newRuleLookup = new LinkedHashMap<>();
for (final String ruleId : newRuleOrder) {
newRuleLookup.put(ruleId, rules.get(ruleId));
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html
index cb23635..cd4d34f 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/resources/docs/org.apache.nifi.processors.attributes.UpdateAttribute/additionalDetails.html
@@ -194,7 +194,7 @@
<p>
Deleting attributes is a simple as providing a regular expression for attribute names to be deleted. This can be a simple regular expression that will
- match a single attribute or more complex regular expression to match a group of similarly named attributes or even seveal individual attribute names.
+ match a single attribute or more complex regular expression to match a group of similarly named attributes or even several individual attribute names.
</p>
<ul>
<li><strong>lastUser</strong> - will delete an attribute with the name "lastUser".
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/src/test/java/org/apache/nifi/processors/windows/event/log/jna/EventSubscribeXmlRenderingCallbackTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/src/test/java/org/apache/nifi/processors/windows/event/log/jna/EventSubscribeXmlRenderingCallbackTest.java b/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/src/test/java/org/apache/nifi/processors/windows/event/log/jna/EventSubscribeXmlRenderingCallbackTest.java
index 3ec7331..cdd49e6 100644
--- a/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/src/test/java/org/apache/nifi/processors/windows/event/log/jna/EventSubscribeXmlRenderingCallbackTest.java
+++ b/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/src/test/java/org/apache/nifi/processors/windows/event/log/jna/EventSubscribeXmlRenderingCallbackTest.java
@@ -96,7 +96,7 @@ public class EventSubscribeXmlRenderingCallbackTest {
}
@Test
- public void testUnuccessfulRender() {
+ public void testUnsuccessfulRender() {
String large = "abcde";
handle = ConsumeWindowsEventLogTest.mockEventHandles(wEvtApi, kernel32, Arrays.asList(large)).get(0);
eventSubscribeXmlRenderingCallback.onEvent(WEvtApi.EvtSubscribeNotifyAction.DELIVER, null, handle);
[2/2] nifi git commit: NIFI-2816 - Clean typos across the code
Posted by pv...@apache.org.
NIFI-2816 - Clean typos across the code
This closes #1057.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/446cd447
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/446cd447
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/446cd447
Branch: refs/heads/master
Commit: 446cd4470251e6a400fde14eca69db8b10969d40
Parents: 1b88552
Author: Andre F de Miranda <tr...@users.noreply.github.com>
Authored: Sat Sep 24 02:32:53 2016 +1000
Committer: Pierre Villard <pi...@gmail.com>
Committed: Mon Sep 26 17:47:31 2016 +0200
----------------------------------------------------------------------
.../nifi/expression/AttributeExpression.java | 2 +-
.../notification/NotificationService.java | 2 +-
.../nifi/security/util/CertificateUtils.java | 2 +-
.../nifi/io/nio/AbstractChannelReader.java | 2 +-
.../src/main/asciidoc/administration-guide.adoc | 2 +-
.../src/main/asciidoc/developer-guide.adoc | 4 +-
.../repository/FlowFileRepository.java | 2 +-
.../apache/nifi/util/MockProcessSession.java | 2 +-
.../nifi/amqp/processors/AMQPPublisher.java | 2 +-
...AbstractAWSCredentialsProviderProcessor.java | 4 +-
.../aws/dynamodb/AbstractDynamoDBProcessor.java | 2 +-
.../AbstractKinesisFirehoseProcessor.java | 2 +-
.../aws/lambda/AbstractAWSLambdaProcessor.java | 2 +-
.../aws/sns/AbstractSNSProcessor.java | 2 +-
.../aws/sqs/AbstractSQSProcessor.java | 2 +-
.../nifi/processors/aws/s3/AbstractS3IT.java | 2 +-
.../nifi/processors/aws/s3/ITPutS3Object.java | 2 +-
.../nifi/couchbase/CouchbaseClusterService.java | 2 +-
...ctElasticsearchTransportClientProcessor.java | 4 +-
.../email/AbstractEmailProcessor.java | 4 +-
.../processors/evtx/parser/BinaryReader.java | 4 +-
.../apache/nifi/web/api/dto/BulletinDTO.java | 2 +-
.../web/api/dto/ControllerConfigurationDTO.java | 4 +-
.../apache/nifi/web/api/dto/ControllerDTO.java | 2 +-
.../nifi/web/api/dto/ControllerServiceDTO.java | 2 +-
...ontrollerServiceReferencingComponentDTO.java | 4 +-
.../nifi/web/api/dto/DocumentedTypeDTO.java | 2 +-
.../nifi/web/api/dto/ProcessGroupDTO.java | 2 +-
.../apache/nifi/web/api/dto/ProcessorDTO.java | 2 +-
.../nifi/web/api/dto/PropertyDescriptorDTO.java | 2 +-
.../web/api/dto/status/ControllerStatusDTO.java | 2 +-
.../nifi/web/api/entity/ConnectionsEntity.java | 4 +-
.../nifi/web/api/entity/ProcessGroupEntity.java | 2 +-
.../apache/nifi/documentation/DocGenerator.java | 8 +-
.../nifi/authorization/FileAuthorizerTest.java | 2 +-
.../http/StandardHttpResponseMerger.java | 8 +-
.../ConnectionStatusEndpiontMerger.java | 86 -------------
.../ConnectionStatusEndpointMerger.java | 86 +++++++++++++
.../endpoints/DropRequestEndpiontMerger.java | 125 -------------------
.../endpoints/DropRequestEndpointMerger.java | 125 +++++++++++++++++++
.../nifi/controller/ReportingTaskNode.java | 2 +-
.../service/ControllerServiceState.java | 2 +-
.../controller/StandardFlowSynchronizer.java | 2 +-
.../reporting/AbstractReportingTaskNode.java | 2 +-
.../repository/FileSystemRepository.java | 2 +-
.../java/org/apache/nifi/engine/FlowEngine.java | 2 +-
.../nifi/authorization/AuthorizableLookup.java | 4 +-
.../StandardAuthorizableLookup.java | 4 +-
.../web/dao/impl/StandardReportingTaskDAO.java | 2 +-
.../util/NiFiTestLoginIdentityProvider.java | 2 +-
.../apache/nifi/web/DownloadableContent.java | 2 +-
.../nifi/web/ContentViewerController.java | 4 +-
.../hadoop/util/ByteFilteringOutputStream.java | 4 +-
.../hive/AuthenticationFailedException.java | 3 -
.../ignite/AbstractIgniteProcessor.java | 2 +-
.../additionalDetails.html | 4 +-
.../additionalDetails.html | 2 +-
.../processors/kafka/test/EmbeddedKafka.java | 4 +-
.../processors/kafka/test/EmbeddedKafka.java | 4 +-
.../processors/kafka/pubsub/ConsumerLease.java | 2 +-
.../additionalDetails.html | 2 +-
.../processors/kafka/test/EmbeddedKafka.java | 4 +-
.../additionalDetails.html | 2 +-
.../additionalDetails.html | 2 +-
.../nifi/processors/twitter/LocationUtil.java | 2 +-
.../additionalDetails.html | 4 +-
.../standard/ConvertCharacterSet.java | 2 +-
.../processors/standard/ConvertJSONToSQL.java | 4 +-
.../nifi/processors/standard/ExtractText.java | 14 +--
.../nifi/processors/standard/FetchFile.java | 2 +-
.../processors/standard/GetFileTransfer.java | 2 +-
.../nifi/processors/standard/util/FTPUtils.java | 4 +-
.../standard/util/crypto/bcrypt/BCrypt.java | 2 +-
.../nifi/controller/MonitorMemoryTest.java | 2 +-
.../apache/nifi/update/attributes/Criteria.java | 2 +-
.../additionalDetails.html | 2 +-
.../EventSubscribeXmlRenderingCallbackTest.java | 2 +-
77 files changed, 314 insertions(+), 317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java b/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
index 1cd3d5c..2c77aaa 100644
--- a/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
+++ b/nifi-api/src/main/java/org/apache/nifi/expression/AttributeExpression.java
@@ -22,7 +22,7 @@ import org.apache.nifi.registry.VariableRegistry;
/**
* Defines a type of expression language statement that can be applied
- * parameterized by various attributes and properties as specified in each of
+ * parametrized by various attributes and properties as specified in each of
* the method calls. AttributeExpression evaluations may be also backed by a
* {@link VariableRegistry} used to substitute attributes and variables found in
* the expression for which the registry has a value.
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationService.java
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationService.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationService.java
index abf9e80..70b6e7e 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationService.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/notification/NotificationService.java
@@ -37,7 +37,7 @@ import org.apache.nifi.components.ConfigurableComponent;
public interface NotificationService extends ConfigurableComponent {
/**
- * Provides the NotificatoinService with access to objects that may be of use
+ * Provides the NotificationService with access to objects that may be of use
* throughout the life of the service
*
* @param context of initialization
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java b/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
index df239fa..816cfa1 100644
--- a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
+++ b/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/CertificateUtils.java
@@ -532,7 +532,7 @@ public final class CertificateUtils {
* @param signingAlgorithm the signing algorithm to use
* @param days the number of days it should be valid for
* @return an issued {@link X509Certificate} from the given issuer certificate and {@link KeyPair}
- * @throws CertificateException if there is an error issueing the certificate
+ * @throws CertificateException if there is an error issuing the certificate
*/
public static X509Certificate generateIssuedCertificate(String dn, PublicKey publicKey, X509Certificate issuer, KeyPair issuerKeyPair, String signingAlgorithm, int days)
throws CertificateException {
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java b/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
index cc24575..544b99b 100644
--- a/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
+++ b/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/AbstractChannelReader.java
@@ -115,7 +115,7 @@ public abstract class AbstractChannelReader implements Runnable {
buffer.flip();
if (buffer.remaining() > 0) {
consumer.addFilledBuffer(buffer);
- buffer = null; //clear the reference - is now the consumer's responsiblity
+ buffer = null; //clear the reference - is now the consumer's responsibility
} else {
buffer.clear();
bufferPool.returnBuffer(buffer, 0);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-docs/src/main/asciidoc/administration-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 5f0301e..ec5c64a 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -257,7 +257,7 @@ The `nifi.login.identity.provider.configuration.file` property specifies the con
The `nifi.security.user.login.identity.provider` property indicates which of the configured Login Identity Provider should be
used. If this property is not configured, NiFi will not support username/password authentication and will require client
certificates for authenticating users over HTTPS. By default, this property is not configured meaning that username/password must be
-explicity enabled.
+explicitly enabled.
NiFi does not perform user authentication over HTTP. Using HTTP all users will be granted all roles.
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-docs/src/main/asciidoc/developer-guide.adoc
----------------------------------------------------------------------
diff --git a/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi-docs/src/main/asciidoc/developer-guide.adoc
index de5fb46..299f510 100644
--- a/nifi-docs/src/main/asciidoc/developer-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/developer-guide.adoc
@@ -638,7 +638,7 @@ or by calling the `getLogger` method of `AbstractProcessor`.
Additionally, Processors should use the `ProvenanceReporter`
interface, obtained via the ProcessSession's
-`getProvenanceReporter` method. The ProvenanceReoprter should be used
+`getProvenanceReporter` method. The ProvenanceReporter should be used
to indicate any time that content is
received from an external source or sent to an external location. The
ProvenanceReporter also has methods for
@@ -1387,7 +1387,7 @@ If at any point in the InputStreamCallback, a condition is reached in
which processing cannot continue
(for example, the input is malformed), a `ProcessException` should be
thrown. The call to the
-ProcesssSession's `read` method is wrapped in a `try/catch` block
+ProcessSession's `read` method is wrapped in a `try/catch` block
where `ProcessException` is
caught. If an Exception is caught, a log message is generated
explaining the error. The List of
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
----------------------------------------------------------------------
diff --git a/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java b/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
index 906cbe2..276d3b7 100644
--- a/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
+++ b/nifi-framework-api/src/main/java/org/apache/nifi/controller/repository/FlowFileRepository.java
@@ -109,7 +109,7 @@ public interface FlowFileRepository extends Closeable {
void swapFlowFilesOut(List<FlowFileRecord> swappedOut, FlowFileQueue flowFileQueue, String swapLocation) throws IOException;
/**
- * Updates the Repository to indicate that the given FlowFileRecpords were
+ * Updates the Repository to indicate that the given FlowFileRecords were
* Swapped In to memory
*
* @param swapLocation the location (e.g., a filename) from which FlowFiles
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
index 87ef4ac..dbac129 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
@@ -164,7 +164,7 @@ public class MockProcessSession implements ProcessSession {
* {@link org.apache.nifi.processor.Processor#onTrigger} commits or rolls back the
* session
*/
- public void clearCommited() {
+ public void clearCommitted() {
committed = false;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
index cd3b505..eb02a86 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AMQPPublisher.java
@@ -97,7 +97,7 @@ final class AMQPPublisher extends AMQPWorker {
}
} else {
throw new IllegalStateException("This instance of AMQPPublisher is invalid since "
- + "its publishigChannel is closed");
+ + "its publishingChannel is closed");
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSCredentialsProviderProcessor.java
----------------------------------------------------------------------
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 2e306ac..293fa57 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
@@ -99,11 +99,11 @@ public abstract class AbstractAWSCredentialsProviderProcessor<ClientType extends
}
/**
- * Abstract method to create aws client using credetials provider. This is the preferred method
+ * Abstract method to create aws client using credentials provider. This is the preferred method
* for creating aws clients
* @param context process context
* @param credentialsProvider aws credentials provider
- * @param config aws client configuraiton
+ * @param config aws client configuration
* @return ClientType the client
*/
protected abstract ClientType createClient(final ProcessContext context, final AWSCredentialsProvider credentialsProvider, final ClientConfiguration config);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
index df1a9ff..de56e69 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
@@ -47,7 +47,7 @@ import com.amazonaws.services.dynamodbv2.document.DynamoDB;
import com.amazonaws.services.dynamodbv2.model.AttributeValue;
/**
- * Base class for Nifi dynamo db related processors
+ * Base class for NiFi dynamo db related processors
*
* @see DeleteDynamoDB
* @see PutDynamoDB
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
index 3b607c9..ddc6e6c 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
@@ -68,7 +68,7 @@ public abstract class AbstractKinesisFirehoseProcessor extends AbstractAWSCreden
}
/**
- * Create client using AWSCredentails
+ * Create client using AWSCredentials
*
* @deprecated use {@link #createClient(ProcessContext, AWSCredentialsProvider, ClientConfiguration)} instead
*/
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/AbstractAWSLambdaProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/AbstractAWSLambdaProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/AbstractAWSLambdaProcessor.java
index d191462..758191d 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/AbstractAWSLambdaProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/AbstractAWSLambdaProcessor.java
@@ -59,7 +59,7 @@ public abstract class AbstractAWSLambdaProcessor extends AbstractAWSCredentialsP
}
/**
- * Create client using AWSCredentails
+ * Create client using AWSCredentials
*
* @deprecated use {@link #createClient(ProcessContext, AWSCredentialsProvider, ClientConfiguration)} instead
*/
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/AbstractSNSProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/AbstractSNSProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/AbstractSNSProcessor.java
index cbdcf9c..cc0aa34 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/AbstractSNSProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/AbstractSNSProcessor.java
@@ -62,7 +62,7 @@ public abstract class AbstractSNSProcessor extends AbstractAWSCredentialsProvide
}
/**
- * Create client using AWSCredentails
+ * Create client using AWSCredentials
*
* @deprecated use {@link #createClient(ProcessContext, AWSCredentialsProvider, ClientConfiguration)} instead
*/
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/AbstractSQSProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/AbstractSQSProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/AbstractSQSProcessor.java
index f9bd5c4..dcae039 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/AbstractSQSProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/AbstractSQSProcessor.java
@@ -55,7 +55,7 @@ public abstract class AbstractSQSProcessor extends AbstractAWSCredentialsProvide
}
/**
- * Create client using AWSCredentails
+ * Create client using AWSCredentials
*
* @deprecated use {@link #createClient(ProcessContext, AWSCredentialsProvider, ClientConfiguration)} instead
*/
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
index 0ecc33e..eaaaa8a 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
@@ -55,7 +55,7 @@ public abstract class AbstractS3IT {
protected final static String REGION = System.getProperty("it.aws.region", "us-west-1");
// Adding REGION to bucket prevents errors of
// "A conflicting conditional operation is currently in progress against this resource."
- // when bucket is rapidly added/deleted and consistency propogation causes this error.
+ // when bucket is rapidly added/deleted and consistency propagation causes this error.
// (Should not be necessary if REGION remains static, but added to prevent future frustration.)
// [see http://stackoverflow.com/questions/13898057/aws-error-message-a-conflicting-conditional-operation-is-currently-in-progress]
protected final static String BUCKET_NAME = "test-bucket-00000000-0000-0000-0000-123456789021-" + REGION;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
index 28c6750..6d389ef 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java
@@ -847,7 +847,7 @@ public class ITPutS3Object extends AbstractS3IT {
// sleep() delays long enough to satisfy interval and age intervals.
Thread.sleep(2000L);
- // System millis are used for timing, but it is incrememtned on each
+ // System millis are used for timing, but it is incremented on each
// call to circumvent what appears to be caching in the AWS library.
// The increments are 1000 millis because AWS returns upload
// initiation times in whole seconds.
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/couchbase/CouchbaseClusterService.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/couchbase/CouchbaseClusterService.java b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/couchbase/CouchbaseClusterService.java
index 7daa97c..613b9a3 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/couchbase/CouchbaseClusterService.java
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/main/java/org/apache/nifi/couchbase/CouchbaseClusterService.java
@@ -43,7 +43,7 @@ import com.couchbase.client.java.CouchbaseCluster;
@CapabilityDescription("Provides a centralized Couchbase connection and bucket passwords management."
+ " Bucket passwords can be specified via dynamic properties.")
@Tags({ "nosql", "couchbase", "database", "connection" })
-@DynamicProperty(name = "Bucket Password for BUCKET_NAME", value = "bucket password", description = "Specify bucket password if neseccery.")
+@DynamicProperty(name = "Bucket Password for BUCKET_NAME", value = "bucket password", description = "Specify bucket password if necessary.")
public class CouchbaseClusterService extends AbstractControllerService implements CouchbaseClusterControllerService {
public static final PropertyDescriptor CONNECTION_STRING = new PropertyDescriptor
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
index d2989db..e1c9d4d 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
@@ -118,7 +118,7 @@ public abstract class AbstractElasticsearchTransportClientProcessor extends Abst
protected String authToken;
/**
- * Instantiate ElasticSearch Client. This chould be called by subclasses' @OnScheduled method to create a client
+ * Instantiate ElasticSearch Client. This should be called by subclasses' @OnScheduled method to create a client
* if one does not yet exist. If called when scheduled, closeClient() should be called by the subclasses' @OnStopped
* method so the client will be destroyed when the processor is stopped.
*
@@ -252,7 +252,7 @@ public abstract class AbstractElasticsearchTransportClientProcessor extends Abst
}
/**
- * Get the ElasticSearch hosts from a Nifi attribute, e.g.
+ * Get the ElasticSearch hosts from a NiFi attribute, e.g.
*
* @param hosts A comma-separated list of ElasticSearch hosts (host:port,host2:port2, etc.)
* @return List of InetSocketAddresses for the ES hosts
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
index 62f4a88..7e6193d 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java
@@ -222,7 +222,7 @@ abstract class AbstractEmailProcessor<T extends AbstractMailReceiver> extends Ab
protected abstract T buildMessageReceiver(ProcessContext context);
/**
- * Return the target receivere's mail protocol (e.g., imap, pop etc.)
+ * Return the target receiver's mail protocol (e.g., imap, pop etc.)
*/
protected abstract String getProtocol(ProcessContext processContext);
@@ -368,7 +368,7 @@ abstract class AbstractEmailProcessor<T extends AbstractMailReceiver> extends Ab
fromAddressesString = Arrays.asList(fromAddresses).toString();
}
} catch (MessagingException e) {
- this.logger.warn("Faild to retrieve 'From' attribute from Message.");
+ this.logger.warn("Failed to retrieve 'From' attribute from Message.");
}
processSession.getProvenanceReporter().receive(flowFile, this.displayUrl, "Received message from " + fromAddressesString, executionDuration);
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
index 12f1f13..e65e9e0 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/main/java/org/apache/nifi/processors/evtx/parser/BinaryReader.java
@@ -86,9 +86,9 @@ public class BinaryReader {
}
/**
- * Returns the byte that would be read without changing the posiiton
+ * Returns the byte that would be read without changing the position
*
- * @return the byte that would be read without changing the posiiton
+ * @return the byte that would be read without changing the position
*/
public int peek() {
return bytes[position];
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
index aac0f59..dc95d6b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
@@ -85,7 +85,7 @@ public class BulletinDTO {
* @return category of this message
*/
@ApiModelProperty(
- value = "The catagory of this bulletin."
+ value = "The category of this bulletin."
)
public String getCategory() {
return category;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
index aee65b4..739679d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
@@ -33,7 +33,7 @@ public class ControllerConfigurationDTO {
* @return maximum number of timer driven threads this NiFi has available
*/
@ApiModelProperty(
- value = "The maimum number of timer driven threads the NiFi has available."
+ value = "The maximum number of timer driven threads the NiFi has available."
)
public Integer getMaxTimerDrivenThreadCount() {
return maxTimerDrivenThreadCount;
@@ -47,7 +47,7 @@ public class ControllerConfigurationDTO {
* @return maximum number of event driven thread this NiFi has available
*/
@ApiModelProperty(
- value = "The maximum number of event driven threads the NiFi has avaiable."
+ value = "The maximum number of event driven threads the NiFi has available."
)
public Integer getMaxEventDrivenThreadCount() {
return maxEventDrivenThreadCount;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
index c433d49..a235b36 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
@@ -227,7 +227,7 @@ public class ControllerDTO {
* @return number of inactive remote ports contained in this process group
*/
@ApiModelProperty(
- value = "The number of inactive remote porst contained in the NiFi."
+ value = "The number of inactive remote ports contained in the NiFi."
)
public Integer getInactiveRemotePortCount() {
return inactiveRemotePortCount;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
index 9b51d8c..9f2f74a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
@@ -165,7 +165,7 @@ public class ControllerServiceDTO extends ComponentDTO {
* @return annotation data for this controller service
*/
@ApiModelProperty(
- value = "The annontation for the controller service. This is how the custom UI relays configuration to the controller service."
+ value = "The annotation for the controller service. This is how the custom UI relays configuration to the controller service."
)
public String getAnnotationData() {
return annotationData;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
index 6f7ab9a..380e6ce 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
@@ -152,7 +152,7 @@ public class ControllerServiceReferencingComponentDTO {
* @return descriptors for the components properties
*/
@ApiModelProperty(
- value = "The descriptors for the componet properties."
+ value = "The descriptors for the component properties."
)
public Map<String, PropertyDescriptorDTO> getDescriptors() {
return descriptors;
@@ -194,7 +194,7 @@ public class ControllerServiceReferencingComponentDTO {
* @return If this referencing component represents a ControllerService, these are the components that reference it
*/
@ApiModelProperty(
- value = "If the referencing component represents a controller service, these are the components that referenc it."
+ value = "If the referencing component represents a controller service, these are the components that reference it."
)
public Set<ControllerServiceReferencingComponentEntity> getReferencingComponents() {
return referencingComponents;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
index f82ff6c..67b26ca 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
@@ -48,7 +48,7 @@ public class DocumentedTypeDTO {
* @return The type is the fully-qualified name of a Java class
*/
@ApiModelProperty(
- value = "The fulley qualified name of the type."
+ value = "The fully qualified name of the type."
)
public String getType() {
return type;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
index 4efb77b..42d605d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
@@ -134,7 +134,7 @@ public class ProcessGroupDTO extends ComponentDTO {
* @return number of running component in this process group
*/
@ApiModelProperty(
- value = "The number of running componetns in this process group."
+ value = "The number of running components in this process group."
)
public Integer getRunningCount() {
return runningCount;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
index 6a2b22c..38053ce 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
@@ -202,7 +202,7 @@ public class ProcessorDTO extends ComponentDTO {
* @return The processor configuration details
*/
@ApiModelProperty(
- value = "The configuration details for the processor. These details will be included in a resopnse if the verbose flag is included in a request."
+ value = "The configuration details for the processor. These details will be included in a response if the verbose flag is included in a request."
)
public ProcessorConfigDTO getConfig() {
return config;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
index b85e30f..f22d883 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
@@ -71,7 +71,7 @@ public class PropertyDescriptorDTO {
* @return An explanation of the meaning of the given property. This description is meant to be displayed to a user or simply provide a mechanism of documenting intent
*/
@ApiModelProperty(
- value = "The descriptoin for the property. Used to relay additional details to a user or provide a mechanism of documenting intent."
+ value = "The description for the property. Used to relay additional details to a user or provide a mechanism of documenting intent."
)
public String getDescription() {
return description;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
index f9af76c..c6d7585 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
@@ -55,7 +55,7 @@ public class ControllerStatusDTO implements Cloneable {
/**
* @return queue for the controller
*/
- @ApiModelProperty("The number of flowfilew queued in the NiFi.")
+ @ApiModelProperty("The number of flowfiles queued in the NiFi.")
public String getQueued() {
return queued;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
index 51f17b9..e8ebac5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionsEntity.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 ConnectionEntitys.
+ * 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 ConnectionEntity.
*/
@XmlRootElement(name = "connectionsEntity")
public class ConnectionsEntity extends Entity {
@@ -28,7 +28,7 @@ public class ConnectionsEntity extends Entity {
private Set<ConnectionEntity> connections;
/**
- * @return list of ConnectionEntitys that are being serialized
+ * @return list of ConnectionEntity that are being serialized
*/
public Set<ConnectionEntity> getConnections() {
return connections;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
index 1060eb6..c16c5c9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java
@@ -114,7 +114,7 @@ public class ProcessGroupEntity extends ComponentEntity implements Permissible<P
* @return number of running component in this process group
*/
@ApiModelProperty(
- value = "The number of running componetns in this process group."
+ value = "The number of running components in this process group."
)
public Integer getRunningCount() {
return runningCount;
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
index d3fbc6f..116fda5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
@@ -105,12 +105,12 @@ public class DocGenerator {
final File directory = new File(docsDir, componentClass.getCanonicalName());
directory.mkdirs();
- final File baseDocumenationFile = new File(directory, "index.html");
- if (baseDocumenationFile.exists()) {
- logger.warn(baseDocumenationFile + " already exists, overwriting!");
+ final File baseDocumentationFile = new File(directory, "index.html");
+ if (baseDocumentationFile.exists()) {
+ logger.warn(baseDocumentationFile + " already exists, overwriting!");
}
- try (final OutputStream output = new BufferedOutputStream(new FileOutputStream(baseDocumenationFile))) {
+ try (final OutputStream output = new BufferedOutputStream(new FileOutputStream(baseDocumentationFile))) {
writer.write(component, output, hasAdditionalInfo(directory));
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/test/java/org/apache/nifi/authorization/FileAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/test/java/org/apache/nifi/authorization/FileAuthorizerTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/test/java/org/apache/nifi/authorization/FileAuthorizerTest.java
index fcedfc8..7e77e05 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/test/java/org/apache/nifi/authorization/FileAuthorizerTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/test/java/org/apache/nifi/authorization/FileAuthorizerTest.java
@@ -1009,7 +1009,7 @@ public class FileAuthorizerTest {
authorizer.onConfigured(configurationContext);
assertEquals(2, authorizer.getUsers().size());
- // retrieve user-1 and verify it exsits
+ // retrieve user-1 and verify it exists
final User user = authorizer.getUser("user-1");
assertEquals("user-1", user.getIdentifier());
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/StandardHttpResponseMerger.java
----------------------------------------------------------------------
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 a7e4883..1d19721 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
@@ -19,7 +19,7 @@ package org.apache.nifi.cluster.coordination.http;
import org.apache.nifi.cluster.coordination.http.endpoints.BulletinBoardEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.ComponentStateEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.ConnectionEndpointMerger;
-import org.apache.nifi.cluster.coordination.http.endpoints.ConnectionStatusEndpiontMerger;
+import org.apache.nifi.cluster.coordination.http.endpoints.ConnectionStatusEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.ConnectionsEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.ControllerBulletinsEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.ControllerConfigurationEndpointMerger;
@@ -30,7 +30,7 @@ import org.apache.nifi.cluster.coordination.http.endpoints.ControllerServicesEnd
import org.apache.nifi.cluster.coordination.http.endpoints.ControllerStatusEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.CountersEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.CurrentUserEndpointMerger;
-import org.apache.nifi.cluster.coordination.http.endpoints.DropRequestEndpiontMerger;
+import org.apache.nifi.cluster.coordination.http.endpoints.DropRequestEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.FlowConfigurationEndpointMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.FlowMerger;
import org.apache.nifi.cluster.coordination.http.endpoints.FlowSnippetEndpointMerger;
@@ -94,7 +94,7 @@ public class StandardHttpResponseMerger implements HttpResponseMerger {
endpointMergers.add(new ControllerBulletinsEndpointMerger());
endpointMergers.add(new GroupStatusEndpointMerger());
endpointMergers.add(new ProcessorStatusEndpointMerger());
- endpointMergers.add(new ConnectionStatusEndpiontMerger());
+ endpointMergers.add(new ConnectionStatusEndpointMerger());
endpointMergers.add(new PortStatusEndpointMerger());
endpointMergers.add(new RemoteProcessGroupStatusEndpointMerger());
endpointMergers.add(new ProcessorEndpointMerger());
@@ -116,7 +116,7 @@ public class StandardHttpResponseMerger implements HttpResponseMerger {
endpointMergers.add(new ControllerServiceReferenceEndpointMerger());
endpointMergers.add(new ReportingTaskEndpointMerger());
endpointMergers.add(new ReportingTasksEndpointMerger());
- endpointMergers.add(new DropRequestEndpiontMerger());
+ endpointMergers.add(new DropRequestEndpointMerger());
endpointMergers.add(new ListFlowFilesEndpointMerger());
endpointMergers.add(new ComponentStateEndpointMerger());
endpointMergers.add(new BulletinBoardEndpointMerger());
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpiontMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpiontMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpiontMerger.java
deleted file mode 100644
index ab700dc..0000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpiontMerger.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.nifi.cluster.coordination.http.endpoints;
-
-import org.apache.nifi.cluster.manager.ComponentEntityStatusMerger;
-import org.apache.nifi.cluster.manager.NodeResponse;
-import org.apache.nifi.cluster.manager.StatusMerger;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.web.api.dto.status.ConnectionStatusDTO;
-import org.apache.nifi.web.api.dto.status.NodeConnectionStatusSnapshotDTO;
-import org.apache.nifi.web.api.entity.ConnectionStatusEntity;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-public class ConnectionStatusEndpiontMerger extends AbstractSingleEntityEndpoint<ConnectionStatusEntity> implements ComponentEntityStatusMerger<ConnectionStatusDTO> {
- public static final Pattern CONNECTION_STATUS_URI_PATTERN = Pattern.compile("/nifi-api/flow/connections/[a-f0-9\\-]{36}/status");
-
- @Override
- public boolean canHandle(URI uri, String method) {
- return "GET".equalsIgnoreCase(method) && CONNECTION_STATUS_URI_PATTERN.matcher(uri.getPath()).matches();
- }
-
- @Override
- protected Class<ConnectionStatusEntity> getEntityClass() {
- return ConnectionStatusEntity.class;
- }
-
- @Override
- protected void mergeResponses(ConnectionStatusEntity clientEntity, Map<NodeIdentifier, ConnectionStatusEntity> entityMap, Set<NodeResponse> successfulResponses,
- Set<NodeResponse> problematicResponses) {
- final ConnectionStatusDTO mergedConnectionStatus = clientEntity.getConnectionStatus();
- mergedConnectionStatus.setNodeSnapshots(new ArrayList<>());
-
- final NodeIdentifier selectedNodeId = entityMap.entrySet().stream()
- .filter(e -> e.getValue() == clientEntity)
- .map(e -> e.getKey())
- .findFirst()
- .orElse(null);
-
- final NodeConnectionStatusSnapshotDTO selectedNodeSnapshot = new NodeConnectionStatusSnapshotDTO();
- selectedNodeSnapshot.setStatusSnapshot(mergedConnectionStatus.getAggregateSnapshot().clone());
- selectedNodeSnapshot.setAddress(selectedNodeId.getApiAddress());
- selectedNodeSnapshot.setApiPort(selectedNodeId.getApiPort());
- selectedNodeSnapshot.setNodeId(selectedNodeId.getId());
-
- mergedConnectionStatus.getNodeSnapshots().add(selectedNodeSnapshot);
-
- // merge the other nodes
- for (final Map.Entry<NodeIdentifier, ConnectionStatusEntity> entry : entityMap.entrySet()) {
- final NodeIdentifier nodeId = entry.getKey();
- final ConnectionStatusEntity nodeConnectionStatusEntity = entry.getValue();
- final ConnectionStatusDTO nodeConnectionStatus = nodeConnectionStatusEntity.getConnectionStatus();
- if (nodeConnectionStatus == mergedConnectionStatus) {
- continue;
- }
-
- mergeStatus(mergedConnectionStatus, clientEntity.getCanRead(), nodeConnectionStatus, nodeConnectionStatusEntity.getCanRead(), nodeId);
- }
- }
-
- @Override
- public void mergeStatus(ConnectionStatusDTO clientStatus, boolean clientStatusReadablePermission, ConnectionStatusDTO status, boolean statusReadablePermission,
- NodeIdentifier statusNodeIdentifier) {
- StatusMerger.merge(clientStatus, clientStatusReadablePermission, status, statusReadablePermission, statusNodeIdentifier.getId(), statusNodeIdentifier.getApiAddress(),
- statusNodeIdentifier.getApiPort());
- }
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpointMerger.java
new file mode 100644
index 0000000..db455d4
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ConnectionStatusEndpointMerger.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.cluster.coordination.http.endpoints;
+
+import org.apache.nifi.cluster.manager.ComponentEntityStatusMerger;
+import org.apache.nifi.cluster.manager.NodeResponse;
+import org.apache.nifi.cluster.manager.StatusMerger;
+import org.apache.nifi.cluster.protocol.NodeIdentifier;
+import org.apache.nifi.web.api.dto.status.ConnectionStatusDTO;
+import org.apache.nifi.web.api.dto.status.NodeConnectionStatusSnapshotDTO;
+import org.apache.nifi.web.api.entity.ConnectionStatusEntity;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class ConnectionStatusEndpointMerger extends AbstractSingleEntityEndpoint<ConnectionStatusEntity> implements ComponentEntityStatusMerger<ConnectionStatusDTO> {
+ public static final Pattern CONNECTION_STATUS_URI_PATTERN = Pattern.compile("/nifi-api/flow/connections/[a-f0-9\\-]{36}/status");
+
+ @Override
+ public boolean canHandle(URI uri, String method) {
+ return "GET".equalsIgnoreCase(method) && CONNECTION_STATUS_URI_PATTERN.matcher(uri.getPath()).matches();
+ }
+
+ @Override
+ protected Class<ConnectionStatusEntity> getEntityClass() {
+ return ConnectionStatusEntity.class;
+ }
+
+ @Override
+ protected void mergeResponses(ConnectionStatusEntity clientEntity, Map<NodeIdentifier, ConnectionStatusEntity> entityMap, Set<NodeResponse> successfulResponses,
+ Set<NodeResponse> problematicResponses) {
+ final ConnectionStatusDTO mergedConnectionStatus = clientEntity.getConnectionStatus();
+ mergedConnectionStatus.setNodeSnapshots(new ArrayList<>());
+
+ final NodeIdentifier selectedNodeId = entityMap.entrySet().stream()
+ .filter(e -> e.getValue() == clientEntity)
+ .map(e -> e.getKey())
+ .findFirst()
+ .orElse(null);
+
+ final NodeConnectionStatusSnapshotDTO selectedNodeSnapshot = new NodeConnectionStatusSnapshotDTO();
+ selectedNodeSnapshot.setStatusSnapshot(mergedConnectionStatus.getAggregateSnapshot().clone());
+ selectedNodeSnapshot.setAddress(selectedNodeId.getApiAddress());
+ selectedNodeSnapshot.setApiPort(selectedNodeId.getApiPort());
+ selectedNodeSnapshot.setNodeId(selectedNodeId.getId());
+
+ mergedConnectionStatus.getNodeSnapshots().add(selectedNodeSnapshot);
+
+ // merge the other nodes
+ for (final Map.Entry<NodeIdentifier, ConnectionStatusEntity> entry : entityMap.entrySet()) {
+ final NodeIdentifier nodeId = entry.getKey();
+ final ConnectionStatusEntity nodeConnectionStatusEntity = entry.getValue();
+ final ConnectionStatusDTO nodeConnectionStatus = nodeConnectionStatusEntity.getConnectionStatus();
+ if (nodeConnectionStatus == mergedConnectionStatus) {
+ continue;
+ }
+
+ mergeStatus(mergedConnectionStatus, clientEntity.getCanRead(), nodeConnectionStatus, nodeConnectionStatusEntity.getCanRead(), nodeId);
+ }
+ }
+
+ @Override
+ public void mergeStatus(ConnectionStatusDTO clientStatus, boolean clientStatusReadablePermission, ConnectionStatusDTO status, boolean statusReadablePermission,
+ NodeIdentifier statusNodeIdentifier) {
+ StatusMerger.merge(clientStatus, clientStatusReadablePermission, status, statusReadablePermission, statusNodeIdentifier.getId(), statusNodeIdentifier.getApiAddress(),
+ statusNodeIdentifier.getApiPort());
+ }
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpiontMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpiontMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpiontMerger.java
deleted file mode 100644
index f78d628..0000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpiontMerger.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.nifi.cluster.coordination.http.endpoints;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.apache.nifi.cluster.manager.NodeResponse;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.controller.queue.DropFlowFileState;
-import org.apache.nifi.util.FormatUtils;
-import org.apache.nifi.web.api.dto.DropRequestDTO;
-import org.apache.nifi.web.api.entity.DropRequestEntity;
-
-public class DropRequestEndpiontMerger extends AbstractSingleDTOEndpoint<DropRequestEntity, DropRequestDTO> {
- public static final Pattern DROP_REQUESTS_URI = Pattern.compile("/nifi-api/flowfile-queues/[a-f0-9\\-]{36}/drop-requests");
- public static final Pattern DROP_REQUEST_URI = Pattern.compile("/nifi-api/flowfile-queues/[a-f0-9\\-]{36}/drop-requests/[a-f0-9\\-]{36}");
-
- @Override
- public boolean canHandle(URI uri, String method) {
- if (("GET".equalsIgnoreCase(method) || "DELETE".equalsIgnoreCase(method)) && DROP_REQUEST_URI.matcher(uri.getPath()).matches()) {
- return true;
- } else if (("POST".equalsIgnoreCase(method) && DROP_REQUESTS_URI.matcher(uri.getPath()).matches())) {
- return true;
- }
-
- return false;
- }
-
- @Override
- protected Class<DropRequestEntity> getEntityClass() {
- return DropRequestEntity.class;
- }
-
- @Override
- protected DropRequestDTO getDto(DropRequestEntity entity) {
- return entity.getDropRequest();
- }
-
- @Override
- protected void mergeResponses(DropRequestDTO clientDto, Map<NodeIdentifier, DropRequestDTO> dtoMap, Set<NodeResponse> successfulResponses, Set<NodeResponse> problematicResponses) {
- boolean nodeWaiting = false;
- int originalCount = 0;
- long originalSize = 0;
- int currentCount = 0;
- long currentSize = 0;
- int droppedCount = 0;
- long droppedSize = 0;
-
- DropFlowFileState state = null;
- boolean allFinished = true;
- String failureReason = null;
- for (final Map.Entry<NodeIdentifier, DropRequestDTO> nodeEntry : dtoMap.entrySet()) {
- final DropRequestDTO nodeDropRequest = nodeEntry.getValue();
-
- if (!nodeDropRequest.isFinished()) {
- allFinished = false;
- }
- if (nodeDropRequest.getFailureReason() != null) {
- failureReason = nodeDropRequest.getFailureReason();
- }
-
- currentCount += nodeDropRequest.getCurrentCount();
- currentSize += nodeDropRequest.getCurrentSize();
- droppedCount += nodeDropRequest.getDroppedCount();
- droppedSize += nodeDropRequest.getDroppedSize();
-
- if (nodeDropRequest.getOriginalCount() == null) {
- nodeWaiting = true;
- } else {
- originalCount += nodeDropRequest.getOriginalCount();
- originalSize += nodeDropRequest.getOriginalSize();
- }
-
- final DropFlowFileState nodeState = DropFlowFileState.valueOfDescription(nodeDropRequest.getState());
- if (state == null || state.ordinal() > nodeState.ordinal()) {
- state = nodeState;
- }
- }
-
- clientDto.setCurrentCount(currentCount);
- clientDto.setCurrentSize(currentSize);
- clientDto.setCurrent(FormatUtils.formatCount(currentCount) + " / " + FormatUtils.formatDataSize(currentSize));
-
- clientDto.setDroppedCount(droppedCount);
- clientDto.setDroppedSize(droppedSize);
- clientDto.setDropped(FormatUtils.formatCount(droppedCount) + " / " + FormatUtils.formatDataSize(droppedSize));
-
- clientDto.setFinished(allFinished);
- clientDto.setFailureReason(failureReason);
- if (originalCount == 0) {
- clientDto.setPercentCompleted(allFinished ? 100 : 0);
- } else {
- clientDto.setPercentCompleted((int) ((double) droppedCount / (double) originalCount * 100D));
- }
-
- if (!nodeWaiting) {
- clientDto.setOriginalCount(originalCount);
- clientDto.setOriginalSize(originalSize);
- clientDto.setOriginal(FormatUtils.formatCount(originalCount) + " / " + FormatUtils.formatDataSize(originalSize));
- }
-
- if (state != null) {
- clientDto.setState(state.toString());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpointMerger.java
new file mode 100644
index 0000000..d87e12d
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/DropRequestEndpointMerger.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.cluster.coordination.http.endpoints;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.apache.nifi.cluster.manager.NodeResponse;
+import org.apache.nifi.cluster.protocol.NodeIdentifier;
+import org.apache.nifi.controller.queue.DropFlowFileState;
+import org.apache.nifi.util.FormatUtils;
+import org.apache.nifi.web.api.dto.DropRequestDTO;
+import org.apache.nifi.web.api.entity.DropRequestEntity;
+
+public class DropRequestEndpointMerger extends AbstractSingleDTOEndpoint<DropRequestEntity, DropRequestDTO> {
+ public static final Pattern DROP_REQUESTS_URI = Pattern.compile("/nifi-api/flowfile-queues/[a-f0-9\\-]{36}/drop-requests");
+ public static final Pattern DROP_REQUEST_URI = Pattern.compile("/nifi-api/flowfile-queues/[a-f0-9\\-]{36}/drop-requests/[a-f0-9\\-]{36}");
+
+ @Override
+ public boolean canHandle(URI uri, String method) {
+ if (("GET".equalsIgnoreCase(method) || "DELETE".equalsIgnoreCase(method)) && DROP_REQUEST_URI.matcher(uri.getPath()).matches()) {
+ return true;
+ } else if (("POST".equalsIgnoreCase(method) && DROP_REQUESTS_URI.matcher(uri.getPath()).matches())) {
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ protected Class<DropRequestEntity> getEntityClass() {
+ return DropRequestEntity.class;
+ }
+
+ @Override
+ protected DropRequestDTO getDto(DropRequestEntity entity) {
+ return entity.getDropRequest();
+ }
+
+ @Override
+ protected void mergeResponses(DropRequestDTO clientDto, Map<NodeIdentifier, DropRequestDTO> dtoMap, Set<NodeResponse> successfulResponses, Set<NodeResponse> problematicResponses) {
+ boolean nodeWaiting = false;
+ int originalCount = 0;
+ long originalSize = 0;
+ int currentCount = 0;
+ long currentSize = 0;
+ int droppedCount = 0;
+ long droppedSize = 0;
+
+ DropFlowFileState state = null;
+ boolean allFinished = true;
+ String failureReason = null;
+ for (final Map.Entry<NodeIdentifier, DropRequestDTO> nodeEntry : dtoMap.entrySet()) {
+ final DropRequestDTO nodeDropRequest = nodeEntry.getValue();
+
+ if (!nodeDropRequest.isFinished()) {
+ allFinished = false;
+ }
+ if (nodeDropRequest.getFailureReason() != null) {
+ failureReason = nodeDropRequest.getFailureReason();
+ }
+
+ currentCount += nodeDropRequest.getCurrentCount();
+ currentSize += nodeDropRequest.getCurrentSize();
+ droppedCount += nodeDropRequest.getDroppedCount();
+ droppedSize += nodeDropRequest.getDroppedSize();
+
+ if (nodeDropRequest.getOriginalCount() == null) {
+ nodeWaiting = true;
+ } else {
+ originalCount += nodeDropRequest.getOriginalCount();
+ originalSize += nodeDropRequest.getOriginalSize();
+ }
+
+ final DropFlowFileState nodeState = DropFlowFileState.valueOfDescription(nodeDropRequest.getState());
+ if (state == null || state.ordinal() > nodeState.ordinal()) {
+ state = nodeState;
+ }
+ }
+
+ clientDto.setCurrentCount(currentCount);
+ clientDto.setCurrentSize(currentSize);
+ clientDto.setCurrent(FormatUtils.formatCount(currentCount) + " / " + FormatUtils.formatDataSize(currentSize));
+
+ clientDto.setDroppedCount(droppedCount);
+ clientDto.setDroppedSize(droppedSize);
+ clientDto.setDropped(FormatUtils.formatCount(droppedCount) + " / " + FormatUtils.formatDataSize(droppedSize));
+
+ clientDto.setFinished(allFinished);
+ clientDto.setFailureReason(failureReason);
+ if (originalCount == 0) {
+ clientDto.setPercentCompleted(allFinished ? 100 : 0);
+ } else {
+ clientDto.setPercentCompleted((int) ((double) droppedCount / (double) originalCount * 100D));
+ }
+
+ if (!nodeWaiting) {
+ clientDto.setOriginalCount(originalCount);
+ clientDto.setOriginalSize(originalSize);
+ clientDto.setOriginal(FormatUtils.formatCount(originalCount) + " / " + FormatUtils.formatDataSize(originalSize));
+ }
+
+ if (state != null) {
+ clientDto.setState(state.toString());
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
index 28e848f..11b6cb6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/ReportingTaskNode.java
@@ -43,7 +43,7 @@ public interface ReportingTaskNode extends ConfiguredComponent {
*
* @param schedulingPeriod new period
*/
- void setScheduldingPeriod(String schedulingPeriod);
+ void setSchedulingPeriod(String schedulingPeriod);
ReportingTask getReportingTask();
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceState.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceState.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceState.java
index 4afd826..d92fadd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceState.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceState.java
@@ -37,7 +37,7 @@ public enum ControllerServiceState {
ENABLING,
/**
* Controller Service has been enabled and has finished its lifecycle
- * methods. The Controller SErvice is ready to be used.
+ * methods. The Controller Service is ready to be used.
*/
ENABLED;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index 61c1513..eb9bcac 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -510,7 +510,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
final ReportingTaskNode reportingTask = controller.createReportingTask(dto.getType(), dto.getId(), false);
reportingTask.setName(dto.getName());
reportingTask.setComments(dto.getComments());
- reportingTask.setScheduldingPeriod(dto.getSchedulingPeriod());
+ reportingTask.setSchedulingPeriod(dto.getSchedulingPeriod());
reportingTask.setSchedulingStrategy(SchedulingStrategy.valueOf(dto.getSchedulingStrategy()));
reportingTask.setAnnotationData(dto.getAnnotationData());
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
index 139b442..21747cf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
@@ -94,7 +94,7 @@ public abstract class AbstractReportingTaskNode extends AbstractConfiguredCompon
}
@Override
- public void setScheduldingPeriod(final String schedulingPeriod) {
+ public void setSchedulingPeriod(final String schedulingPeriod) {
this.schedulingPeriod.set(schedulingPeriod);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index 4e70e7b..2960091 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -120,7 +120,7 @@ public class FileSystemRepository implements ContentRepository {
private ResourceClaimManager resourceClaimManager; // effectively final
- // Map of contianer to archived files that should be deleted next.
+ // Map of container to archived files that should be deleted next.
private final Map<String, BlockingQueue<ArchiveInfo>> archivedFiles = new HashMap<>();
// guarded by synchronizing on this
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/engine/FlowEngine.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/engine/FlowEngine.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/engine/FlowEngine.java
index d407e2f..ffc463f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/engine/FlowEngine.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/engine/FlowEngine.java
@@ -80,7 +80,7 @@ public final class FlowEngine extends ScheduledThreadPoolExecutor {
}
/**
- * Hook method called by the thread that executed the given runnable after execution of the runnable completed. Logs the fact of completion and any errors that might have occured.
+ * Hook method called by the thread that executed the given runnable after execution of the runnable completed. Logs the fact of completion and any errors that might have occurred.
*
* @param runnable runnable
* @param throwable throwable
http://git-wip-us.apache.org/repos/asf/nifi/blob/446cd447/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizableLookup.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizableLookup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizableLookup.java
index b3ef20c..350410a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizableLookup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/authorization/AuthorizableLookup.java
@@ -171,11 +171,11 @@ public interface AuthorizableLookup {
/**
* Get the authorizable referencing component.
*
- * @param controllerSeriveId controller service id
+ * @param controllerServiceId controller service id
* @param id component id
* @return authorizable
*/
- Authorizable getControllerServiceReferencingComponent(String controllerSeriveId, String id);
+ Authorizable getControllerServiceReferencingComponent(String controllerServiceId, String id);
/**
* Get the authorizable ReportingTask.