(nifi) branch main updated: NIFI-12853 Refactor FlowFilePrioritizer using updated Java APIs

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 63fa036818 NIFI-12853 Refactor FlowFilePrioritizer using updated Java 
APIs
63fa036818 is described below

commit 63fa036818543deb2bec9d2f9ecbd3ee20bff69f
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Thu Feb 29 23:05:46 2024 +0100

NIFI-12853 Refactor FlowFilePrioritizer using updated Java APIs

Signed-off-by: Mike Moser 

This closes #8461
---
 .../apache/nifi/flowfile/FlowFilePrioritizer.java  |   9 +-
 .../prioritizer/FirstInFirstOutPrioritizer.java|  24 ++--
 .../NewestFlowFileFirstPrioritizer.java|  25 ++---
 .../OldestFlowFileFirstPrioritizer.java|  24 ++--
 .../prioritizer/PriorityAttributePrioritizer.java  |  88 ++-
 ...st.java => FirstInFirstOutPrioritizerTest.java} |  32 +++---
 .../prioritizer/NewestFirstPrioritizerTest.java|  33 +++---
 .../prioritizer/OldestFirstPrioritizerTest.java|  45 +++-
 .../PriorityAttributePrioritizerTest.java  | 122 +++--
 9 files changed, 149 insertions(+), 253 deletions(-)

diff --git 
a/nifi-framework-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
 
b/nifi-framework-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
index 684f454f57..cb60ebed17 100644
--- 
a/nifi-framework-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
+++ 
b/nifi-framework-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
@@ -19,11 +19,10 @@ package org.apache.nifi.flowfile;
 import java.util.Comparator;
 
 /**
- * Provides a mechanism to prioritize flow file objects based on their
- * attributes. The actual flow file content will not be available for 
comparison
- * so if features of that content are necessary for prioritization it should be
- * extracted to be used as an attribute of the flow file.
- *
+ * Provides a mechanism to prioritize flow file objects based on their 
attributes.
+ * The actual flow file content will not be available for comparison.
+ * If features of that content are necessary for prioritization,
+ * it should be extracted to be used as an attribute of the flow file.
  */
 public interface FlowFilePrioritizer extends Comparator {
 }
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
index 08437c76ba..42cd4c81ed 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/FirstInFirstOutPrioritizer.java
@@ -19,24 +19,18 @@ package org.apache.nifi.prioritizer;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.flowfile.FlowFilePrioritizer;
 
+import java.util.Comparator;
+
 public class FirstInFirstOutPrioritizer implements FlowFilePrioritizer {
 
+private static final Comparator composedComparator = 
Comparator.nullsLast(
+Comparator
+.comparingLong(FlowFile::getLastQueueDate)
+.thenComparingLong(FlowFile::getQueueDateIndex)
+);
+
 @Override
 public int compare(final FlowFile o1, final FlowFile o2) {
-if (o1 == null && o2 == null) {
-return 0;
-} else if (o2 == null) {
-return -1;
-} else if (o1 == null) {
-return 1;
-}
-
-final int dateComparison = 
o1.getLastQueueDate().compareTo(o2.getLastQueueDate());
-if (dateComparison != 0) {
-return dateComparison;
-}
-
-return Long.compare(o1.getQueueDateIndex(), o2.getQueueDateIndex());
+return composedComparator.compare(o1, o2);
 }
-
 }
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
index 4893cf0589..6e31a300c3 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/src/main/java/org/apache/nifi/prioritizer/NewestFlowFileFirstPrioritizer.java
@@ -19,24 

(nifi) branch support/nifi-1.x updated: NIFI-8606 Added Disable & Configure button to the Controller Services Details dialog

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new 073a84b4f3 NIFI-8606 Added Disable & Configure button to the 
Controller Services Details dialog
073a84b4f3 is described below

commit 073a84b4f3a1cbea89b17ffd1c6232922deadfc4
Author: Freedom9339 
AuthorDate: Wed Aug 2 17:07:02 2023 +

NIFI-8606 Added Disable & Configure button to the Controller Services 
Details dialog

This closes #7562

Signed-off-by: Mike Moser 
---
 .../canvas/controller-service-configuration.jsp|   1 +
 .../src/main/webapp/css/controller-service.css |   5 +
 .../js/jquery/statusbar/jquery.statusbar.css   |   5 +
 .../webapp/js/jquery/statusbar/jquery.statusbar.js |  27 +-
 .../webapp/js/nf/canvas/nf-canvas-bootstrap.js |   7 +-
 .../webapp/js/nf/canvas/nf-controller-service.js   | 108 -
 6 files changed, 142 insertions(+), 11 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
index aba320ffb1..0ad7ed184c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
@@ -16,6 +16,7 @@
 --%>
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
 
+
 
 
 
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
index 5e2f6f3888..967e5f23c0 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
@@ -249,3 +249,8 @@ div.new-inline-controller-service-button-container {
 right: 0;
 padding: 0 8px 10px;
 }
+
+/* Status bar button icon */
+#controller-service-configuration div.dialog-status-bar 
div.button-icon.fa-hourglass-end {
+font-size : 11px !important;
+}
\ No newline at end of file
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
index ddff90653f..6db85e3f7f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
@@ -62,6 +62,11 @@
 color : #7dc7a0;
 }
 
+.dialog-status-bar[state="ENABLED"] text.run-status-icon::before {
+content : "\f04b";
+color : #7dc7a0;
+}
+
 .dialog-status-bar[state="STOPPED"] text.run-status-icon::before {
 content : "\f04d";
 color : #d18686;
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
index c7c9afa745..d01ca60114 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
@@ -27,7 +27,9 @@
 // static key path variables
 var PROCESSOR_ID_KEY = 'component.id',
 ACTIVE_THREAD_COUNT_KEY = 'status.aggregateSnapshot.activeThreadCount',
-RUN_STATUS_KEY = 'status.aggregateSnapshot.runStatus'
+RUN_STATUS_KEY = 'status.aggregateSnapshot.runStatus',
+CONTROLLER_STATUS_KEY = 'status.runStatus',
+CONTROLLER_VALIDATION_KEY = 'status.validationStatus';
 
 var isUndefined = function (obj) {
 return typeof obj === 'undefined';
@@ -264,24 +266,39 @@
 processorId,
 obj,
 runStatus,
+validationStatus,
  

(nifi) branch main updated: NIFI-8606 Added Disable & Configure button to the Controller Services Details dialog

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 39cac2b090 NIFI-8606 Added Disable & Configure button to the 
Controller Services Details dialog
39cac2b090 is described below

commit 39cac2b090c0c0960bfde134fe756806a1758959
Author: Freedom9339 
AuthorDate: Wed Aug 2 17:07:02 2023 +

NIFI-8606 Added Disable & Configure button to the Controller Services 
Details dialog

This closes #7562

Signed-off-by: Mike Moser 
---
 .../canvas/controller-service-configuration.jsp|   1 +
 .../src/main/webapp/css/controller-service.css |   5 +
 .../js/jquery/statusbar/jquery.statusbar.css   |   5 +
 .../webapp/js/jquery/statusbar/jquery.statusbar.js |  27 +-
 .../webapp/js/nf/canvas/nf-canvas-bootstrap.js |   7 +-
 .../webapp/js/nf/canvas/nf-controller-service.js   | 108 -
 6 files changed, 142 insertions(+), 11 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
index aba320ffb1..0ad7ed184c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
@@ -16,6 +16,7 @@
 --%>
 <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
 
+
 
 
 
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
index 5e2f6f3888..967e5f23c0 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
@@ -249,3 +249,8 @@ div.new-inline-controller-service-button-container {
 right: 0;
 padding: 0 8px 10px;
 }
+
+/* Status bar button icon */
+#controller-service-configuration div.dialog-status-bar 
div.button-icon.fa-hourglass-end {
+font-size : 11px !important;
+}
\ No newline at end of file
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
index ddff90653f..6db85e3f7f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.css
@@ -62,6 +62,11 @@
 color : #7dc7a0;
 }
 
+.dialog-status-bar[state="ENABLED"] text.run-status-icon::before {
+content : "\f04b";
+color : #7dc7a0;
+}
+
 .dialog-status-bar[state="STOPPED"] text.run-status-icon::before {
 content : "\f04d";
 color : #d18686;
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
index c7c9afa745..d01ca60114 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/statusbar/jquery.statusbar.js
@@ -27,7 +27,9 @@
 // static key path variables
 var PROCESSOR_ID_KEY = 'component.id',
 ACTIVE_THREAD_COUNT_KEY = 'status.aggregateSnapshot.activeThreadCount',
-RUN_STATUS_KEY = 'status.aggregateSnapshot.runStatus'
+RUN_STATUS_KEY = 'status.aggregateSnapshot.runStatus',
+CONTROLLER_STATUS_KEY = 'status.runStatus',
+CONTROLLER_VALIDATION_KEY = 'status.validationStatus';
 
 var isUndefined = function (obj) {
 return typeof obj === 'undefined';
@@ -264,24 +266,39 @@
 processorId,
 obj,
 runStatus,
+validationStatus,
 activeThreadCount,
 bullet

(nifi) branch support/nifi-1.x updated: NIFI-12386 Adds processor FilterAttribute attribute uuid is not removed by removeAttribute(s) in MockProcessSession

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new b287b3ada6 NIFI-12386 Adds processor FilterAttribute attribute uuid is 
not removed by removeAttribute(s) in MockProcessSession
b287b3ada6 is described below

commit b287b3ada61b914308e6b8a08b3ac30ba069ca9f
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat Nov 18 00:28:07 2023 +0100

NIFI-12386 Adds processor FilterAttribute
attribute uuid is not removed by removeAttribute(s) in MockProcessSession

Signed-off-by: Mike Moser 

This closes #8064
---
 .../java/org/apache/nifi/util/MockFlowFile.java|   5 +
 .../apache/nifi/util/TestMockProcessSession.java   |  26 ++
 .../nifi/processors/standard/FilterAttribute.java  | 273 +++
 .../services/org.apache.nifi.processor.Processor   |   1 +
 .../processors/standard/TestFilterAttribute.java   | 388 +
 5 files changed, 693 insertions(+)

diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java 
b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
index f5702daed1..ec86fe7656 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
@@ -189,6 +189,11 @@ public class MockFlowFile implements FlowFileRecord {
 
 public void removeAttributes(final Set attrNames) {
 for (final String attrName : attrNames) {
+if (CoreAttributes.UUID.key().equals(attrName)) {
+// the core attribute "uuid" of a FlowFile cannot be altered / 
removed
+continue;
+}
+
 attributes.remove(attrName);
 }
 }
diff --git 
a/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java 
b/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
index 700d0d29b2..3787918653 100644
--- a/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
+++ b/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
@@ -17,6 +17,7 @@
 package org.apache.nifi.util;
 
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
@@ -30,10 +31,13 @@ import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Pattern;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -182,6 +186,28 @@ public class TestMockProcessSession {
 output.get(0).assertAttributeEquals("key1", "val1");
 }
 
+@Test
+void testAttributeUUIDNotRemovable() {
+final Processor processor = new PoorlyBehavedProcessor();
+final MockProcessSession session = new MockProcessSession(new 
SharedSessionState(processor, new AtomicLong(0L)), processor, new 
MockStateManager(processor));
+FlowFile ff1 = 
session.createFlowFile("removeAttribute(attrName)".getBytes());
+FlowFile ff2 = 
session.createFlowFile("removeAllAttributes(attrNames)".getBytes());
+FlowFile ff3 = 
session.createFlowFile("removeAllAttributes(keyPattern)".getBytes());
+
+String attrName = CoreAttributes.UUID.key();
+session.removeAttribute(ff1, attrName);
+session.removeAllAttributes(ff2, new 
HashSet<>(Collections.singletonList(attrName)));
+session.removeAllAttributes(ff3, 
Pattern.compile(Pattern.quote(attrName)));
+
+session.transfer(Arrays.asList(ff1, ff2, ff3), 
PoorlyBehavedProcessor.REL_FAILURE);
+session.commitAsync();
+List output = 
session.getFlowFilesForRelationship(PoorlyBehavedProcessor.REL_FAILURE);
+assertEquals(3, output.size());
+output.get(0).assertAttributeEquals(attrName, 
ff1.getAttribute(attrName));
+output.get(1).assertAttributeEquals(attrName, 
ff2.getAttribute(attrName));
+output.get(2).assertAttributeEquals(attrName, 
ff3.getAttribute(attrName));
+}
+
 protected static class PoorlyBehavedProcessor extends AbstractProcessor {
 
 private static final Relationship REL_FAILURE = new 
Relationship.Builder()
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processor

(nifi) branch main updated: NIFI-12386 Adds processor FilterAttribute attribute uuid is not removed by removeAttribute(s) in MockProcessSession

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new edca4cd347 NIFI-12386 Adds processor FilterAttribute attribute uuid is 
not removed by removeAttribute(s) in MockProcessSession
edca4cd347 is described below

commit edca4cd347f01694fdd06ec29fc97ecd95fe36aa
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat Nov 18 00:28:07 2023 +0100

NIFI-12386 Adds processor FilterAttribute
attribute uuid is not removed by removeAttribute(s) in MockProcessSession

Signed-off-by: Mike Moser 

This closes #8049
---
 .../java/org/apache/nifi/util/MockFlowFile.java|   5 +
 .../apache/nifi/util/TestMockProcessSession.java   |  24 ++
 .../nifi/processors/standard/FilterAttribute.java  | 272 +++
 .../services/org.apache.nifi.processor.Processor   |   1 +
 .../processors/standard/TestFilterAttribute.java   | 373 +
 5 files changed, 675 insertions(+)

diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java 
b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
index f5702daed1..ec86fe7656 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
@@ -189,6 +189,11 @@ public class MockFlowFile implements FlowFileRecord {
 
 public void removeAttributes(final Set attrNames) {
 for (final String attrName : attrNames) {
+if (CoreAttributes.UUID.key().equals(attrName)) {
+// the core attribute "uuid" of a FlowFile cannot be altered / 
removed
+continue;
+}
+
 attributes.remove(attrName);
 }
 }
diff --git 
a/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java 
b/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
index 700d0d29b2..c1364a75e3 100644
--- a/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
+++ b/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
@@ -17,6 +17,7 @@
 package org.apache.nifi.util;
 
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
@@ -34,6 +35,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Pattern;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -182,6 +184,28 @@ public class TestMockProcessSession {
 output.get(0).assertAttributeEquals("key1", "val1");
 }
 
+@Test
+void testAttributeUUIDNotRemovable() {
+final Processor processor = new PoorlyBehavedProcessor();
+final MockProcessSession session = new MockProcessSession(new 
SharedSessionState(processor, new AtomicLong(0L)), processor, new 
MockStateManager(processor));
+FlowFile ff1 = 
session.createFlowFile("removeAttribute(attrName)".getBytes());
+FlowFile ff2 = 
session.createFlowFile("removeAllAttributes(attrNames)".getBytes());
+FlowFile ff3 = 
session.createFlowFile("removeAllAttributes(keyPattern)".getBytes());
+
+String attrName = CoreAttributes.UUID.key();
+session.removeAttribute(ff1, attrName);
+session.removeAllAttributes(ff2, Set.of(attrName));
+session.removeAllAttributes(ff3, 
Pattern.compile(Pattern.quote(attrName)));
+
+session.transfer(List.of(ff1, ff2, ff3), 
PoorlyBehavedProcessor.REL_FAILURE);
+session.commitAsync();
+List output = 
session.getFlowFilesForRelationship(PoorlyBehavedProcessor.REL_FAILURE);
+assertEquals(3, output.size());
+output.get(0).assertAttributeEquals(attrName, 
ff1.getAttribute(attrName));
+output.get(1).assertAttributeEquals(attrName, 
ff2.getAttribute(attrName));
+output.get(2).assertAttributeEquals(attrName, 
ff3.getAttribute(attrName));
+}
+
 protected static class PoorlyBehavedProcessor extends AbstractProcessor {
 
 private static final Relationship REL_FAILURE = new 
Relationship.Builder()
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
new file mode 100644
index 00..de612196fd
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/jav

(nifi) branch main updated: NIFI-12290 Migrated from Quartz to Spring for Cron Expressions

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 786784ef62 NIFI-12290 Migrated from Quartz to Spring for Cron 
Expressions
786784ef62 is described below

commit 786784ef62188b2b018ee262c2e8a750fb507789
Author: exceptionfactory 
AuthorDate: Sat Oct 28 18:42:46 2023 -0500

NIFI-12290 Migrated from Quartz to Spring for Cron Expressions

- Removed support for Year field in Cron Expressions
- Changed numeric Day of Week field from starting with 1 to starting with 0
- Removed Quartz and C3P0 from Notice files

This closes #7951

Signed-off-by: Mike Moser 
---
 minifi/minifi-assembly/NOTICE  |  22 
 minifi/minifi-c2/minifi-c2-assembly/NOTICE |  21 
 .../src/main/resources/META-INF/NOTICE |  21 
 .../src/main/resources/META-INF/NOTICE |  21 
 .../minifi-toolkit/minifi-toolkit-assembly/NOTICE  |  21 
 nifi-assembly/NOTICE   |  21 
 nifi-dependency-check-maven/suppressions.xml   |   5 -
 nifi-docs/src/main/asciidoc/user-guide.adoc|   9 +-
 .../nifi-kafka-connector-assembly/NOTICE   |   9 --
 .../src/main/resources/META-INF/NOTICE |  21 
 .../nifi-framework-components/pom.xml  |   4 +-
 .../nifi/controller/StandardProcessorNode.java |   4 +-
 .../org/apache/nifi/controller/FlowController.java |   6 +-
 .../scheduling/AbstractSchedulingAgent.java|   2 +-
 ...hedulingAgent.java => CronSchedulingAgent.java} |  58 ++-
 .../scheduling/CronSchedulingAgentTest.java| 114 +
 .../controller/scheduling/DummyScheduleState.java  |  26 -
 .../nifi-framework/nifi-web/nifi-web-api/pom.xml   |   5 -
 .../nifi/web/dao/impl/StandardProcessorDAO.java|   9 +-
 .../web/dao/impl/StandardReportingTaskDAO.java |   9 +-
 .../src/main/resources/META-INF/NOTICE |  21 
 .../src/main/resources/META-INF/NOTICE |  21 
 nifi-nar-bundles/nifi-framework-bundle/pom.xml |   5 -
 .../src/main/resources/META-INF/NOTICE |  21 
 nifi-stateless/nifi-stateless-assembly/NOTICE  |   8 --
 .../src/main/resources/META-INF/NOTICE |   9 --
 26 files changed, 164 insertions(+), 329 deletions(-)

diff --git a/minifi/minifi-assembly/NOTICE b/minifi/minifi-assembly/NOTICE
index 82b55b88d9..e37359ea7c 100644
--- a/minifi/minifi-assembly/NOTICE
+++ b/minifi/minifi-assembly/NOTICE
@@ -589,28 +589,6 @@ The following binary components are provided under the 
Apache Software License v
 Curator Recipes
 Copyright 2011-2014 The Apache Software Foundation
 
-
-(ASLv2) Quartz
-  The following NOTICE information applies:
-Copyright Declaration:
-Copyright © 2003-2016 Software AG, Darmstadt, Germany and/or Software 
AG USA Inc., Reston, VA, USA, and/or its subsidiaries and/or its affiliates 
and/or their licensors.
-
-Trademark and Patent declaration
-The name Software AG and all Software AG product names are either 
trademarks or registered trademarks of Software AG and/or Software AG USA Inc. 
and/or its subsidiaries and/or its affiliates
-and/or their licensors. Other company and product names mentioned 
herein may be trademarks of their respective owners.
-
-Detailed information on trademarks and patents owned by Software AG 
and/or its subsidiaries is located at https://softwareag.com/licenses.
-
-Third Party declaration
-This software may include portions of third-party products. For 
third-party copyright notices, license terms, additional rights or 
restrictions, please refer to "License Texts, Copyright
-Notices and Disclaimers of Third Party Products". For certain specific 
third-party license restrictions, please refer to section E of the Legal 
Notices available under "License Terms and
-Conditions for Use of Software AG Products / Copyright and Trademark 
Notices of Software AG Products". These documents are part of the product 
documentation, located at
-https://softwareag.com/licenses and/or in the root installation 
directory of the licensed product(s).
-
-Confidentiality Disclaimer:
-Use, reproduction, transfer, publication or disclosure is prohibited 
except as specifically provided for in your License Agreement with Software AG.
-Contact GitHub API Training Shop Blog About
-
 
 Common Development and Distribution License 1.1
 
diff --git a/minifi/minifi-c2/minifi-c2-assembly/NOTICE 
b/minifi/minifi-c2/minifi-c2-assembly/NOTICE
index 8dbf0ee4be..ca826d00b0 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/NOTICE
+++ b/minifi/minifi-c2/minifi-c2-assembly/N

[nifi] branch main updated: NIFI-12242: Added ability to route data that exceeds the configured threshold in ControlRate to be routed to 'rate exceeded' instead of just staying in the queue. Added Us

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 40ac38dfe3 NIFI-12242: Added ability to route data that exceeds the 
configured threshold in ControlRate to be routed to  'rate exceeded' instead of 
just staying in the queue. Added Use Case documentation to ControlRate.
40ac38dfe3 is described below

commit 40ac38dfe3b12376050fd09f8017cea52bcb7943
Author: Mark Payne 
AuthorDate: Wed Oct 18 12:34:30 2023 -0400

NIFI-12242: Added ability to route data that exceeds the configured 
threshold in ControlRate to be routed to  'rate exceeded' instead of just 
staying in the queue. Added Use Case documentation to ControlRate.

This closes #7895

Signed-off-by: Mike Moser 
---
 .../nifi/processors/standard/ControlRate.java  | 182 -
 .../nifi/processors/standard/TestControlRate.java  |  43 -
 2 files changed, 180 insertions(+), 45 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
index ef62eee94f..4bbcc23f3f 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.SideEffectFree;
 import org.apache.nifi.annotation.behavior.TriggerSerially;
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.documentation.UseCase;
 import org.apache.nifi.annotation.lifecycle.OnScheduled;
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
@@ -33,9 +34,9 @@ import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.DataUnit;
 import org.apache.nifi.processor.FlowFileFilter;
+import org.apache.nifi.processor.FlowFileFilter.FlowFileFilterResult;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.ProcessorInitializationContext;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processor.util.StandardValidators;
@@ -45,7 +46,6 @@ import org.apache.nifi.util.timebuffer.TimestampedLong;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -66,6 +66,52 @@ import java.util.regex.Pattern;
 @CapabilityDescription("Controls the rate at which data is transferred to 
follow-on processors."
 + " If you configure a very small Time Duration, then the accuracy of 
the throttle gets worse."
 + " You can improve this accuracy by decreasing the Yield Duration, at 
the expense of more Tasks given to the processor.")
+@UseCase(description = "Limit the rate at which data is sent to a downstream 
system with little to no bursts",
+keywords = {"throttle", "limit", "slow down", "data rate"},
+configuration = """
+Set the "Rate Control Criteria" to `data rate`.
+Set the "Time Duration" property to `1 sec`.
+Configure the "Maximum Rate" property to specify how much data should 
be allowed through each second.
+
+For example, to allow through 8 MB per second, set "Maximum Rate" to 
`8 MB`.
+"""
+)
+@UseCase(description = "Limit the rate at which FlowFiles are sent to a 
downstream system with little to no bursts",
+keywords = {"throttle", "limit", "slow down", "flowfile rate"},
+configuration = """
+Set the "Rate Control Criteria" to `flowfile count`.
+Set the "Time Duration" property to `1 sec`.
+Configure the "Maximum Rate" property to specify how many FlowFiles 
should be allowed through each second.
+
+For example, to allow through 100 FlowFiles per second, set "Maximum 
Rate" to `100`.
+"""
+)
+@UseCase(description = "Reject requests that exceed a specific rate with 
little to no bursts",
+keywords = {"throttle", "limit", "slow down", "request rate"},
+c

[nifi] branch support/nifi-1.x updated: NIFI-12038 This closes #7760. introduce PackageFlowFile processor

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new 4c5ea5f4da NIFI-12038 This closes #7760. introduce PackageFlowFile 
processor
4c5ea5f4da is described below

commit 4c5ea5f4da58ac26ad7d450c194834db72a8ae1d
Author: Mike Moser 
AuthorDate: Thu Sep 14 19:48:09 2023 +

NIFI-12038 This closes #7760. introduce PackageFlowFile processor

Signed-off-by: Joseph Witt 
---
 .../org/apache/nifi/util/FlowFilePackagerV3.java   |   2 +-
 .../apache/nifi/util/TestPackageUnpackageV3.java   |   2 +
 .../nifi/processors/standard/PackageFlowFile.java  | 134 
 .../services/org.apache.nifi.processor.Processor   |   1 +
 .../processors/standard/TestPackageFlowFile.java   | 139 +
 5 files changed, 277 insertions(+), 1 deletion(-)

diff --git 
a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
 
b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
index 181f3e3079..4487ed69fb 100644
--- 
a/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
+++ 
b/nifi-commons/nifi-flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV3.java
@@ -37,7 +37,7 @@ public class FlowFilePackagerV3 implements FlowFilePackager {
 writeFieldLength(out, attributes.size()); //write out the number 
of attributes
 for (final Map.Entry entry : 
attributes.entrySet()) { //write out each attribute key/value pair
 writeString(entry.getKey(), out);
-writeString(entry.getValue(), out);
+writeString(entry.getValue() == null ? "" : entry.getValue(), 
out);
 }
 }
 
diff --git 
a/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
 
b/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
index 1bd8f09821..cd6a1a523d 100644
--- 
a/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
+++ 
b/nifi-commons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
@@ -38,6 +38,7 @@ public class TestPackageUnpackageV3 {
 final byte[] data = "Hello, World!".getBytes(StandardCharsets.UTF_8);
 final Map map = new HashMap<>();
 map.put("abc", "cba");
+map.put("123", null);
 
 final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 final ByteArrayInputStream in = new ByteArrayInputStream(data);
@@ -49,6 +50,7 @@ public class TestPackageUnpackageV3 {
 final Map unpackagedAttributes = 
unpackager.unpackageFlowFile(encodedIn, decodedOut);
 final byte[] decoded = decodedOut.toByteArray();
 
+map.put("123", ""); // replace null attribute for verification, 
because it is packaged as empty string
 assertEquals(map, unpackagedAttributes);
 assertArrayEquals(data, decoded);
 }
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java
new file mode 100644
index 00..3e589a7104
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java
@@ -0,0 +1,134 @@
+/*
+ * 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.processors.standard;
+
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.behavior.SideEffectFree;
+import org.apache.nifi.annotation.behavior.SupportsBatching;
+import org.apache.nifi.annotation.behavior.WritesAttribute;
+import org.apache.nifi.annotation.behavior.W

[nifi] branch support/nifi-1.x updated: NIFI-10756 Generate error message when processor and/or controller service is unable to transition to start and/or enabled state

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new 434154b514 NIFI-10756 Generate error message when processor and/or 
controller service is unable to transition to start and/or enabled state
434154b514 is described below

commit 434154b514c36c26777cde5a37334e1de0263e66
Author: Nissim Shiman 
AuthorDate: Fri Mar 17 19:32:20 2023 +

NIFI-10756 Generate error message when processor and/or controller
service is unable to transition to start and/or enabled state

Signed-off-by: Mike Moser 
---
 .../org/apache/nifi/controller/StandardProcessorNode.java | 15 +++
 .../controller/service/StandardControllerServiceNode.java |  9 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index c7dd22d6f4..e740336a6d 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1594,7 +1594,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 }
 
 if (starting) { // will ensure that the Processor represented by this 
node can only be started once
-initiateStart(taskScheduler, administrativeYieldMillis, 
timeoutMillis, processContextFactory, schedulingAgentCallback);
+initiateStart(taskScheduler, administrativeYieldMillis, 
timeoutMillis, new AtomicLong(0), processContextFactory, 
schedulingAgentCallback);
 } else {
 final String procName = 
processorRef.get().getProcessor().toString();
 procLog.warn("Cannot start {} because it is not currently stopped. 
Current state is {}", procName, currentState);
@@ -1711,7 +1711,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 
 
 private void initiateStart(final ScheduledExecutorService taskScheduler, 
final long administrativeYieldMillis, final long timeoutMilis,
-final Supplier processContextFactory, final 
SchedulingAgentCallback schedulingAgentCallback) {
+AtomicLong startupAttemptCount, final Supplier 
processContextFactory, final SchedulingAgentCallback schedulingAgentCallback) {
 
 final Processor processor = getProcessor();
 final ComponentLog procLog = new 
SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor);
@@ -1733,8 +1733,15 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 if (validationStatus != ValidationStatus.VALID) {
 LOG.debug("Cannot start {} because Processor is currently not 
valid; will try again after 5 seconds", StandardProcessorNode.this);
 
+startupAttemptCount.incrementAndGet();
+if (startupAttemptCount.get() == 240 || 
startupAttemptCount.get() % 7200 == 0) {
+final ValidationState validationState = 
getValidationState();
+procLog.error("Encountering difficulty starting. 
(Validation State is {}: {}). Will continue trying to start.",
+validationState, 
validationState.getValidationErrors());
+}
+
 // re-initiate the entire process
-final Runnable initiateStartTask = () -> 
initiateStart(taskScheduler, administrativeYieldMillis, timeoutMilis, 
processContextFactory, schedulingAgentCallback);
+final Runnable initiateStartTask = () -> 
initiateStart(taskScheduler, administrativeYieldMillis, timeoutMilis, 
startupAttemptCount, processContextFactory, schedulingAgentCallback);
 taskScheduler.schedule(initiateStartTask, 500, 
TimeUnit.MILLISECONDS);
 
 schedulingAgentCallback.onTaskComplete();
@@ -1811,7 +1818,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 // make sure we only continue retry loop if STOP action wasn't 
initiated
 if (scheduledState.get() != ScheduledState.STOPPING && 
scheduledState.get() != ScheduledState.RUN_ONCE) {
 // re-initiate the entire process
-final Runnable initiateStartTask = () -> 
initiateStart(taskScheduler, administrativeYieldMillis, timeoutMilis, 
processContextFactory, schedulingAgen

[nifi] branch main updated: NIFI-10756 Generate error message when processor and/or controller service is unable to transition to start and/or enabled state

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new fd2138b8cf NIFI-10756 Generate error message when processor and/or 
controller service is unable to transition to start and/or enabled state
fd2138b8cf is described below

commit fd2138b8cfa6b0afa8745ab16900f8754070441d
Author: Nissim Shiman 
AuthorDate: Fri Mar 17 19:32:20 2023 +

NIFI-10756 Generate error message when processor and/or controller
service is unable to transition to start and/or enabled state

Signed-off-by: Mike Moser 
---
 .../org/apache/nifi/controller/StandardProcessorNode.java | 15 +++
 .../controller/service/StandardControllerServiceNode.java |  9 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index c7dd22d6f4..e740336a6d 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1594,7 +1594,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 }
 
 if (starting) { // will ensure that the Processor represented by this 
node can only be started once
-initiateStart(taskScheduler, administrativeYieldMillis, 
timeoutMillis, processContextFactory, schedulingAgentCallback);
+initiateStart(taskScheduler, administrativeYieldMillis, 
timeoutMillis, new AtomicLong(0), processContextFactory, 
schedulingAgentCallback);
 } else {
 final String procName = 
processorRef.get().getProcessor().toString();
 procLog.warn("Cannot start {} because it is not currently stopped. 
Current state is {}", procName, currentState);
@@ -1711,7 +1711,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 
 
 private void initiateStart(final ScheduledExecutorService taskScheduler, 
final long administrativeYieldMillis, final long timeoutMilis,
-final Supplier processContextFactory, final 
SchedulingAgentCallback schedulingAgentCallback) {
+AtomicLong startupAttemptCount, final Supplier 
processContextFactory, final SchedulingAgentCallback schedulingAgentCallback) {
 
 final Processor processor = getProcessor();
 final ComponentLog procLog = new 
SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor);
@@ -1733,8 +1733,15 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 if (validationStatus != ValidationStatus.VALID) {
 LOG.debug("Cannot start {} because Processor is currently not 
valid; will try again after 5 seconds", StandardProcessorNode.this);
 
+startupAttemptCount.incrementAndGet();
+if (startupAttemptCount.get() == 240 || 
startupAttemptCount.get() % 7200 == 0) {
+final ValidationState validationState = 
getValidationState();
+procLog.error("Encountering difficulty starting. 
(Validation State is {}: {}). Will continue trying to start.",
+validationState, 
validationState.getValidationErrors());
+}
+
 // re-initiate the entire process
-final Runnable initiateStartTask = () -> 
initiateStart(taskScheduler, administrativeYieldMillis, timeoutMilis, 
processContextFactory, schedulingAgentCallback);
+final Runnable initiateStartTask = () -> 
initiateStart(taskScheduler, administrativeYieldMillis, timeoutMilis, 
startupAttemptCount, processContextFactory, schedulingAgentCallback);
 taskScheduler.schedule(initiateStartTask, 500, 
TimeUnit.MILLISECONDS);
 
 schedulingAgentCallback.onTaskComplete();
@@ -1811,7 +1818,7 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 // make sure we only continue retry loop if STOP action wasn't 
initiated
 if (scheduledState.get() != ScheduledState.STOPPING && 
scheduledState.get() != ScheduledState.RUN_ONCE) {
 // re-initiate the entire process
-final Runnable initiateStartTask = () -> 
initiateStart(taskScheduler, administrativeYieldMillis, timeoutMilis, 
processContextFactory, schedulingAgentCallback);
+ 

[nifi] branch master updated: NIFI-5660: JMSPublisher should set some header properties in JmsTemplate instead of directly in the message NIFI-5660: Added lines to integration test to verify these hea

[mosermw]

This is an automated email from the ASF dual-hosted git repository.

mosermw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new a0c28ee  NIFI-5660: JMSPublisher should set some header properties in 
JmsTemplate instead of directly in the message NIFI-5660: Added lines to 
integration test to verify these header properties (added by Mike Moser)
a0c28ee is described below

commit a0c28ee19e1b29b30e17946f074a01f94cfbc3c0
Author: Mark Bean 
AuthorDate: Fri Oct 5 14:08:28 2018 +

NIFI-5660: JMSPublisher should set some header properties in JmsTemplate 
instead of directly in the message
NIFI-5660: Added lines to integration test to verify these header 
properties (added by Mike Moser)

Signed-off-by: Mike Moser 

This closes #3053
---
 .../org/apache/nifi/jms/processors/AbstractJMSProcessor.java | 5 +
 .../main/java/org/apache/nifi/jms/processors/JMSPublisher.java   | 9 ++---
 .../org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java   | 4 
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
index f47cf78..e51238d 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
@@ -33,6 +33,7 @@ import 
org.springframework.jms.connection.UserCredentialsConnectionFactoryAdapte
 import org.springframework.jms.core.JmsTemplate;
 
 import javax.jms.ConnectionFactory;
+import javax.jms.Message;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
@@ -177,6 +178,10 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
 }
 }
 if (worker != null) {
+worker.jmsTemplate.setExplicitQosEnabled(false);
+
worker.jmsTemplate.setDeliveryMode(Message.DEFAULT_DELIVERY_MODE);
+worker.jmsTemplate.setTimeToLive(Message.DEFAULT_TIME_TO_LIVE);
+worker.jmsTemplate.setPriority(Message.DEFAULT_PRIORITY);
 workerPool.offer(worker);
 }
 }
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
index c13f4b7..506de49 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/JMSPublisher.java
@@ -84,11 +84,14 @@ final class JMSPublisher extends JMSWorker {
 for (Entry entry : 
flowFileAttributesToSend.entrySet()) {
 try {
 if (entry.getKey().equals(JmsHeaders.DELIVERY_MODE)) {
-
message.setJMSDeliveryMode(Integer.parseInt(entry.getValue()));
+
this.jmsTemplate.setDeliveryMode(Integer.parseInt(entry.getValue()));
+this.jmsTemplate.setExplicitQosEnabled(true);
 } else if (entry.getKey().equals(JmsHeaders.EXPIRATION)) {
-
message.setJMSExpiration(Integer.parseInt(entry.getValue()));
+
this.jmsTemplate.setTimeToLive(Integer.parseInt(entry.getValue()));
+this.jmsTemplate.setExplicitQosEnabled(true);
 } else if (entry.getKey().equals(JmsHeaders.PRIORITY)) {
-
message.setJMSPriority(Integer.parseInt(entry.getValue()));
+
this.jmsTemplate.setPriority(Integer.parseInt(entry.getValue()));
+this.jmsTemplate.setExplicitQosEnabled(true);
 } else if (entry.getKey().equals(JmsHeaders.REDELIVERED)) {
 
message.setJMSRedelivered(Boolean.parseBoolean(entry.getValue()));
 } else if (entry.getKey().equals(JmsHeaders.TIMESTAMP)) {
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java
index 7812e71..12474ec 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerIT.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test

nifi git commit: NIFI-5635 - Description PutEmail properties with multiple senders/recipients

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 246c09052 -> 768bcfb50


NIFI-5635 - Description PutEmail properties with multiple senders/recipients

This closes #3031

Signed-off-by: Mike Moser 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/768bcfb5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/768bcfb5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/768bcfb5

Branch: refs/heads/master
Commit: 768bcfb5092fb240adbe528103c06d7796a709bc
Parents: 246c090
Author: Pierre Villard 
Authored: Tue Sep 25 22:53:28 2018 +0200
Committer: Mike Moser 
Committed: Sun Oct 7 17:21:01 2018 -0400

--
 .../org/apache/nifi/processors/standard/PutEmail.java | 12 
 .../apache/nifi/processors/standard/TestPutEmail.java | 14 ++
 2 files changed, 18 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/768bcfb5/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
index 8fdcc14..b7b8232 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
@@ -165,28 +165,32 @@ public class PutEmail extends AbstractProcessor {
 .build();
 public static final PropertyDescriptor FROM = new 
PropertyDescriptor.Builder()
 .name("From")
-.description("Specifies the Email address to use as the sender")
+.description("Specifies the Email address to use as the sender. "
++ "Comma separated sequence of addresses following RFC822 
syntax.")
 .required(true)
 
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
 .build();
 public static final PropertyDescriptor TO = new 
PropertyDescriptor.Builder()
 .name("To")
-.description("The recipients to include in the To-Line of the 
email")
+.description("The recipients to include in the To-Line of the 
email. "
++ "Comma separated sequence of addresses following RFC822 
syntax.")
 .required(false)
 
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
 .build();
 public static final PropertyDescriptor CC = new 
PropertyDescriptor.Builder()
 .name("CC")
-.description("The recipients to include in the CC-Line of the 
email")
+.description("The recipients to include in the CC-Line of the 
email. "
++ "Comma separated sequence of addresses following RFC822 
syntax.")
 .required(false)
 
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
 .build();
 public static final PropertyDescriptor BCC = new 
PropertyDescriptor.Builder()
 .name("BCC")
-.description("The recipients to include in the BCC-Line of the 
email")
+.description("The recipients to include in the BCC-Line of the 
email. "
++ "Comma separated sequence of addresses following RFC822 
syntax.")
 .required(false)
 
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)

http://git-wip-us.apache.org/repos/asf/nifi/blob/768bcfb5/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
index 7df04ba..97ff77e 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
+++ 

nifi git commit: NIFI-5350 Add a way to provide arbitrary Java options in shell scripts

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 9ee2316ff -> a19134f32


NIFI-5350 Add a way to provide arbitrary Java options in shell scripts

Signed-off-by: Mike Moser 

This closes #2823


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a19134f3
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a19134f3
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a19134f3

Branch: refs/heads/master
Commit: a19134f32560ae044cb898a7654ada31338e20c2
Parents: 9ee2316
Author: Lars Francke 
Authored: Thu Jun 28 23:22:49 2018 +0200
Committer: Mike Moser 
Committed: Mon Aug 6 21:02:29 2018 +

--
 .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a19134f3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index eaf4e1a..0d8db06 100755
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -308,7 +308,7 @@ run() {
 
 BOOTSTRAP_DIR_PARAMS="${BOOTSTRAP_LOG_PARAMS} ${BOOTSTRAP_PID_PARAMS} 
${BOOTSTRAP_CONF_PARAMS}"
 
-run_nifi_cmd="'${JAVA}' -cp '${BOOTSTRAP_CLASSPATH}' -Xms12m -Xmx24m 
${BOOTSTRAP_DIR_PARAMS} ${BOOTSTRAP_DEBUG_PARAMS} 
org.apache.nifi.bootstrap.RunNiFi $@"
+run_nifi_cmd="'${JAVA}' -cp '${BOOTSTRAP_CLASSPATH}' -Xms12m -Xmx24m 
${BOOTSTRAP_DIR_PARAMS} ${BOOTSTRAP_DEBUG_PARAMS} ${BOOTSTRAP_JAVA_OPTS} 
org.apache.nifi.bootstrap.RunNiFi $@"
 
 if [ -n "${run_as_user}" ]; then
   # Provide SCRIPT_DIR and execute nifi-env for the run.as user command

nifi git commit: NIFI-4272 support multiple captures when EL is present in replacement value This closes #2748

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master eedf1237a -> f7f809c3d


NIFI-4272 support multiple captures when EL is present in replacement value
This closes #2748

Signed-off-by: Mike Moser 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f7f809c3
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f7f809c3
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f7f809c3

Branch: refs/heads/master
Commit: f7f809c3d3632eea5234b31740984b73de322464
Parents: eedf123
Author: Otto Fowler 
Authored: Wed May 30 16:53:55 2018 -0400
Committer: Mike Moser 
Committed: Wed Jun 6 17:23:20 2018 +

--
 .../nifi/processors/standard/ReplaceText.java   | 110 +++
 .../processors/standard/TestReplaceText.java|  62 ++-
 2 files changed, 150 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/f7f809c3/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
index de17213..f303796 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
@@ -18,16 +18,17 @@ package org.apache.nifi.processors.standard;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.nifi.annotation.behavior.EventDriven;
-import org.apache.nifi.annotation.behavior.SystemResourceConsideration;
 import org.apache.nifi.annotation.behavior.InputRequirement;
 import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
 import org.apache.nifi.annotation.behavior.SideEffectFree;
 import org.apache.nifi.annotation.behavior.SupportsBatching;
 import org.apache.nifi.annotation.behavior.SystemResource;
+import org.apache.nifi.annotation.behavior.SystemResourceConsideration;
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.PropertyValue;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.components.Validator;
@@ -79,7 +80,9 @@ import java.util.regex.Pattern;
 @SystemResourceConsideration(resource = SystemResource.MEMORY)
 public class ReplaceText extends AbstractProcessor {
 
-private static Pattern REPLACEMENT_NORMALIZATION_PATTERN = 
Pattern.compile("(\\$\\D)");
+private static Pattern QUOTED_GROUP_REF_PATTERN = 
Pattern.compile("\\$\\{\\s*?'\\$\\d+?'.+?\\}");
+private static Pattern DOUBLE_QUOTED_GROUP_REF_PATTERN = 
Pattern.compile("\\$\\{\\s*?\"\\$\\d+?\".+?\\}");
+private static Pattern LITERAL_QUOTED_PATTERN = 
Pattern.compile("literal\\(('.*?')\\)",Pattern.DOTALL);
 
 // Constants
 public static final String LINE_BY_LINE = "Line-by-Line";
@@ -301,12 +304,8 @@ public class ReplaceText extends AbstractProcessor {
 
 // If we find a back reference that is not valid, then we will treat it as 
a literal string. For example, if we have 3 capturing
 // groups and the Replacement Value has the value is "I owe $8 to him", 
then we want to treat the $8 as a literal "$8", rather
-// than attempting to use it as a back reference.
+// than attempting to use it as a back reference.  We do this even if 
there are no capture groups.
 private static String escapeLiteralBackReferences(final String unescaped, 
final int numCapturingGroups) {
-if (numCapturingGroups == 0) {
-return unescaped;
-}
-
 String value = unescaped;
 final Matcher backRefMatcher = 
unescapedBackReferencePattern.matcher(value); // consider unescaped back 
references
 while (backRefMatcher.find()) {
@@ -542,12 +541,18 @@ public class ReplaceText extends AbstractProcessor {
 additionalAttrs.put("$" + i, groupValue);
 }
 
-String replacement = 
context.getProperty(REPLACEMENT_VALUE).evaluateAttributeExpressions(flowFile, 
additionalAttrs, escapeBackRefDecorator).getValue();
+// prepare the string and do the regex replace first
+// then evaluate the EL on the result
+

nifi git commit: NIFI-4658 set Maximum Number of Entries to required and allow FlowFiles having fragment.count greater than Max Entries property

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master b7e1f4813 -> c59b6fdf6


NIFI-4658 set Maximum Number of Entries to required and allow FlowFiles having 
fragment.count greater than Max Entries property

Signed-off-by: Mike Moser 

This closes #2559


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c59b6fdf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c59b6fdf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c59b6fdf

Branch: refs/heads/master
Commit: c59b6fdf66a33b68a6dd6a0a2b1da90cd98d9825
Parents: b7e1f48
Author: Mark Bean 
Authored: Fri Mar 16 19:43:29 2018 -0400
Committer: Mike Moser 
Committed: Mon Apr 2 20:42:04 2018 -0400

--
 .../org/apache/nifi/processor/util/bin/Bin.java | 14 -
 .../nifi/processor/util/bin/BinFiles.java   |  4 +--
 .../nifi/processor/util/bin/BinManager.java |  4 +++
 .../processors/standard/TestMergeContent.java   | 30 
 4 files changed, 43 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/c59b6fdf/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
--
diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
index b427e06..f95c470 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
@@ -48,10 +48,10 @@ public class Bin {
 private volatile int maximumEntries = Integer.MAX_VALUE;
 private final String fileCountAttribute;
 
-final List binContents = new ArrayList<>();
+private final List binContents = new ArrayList<>();
 private final Set binIndexSet = new HashSet<>();
-long size;
-int successiveFailedOfferings = 0;
+private long size;
+private int successiveFailedOfferings = 0;
 
 /**
  * Constructs a new bin
@@ -141,11 +141,11 @@ public class Bin {
 if (fileCountAttribute != null) {
 final String countValue = 
flowFile.getAttribute(fileCountAttribute);
 final Integer count = toInteger(countValue);
-if (count != null) {
-int currentMaxEntries = this.maximumEntries;
-this.maximumEntries = Math.min(count, currentMaxEntries);
-this.minimumEntries = currentMaxEntries;
+if (count == null) {
+return false;
 }
+this.maximumEntries = count;
+this.minimumEntries = count;
 
 final String index = 
flowFile.getAttribute(FRAGMENT_INDEX_ATTRIBUTE);
 if (index == null || index.isEmpty() || !binIndexSet.add(index)) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/c59b6fdf/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
--
diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
index 643aae4..bad0ded 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
@@ -72,9 +72,9 @@ public abstract class BinFiles extends 
AbstractSessionFactoryProcessor {
 .build();
 public static final PropertyDescriptor MAX_ENTRIES = new 
PropertyDescriptor.Builder()
 .name("Maximum Number of Entries")
-.description("The maximum number of files to include in a bundle. 
If not specified, there is no maximum.")
+.description("The maximum number of files to include in a bundle")
 .defaultValue("1000")
-.required(false)
+.required(true)
 .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
 .build();
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/c59b6fdf/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/BinManager.java
--
diff --git 

nifi git commit: NIFI-4950 Defining behavior for MergeContent when more than 1 FlowFile has the same fragment.index value

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master c056ede6c -> 8b2c5b724


NIFI-4950 Defining behavior for MergeContent when more than 1 FlowFile has the 
same fragment.index value

Signed-off-by: Mike Moser 

This closes #2557.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8b2c5b72
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8b2c5b72
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8b2c5b72

Branch: refs/heads/master
Commit: 8b2c5b72469dd9715c532164f288acae835a0fd6
Parents: c056ede
Author: Mark Bean 
Authored: Thu Mar 15 19:06:00 2018 -0400
Committer: Mike Moser 
Committed: Fri Mar 16 18:31:43 2018 +

--
 .../org/apache/nifi/processor/util/bin/Bin.java | 19 ++
 .../nifi/processors/standard/MergeContent.java  |  3 +-
 .../processors/standard/TestMergeContent.java   | 37 
 3 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8b2c5b72/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
--
diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
index fdbc71f..b427e06 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/bin/Bin.java
@@ -18,18 +18,27 @@ package org.apache.nifi.processor.util.bin;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.FragmentAttributes;
 import org.apache.nifi.processor.ProcessSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Note: {@code Bin} objects are NOT thread safe. If multiple threads access a 
{@code Bin}, the caller must synchronize
  * access.
  */
 public class Bin {
+private static final Logger logger = LoggerFactory.getLogger(Bin.class);
+
+public static final String FRAGMENT_INDEX_ATTRIBUTE = 
FragmentAttributes.FRAGMENT_INDEX.key();
+
 private final ProcessSession session;
 private final long creationMomentEpochNs;
 private final long minimumSizeBytes;
@@ -40,6 +49,7 @@ public class Bin {
 private final String fileCountAttribute;
 
 final List binContents = new ArrayList<>();
+private final Set binIndexSet = new HashSet<>();
 long size;
 int successiveFailedOfferings = 0;
 
@@ -127,6 +137,7 @@ public class Bin {
 return false;
 }
 
+// fileCountAttribute is non-null for defragment mode
 if (fileCountAttribute != null) {
 final String countValue = 
flowFile.getAttribute(fileCountAttribute);
 final Integer count = toInteger(countValue);
@@ -135,6 +146,14 @@ public class Bin {
 this.maximumEntries = Math.min(count, currentMaxEntries);
 this.minimumEntries = currentMaxEntries;
 }
+
+final String index = 
flowFile.getAttribute(FRAGMENT_INDEX_ATTRIBUTE);
+if (index == null || index.isEmpty() || !binIndexSet.add(index)) {
+// Do not accept flowfile with duplicate fragment index value
+logger.warn("Duplicate or missing value for '" + 
FRAGMENT_INDEX_ATTRIBUTE + "' in defragment mode. Flowfile {} not allowed in 
Bin", new Object[] { flowFile });
+successiveFailedOfferings++;
+return false;
+}
 }
 
 size += flowFile.getSize();

http://git-wip-us.apache.org/repos/asf/nifi/blob/8b2c5b72/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
index 803b65d..cc9f6f7 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
+++ 

nifi git commit: NIFI-3039 Provenance Repository - Fix PurgeOldEvent and Rollover Size Limits * Added low water mark for purgeOldEvents() to more quickly purge after a large spike in events. * Adjuste

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master c71409fb5 -> 49c7af03c


NIFI-3039 Provenance Repository - Fix PurgeOldEvent and Rollover Size Limits
* Added low water mark for purgeOldEvents() to more quickly purge after a large 
spike in events.
* Adjusted rollover high water mark to avoid overrunning 
"nifi.provenance.repository.max.storage.size".
* Adjusted looping logic in mergeJournals() to use ".firstKey()" instead of 
".entrySet().iterator().next()" to avoid unnecessary object creation.

Signed-off-by: Mike Moser 
This closes #1240


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/49c7af03
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/49c7af03
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/49c7af03

Branch: refs/heads/master
Commit: 49c7af03c1ae8a5bd7c727b9a5d59b9d7e2d487e
Parents: c71409f
Author: Joe Skora 
Authored: Thu Nov 17 15:30:52 2016 +
Committer: Mike Moser 
Committed: Fri Mar 9 21:49:13 2018 +

--
 .../provenance/PersistentProvenanceRepository.java   | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/49c7af03/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
index 604bb3f..a582990 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
@@ -137,6 +137,10 @@ public class PersistentProvenanceRepository implements 
ProvenanceRepository {
 public static final int MAX_INDEXING_FAILURE_COUNT = 5; // how many 
indexing failures we will tolerate before skipping indexing for a prov file
 public static final int MAX_JOURNAL_ROLLOVER_RETRIES = 5;
 
+private static final float PURGE_OLD_EVENTS_HIGH_WATER = 0.9f;
+private static final float PURGE_OLD_EVENTS_LOW_WATER = 0.88f;
+private static final float ROLLOVER_HIGH_WATER = 0.99f;
+
 private static final Logger logger = 
LoggerFactory.getLogger(PersistentProvenanceRepository.class);
 
 private final long maxPartitionMillis;
@@ -945,13 +949,13 @@ public class PersistentProvenanceRepository implements 
ProvenanceRepository {
 };
 
 // If we have too much data (at least 90% of our max capacity), start 
aging it off
-if (bytesUsed > configuration.getMaxStorageCapacity() * 0.9) {
+if (bytesUsed > configuration.getMaxStorageCapacity() * 
PURGE_OLD_EVENTS_HIGH_WATER) {
 Collections.sort(sortedByBasename, sortByBasenameComparator);
 
 for (final File file : sortedByBasename) {
 toPurge.add(file);
 bytesUsed -= file.length();
-if (bytesUsed < configuration.getMaxStorageCapacity()) {
+if (bytesUsed < configuration.getMaxStorageCapacity() * 
PURGE_OLD_EVENTS_LOW_WATER) {
 // we've shrunk the repo size down enough to stop
 break;
 }
@@ -1369,7 +1373,7 @@ public class PersistentProvenanceRepository implements 
ProvenanceRepository {
 int journalFileCount = getJournalCount();
 long repoSize = getSize(getLogFiles(), 0L);
 final int journalCountThreshold = configuration.getJournalCount() 
* 5;
-final long sizeThreshold = (long) 
(configuration.getMaxStorageCapacity() * 1.1D); // do not go over 10% of max 
capacity
+final long sizeThreshold = (long) 
(configuration.getMaxStorageCapacity() * ROLLOVER_HIGH_WATER);
 
 // check if we need to apply backpressure.
 // If we have too many journal files, or if the repo becomes too 
large, backpressure is necessary. Without it,
@@ -1759,9 +1763,8 @@ public class PersistentProvenanceRepository implements 
ProvenanceRepository {
 
 boolean indexEvents = true;
 while (!recordToReaderMap.isEmpty()) {
-final Map.Entry entry = 

nifi git commit: NIFI-4699 Use a filter in PostHTTP to pull flowfiles from queue whose URL is the same

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 16e56ccfc -> a2f2ddd6b


NIFI-4699 Use a filter in PostHTTP to pull flowfiles from queue whose URL is 
the same

This closes #2412.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a2f2ddd6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a2f2ddd6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a2f2ddd6

Branch: refs/heads/master
Commit: a2f2ddd6b82ab611e34301e67acf30b30b5a5964
Parents: 16e56cc
Author: Mike Moser 
Authored: Tue Jan 9 15:56:54 2018 +
Committer: Mike Moser 
Committed: Thu Feb 8 18:36:11 2018 +

--
 .../nifi/processors/standard/PostHTTP.java  | 226 +--
 .../nifi/processors/standard/TestPostHTTP.java  | 118 ++
 2 files changed, 229 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a2f2ddd6/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
index d5344fa..00e51d2 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PostHTTP.java
@@ -66,6 +66,7 @@ import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.DataUnit;
+import org.apache.nifi.processor.FlowFileFilter;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -76,8 +77,6 @@ import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.security.util.CertificateUtils;
 import org.apache.nifi.security.util.KeyStoreUtils;
 import org.apache.nifi.ssl.SSLContextService;
-import org.apache.nifi.stream.io.BufferedInputStream;
-import org.apache.nifi.stream.io.BufferedOutputStream;
 import org.apache.nifi.stream.io.GZIPOutputStream;
 import org.apache.nifi.stream.io.LeakyBucketStreamThrottler;
 import org.apache.nifi.stream.io.StreamThrottler;
@@ -95,6 +94,8 @@ import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.Response.Status;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -121,6 +122,7 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
@@ -449,6 +451,26 @@ public class PostHTTP extends AbstractProcessor {
 
 @Override
 public void onTrigger(final ProcessContext context, final ProcessSession 
session) {
+FlowFile firstFlowFile = session.get();
+if (firstFlowFile == null) {
+return;
+}
+
+final ComponentLog logger = getLogger();
+final String url = 
context.getProperty(URL).evaluateAttributeExpressions(firstFlowFile).getValue();
+try {
+new java.net.URL(url);
+} catch (final MalformedURLException e) {
+logger.error("After substituting attribute values for {}, URL is 
{}; this is not a valid URL, so routing to failure",
+new Object[]{firstFlowFile, url});
+firstFlowFile = session.penalize(firstFlowFile);
+session.transfer(firstFlowFile, REL_FAILURE);
+return;
+}
+
+final List toSend = new ArrayList<>();
+toSend.add(firstFlowFile);
+
 final boolean sendAsFlowFile = 
context.getProperty(SEND_AS_FLOWFILE).asBoolean();
 final int compressionLevel = 
context.getProperty(COMPRESSION_LEVEL).asInteger();
 final String userAgent = context.getProperty(USER_AGENT).getValue();
@@ -461,141 +483,115 @@ public class PostHTTP extends AbstractProcessor {
 final RequestConfig requestConfig = requestConfigBuilder.build();
 
 final StreamThrottler throttler = throttlerRef.get();
-final ComponentLog logger = getLogger();
 
 

svn commit: r1821004 - /nifi/site/trunk/people.html

[mosermw]

Author: mosermw
Date: Fri Jan 12 16:36:50 2018
New Revision: 1821004

URL: http://svn.apache.org/viewvc?rev=1821004=rev
Log:
Updated PMC and Committer list

Modified:
nifi/site/trunk/people.html

Modified: nifi/site/trunk/people.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/people.html?rev=1821004=1821003=1821004=diff
==
--- nifi/site/trunk/people.html (original)
+++ nifi/site/trunk/people.html Fri Jan 12 16:36:50 2018
@@ -247,6 +247,26 @@
 Koji Kawamura
 
 
+
+mosermw
+Michael Moser
+
+
+
+scottyaslan
+Scott Aslan
+
+
+
+jstorck
+Jeff Storck
+
+
+
+phrocker
+Marc Parisi
+
+
 
 
 
@@ -272,10 +292,6 @@
Toivo Adams

 
-   mosermw
-   Michael Moser
-   
-
 
rickysaltzer
Ricky Saltzer
@@ -287,11 +303,6 @@
 
 
 
-scottyaslan
-Scott Aslan
-
-
-
 jeremydyer
 Jeremy Dyer
 
@@ -307,11 +318,6 @@
 
 
 
-jstorck
-Jeff Storck
-
-
-
 rmoran
 Rob Moran
 
@@ -322,8 +328,23 @@
 
 
 
-phrocker
-Marc Parisi
+mhogue
+Mike Hogue
+
+
+
+pwicks
+Peter Wicks
+
+
+
+aichrist
+Andrew Christianson
+
+
+
+kdoran
+Kevin Doran
 
 
 

nifi-site git commit: Updated PMC and Committer list

[mosermw]

Repository: nifi-site
Updated Branches:
  refs/heads/master 5f55fdb0c -> 5125192ef


Updated PMC and Committer list


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/5125192e
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/5125192e
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/5125192e

Branch: refs/heads/master
Commit: 5125192ef89ec8bfa79487a90ef999bd4368d873
Parents: 5f55fdb
Author: Mike Moser <mose...@apache.org>
Authored: Fri Jan 12 16:34:08 2018 +
Committer: Mike Moser <mose...@apache.org>
Committed: Fri Jan 12 16:34:08 2018 +

--
 README.md |  5 ++--
 src/pages/html/people.hbs | 53 +-
 2 files changed, 40 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/5125192e/README.md
--
diff --git a/README.md b/README.md
index 0781a08..b400e5c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
   limitations under the License.
 -->
 # About
-[Apache NiFi project] (http://nifi.incubator.apache.org).
+[Apache NiFi project] (http://nifi.apache.org).
 
 ## Setting up Build Environment
 
@@ -199,4 +199,5 @@ 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.
\ No newline at end of file
+limitations under the License.
+

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/5125192e/src/pages/html/people.hbs
--
diff --git a/src/pages/html/people.hbs b/src/pages/html/people.hbs
index 9bcbe7c..529c914 100644
--- a/src/pages/html/people.hbs
+++ b/src/pages/html/people.hbs
@@ -144,6 +144,26 @@ title: Apache NiFi Team
 Koji Kawamura
     
 
+
+mosermw
+Michael Moser
+
+
+
+scottyaslan
+Scott Aslan
+
+
+
+jstorck
+Jeff Storck
+
+
+
+phrocker
+Marc Parisi
+
+
 
 
 
@@ -169,10 +189,6 @@ title: Apache NiFi Team
Toivo Adams
    
 
-   mosermw
-   Michael Moser
-   
-
 
rickysaltzer
Ricky Saltzer
@@ -184,11 +200,6 @@ title: Apache NiFi Team
 
 
 
-scottyaslan
-Scott Aslan
-
-
-
 jeremydyer
 Jeremy Dyer
 
@@ -204,11 +215,6 @@ title: Apache NiFi Team
 
 
 
-jstorck
-Jeff Storck
-
-
-
 rmoran
 Rob Moran
 
@@ -219,8 +225,23 @@ title: Apache NiFi Team
 
 
 
-phrocker
-Marc Parisi
+mhogue
+Mike Hogue
+
+
+
+pwicks
+Peter Wicks
+
+
+
+aichrist
+Andrew Christianson
+
+
+
+kdoran
+Kevin Doran
 
 
 

nifi git commit: NIFI-4589: Allow multiple keys in FetchDistributedMapCache, add subMap operation to API

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 412b3fbbe -> 16a23f5a0


NIFI-4589: Allow multiple keys in FetchDistributedMapCache, add subMap 
operation to API

Signed-off-by: Mike Moser 

This closes #2260.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/16a23f5a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/16a23f5a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/16a23f5a

Branch: refs/heads/master
Commit: 16a23f5a0fe841a609abaf11f19b4d580a88c401
Parents: 412b3fb
Author: Matthew Burgess 
Authored: Thu Nov 9 10:31:16 2017 -0500
Committer: Mike Moser 
Committed: Tue Nov 21 20:13:35 2017 +

--
 .../standard/FetchDistributedMapCache.java  | 145 ++-
 .../standard/TestFetchDistributedMapCache.java  |  58 
 .../cache/client/DistributedMapCacheClient.java |  29 
 .../DistributedMapCacheClientService.java   |  46 +-
 .../distributed/cache/server/map/MapCache.java  |   3 +
 .../cache/server/map/MapCacheServer.java|  19 ++-
 .../cache/server/map/PersistentMapCache.java|  12 ++
 .../cache/server/map/SimpleMapCache.java|  27 +++-
 .../cache/server/map/TestSimpleMapCache.java|   6 +
 9 files changed, 305 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/16a23f5a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
index 185ed72..e50e843 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java
@@ -26,6 +26,9 @@ import 
org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.SeeAlso;
 import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.PropertyValue;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.distributed.cache.client.Deserializer;
 import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
 import org.apache.nifi.distributed.cache.client.Serializer;
@@ -40,28 +43,35 @@ import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.nifi.processor.io.OutputStreamCallback;
 import org.apache.nifi.processor.util.StandardValidators;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @EventDriven
 @SupportsBatching
 @Tags({"map", "cache", "fetch", "distributed"})
 @InputRequirement(Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Computes a cache key from FlowFile attributes, for 
each incoming FlowFile, and fetches the value from the Distributed Map Cache 
associated "
-+ "with that key. The incoming FlowFile's content is replaced with the 
binary data received by the Distributed Map Cache. If there is no value stored "
-+ "under that key then the flow file will be routed to 'not-found'. 
Note that the processor will always attempt to read the entire cached value 
into "
+@CapabilityDescription("Computes cache key(s) from FlowFile attributes, for 
each incoming FlowFile, and fetches the value(s) from the Distributed Map Cache 
associated "
++ "with each key. If configured without a destination attribute, the 
incoming FlowFile's content is replaced with the binary data received by the 
Distributed Map Cache. "
++ "If there is no value stored under that key then the flow file will 
be routed to 'not-found'. Note that the processor will always attempt to read 
the entire cached value into "
 + "memory before placing it in it's destination. This could be 

nifi-site git commit: updated downloads for 0.7.3 release, plus some improvements to Release Guide

[mosermw]

Repository: nifi-site
Updated Branches:
  refs/heads/master 02538798b -> c90b35ccc


updated downloads for 0.7.3 release, plus some improvements to Release Guide


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/c90b35cc
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/c90b35cc
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/c90b35cc

Branch: refs/heads/master
Commit: c90b35cccdaab3afc2b5896ba8ce632d5c6cd381
Parents: 0253879
Author: Mike Moser 
Authored: Fri May 19 14:27:00 2017 +
Committer: Mike Moser 
Committed: Fri May 19 14:27:00 2017 +

--
 src/pages/html/download.hbs | 10 +-
 src/pages/markdown/release-guide.md | 13 +++--
 2 files changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/c90b35cc/src/pages/html/download.hbs
--
diff --git a/src/pages/html/download.hbs b/src/pages/html/download.hbs
index cde0773..2d095a4 100644
--- a/src/pages/html/download.hbs
+++ b/src/pages/html/download.hbs
@@ -47,23 +47,23 @@ title: Apache NiFi Downloads
 https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.2.0;>Release
 Notes
 
 
-0.7.2
+0.7.3
 
 
 Sources:
 
-  https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.2/nifi-0.7.2-source-release.zip;>nifi-0.7.2-source-release.zip
 ( https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-source-release.zip.asc;>asc,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-source-release.zip.md5;>md5,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-source-release.zip.sha1;>sha1,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-source-release.zip.sha1;>sha256
  )
+  https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.3/nifi-0.7.3-source-release.zip;>nifi-0.7.3-source-release.zip
 ( https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-source-release.zip.asc;>asc,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-source-release.zip.md5;>md5,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-source-release.zip.sha1;>sha1,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-source-release.zip.sha256;>sha256
  )
 
 
 
 Binaries
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.2/nifi-0.7.2-bin.tar.gz;>nifi-0.7.2-bin.tar.gz
 ( https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.tar.gz.asc;>asc,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.tar.gz.md5;>md5,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.tar.gz.sha1;>sha1,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.tar.gz.sha256;>sha256
  )
+https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.3/nifi-0.7.3-bin.tar.gz;>nifi-0.7.3-bin.tar.gz
 ( https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.tar.gz.asc;>asc,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.tar.gz.md5;>md5,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.tar.gz.sha1;>sha1,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.tar.gz.sha256;>sha256
  )
 
-https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.2/nifi-0.7.2-bin.zip;>nifi-0.7.2-bin.zip
 ( https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.zip.asc;>asc,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.zip.md5;>md5,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.zip.sha1;>sha1,
 https://archive.apache.org/dist/nifi/0.7.2/nifi-0.7.2-bin.zip.sha256;>sha256
  )
+https://www.apache.org/dyn/closer.lua?path=/nifi/0.7.3/nifi-0.7.3-bin.zip;>nifi-0.7.3-bin.zip
 ( https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.zip.asc;>asc,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.zip.md5;>md5,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.zip.sha1;>sha1,
 https://archive.apache.org/dist/nifi/0.7.3/nifi-0.7.3-bin.zip.sha256;>sha256
  )
 
 
-https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version0.7.2;>Release
 Notes
+https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version0.7.3;>Release
 Notes
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/c90b35cc/src/pages/markdown/release-guide.md

[nifi] Git Push Summary

[mosermw]

Repository: nifi
Updated Tags:  refs/tags/rel/nifi-0.7.3 [created] 3ebca16fe

[nifi] Git Push Summary

[mosermw]

Repository: nifi
Updated Tags:  refs/tags/nifi-0.7.3-RC1 [created] bcc7ff908

[5/6] nifi git commit: NIFI-3824-RC1prepare for next development iteration

[mosermw]

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-framework-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml 
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 275fe8f..8932372 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-0.7.3
+0.7.4-SNAPSHOT
 
 nifi-framework-bundle
 pom
@@ -31,92 +31,92 @@
 
 org.apache.nifi
 nifi-framework-cluster-protocol
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-cluster-web
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-file-authorization-provider
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-cluster-authorization-provider
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-cluster
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-runtime
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-client-dto
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-content-access
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-security
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-core-api
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-site-to-site
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-core
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-user-actions
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-administration
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-jetty
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-optimistic-locking
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-security
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-documentation
-0.7.3
+0.7.4-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
index 8e3d2d1..9748bae 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-geo-bundle
-0.7.3
+0.7.4-SNAPSHOT
 
 nifi-geo-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
index 88a1a43..cf85e47 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-geo-bundle
-0.7.3
+0.7.4-SNAPSHOT
 
 nifi-geo-processors
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-geo-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/pom.xml
index bceacb6..de3930d 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/pom.xml
+++ 

[3/6] nifi git commit: NIFI-3824-RC1prepare release nifi-0.7.3-RC1

[mosermw]

NIFI-3824-RC1prepare release nifi-0.7.3-RC1


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/78532ef4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/78532ef4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/78532ef4

Branch: refs/heads/NIFI-3824-RC1
Commit: 78532ef44fb8b830a5316ce10a5cc7862bc3b5b2
Parents: 42b3122
Author: Mike Moser 
Authored: Sun May 14 17:23:21 2017 -0400
Committer: Mike Moser 
Committed: Sun May 14 17:23:21 2017 -0400

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   6 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   4 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |   2 +-
 .../nifi-cluster-authorization-provider/pom.xml |   2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |   2 +-
 .../nifi-file-authorization-provider/pom.xml|   2 +-
 .../nifi-framework-cluster-protocol/pom.xml |   2 +-
 .../nifi-framework-cluster-web/pom.xml  |   2 +-
 .../nifi-framework-cluster/pom.xml  |   2 +-
 .../nifi-framework-core-api/pom.xml |   2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |   2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |   2 +-
 .../nifi-framework/nifi-resources/pom.xml   |   2 +-
 .../nifi-framework/nifi-runtime/pom.xml |   2 +-
 .../nifi-framework/nifi-security/pom.xml|   2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|   2 +-
 .../nifi-framework/nifi-user-actions/pom.xml|   2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |   2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |   2 +-
 

[2/6] nifi git commit: NIFI-3824-RC1prepare release nifi-0.7.3-RC1

[mosermw]

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-framework-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml 
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 80be836..275fe8f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-0.8.0-SNAPSHOT
+0.7.3
 
 nifi-framework-bundle
 pom
@@ -31,92 +31,92 @@
 
 org.apache.nifi
 nifi-framework-cluster-protocol
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-framework-cluster-web
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-file-authorization-provider
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-cluster-authorization-provider
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-framework-cluster
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-runtime
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-client-dto
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-web-content-access
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-security
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-framework-core-api
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-site-to-site
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-framework-core
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-user-actions
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-administration
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-jetty
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-web-optimistic-locking
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-web-security
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-documentation
-0.8.0-SNAPSHOT
+0.7.3
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
index ddc7a43..8e3d2d1 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-geo-bundle
-0.8.0-SNAPSHOT
+0.7.3
 
 nifi-geo-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
index e9e9ef6..88a1a43 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-geo-bundle
-0.8.0-SNAPSHOT
+0.7.3
 
 nifi-geo-processors
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-geo-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/pom.xml
index 96ccddc..bceacb6 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/pom.xml
+++ 

[1/6] nifi git commit: NIFI-3824-RC1prepare release nifi-0.7.3-RC1

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-3824-RC1 [created] 4fd4e1368


http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
index 672e1f6..2f5d4c9 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-standard-bundle
-0.8.0-SNAPSHOT
+0.7.3
 
 org.apache.nifi
 nifi-standard-prioritizers

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index cf36974..6c68ed8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-standard-bundle
-0.8.0-SNAPSHOT
+0.7.3
 
 nifi-standard-processors
 jar
@@ -238,7 +238,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-standard-utils
-0.8.0-SNAPSHOT
+0.7.3
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
index 7e8595f..1a2460f 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-standard-bundle
-0.8.0-SNAPSHOT
+0.7.3
 
 nifi-standard-reporting-tasks
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
index 0b995d0..9be31da 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
@@ -13,7 +13,7 @@ language governing permissions and limitations under the 
License. -->
 
 nifi-standard-bundle
 org.apache.nifi
-0.8.0-SNAPSHOT
+0.7.3
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-standard-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index c322b40..b8c5a91 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-0.8.0-SNAPSHOT
+0.7.3
 
 nifi-standard-bundle
 pom
@@ -37,29 +37,29 @@
 
 org.apache.nifi
 nifi-standard-processors
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-standard-prioritizers
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-standard-reporting-tasks
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-standard-content-viewer
 war
-0.8.0-SNAPSHOT
+0.7.3
 
 
 org.apache.nifi
 nifi-jolt-transform-json-ui
 war
-0.8.0-SNAPSHOT
+0.7.3
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/78532ef4/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml
--
diff --git 

[4/6] nifi git commit: NIFI-3824-RC1prepare for next development iteration

[mosermw]

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
index 2f5d4c9..01982f3 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-standard-bundle
-0.7.3
+0.7.4-SNAPSHOT
 
 org.apache.nifi
 nifi-standard-prioritizers

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 6c68ed8..b12a1fa 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-standard-bundle
-0.7.3
+0.7.4-SNAPSHOT
 
 nifi-standard-processors
 jar
@@ -238,7 +238,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-standard-utils
-0.7.3
+0.7.4-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
index 1a2460f..0840ede 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-standard-bundle
-0.7.3
+0.7.4-SNAPSHOT
 
 nifi-standard-reporting-tasks
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
index 9be31da..af8cdbb 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
@@ -13,7 +13,7 @@ language governing permissions and limitations under the 
License. -->
 
 nifi-standard-bundle
 org.apache.nifi
-0.7.3
+0.7.4-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-standard-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index b8c5a91..e7fa07a 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-0.7.3
+0.7.4-SNAPSHOT
 
 nifi-standard-bundle
 pom
@@ -37,29 +37,29 @@
 
 org.apache.nifi
 nifi-standard-processors
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-standard-prioritizers
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-standard-reporting-tasks
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-standard-content-viewer
 war
-0.7.3
+0.7.4-SNAPSHOT
 
 
 org.apache.nifi
 nifi-jolt-transform-json-ui
 war
-0.7.3
+0.7.4-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4fd4e136/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml 

[6/6] nifi git commit: NIFI-3824-RC1prepare for next development iteration

[mosermw]

NIFI-3824-RC1prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4fd4e136
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4fd4e136
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4fd4e136

Branch: refs/heads/NIFI-3824-RC1
Commit: 4fd4e13687a067db91cf84e62b778a0398c65074
Parents: 78532ef
Author: Mike Moser 
Authored: Sun May 14 17:23:37 2017 -0400
Committer: Mike Moser 
Committed: Sun May 14 17:23:37 2017 -0400

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   6 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   4 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |   2 +-
 .../nifi-cluster-authorization-provider/pom.xml |   2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |   2 +-
 .../nifi-file-authorization-provider/pom.xml|   2 +-
 .../nifi-framework-cluster-protocol/pom.xml |   2 +-
 .../nifi-framework-cluster-web/pom.xml  |   2 +-
 .../nifi-framework-cluster/pom.xml  |   2 +-
 .../nifi-framework-core-api/pom.xml |   2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |   2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |   2 +-
 .../nifi-framework/nifi-resources/pom.xml   |   2 +-
 .../nifi-framework/nifi-runtime/pom.xml |   2 +-
 .../nifi-framework/nifi-security/pom.xml|   2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|   2 +-
 .../nifi-framework/nifi-user-actions/pom.xml|   2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |   2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |   2 +-
 

nifi git commit: Adding mose...@apache.org to KEYS

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 2328d1b0f -> 957c49b15


Adding mose...@apache.org to KEYS


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/957c49b1
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/957c49b1
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/957c49b1

Branch: refs/heads/0.x
Commit: 957c49b158c3dfcb8a1ee9a3a68863b72f33efe9
Parents: 2328d1b
Author: Mike Moser 
Authored: Sat May 13 21:04:08 2017 -0400
Committer: Mike Moser 
Committed: Sat May 13 21:04:08 2017 -0400

--
 KEYS | 61 -
 1 file changed, 60 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/957c49b1/KEYS
--
diff --git a/KEYS b/KEYS
index 2be5e6c..2ee5966 100644
--- a/KEYS
+++ b/KEYS
@@ -970,4 +970,63 @@ 
yCkBJP2wb2XKjbLwVHdLnXv4v2ERa2hOxpvq7lytc1x88Ls0k3AfC5Fwd0KlJ7ur
 rIweBoDK7maio9YZPLHo1EvnzPfCC53e/u/BSmlaRXFqdj/Zo8Tm2Cg6C3CGz7R7
 P7qGxBxqZV2gSuQbbUUx
 =JS1c
--END PGP PUBLIC KEY BLOCK-
\ No newline at end of file
+-END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/DA01B7A9 2017-05-13
+uid  Michael Moser (CODE SIGNING KEY) 
+sig 3DA01B7A9 2017-05-13  Michael Moser (CODE SIGNING KEY) 

+sub   4096R/E6689021 2017-05-13
+sig  DA01B7A9 2017-05-13  Michael Moser (CODE SIGNING KEY) 

+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+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
+1/p1MJwDY8kXnVOVaIik15rUPA==
+=4ktw
+-END PGP PUBLIC KEY BLOCK-

nifi git commit: Adding mose...@apache.org to KEYS

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-0.7.x a340bcdac -> 42b312257


Adding mose...@apache.org to KEYS


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/42b31225
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/42b31225
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/42b31225

Branch: refs/heads/support/nifi-0.7.x
Commit: 42b3122579a5fa1bf1b9903b1b20aa48ffb7e954
Parents: a340bcd
Author: Mike Moser 
Authored: Sat May 13 21:04:08 2017 -0400
Committer: Mike Moser 
Committed: Sat May 13 21:14:36 2017 -0400

--
 KEYS | 59 +++
 1 file changed, 59 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/42b31225/KEYS
--
diff --git a/KEYS b/KEYS
index 81123f8..2ee5966 100644
--- a/KEYS
+++ b/KEYS
@@ -971,3 +971,62 @@ 
rIweBoDK7maio9YZPLHo1EvnzPfCC53e/u/BSmlaRXFqdj/Zo8Tm2Cg6C3CGz7R7
 P7qGxBxqZV2gSuQbbUUx
 =JS1c
 -END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/DA01B7A9 2017-05-13
+uid  Michael Moser (CODE SIGNING KEY) 
+sig 3DA01B7A9 2017-05-13  Michael Moser (CODE SIGNING KEY) 

+sub   4096R/E6689021 2017-05-13
+sig  DA01B7A9 2017-05-13  Michael Moser (CODE SIGNING KEY) 

+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+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
+1/p1MJwDY8kXnVOVaIik15rUPA==
+=4ktw
+-END PGP PUBLIC KEY BLOCK-

[36/39] nifi git commit: NIFI-3517 If HandleHttpResponse cannot write response remove entry from HttpContextMap. * Add test for failure not clear context map. * Add handler to remove context map entry

[mosermw]

NIFI-3517 If HandleHttpResponse cannot write response remove entry from 
HttpContextMap.
* Add test for failure not clear context map.
* Add handler to remove context map entry if ProcessException occurs during 
while exporting response.

Signed-off-by: Mike Moser 

This closes #1567.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ceec0ecf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ceec0ecf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ceec0ecf

Branch: refs/heads/support/nifi-0.7.x
Commit: ceec0ecfd75d1c5387f98278b11278e497ca8428
Parents: 8a18d26
Author: Joe Skora 
Authored: Mon Mar 6 20:25:06 2017 -0500
Committer: Mike Moser 
Committed: Mon May 1 20:43:29 2017 +

--
 .../processors/standard/HandleHttpResponse.java |  5 +++
 .../standard/TestHandleHttpResponse.java| 41 +---
 2 files changed, 40 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ceec0ecf/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
index e15abcc..2244ca6 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
@@ -165,6 +165,11 @@ public class HandleHttpResponse extends AbstractProcessor {
 try {
 session.exportTo(flowFile, response.getOutputStream());
 response.flushBuffer();
+} catch (final ProcessException e) {
+session.transfer(flowFile, REL_FAILURE);
+getLogger().error("Failed to respond to HTTP request for {} due to 
{}", new Object[]{flowFile, e});
+contextMap.complete(contextIdentifier);
+return;
 } catch (final Exception e) {
 session.transfer(flowFile, REL_FAILURE);
 getLogger().error("Failed to respond to HTTP request for {} due to 
{}", new Object[]{flowFile, e});

http://git-wip-us.apache.org/repos/asf/nifi/blob/ceec0ecf/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
index bdf1cdc..ba402d4 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.nifi.controller.AbstractControllerService;
 import org.apache.nifi.http.HttpContextMap;
 import org.apache.nifi.processor.exception.FlowFileAccessException;
+import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processors.standard.util.HTTPUtils;
 import org.apache.nifi.provenance.ProvenanceEventType;
 import org.apache.nifi.reporting.InitializationException;
@@ -56,7 +57,7 @@ public class TestHandleHttpResponse {
 public void testEnsureCompleted() throws InitializationException {
 final TestRunner runner = 
TestRunners.newTestRunner(HandleHttpResponse.class);
 
-final MockHttpContextMap contextMap = new MockHttpContextMap("my-id", 
false);
+final MockHttpContextMap contextMap = new MockHttpContextMap("my-id", 
"");
 runner.addControllerService("http-context-map", contextMap);
 runner.enableControllerService(contextMap);
 runner.setProperty(HandleHttpResponse.HTTP_CONTEXT_MAP, 
"http-context-map");
@@ -95,7 +96,7 @@ public class TestHandleHttpResponse {
 public void testWithExceptionThrown() throws InitializationException {
 final TestRunner runner = 
TestRunners.newTestRunner(HandleHttpResponse.class);
 
-final MockHttpContextMap contextMap = new 

[03/39] nifi git commit: NIFI-2896-RC1 prepare for next development iteration

[mosermw]

NIFI-2896-RC1 prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e97d1a86
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e97d1a86
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e97d1a86

Branch: refs/heads/support/nifi-0.7.x
Commit: e97d1a86094c45dd53af66e8c628b5cb5750c2a6
Parents: 421d5e6
Author: Joe Skora 
Authored: Sun Oct 16 14:19:52 2016 -0400
Committer: Joe Skora 
Committed: Sun Oct 16 14:19:52 2016 -0400

--
 nifi-api/pom.xml|   2 +-
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/pom.xml |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   6 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   4 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-cassandra-bundle/pom.xml  |   4 +-
 .../nifi-couchbase-nar/pom.xml  |   6 +-
 .../nifi-couchbase-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-couchbase-bundle/pom.xml  |   4 +-
 .../nifi-elasticsearch-nar/pom.xml  |   2 +-
 .../nifi-elasticsearch-processors/pom.xml   |   2 +-
 .../nifi-elasticsearch-bundle/pom.xml   |   4 +-
 .../nifi-flume-bundle/nifi-flume-nar/pom.xml|   4 +-
 .../nifi-flume-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-flume-bundle/pom.xml  |   6 +-
 .../nifi-framework-nar/pom.xml  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml  |   2 +-
 .../nifi-cluster-authorization-provider/pom.xml |   2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |   2 +-
 .../nifi-file-authorization-provider/pom.xml|   2 +-
 .../nifi-framework-cluster-protocol/pom.xml |   2 +-
 .../nifi-framework-cluster-web/pom.xml  |   2 +-
 .../nifi-framework-cluster/pom.xml  |   2 +-
 .../nifi-framework-core-api/pom.xml |   2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |   2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml   |   2 +-
 .../nifi-framework/nifi-resources/pom.xml   |   2 +-
 .../nifi-framework/nifi-runtime/pom.xml |   2 +-
 .../nifi-framework/nifi-security/pom.xml|   2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml|   2 +-
 .../nifi-framework/nifi-user-actions/pom.xml|   2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |   2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |   2 +-
 

[27/39] nifi git commit: NIFI-3294 Adjusting nifi.sh to invoke nifi-env.sh when running as another user such that properties are preserved across environments.

[mosermw]

NIFI-3294 Adjusting nifi.sh to invoke nifi-env.sh when running as another user 
such that properties are preserved across environments.

Updating nifi.sh to include improvements by NIFI-2689

This closes #1525.

Signed-off-by: ijokarumawak 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9a5487cd
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9a5487cd
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9a5487cd

Branch: refs/heads/support/nifi-0.7.x
Commit: 9a5487cde360116ec309dce9eb526b2364632f33
Parents: 58744fc
Author: Aldrin Piri 
Authored: Tue Feb 21 16:15:20 2017 -0500
Committer: ijokarumawak 
Committed: Thu Feb 23 08:23:42 2017 +0900

--
 .../src/main/resources/bin/nifi.sh  | 72 ++--
 1 file changed, 53 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/9a5487cd/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index b58a622..d827735 100755
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -17,11 +17,35 @@
 
 # Script structure inspired from Apache Karaf and other Apache projects with 
similar startup approaches
 
-SCRIPT_DIR=$(dirname "$0")
-SCRIPT_NAME=$(basename "$0")
+# Discover the path of the file
+
+
+# Since MacOS X, FreeBSD and some other systems lack gnu readlink, we use a 
more portable
+# approach based on following StackOverflow comment 
http://stackoverflow.com/a/1116890/76
+
+TARGET_FILE=$0
+
+cd $(dirname $TARGET_FILE)
+TARGET_FILE=$(basename $TARGET_FILE)
+
+# Iterate down a (possible) chain of symlinks
+while [ -L "$TARGET_FILE" ]
+do
+TARGET_FILE=$(readlink $TARGET_FILE)
+cd $(dirname $TARGET_FILE)
+TARGET_FILE=$(basename $TARGET_FILE)
+done
+
+# Compute the canonicalized name by finding the physical path
+# for the directory we're in and appending the target file.
+PHYS_DIR=$(pwd -P)
+
+SCRIPT_DIR=$PHYS_DIR
 PROGNAME=$(basename "$0")
 
-. "$SCRIPT_DIR"/nifi-env.sh
+. "${SCRIPT_DIR}/nifi-env.sh"
+
+
 
 warn() {
 echo "${PROGNAME}: $*"
@@ -210,20 +234,21 @@ run() {
 BOOTSTRAP_CONF="${BOOTSTRAP_CONF_DIR}/bootstrap.conf";
 BOOTSTRAP_LIBS="${NIFI_HOME}/lib/bootstrap/*"
 
-run_as=$(grep '^\s*run.as' "${BOOTSTRAP_CONF}" | cut -d'=' -f2)
+run_as_user=$(grep '^\s*run.as' "${BOOTSTRAP_CONF}" | cut -d'=' -f2)
 # If the run as user is the same as that starting the process, ignore this 
configuration
-if [ "$run_as" = "$(whoami)" ]; then
-unset run_as
+if [ "${run_as_user}" = "$(whoami)" ]; then
+unset run_as_user
 fi
 
-sudo_cmd_prefix=""
 if $cygwin; then
-if [ -n "${run_as}" ]; then
+if [ -n "${run_as_user}" ]; then
 echo "The run.as option is not supported in a Cygwin environment. 
Exiting."
 exit 1
 fi;
 
 NIFI_HOME=$(cygpath --path --windows "${NIFI_HOME}")
+NIFI_LOG_DIR=$(cygpath --path --windows "${NIFI_LOG_DIR}")
+NIFI_PID_DIR=$(cygpath --path --windows "${NIFI_PID_DIR}")
 BOOTSTRAP_CONF=$(cygpath --path --windows "${BOOTSTRAP_CONF}")
 BOOTSTRAP_CONF_DIR=$(cygpath --path --windows "${BOOTSTRAP_CONF_DIR}")
 BOOTSTRAP_LIBS=$(cygpath --path --windows "${BOOTSTRAP_LIBS}")
@@ -233,11 +258,9 @@ run() {
 BOOTSTRAP_CLASSPATH="${TOOLS_JAR};${BOOTSTRAP_CLASSPATH}"
 fi
 else
-if [ -n "${run_as}" ]; then
-if id -u "${run_as}" >/dev/null 2>&1; then
-sudo_cmd_prefix="sudo -u ${run_as}"
-else
-echo "The specified run.as user ${run_as} does not exist. 
Exiting."
+if [ -n "${run_as_user}" ]; then
+if ! id -u "${run_as_user}" >/dev/null 2>&1; then
+echo "The specified run.as user ${run_as_user} does not exist. 
Exiting."
 exit 1
 fi
 fi;
@@ -258,19 +281,30 @@ run() {
 # all other commands will terminate quickly so want to just wait for them
 
 #setup directory parameters
-
BOOTSTRAP_LOG_PARAMS="-Dorg.apache.nifi.bootstrap.config.log.dir="\""${NIFI_LOG_DIR}"\"""
-
BOOTSTRAP_PID_PARAMS="-Dorg.apache.nifi.bootstrap.config.pid.dir="\""${NIFI_PID_DIR}"\"""
-

[14/39] nifi git commit: NIFI-3350 optimized documentation extraction to reduce startup time

[mosermw]

NIFI-3350 optimized documentation extraction to reduce startup time

Signed-off-by: James Wing 

This closes #1416.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3a094818
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3a094818
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3a094818

Branch: refs/heads/support/nifi-0.7.x
Commit: 3a0948188e3095bc0b38c54daea0dd219a3b11fa
Parents: 6ccc729
Author: Mike Moser 
Authored: Fri Jan 13 22:17:36 2017 +
Committer: James Wing 
Committed: Mon Jan 23 21:20:24 2017 -0800

--
 .../main/java/org/apache/nifi/nar/NarUnpacker.java  | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/3a094818/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
index ee8b454..1203118 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
@@ -90,7 +90,7 @@ public final class NarUnpacker {
 
 if (!narFiles.isEmpty()) {
 final long startTime = System.nanoTime();
-logger.info("Expanding " + narFiles.size() + " NAR files with 
all processors... It can take few minutes.");
+logger.info("Expanding " + narFiles.size() + " NAR files with 
all processors...");
 for (File narFile : narFiles) {
 logger.debug("Expanding NAR file: " + 
narFile.getAbsolutePath());
 
@@ -262,7 +262,9 @@ public final class NarUnpacker {
 private static void unpackDocumentation(final File jar, final File 
docsDirectory,
 final ExtensionMapping extensionMapping) throws IOException {
 // determine the components that may have documentation
-determineDocumentedNiFiComponents(jar, extensionMapping);
+if (!determineDocumentedNiFiComponents(jar, extensionMapping)) {
+return;
+}
 
 // look for all documentation related to each component
 try (final JarFile jarFile = new JarFile(jar)) {
@@ -301,7 +303,10 @@ public final class NarUnpacker {
 }
 }
 
-private static void determineDocumentedNiFiComponents(final File jar,
+/*
+ * Returns true if this jar file contains a NiFi component
+ */
+private static boolean determineDocumentedNiFiComponents(final File jar,
 final ExtensionMapping extensionMapping) throws IOException {
 try (final JarFile jarFile = new JarFile(jar)) {
 final JarEntry processorEntry = jarFile
@@ -311,12 +316,17 @@ public final class NarUnpacker {
 final JarEntry controllerServiceEntry = jarFile
 
.getJarEntry("META-INF/services/org.apache.nifi.controller.ControllerService");
 
+if (processorEntry==null && reportingTaskEntry==null && 
controllerServiceEntry==null) {
+return false;
+}
+
 
extensionMapping.addAllProcessors(determineDocumentedNiFiComponents(jarFile,
 processorEntry));
 
extensionMapping.addAllReportingTasks(determineDocumentedNiFiComponents(jarFile,
 reportingTaskEntry));
 
extensionMapping.addAllControllerServices(determineDocumentedNiFiComponents(jarFile,
 controllerServiceEntry));
+return true;
 }
 }
 

[13/39] nifi git commit: NIFI-3382 New test keystore, truststore

[mosermw]

NIFI-3382 New test keystore, truststore

This closes #1439.

Signed-off-by: Andy LoPresto 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6ccc7298
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6ccc7298
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6ccc7298

Branch: refs/heads/support/nifi-0.7.x
Commit: 6ccc7298903cf208c0c7fa8f12c54105ae8d0390
Parents: a3d95dc
Author: James Wing 
Authored: Sun Jan 22 20:45:29 2017 -0800
Committer: Andy LoPresto 
Committed: Mon Jan 23 17:30:36 2017 -0800

--
 .../resources/access-control/localhost-ks.jks| Bin 3512 -> 3512 bytes
 .../resources/access-control/localhost-ts.jks| Bin 1816 -> 1815 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6ccc7298/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
index df36197..f42cf6c 100755
Binary files 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
 and 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
 differ

http://git-wip-us.apache.org/repos/asf/nifi/blob/6ccc7298/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
index 7824378..b6c29ef 100755
Binary files 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
 and 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
 differ

[20/39] nifi git commit: NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (1.x) * Remove function based on JDK source. * Add new function to find bytes based on RFC3629. * Add field nam

[mosermw]

NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (1.x)
* Remove function based on JDK source.
* Add new function to find bytes based on RFC3629.
* Add field name to log entry when field is truncated.

Signed-off-by: Mike Moser 
This closes #1481


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e97d7460
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e97d7460
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e97d7460

Branch: refs/heads/support/nifi-0.7.x
Commit: e97d7460a0fe0563b52969a378a0b21172a3c347
Parents: de8d013
Author: Joe Skora 
Authored: Tue Feb 7 17:09:20 2017 +
Committer: Mike Moser 
Committed: Mon Feb 13 16:07:03 2017 -0500

--
 .../nifi/provenance/StandardRecordWriter.java   | 84 ++--
 1 file changed, 43 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d7460/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
index f015cc8..b14726a 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
@@ -87,7 +87,7 @@ public class StandardRecordWriter implements RecordWriter {
 lastBlockOffset = rawOutStream.getBytesWritten();
 resetWriteStream(firstEventId);
 
-writeUTFLimited(out, 
PersistentProvenanceRepository.class.getName());
+writeUTFLimited(out, 
PersistentProvenanceRepository.class.getName(), 
"PersistentProvenanceRepository.class.name");
 out.writeInt(PersistentProvenanceRepository.SERIALIZATION_VERSION);
 out.flush();
 } catch (final IOException ioe) {
@@ -165,7 +165,7 @@ public class StandardRecordWriter implements RecordWriter {
 }
 
 out.writeLong(recordIdentifier);
-writeUTFLimited(out, record.getEventType().name());
+writeUTFLimited(out, record.getEventType().name(), "EventType");
 out.writeLong(record.getEventTime());
 out.writeLong(record.getFlowFileEntryDate());
 out.writeLong(record.getEventDuration());
@@ -173,10 +173,10 @@ public class StandardRecordWriter implements RecordWriter 
{
 writeUUIDs(out, record.getLineageIdentifiers());
 out.writeLong(record.getLineageStartDate());
 
-writeNullableString(out, record.getComponentId());
-writeNullableString(out, record.getComponentType());
+writeNullableString(out, record.getComponentId(), "ComponentId");
+writeNullableString(out, record.getComponentType(), 
"ComponentType");
 writeUUID(out, record.getFlowFileUuid());
-writeNullableString(out, record.getDetails());
+writeNullableString(out, record.getDetails(), "Details");
 
 // Write FlowFile attributes
 final Map attrs = record.getPreviousAttributes();
@@ -196,9 +196,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If Content Claim Info is present, write out a 'TRUE' followed 
by claim info. Else, write out 'false'.
 if (record.getContentClaimSection() != null && 
record.getContentClaimContainer() != null && record.getContentClaimIdentifier() 
!= null) {
 out.writeBoolean(true);
-writeUTFLimited(out, record.getContentClaimContainer());
-writeUTFLimited(out, record.getContentClaimSection());
-writeUTFLimited(out, record.getContentClaimIdentifier());
+writeUTFLimited(out, record.getContentClaimContainer(), 
"ContentClaimContainer");
+writeUTFLimited(out, record.getContentClaimSection(), 
"ContentClaimSection");
+writeUTFLimited(out, record.getContentClaimIdentifier(), 
"ContentClaimIdentifier");
 if (record.getContentClaimOffset() == null) {
 out.writeLong(0L);
 } else {
@@ -212,9 +212,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If 

[35/39] nifi git commit: NIFI-3725 - validate processors only when they are in STOPPED state - report validation errors via REST API on processors/services/tasks/ports only when they are in the STOPPE

[mosermw]

NIFI-3725 - validate processors only when they are in STOPPED state - report 
validation errors via REST API on processors/services/tasks/ports only when 
they are in the STOPPED state

Signed-off-by: Joe Skora 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8a18d266
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8a18d266
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8a18d266

Branch: refs/heads/support/nifi-0.7.x
Commit: 8a18d26c28bcb0e2df6b30359976638637d9
Parents: b69b3b6
Author: Mike Moser 
Authored: Wed Apr 26 18:00:32 2017 +
Committer: Joe Skora 
Committed: Thu Apr 27 15:39:25 2017 -0400

--
 .../apache/nifi/controller/FlowController.java  | 12 ++--
 .../nifi/controller/StandardProcessorNode.java  | 72 +++-
 .../reporting/AbstractReportingTaskNode.java| 10 +++
 .../service/StandardControllerServiceNode.java  |  9 +++
 .../nifi/remote/StandardRemoteGroupPort.java| 49 +++--
 .../nifi/remote/StandardRootGroupPort.java  | 17 +++--
 6 files changed, 103 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8a18d266/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 4559706..611e471 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -2551,16 +2551,16 @@ public class FlowController implements EventAccess, 
ControllerServiceProvider, R
 status.setBytesSent(entry.getBytesSent());
 }
 
-// determine the run status and get any validation errors... must check
-// is valid when not disabled since a processors validity could change 
due
-// to environmental conditions (property configured with a file path 
and
-// the file being externally removed)
+// Determine the run status and get any validation errors... only 
validating while STOPPED
+// is a trade-off we are willing to make, even though processor 
validity could change due to
+// environmental conditions (property configured with a file path and 
the file being externally
+// removed). This saves on validation costs that would be unnecessary 
most of the time.
 if (ScheduledState.DISABLED.equals(procNode.getScheduledState())) {
 status.setRunStatus(RunStatus.Disabled);
-} else if (!procNode.isValid()) {
-status.setRunStatus(RunStatus.Invalid);
 } else if 
(ScheduledState.RUNNING.equals(procNode.getScheduledState())) {
 status.setRunStatus(RunStatus.Running);
+} else if (!procNode.isValid()) {
+status.setRunStatus(RunStatus.Invalid);
 } else {
 status.setRunStatus(RunStatus.Stopped);
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/8a18d266/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 5b45d2a..bb93fa2 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -946,50 +946,54 @@ public class StandardProcessorNode extends ProcessorNode 
implements Connectable
 final List results = new ArrayList<>();
 try {
 
-final ValidationContext validationContext = 
this.getValidationContextFactory()
-.newValidationContext(getProperties(), 
getAnnotationData());
-
-final Collection validationResults;
-try (final NarCloseable narCloseable = 

[01/39] nifi git commit: NIFI-2896-RC1 prepare for next development iteration

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-0.7.x 598585d0d -> a340bcdac


http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
index 7f6bd25..672e1f6 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-standard-bundle
-0.7.1
+0.8.0-SNAPSHOT
 
 org.apache.nifi
 nifi-standard-prioritizers

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 954e773..9a3d200 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-standard-bundle
-0.7.1
+0.8.0-SNAPSHOT
 
 nifi-standard-processors
 jar
@@ -238,7 +238,7 @@ language governing permissions and limitations under the 
License. -->
 
 org.apache.nifi
 nifi-standard-utils
-0.7.1
+0.8.0-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
index 9533f8d..7e8595f 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-standard-bundle
-0.7.1
+0.8.0-SNAPSHOT
 
 nifi-standard-reporting-tasks
 jar

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
index 2fc26db..0b995d0 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml
@@ -13,7 +13,7 @@ language governing permissions and limitations under the 
License. -->
 
 nifi-standard-bundle
 org.apache.nifi
-0.7.1
+0.8.0-SNAPSHOT
 
 4.0.0
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-standard-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 9983266..c322b40 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-0.7.1
+0.8.0-SNAPSHOT
 
 nifi-standard-bundle
 pom
@@ -37,29 +37,29 @@
 
 org.apache.nifi
 nifi-standard-processors
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-standard-prioritizers
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-standard-reporting-tasks
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-standard-content-viewer
 war
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-jolt-transform-json-ui
 war
-0.7.1
+0.8.0-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-api/pom.xml
--
diff --git 

[11/39] nifi git commit: NIFI-3230 fix ActiveMQ SSL support for simple connect URIs in Get/Put JMS processors

[mosermw]

NIFI-3230 fix ActiveMQ SSL support for simple connect URIs in Get/Put JMS 
processors

This closes #1344.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/954201a4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/954201a4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/954201a4

Branch: refs/heads/support/nifi-0.7.x
Commit: 954201a4d74b33964dd361732255d086032901ad
Parents: 0952685
Author: Mike Moser 
Authored: Tue Dec 20 17:26:39 2016 +
Committer: Pierre Villard 
Committed: Thu Jan 5 22:20:18 2017 +0100

--
 .../java/org/apache/nifi/processors/standard/util/JmsFactory.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/954201a4/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
index 45758a4..26d0399 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
@@ -378,6 +378,9 @@ public class JmsFactory {
 private static boolean isSSL(URI uri) {
 try {
 CompositeData compositeData = URISupport.parseComposite(uri);
+if ("ssl".equals(compositeData.getScheme())) {
+return true;
+}
 for(URI component : compositeData.getComponents()){
 if ("ssl".equals(component.getScheme())) {
 return true;

[10/39] nifi git commit: NIFI-3164 Added NAR loading duration

[mosermw]

NIFI-3164 Added NAR loading duration

This closes #1366.

Signed-off-by: James Wing 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0952685c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0952685c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0952685c

Branch: refs/heads/support/nifi-0.7.x
Commit: 0952685cd3a76341df371a2922bddcf740a59474
Parents: 9fe8ea0
Author: Pierre Villard 
Authored: Wed Dec 28 18:59:15 2016 +0100
Committer: James Wing 
Committed: Thu Dec 29 10:31:38 2016 -0800

--
 .../src/main/java/org/apache/nifi/nar/NarUnpacker.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/0952685c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
index 64da7f2..ee8b454 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
@@ -89,6 +89,7 @@ public final class NarUnpacker {
 }
 
 if (!narFiles.isEmpty()) {
+final long startTime = System.nanoTime();
 logger.info("Expanding " + narFiles.size() + " NAR files with 
all processors... It can take few minutes.");
 for (File narFile : narFiles) {
 logger.debug("Expanding NAR file: " + 
narFile.getAbsolutePath());
@@ -144,6 +145,8 @@ public final class NarUnpacker {
 }
 }
 }
+final long endTime = System.nanoTime();
+logger.info("NAR loading process took " + (endTime - 
startTime) + " nanoseconds.");
 }
 
 // attempt to delete any docs files that exist so that any

[08/39] nifi git commit: NIFI-3041 Removed references to Windows start-nifi.bat and stop-nifi.bat in Admin Guide

[mosermw]

NIFI-3041 Removed references to Windows start-nifi.bat and stop-nifi.bat in 
Admin Guide

This closes #1257.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c87c93d7
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c87c93d7
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c87c93d7

Branch: refs/heads/support/nifi-0.7.x
Commit: c87c93d7676aacf378c76b3e2b1caa1344b009d3
Parents: a9395bc
Author: Andrew Lim 
Authored: Tue Nov 22 09:53:18 2016 -0500
Committer: Pierre Villard 
Committed: Tue Nov 22 22:58:43 2016 +0100

--
 nifi-docs/src/main/asciidoc/administration-guide.adoc | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/c87c93d7/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 7cae730..6847f54 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -64,8 +64,6 @@ How to install and start NiFi
 *** At a minimum, we recommend editing the _nifi.properties_ file and entering 
a password for the nifi.sensitive.props.key (see <> below)
 ** Navigate to the /bin directory
 ** Double-click run-nifi.bat. This runs NiFi in the foreground and waits for a 
Ctrl-C to initiate shutdown of NiFi
-** Alternatively, to start NiFi in the background, double-click start-nifi.bat
-** To stop NiFi running in the background, double-click stop-nifi.bat
 ** To see the current status of NiFi, double-click status-nifi.bat
 
 

[30/39] nifi git commit: NIFI-3710: Port S3 Signer V4 Fixes to 0.x

[mosermw]

NIFI-3710: Port S3 Signer V4 Fixes to 0.x

* Port of S3 changes for selecting the S3 signer to allow v2 or v4.
* Necessary for supporting S3-compatible, non-AWS stores in recent SDKs.
* Includes original code from NIFI-2763 and fix from NIFI-2902.

This closes #1680
Signed-off-by: Mike Moser 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a1bb7a7e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a1bb7a7e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a1bb7a7e

Branch: refs/heads/support/nifi-0.7.x
Commit: a1bb7a7ee6d1a554b296bf8365e747e0fa2f97ec
Parents: 7d00c01
Author: d810146 
Authored: Wed Sep 28 16:16:21 2016 +1000
Committer: Mike Moser 
Committed: Wed Apr 19 16:31:02 2017 +

--
 .../processors/aws/s3/AbstractS3Processor.java  | 24 +++-
 .../nifi/processors/aws/s3/DeleteS3Object.java  |  2 +-
 .../nifi/processors/aws/s3/FetchS3Object.java   |  2 +-
 .../apache/nifi/processors/aws/s3/ListS3.java   |  2 +-
 .../nifi/processors/aws/s3/PutS3Object.java |  4 +-
 .../processors/aws/s3/ITDeleteS3Object.java |  3 +-
 .../nifi/processors/aws/s3/ITFetchS3Object.java |  3 +-
 .../apache/nifi/processors/aws/s3/ITListS3.java |  3 +-
 .../nifi/processors/aws/s3/ITPutS3Object.java   |  3 +-
 .../nifi/processors/aws/s3/TestPutS3Object.java | 64 
 10 files changed, 100 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a1bb7a7e/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
index ee46690..b96c05e 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.processor.ProcessContext;
@@ -114,7 +115,16 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 .expressionLanguageSupported(true)
 .defaultValue("${filename}")
 .build();
-
+public static final PropertyDescriptor SIGNER_OVERRIDE = new 
PropertyDescriptor.Builder()
+.name("Signer Override")
+.description("The AWS libraries use the default signer but this 
property allows you to specify a custom signer to support older S3-compatible 
services.")
+.required(false)
+.allowableValues(
+new AllowableValue("Default Signature", "Default 
Signature"),
+new AllowableValue("AWSS3V4SignerType", "Signature v4"),
+new AllowableValue("S3SignerType", "Signature v2"))
+.defaultValue("Default Signature")
+.build();
 /**
  * Create client using credentials provider. This is the preferred way for 
creating clients
  */
@@ -122,6 +132,8 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 protected AmazonS3Client createClient(final ProcessContext context, final 
AWSCredentialsProvider credentialsProvider, final ClientConfiguration config) {
 getLogger().info("Creating client with credentials provider");
 
+initializeSignerOverride(context, config);
+
 final AmazonS3Client s3 = new AmazonS3Client(credentialsProvider, 
config);
 
 initalizeEndpointOverride(context, s3);
@@ -138,6 +150,14 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 }
 }
 
+private void initializeSignerOverride(final ProcessContext context, final 
ClientConfiguration config) {
+String signer = context.getProperty(SIGNER_OVERRIDE).getValue();
+
+if (signer != null && 
!signer.equals(SIGNER_OVERRIDE.getDefaultValue())) {
+config.setSignerOverride(signer);
+}
+}
+
 /**
  * Create client using AWSCredentials
  *
@@ -147,6 +167,8 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 protected AmazonS3Client createClient(final 

[23/39] nifi git commit: Added Code Signing Key to KEYS.

[mosermw]

Added Code Signing Key to KEYS.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1c7e1236
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1c7e1236
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1c7e1236

Branch: refs/heads/support/nifi-0.7.x
Commit: 1c7e1236c244701773ae883eb0843515a356eacc
Parents: fd6eb66
Author: Andy LoPresto 
Authored: Wed Feb 15 11:31:56 2017 -0800
Committer: Andy LoPresto 
Committed: Wed Feb 15 11:31:56 2017 -0800

--
 KEYS | 169 ++
 1 file changed, 169 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1c7e1236/KEYS
--
diff --git a/KEYS b/KEYS
index 6d431aa..f31303b 100644
--- a/KEYS
+++ b/KEYS
@@ -343,6 +343,175 @@ 
CHcx2QO8X+Z8Q6Jz/QVIo54G4yrjq/0X3jVHyNf5QV/HdMPKkHPYbiwLIRpgQfqL
 uHOgUlOx0ZHBeBF9L2r5IaxVeKCk7DfZi3I2cP8A3pnxDw==
 =B5Xe
 -END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/2F7DEF69 2015-12-02 [expires: 2019-12-02]
+  Key fingerprint = 70EC B3E5 98A6 5A3F D3C4  BACE 3C6E F65B 2F7D EF69
+uid   [ultimate] Andy LoPresto 
+uid   [ultimate] Andy LoPresto 
+sub   4096R/04AA6F62 2015-12-02 [expires: 2019-12-02]
+
+pub   4096R/2D90B61D 2017-02-15
+  Key fingerprint = BD54 0AEC 07AC 788F 5613  EF1D 6EC2 9315 2D90 B61D
+uid   [ultimate] Andy LoPresto (CODE SIGNING KEY) 
+sub   4096R/AEF3918B 2017-02-15
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - https://gpgtools.org
+
+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

[18/39] nifi git commit: NIFI-1125 InvokeHTTP throws NullPointerException

[mosermw]

NIFI-1125 InvokeHTTP throws NullPointerException

Added null check in onPropertyModified to avoid NPE.

This closes #1477.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97d064ff
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97d064ff
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97d064ff

Branch: refs/heads/support/nifi-0.7.x
Commit: 97d064ff5c1bc2d6eee615aa39a59f909fc98a0a
Parents: 4f72e34
Author: Koji Kawamura 
Authored: Tue Feb 7 11:08:06 2017 +0900
Committer: Mike Moser 
Committed: Fri Feb 10 16:22:42 2017 -0500

--
 .../nifi/processors/standard/InvokeHTTP.java|  2 +-
 .../processors/standard/TestInvokeHTTP.java | 29 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/97d064ff/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 8c5dc4d..6befbf4 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -460,7 +460,7 @@ public final class InvokeHTTP extends AbstractProcessor {
 } else {
 // compile the attributes-to-send filter pattern
 if 
(PROP_ATTRIBUTES_TO_SEND.getName().equalsIgnoreCase(descriptor.getName())) {
-if (newValue.isEmpty()) {
+if (newValue == null || newValue.isEmpty()) {
 regexAttributesToSend = null;
 } else {
 final String trimmedValue = 
StringUtils.trimToEmpty(newValue);

http://git-wip-us.apache.org/repos/asf/nifi/blob/97d064ff/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
index 3f64c3c..29ec0bb 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
@@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +40,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class TestInvokeHTTP extends TestInvokeHttpCommon {
 
@@ -208,4 +211,30 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon {
 }
 }
 }
+
+@Test
+public void testOnPropertyModified() throws Exception {
+final InvokeHTTP processor = new InvokeHTTP();
+final Field regexAttributesToSendField = 
InvokeHTTP.class.getDeclaredField("regexAttributesToSend");
+regexAttributesToSendField.setAccessible(true);
+
+assertNull(regexAttributesToSendField.get(processor));
+
+// Set Attributes to Send.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, null, 
"uuid");
+assertNotNull(regexAttributesToSendField.get(processor));
+
+// Null clear Attributes to Send. NIFI-1125: Throws 
NullPointerException.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, 
"uuid", null);
+assertNull(regexAttributesToSendField.get(processor));
+
+// Set Attributes to Send.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, null, 
"uuid");
+assertNotNull(regexAttributesToSendField.get(processor));
+
+// Clear Attributes to Send with empty string.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, 
"uuid", "");
+assertNull(regexAttributesToSendField.get(processor));
+

[04/39] nifi git commit: Add jsk...@apache.org to KEYS.

[mosermw]

Add jsk...@apache.org to KEYS.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/12c1b4dd
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/12c1b4dd
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/12c1b4dd

Branch: refs/heads/support/nifi-0.7.x
Commit: 12c1b4dd76eaef55be39cb8822deada7bcd1aeec
Parents: e97d1a8
Author: Joe Skora 
Authored: Thu Oct 20 00:56:31 2016 -0400
Committer: Joe Skora 
Committed: Thu Oct 20 00:56:31 2016 -0400

--
 KEYS | 58 ++
 1 file changed, 58 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/12c1b4dd/KEYS
--
diff --git a/KEYS b/KEYS
index dc4e5c7..6d431aa 100644
--- a/KEYS
+++ b/KEYS
@@ -343,3 +343,61 @@ 
CHcx2QO8X+Z8Q6Jz/QVIo54G4yrjq/0X3jVHyNf5QV/HdMPKkHPYbiwLIRpgQfqL
 uHOgUlOx0ZHBeBF9L2r5IaxVeKCk7DfZi3I2cP8A3pnxDw==
 =B5Xe
 -END PGP PUBLIC KEY BLOCK-
+pub   4096R/7D84EBD6 2016-10-13
+uid  Joseph Skora (CODE SIGNING KEY) 
+sig 37D84EBD6 2016-10-13  Joseph Skora (CODE SIGNING KEY) 

+sub   4096R/CCFB335F 2016-10-13
+sig  7D84EBD6 2016-10-13  Joseph Skora (CODE SIGNING KEY) 

+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+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
+Ry2jgybWqDPTomJ0jsgp7GA=
+=h5+w
+-END PGP PUBLIC KEY BLOCK-

[34/39] nifi git commit: NIFI-3553 added final keyword for java 7 compatibility

[mosermw]

NIFI-3553 added final keyword for java 7 compatibility

Signed-off-by: Joe Skora 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b69b3b6c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b69b3b6c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b69b3b6c

Branch: refs/heads/support/nifi-0.7.x
Commit: b69b3b6c622d27544df70e157f8d8b1531a881c6
Parents: c1e65f9
Author: Mike Moser 
Authored: Fri Apr 21 19:00:53 2017 +
Committer: Joe Skora 
Committed: Thu Apr 27 14:59:38 2017 -0400

--
 .../org/apache/nifi/processors/standard/FetchFileTransfer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/b69b3b6c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
index 6182b0a..92106ae 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
@@ -222,7 +222,7 @@ public abstract class FetchFileTransfer extends 
AbstractProcessor {
 }
 
 // we have a queue of FileTransfer Objects. Get one from the queue or 
create a new one.
-FileTransfer transfer;
+final FileTransfer transfer;
 FileTransferIdleWrapper transferWrapper = transferQueue.poll();
 if (transferWrapper == null) {
 transfer = createFileTransfer(context);

[31/39] nifi git commit: NIFI-3018 removed flume-twitter-source due to usage of org.json cat-x lib

[mosermw]

NIFI-3018 removed flume-twitter-source due to usage of org.json cat-x lib

Signed-off-by: Joe Skora 

This closes #1666


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/50725591
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/50725591
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/50725591

Branch: refs/heads/support/nifi-0.7.x
Commit: 5072559156c613823ac554884dd9166acb0edd6b
Parents: a1bb7a7
Author: Mike Moser 
Authored: Wed Apr 12 15:35:19 2017 +
Committer: Joe Skora 
Committed: Thu Apr 27 12:56:44 2017 -0400

--
 .../nifi-flume-nar/src/main/resources/META-INF/NOTICE  | 6 --
 .../nifi-flume-bundle/nifi-flume-processors/pom.xml| 5 -
 2 files changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/50725591/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
index 7d73ff9..a154d24 100644
--- 
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
@@ -175,12 +175,6 @@ The following binary components are provided under the 
Apache Software License v
Jetty Web Container
Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
 
-  (ASLv2) Twitter4J
-The following NOTICE information applies:
-  Copyright 2007 Yusuke Yamamoto
-  
-  Twitter4J includes software from JSON.org to parse JSON response from 
the Twitter API. You can see the license term at 
http://www.JSON.org/license.html
-
   (ASLv2) Apache Velocity
 The following NOTICE information applies:
   Apache Velocity

http://git-wip-us.apache.org/repos/asf/nifi/blob/50725591/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml 
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
index 0293605..994e396 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
@@ -78,11 +78,6 @@
 flume-scribe-source
 ${flume.version}
 
-
-org.apache.flume.flume-ng-sources
-flume-twitter-source
-${flume.version}
-
 
 
 

[32/39] nifi git commit: NIFI-3019 cherry-picked into 0.x branch by mose...@apache.org NIFI-3692 Use hbc-core instead of hbc-twitter4j in social-media bundle to resolve org.json cat-x

[mosermw]

NIFI-3019 cherry-picked into 0.x branch by mose...@apache.org NIFI-3692 Use 
hbc-core instead of hbc-twitter4j in social-media bundle to resolve org.json 
cat-x

Signed-off-by: Joe Skora 

This closes #1667.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cd1cf68c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cd1cf68c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cd1cf68c

Branch: refs/heads/support/nifi-0.7.x
Commit: cd1cf68c9841d0cc892187ce0e510492cd9ddd48
Parents: 5072559
Author: Joey Frazee 
Authored: Tue Apr 11 10:19:44 2017 -0500
Committer: Joe Skora 
Committed: Thu Apr 27 13:17:09 2017 -0400

--
 nifi-assembly/NOTICE|  6 --
 .../src/main/resources/META-INF/NOTICE  |  8 +---
 .../nifi-twitter-processors/pom.xml | 12 +++-
 3 files changed, 12 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/cd1cf68c/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 6afaf78..75aebf2 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -642,12 +642,6 @@ The following binary components are provided under the 
Apache Software License v
   Apache License Version 2.0 http://www.apache.org/licenses/.
   (c) Daniel Lemire, http://lemire.me/en/
 
-  (ASLv2) Twitter4J
-The following NOTICE information applies:
-  Copyright 2007 Yusuke Yamamoto
-  
-  Twitter4J includes software from JSON.org to parse JSON response from 
the Twitter API. You can see the license term at 
http://www.JSON.org/license.html
-  
   (ASLv2) JOAuth
 The following NOTICE information applies:
   JOAuth

http://git-wip-us.apache.org/repos/asf/nifi/blob/cd1cf68c/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
index 7a35686..23e8f90 100644
--- 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
@@ -40,12 +40,6 @@ The following binary components are provided under the 
Apache Software License v
   Apache Commons Logging
   Copyright 2003-2013 The Apache Software Foundation
 
-  (ASLv2) Twitter4J
-The following NOTICE information applies:
-  Copyright 2007 Yusuke Yamamoto
-  
-  Twitter4J includes software from JSON.org to parse JSON response from 
the Twitter API. You can see the license term at 
http://www.JSON.org/license.html
-  
   (ASLv2) JOAuth
 The following NOTICE information applies:
   JOAuth
@@ -54,4 +48,4 @@ The following binary components are provided under the Apache 
Software License v
   (ASLv2) Hosebird Client
 The following NOTICE information applies:
   Hosebird Client (hbc)
-  Copyright 2013 Twitter, Inc.
\ No newline at end of file
+  Copyright 2013 Twitter, Inc.

http://git-wip-us.apache.org/repos/asf/nifi/blob/cd1cf68c/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml 
b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index aefe6fa..3f34ef5 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -36,8 +36,18 @@
 
 
 com.twitter
-hbc-twitter4j
+hbc-core
 2.2.0
+
+
+com.google.code.findbugs
+jsr305
+
+
+org.twitter4j
+twitter4j-core
+
+
 
 
 org.apache.nifi

[26/39] nifi git commit: Synced KEYS from https://dist.apache.org/repos/dist/release/nifi/KEYS.

[mosermw]

Synced KEYS from https://dist.apache.org/repos/dist/release/nifi/KEYS.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/58744fc4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/58744fc4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/58744fc4

Branch: refs/heads/support/nifi-0.7.x
Commit: 58744fc489fba68b40925752f65af0828b72e957
Parents: bd497a7
Author: Andy LoPresto 
Authored: Thu Feb 16 21:01:10 2017 -0800
Committer: Andy LoPresto 
Committed: Thu Feb 16 21:01:10 2017 -0800

--
 KEYS | 513 +++---
 1 file changed, 457 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/58744fc4/KEYS
--
diff --git a/KEYS b/KEYS
index f31303b..2be5e6c 100644
--- a/KEYS
+++ b/KEYS
@@ -65,7 +65,6 @@ EaWfWeQZ4Q==
 =b8+3
 -END PGP PUBLIC KEY BLOCK-
 
-
 pub   2048R/4F811A1A 2014-08-26
 uid  Joseph Witt 
 sig 34F811A1A 2015-01-15  Joseph Witt 
@@ -112,7 +111,6 @@ jTV5DLe6QqCkuu5IrLDfU5lU1LyuQSYSBfhcUMMa5h1iPfsX2rL1c2MpYMc=
 =2Pk/
 -END PGP PUBLIC KEY BLOCK-
 
-
 pub   2048R/3DD8317F 2014-08-31
 uid  Tony Kurc 
 sig 33DD8317F 2015-01-15  Tony Kurc 
@@ -144,6 +142,66 @@ 
lLqlJSFiuV7mNyu7u15/EO9S+ITRYdvsncRRYYdQdYZCyvgxP038P2WUeyRMtQSp
 F9jzEw==
 =IZsE
 -END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/629F19A9 2015-05-04
+uid  Mark Payne (CODE SIGNING KEY) 
+sig 3629F19A9 2015-05-04  Mark Payne (CODE SIGNING KEY) 

+sub   4096R/8E6FCF86 2015-05-04
+sig  629F19A9 2015-05-04  Mark Payne (CODE SIGNING KEY) 

+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+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

[37/39] nifi git commit: NIFI-3223 added support for expression language in PublishAMQP - EXCHANGE - ROUTING_KEY

[mosermw]

NIFI-3223 added support for expression language in PublishAMQP
- EXCHANGE
- ROUTING_KEY

Signed-off-by: Mike Moser 

This closes #1723.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d38a324b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d38a324b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d38a324b

Branch: refs/heads/support/nifi-0.7.x
Commit: d38a324b3d514d5f1637357ae14f947c42f1dba4
Parents: ceec0ec
Author: Oleg Zhurakousky 
Authored: Fri Jan 27 13:41:54 2017 -0500
Committer: Mike Moser 
Committed: Tue May 2 14:17:47 2017 +

--
 .../nifi/amqp/processors/AMQPPublisher.java | 65 
 .../nifi/amqp/processors/PublishAMQP.java   | 18 +++---
 .../nifi/amqp/processors/AMQPPublisherTest.java | 37 +++
 .../nifi/amqp/processors/ConsumeAMQPTest.java   |  6 +-
 4 files changed, 49 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/d38a324b/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 41a08d9..b4d6951 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
@@ -18,9 +18,7 @@ package org.apache.nifi.amqp.processors;
 
 import java.io.IOException;
 
-import org.apache.nifi.logging.ProcessorLog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.nifi.logging.ComponentLog;
 
 import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.Connection;
@@ -32,50 +30,21 @@ import com.rabbitmq.client.ReturnListener;
  */
 final class AMQPPublisher extends AMQPWorker {
 
-private final static Logger logger = 
LoggerFactory.getLogger(AMQPPublisher.class);
+private final ComponentLog processLog;
 
-private final String exchangeName;
-
-private final String routingKey;
-
-private final ProcessorLog processLog;
+private final String connectionString;
 
 /**
  * Creates an instance of this publisher
  *
  * @param connection
  *instance of AMQP {@link Connection}
- * @param exchangeName
- *the name of AMQP exchange to which messages will be 
published.
- *If not provided 'default' exchange will be used.
- * @param routingKey
- *(required) the name of the routingKey to be used by 
AMQP-based
- *system to route messages to its final destination (queue).
  */
-AMQPPublisher(Connection connection, String exchangeName, String 
routingKey, ProcessorLog processLog) {
+AMQPPublisher(Connection connection, ComponentLog processLog) {
 super(connection);
 this.processLog = processLog;
-this.validateStringProperty("routingKey", routingKey);
-this.exchangeName = exchangeName == null ? "" : exchangeName.trim();
-if (this.exchangeName.length() == 0) {
-logger.info("The 'exchangeName' is not specified. Messages will be 
sent to default exchange");
-}
-
-this.routingKey = routingKey;
 this.channel.addReturnListener(new UndeliverableMessageLogger());
-logger.info("Successfully connected AMQPPublisher to " + 
connection.toString() + " and '" + this.exchangeName
-+ "' exchange with '" + routingKey + "' as a routing key.");
-}
-
-/**
- * Publishes message without any AMQP properties (see
- * {@link BasicProperties}) to a pre-defined AMQP Exchange.
- *
- * @param bytes
- *bytes representing a message.
- */
-void publish(byte[] bytes) {
-this.publish(bytes, null);
+this.connectionString = connection.toString();
 }
 
 /**
@@ -86,14 +55,28 @@ final class AMQPPublisher extends AMQPWorker {
  *bytes representing a message.
  * @param properties
  *instance of {@link BasicProperties}
+ * @param exchange
+ *the name of AMQP exchange to which messages will be 
published.
+ *If not provided 'default' exchange will be used.
+ * @param routingKey
+ *(required) the name of the routingKey to be used by 
AMQP-based
+ *system to route messages to its final 

[17/39] nifi git commit: NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (0.x) * Updated StandardRecordWriter to consider the encoding behavior of * java.io.DataOutputStream.writeUTF()

[mosermw]

NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (0.x)
* Updated StandardRecordWriter to consider the encoding behavior of
* java.io.DataOutputStream.writeUTF() and truncate string values such that
* the UTF representation will not be longer than that DataOutputStream's
* 64K byte UTF format limit.
* Add test to confirm handling of large UTF strings.

Signed-off-by: Mike Moser 
This closes #1470.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4f72e349
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4f72e349
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4f72e349

Branch: refs/heads/support/nifi-0.7.x
Commit: 4f72e3491f2372c8c45afb96a765c1f5cdd2f07d
Parents: 2276c6a
Author: Joe Skora 
Authored: Thu Feb 2 19:11:05 2017 +
Committer: Mike Moser 
Committed: Fri Feb 3 17:10:30 2017 -0500

--
 .../nifi/provenance/StandardRecordWriter.java   | 62 
 .../TestStandardRecordReaderWriter.java | 44 ++
 2 files changed, 96 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4f72e349/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
index a5c121a..f015cc8 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UTFDataFormatException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,6 +38,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class StandardRecordWriter implements RecordWriter {
+
+public static final int MAX_ALLOWED_UTF_LENGTH = 65_535;
+
 private static final Logger logger = 
LoggerFactory.getLogger(StandardRecordWriter.class);
 
 private final File file;
@@ -83,7 +87,7 @@ public class StandardRecordWriter implements RecordWriter {
 lastBlockOffset = rawOutStream.getBytesWritten();
 resetWriteStream(firstEventId);
 
-out.writeUTF(PersistentProvenanceRepository.class.getName());
+writeUTFLimited(out, 
PersistentProvenanceRepository.class.getName());
 out.writeInt(PersistentProvenanceRepository.SERIALIZATION_VERSION);
 out.flush();
 } catch (final IOException ioe) {
@@ -161,7 +165,7 @@ public class StandardRecordWriter implements RecordWriter {
 }
 
 out.writeLong(recordIdentifier);
-out.writeUTF(record.getEventType().name());
+writeUTFLimited(out, record.getEventType().name());
 out.writeLong(record.getEventTime());
 out.writeLong(record.getFlowFileEntryDate());
 out.writeLong(record.getEventDuration());
@@ -192,9 +196,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If Content Claim Info is present, write out a 'TRUE' followed 
by claim info. Else, write out 'false'.
 if (record.getContentClaimSection() != null && 
record.getContentClaimContainer() != null && record.getContentClaimIdentifier() 
!= null) {
 out.writeBoolean(true);
-out.writeUTF(record.getContentClaimContainer());
-out.writeUTF(record.getContentClaimSection());
-out.writeUTF(record.getContentClaimIdentifier());
+writeUTFLimited(out, record.getContentClaimContainer());
+writeUTFLimited(out, record.getContentClaimSection());
+writeUTFLimited(out, record.getContentClaimIdentifier());
 if (record.getContentClaimOffset() == null) {
 out.writeLong(0L);
 } else {
@@ -208,9 +212,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If Previous Content Claim Info is present, write out a 'TRUE' 
followed by claim info. Else, write out 'false'.
 if 

[38/39] nifi git commit: NIFI-2752 Correct ReplaceText default pattern and unit tests (0.x)

[mosermw]

NIFI-2752 Correct ReplaceText default pattern and unit tests (0.x)

Signed-off-by: Mike Moser 

This closes #1732.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2328d1b0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2328d1b0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2328d1b0

Branch: refs/heads/support/nifi-0.7.x
Commit: 2328d1b0f39cff30eadfa97408c6f1d8d995456f
Parents: d38a324
Author: Joe Skora 
Authored: Tue May 2 13:14:28 2017 -0400
Committer: Mike Moser 
Committed: Tue May 2 18:53:59 2017 +

--
 .../nifi/processors/standard/ReplaceText.java   |  9 +--
 .../processors/standard/TestReplaceText.java| 60 +++-
 2 files changed, 60 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2328d1b0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
index 1df7b91..61c5f1f 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
@@ -84,7 +84,7 @@ public class ReplaceText extends AbstractProcessor {
 public static final String literalReplaceValue = "Literal Replace";
 public static final String alwaysReplace = "Always Replace";
 private static final Pattern backReferencePattern = 
Pattern.compile("\\$(\\d+)");
-private static final String DEFAULT_REGEX = "(?s:^.*$)";
+private static final String DEFAULT_REGEX = "(?s)(^.*$)";
 private static final String DEFAULT_REPLACEMENT_VALUE = "$1";
 
 // Prepend and Append will just insert the replacement value at the 
beginning or end
@@ -214,13 +214,6 @@ public class ReplaceText extends AbstractProcessor {
 String unsubstitutedReplacement = 
context.getProperty(REPLACEMENT_VALUE).getValue();
 final String replacementStrategy = 
context.getProperty(REPLACEMENT_STRATEGY).getValue();
 
-if (replacementStrategy.equalsIgnoreCase(regexReplaceValue) && 
unsubstitutedRegex.equals(DEFAULT_REGEX) && 
unsubstitutedReplacement.equals(DEFAULT_REPLACEMENT_VALUE)) {
-// This pattern says replace content with itself. We can highly 
optimize this process by simply transferring
-// all FlowFiles to the 'success' relationship
-session.transfer(flowFiles, REL_SUCCESS);
-return;
-}
-
 final Charset charset = 
Charset.forName(context.getProperty(CHARACTER_SET).getValue());
 final int maxBufferSize = 
context.getProperty(MAX_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/2328d1b0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
index a6e0971..b65bff1 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
@@ -30,10 +30,15 @@ import org.apache.nifi.util.MockFlowFile;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class TestReplaceText {
 
+@Rule
+public ExpectedException exception = ExpectedException.none();
+
 @Test
 public void testConfigurationCornerCase() throws IOException {
 final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
@@ -64,7 +69,7 @@ public class TestReplaceText {
 }
 
 @Test
-public void testWithEscaped$InReplacemenmt() throws IOException {
+public void testWithEscaped$InReplacement() throws IOException {
 final TestRunner runner = 

[19/39] nifi git commit: NIFI-3403 - Fix NPE in InvokeHTTP

[mosermw]

NIFI-3403 - Fix NPE in InvokeHTTP

Signed-off-by: Mike Moser 

This closes #1494


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/de8d0134
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/de8d0134
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/de8d0134

Branch: refs/heads/support/nifi-0.7.x
Commit: de8d01349e80965de0fba989888c6951217270ad
Parents: 97d064f
Author: Pierre Villard 
Authored: Thu Feb 9 20:10:33 2017 +0100
Committer: Mike Moser 
Committed: Fri Feb 10 17:20:42 2017 -0500

--
 .../nifi/processors/standard/InvokeHTTP.java|  2 +-
 .../standard/util/TestInvokeHttpCommon.java | 29 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/de8d0134/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 6befbf4..a3b23f8 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -855,7 +855,7 @@ public final class InvokeHTTP extends AbstractProcessor {
 // iterate through the flowfile attributes, adding any attribute that
 // matches the attributes-to-send pattern. if the pattern is not set
 // (it's an optional property), ignore that attribute entirely
-if (regexAttributesToSend != null) {
+if (regexAttributesToSend != null && requestFlowFile != null) {
 Map attributes = requestFlowFile.getAttributes();
 Matcher m = regexAttributesToSend.matcher("");
 for (Map.Entry entry : attributes.entrySet()) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/de8d0134/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
index a0dade1..27eda3b 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
@@ -449,6 +449,35 @@ public abstract class TestInvokeHttpCommon {
 }
 
 @Test
+public void testNoInputWithAttributes() throws Exception {
+addHandler(new GetOrHeadHandler());
+
+runner.setProperty(InvokeHTTP.PROP_URL, url + "/status/200");
+runner.setProperty(InvokeHTTP.PROP_METHOD, "GET");
+runner.setProperty(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, "myAttribute");
+runner.setIncomingConnection(false);
+runner.setNonLoopConnection(false);
+
+runner.run();
+
+runner.assertTransferCount(InvokeHTTP.REL_SUCCESS_REQ, 0);
+runner.assertTransferCount(InvokeHTTP.REL_RESPONSE, 1);
+runner.assertTransferCount(InvokeHTTP.REL_RETRY, 0);
+runner.assertTransferCount(InvokeHTTP.REL_NO_RETRY, 0);
+runner.assertTransferCount(InvokeHTTP.REL_FAILURE, 0);
+runner.assertPenalizeCount(0);
+
+// expected in response
+// status code, status message, all headers from server response --> 
ff attributes
+// server response message body into payload of ff
+final MockFlowFile bundle1 = 
runner.getFlowFilesForRelationship(InvokeHTTP.REL_RESPONSE).get(0);
+bundle1.assertContentEquals("/status/200".getBytes("UTF-8"));
+bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
+bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
+bundle1.assertAttributeEquals("Content-Type", "text/plain; 
charset=ISO-8859-1");
+}
+
+@Test
 public void testNoInputFail() throws Exception {
 addHandler(new GetOrHeadHandler());
 

[39/39] nifi git commit: Merge branch '0.x' into support/nifi-0.7.x

[mosermw]

Merge branch '0.x' into support/nifi-0.7.x


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a340bcda
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a340bcda
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a340bcda

Branch: refs/heads/support/nifi-0.7.x
Commit: a340bcdacc39ae867b5276695a6deb40e15b4034
Parents: 598585d 2328d1b
Author: Mike Moser 
Authored: Tue May 9 21:27:07 2017 +
Committer: Mike Moser 
Committed: Tue May 9 21:27:07 2017 +

--
 KEYS| 462 ++-
 nifi-api/.gitignore |   2 -
 nifi-api/pom.xml|   2 +-
 .../repository/claim/ResourceClaimManager.java  |  14 +-
 nifi-assembly/NOTICE|   7 -
 nifi-assembly/pom.xml   |   2 +-
 nifi-bootstrap/pom.xml  |   2 +-
 .../nifi-data-provenance-utils/.gitignore   |   2 -
 nifi-commons/nifi-data-provenance-utils/pom.xml |   2 +-
 nifi-commons/nifi-expression-language/pom.xml   |   2 +-
 nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 nifi-commons/nifi-hadoop-utils/pom.xml  |   4 +-
 nifi-commons/nifi-hl7-query-language/.gitignore |   3 -
 nifi-commons/nifi-hl7-query-language/pom.xml|   2 +-
 nifi-commons/nifi-logging-utils/pom.xml |   2 +-
 nifi-commons/nifi-processor-utilities/pom.xml   |   2 +-
 nifi-commons/nifi-properties/.gitignore |   3 -
 nifi-commons/nifi-properties/pom.xml|   2 +-
 nifi-commons/nifi-security-utils/pom.xml|   2 +-
 nifi-commons/nifi-site-to-site-client/pom.xml   |   4 +-
 nifi-commons/nifi-socket-utils/pom.xml  |   2 +-
 nifi-commons/nifi-utils/.gitignore  |   8 -
 nifi-commons/nifi-utils/pom.xml |   4 +-
 .../java/org/apache/nifi/util/FormatUtils.java  |   4 +-
 nifi-commons/nifi-web-utils/pom.xml |   2 +-
 nifi-commons/nifi-write-ahead-log/.gitignore|   2 -
 nifi-commons/nifi-write-ahead-log/pom.xml   |   2 +-
 nifi-commons/pom.xml|   2 +-
 nifi-docs/pom.xml   |   2 +-
 .../src/main/asciidoc/administration-guide.adoc |   2 -
 .../nifi-nifi-example-nar/pom.xml   |   2 +-
 .../nifi-nifi-example-processors/pom.xml|   2 +-
 nifi-external/nifi-example-bundle/pom.xml   |   4 +-
 nifi-external/nifi-spark-receiver/pom.xml   |   2 +-
 nifi-external/nifi-storm-spout/pom.xml  |   2 +-
 nifi-external/pom.xml   |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml |   2 +-
 .../nifi-service-bundle-archetype/pom.xml   |   2 +-
 nifi-maven-archetypes/pom.xml   |   2 +-
 nifi-mock/pom.xml   |   2 +-
 .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml  |   4 +-
 .../nifi-ambari-reporting-task/pom.xml  |   2 +-
 nifi-nar-bundles/nifi-ambari-bundle/pom.xml |   2 +-
 .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml  |   4 +-
 .../nifi-amqp-processors/pom.xml|   2 +-
 .../nifi/amqp/processors/AMQPPublisher.java |  65 +--
 .../nifi/amqp/processors/PublishAMQP.java   |  18 +-
 .../nifi/amqp/processors/AMQPPublisherTest.java |  37 +-
 .../nifi/amqp/processors/ConsumeAMQPTest.java   |   6 +-
 nifi-nar-bundles/nifi-amqp-bundle/pom.xml   |   6 +-
 .../nifi-avro-bundle/nifi-avro-nar/pom.xml  |   6 +-
 .../nifi-avro-processors/.gitignore |   1 -
 .../nifi-avro-processors/pom.xml|   2 +-
 nifi-nar-bundles/nifi-avro-bundle/pom.xml   |   4 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml|   4 +-
 .../src/main/resources/META-INF/NOTICE  |   1 -
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |   2 +-
 .../processors/aws/s3/AbstractS3Processor.java  |  24 +-
 .../nifi/processors/aws/s3/DeleteS3Object.java  |   2 +-
 .../nifi/processors/aws/s3/FetchS3Object.java   |   2 +-
 .../apache/nifi/processors/aws/s3/ListS3.java   |   2 +-
 .../nifi/processors/aws/s3/PutS3Object.java |   4 +-
 .../aws/dynamodb/GetDynamoDBTest.java   |   6 +-
 .../processors/aws/s3/ITDeleteS3Object.java |   3 +-
 .../nifi/processors/aws/s3/ITFetchS3Object.java |   3 +-
 .../apache/nifi/processors/aws/s3/ITListS3.java |   3 +-
 .../nifi/processors/aws/s3/ITPutS3Object.java   |   4 +-
 .../nifi/processors/aws/s3/TestPutS3Object.java |  64 +++
 .../nifi/processors/aws/sns/ITPutSNS.java   |   1 +
 nifi-nar-bundles/nifi-aws-bundle/pom.xml|   2 +-
 .../nifi-azure-bundle/nifi-azure-nar/pom.xml|   6 +-
 .../nifi-azure-processors/pom.xml   |   2 +-
 nifi-nar-bundles/nifi-azure-bundle/pom.xml  |   4 +-
 .../nifi-cassandra-nar/pom.xml  |   2 +-
 .../nifi-cassandra-processors/pom.xml   | 

[05/39] nifi git commit: NIFI-2685 - Configure surefire to use JAVA Headless mode

[mosermw]

NIFI-2685 - Configure surefire to use JAVA Headless mode


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1d658248
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1d658248
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1d658248

Branch: refs/heads/support/nifi-0.7.x
Commit: 1d6582486ac7cfcc586b5a519c7964af3df23efe
Parents: 12c1b4d
Author: Andre F de Miranda 
Authored: Fri Aug 26 17:04:17 2016 +1000
Committer: Matt Burgess 
Committed: Thu Oct 20 16:58:24 2016 -0400

--
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1d658248/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 457cc94..3c07bc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1301,6 +1301,9 @@ language governing permissions and limitations under the 
License. -->
 maven-surefire-plugin
 2.18
 
+
+true
+
 
true
 -Xmx2G 
-Djava.net.preferIPv4Stack=true
 

[28/39] nifi git commit: NIFI-3554 - Fixing the jBCrypt dependency name from nifi-standard-processors/pom.xml file, so it uses the expected naming format from the maven repository

[mosermw]

NIFI-3554 - Fixing the jBCrypt dependency name from
 nifi-standard-processors/pom.xml file, so it uses the expected naming format
 from the maven repository

Signed-off-by: Andre F de Miranda 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/32a93be5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/32a93be5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/32a93be5

Branch: refs/heads/support/nifi-0.7.x
Commit: 32a93be546fd026db54b0cfc188e6971a40b70a4
Parents: 9a5487c
Author: Pere Urbon-Bayes 
Authored: Sun Mar 5 10:48:15 2017 +1100
Committer: Andre F de Miranda 
Committed: Sun Mar 5 10:49:46 2017 +1100

--
 .../nifi-standard-bundle/nifi-standard-processors/pom.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/32a93be5/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 9a3d200..cf36974 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -186,7 +186,7 @@ language governing permissions and limitations under the 
License. -->
 
 
 de.svenkubiak
-jBcrypt
+jBCrypt
 0.4.1
 
 

[25/39] nifi git commit: NIFI-3362 update FlowConfiguration.xsd to allow all current time period units

[mosermw]

NIFI-3362 update FlowConfiguration.xsd to allow all current time period units

This closes #1509.

Signed-off-by: Aldrin Piri 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bd497a74
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bd497a74
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bd497a74

Branch: refs/heads/support/nifi-0.7.x
Commit: bd497a7457a60fe6cd01d60c27bf9ce472dfd1f4
Parents: 7d23bd7
Author: Mike Moser 
Authored: Fri Feb 10 20:06:16 2017 +
Committer: Aldrin Piri 
Committed: Thu Feb 16 21:25:02 2017 -0500

--
 .../src/main/java/org/apache/nifi/util/FormatUtils.java  | 4 ++--
 .../nifi-framework-core/src/main/resources/FlowConfiguration.xsd | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/bd497a74/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
--
diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
index a30c14e..3d4b976 100644
--- 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/FormatUtils.java
@@ -35,8 +35,8 @@ public class FormatUtils {
 private static final double BYTES_IN_TERABYTE = BYTES_IN_GIGABYTE * 1024;
 
 // for Time Durations
-private static final String NANOS = join(UNION, "ns", "nano", "nanos", 
"nanoseconds");
-private static final String MILLIS = join(UNION, "ms", "milli", "millis", 
"milliseconds");
+private static final String NANOS = join(UNION, "ns", "nano", "nanos", 
"nanosecond", "nanoseconds");
+private static final String MILLIS = join(UNION, "ms", "milli", "millis", 
"millisecond", "milliseconds");
 private static final String SECS = join(UNION, "s", "sec", "secs", 
"second", "seconds");
 private static final String MINS = join(UNION, "m", "min", "mins", 
"minute", "minutes");
 private static final String HOURS = join(UNION, "h", "hr", "hrs", "hour", 
"hours");

http://git-wip-us.apache.org/repos/asf/nifi/blob/bd497a74/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
index 56f08a6..3765957 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
@@ -302,7 +302,7 @@
 
 
 
-
+
 
 

@@ -371,4 +371,4 @@
 
 
 
-
\ No newline at end of file
+

[33/39] nifi git commit: NIFI-3553: If IOException is thrown when completing FTP transfer, do not update the FlowFile to point to the content that was streamed but instead leave FlowFile pointing to o

[mosermw]

NIFI-3553: If IOException is thrown when completing FTP transfer, do not update 
the FlowFile to point to the content that was streamed but instead leave 
FlowFile pointing to original version


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c1e65f95
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c1e65f95
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c1e65f95

Branch: refs/heads/support/nifi-0.7.x
Commit: c1e65f95bd9951390215c8ef7e2b25cf95f8b5f1
Parents: cd1cf68
Author: Mark Payne 
Authored: Fri Mar 3 13:18:41 2017 -0500
Committer: Joe Skora 
Committed: Thu Apr 27 14:56:14 2017 -0400

--
 .../org/apache/nifi/processors/standard/FetchFileTransfer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/c1e65f95/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
index a7ae5ef..6182b0a 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFileTransfer.java
@@ -239,9 +239,9 @@ public abstract class FetchFileTransfer extends 
AbstractProcessor {
 @Override
 public void process(final OutputStream out) throws IOException 
{
 StreamUtils.copy(in, out);
+transfer.flush();
 }
 });
-transfer.flush();
 transferQueue.offer(new FileTransferIdleWrapper(transfer, 
System.nanoTime()));
 } catch (final FileNotFoundException e) {
 getLogger().error("Failed to fetch content for {} from filename {} 
on remote host {} because the file could not be found on the remote system; 
routing to {}",
@@ -255,14 +255,14 @@ public abstract class FetchFileTransfer extends 
AbstractProcessor {
 session.transfer(session.penalize(flowFile), 
REL_PERMISSION_DENIED);
 session.getProvenanceReporter().route(flowFile, 
REL_PERMISSION_DENIED);
 return;
-} catch (final IOException e) {
+} catch (final ProcessException | IOException e) {
 try {
 transfer.close();
 } catch (final IOException e1) {
 getLogger().warn("Failed to close connection to {}:{} due to 
{}", new Object[] {host, port, e.toString()}, e);
 }
 
-getLogger().error("Failed to fetch content for {} from filename {} 
on remote host {}:{} due to {}; routing to failure",
+getLogger().error("Failed to fetch content for {} from filename {} 
on remote host {}:{} due to {}; routing to comms.failure",
 new Object[] {flowFile, filename, host, port, e.toString()}, 
e);
 session.transfer(session.penalize(flowFile), REL_COMMS_FAILURE);
 return;

[09/39] nifi git commit: NIFI-3164 Added message at startup to log NAR loading

[mosermw]

NIFI-3164 Added message at startup to log NAR loading

This closes #1365.

Signed-off-by: James Wing 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9fe8ea0c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9fe8ea0c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9fe8ea0c

Branch: refs/heads/support/nifi-0.7.x
Commit: 9fe8ea0c62dafd9c28a1cdd0d0e994919899afb4
Parents: c87c93d
Author: Pierre Villard 
Authored: Wed Dec 28 18:59:15 2016 +0100
Committer: James Wing 
Committed: Wed Dec 28 14:30:26 2016 -0800

--
 .../src/main/java/org/apache/nifi/nar/NarUnpacker.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/9fe8ea0c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
index 2837d35..64da7f2 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
@@ -89,6 +89,7 @@ public final class NarUnpacker {
 }
 
 if (!narFiles.isEmpty()) {
+logger.info("Expanding " + narFiles.size() + " NAR files with 
all processors... It can take few minutes.");
 for (File narFile : narFiles) {
 logger.debug("Expanding NAR file: " + 
narFile.getAbsolutePath());
 

[02/39] nifi git commit: NIFI-2896-RC1 prepare for next development iteration

[mosermw]

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-framework-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml 
b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 76cd59f..80be836 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -17,7 +17,7 @@
 
 org.apache.nifi
 nifi-nar-bundles
-0.7.1
+0.8.0-SNAPSHOT
 
 nifi-framework-bundle
 pom
@@ -31,92 +31,92 @@
 
 org.apache.nifi
 nifi-framework-cluster-protocol
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-cluster-web
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-file-authorization-provider
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-cluster-authorization-provider
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-cluster
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-runtime
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-client-dto
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-content-access
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-security
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-core-api
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-site-to-site
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-framework-core
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-user-actions
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-administration
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-jetty
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-optimistic-locking
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-web-security
-0.7.1
+0.8.0-SNAPSHOT
 
 
 org.apache.nifi
 nifi-documentation
-0.7.1
+0.8.0-SNAPSHOT
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
index 2422fe5..ddc7a43 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-geo-bundle
-0.7.1
+0.8.0-SNAPSHOT
 
 nifi-geo-nar
 nar

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
index efa7903..e9e9ef6 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache.nifi
 nifi-geo-bundle
-0.7.1
+0.8.0-SNAPSHOT
 
 nifi-geo-processors
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d1a86/nifi-nar-bundles/nifi-geo-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-geo-bundle/pom.xml 
b/nifi-nar-bundles/nifi-geo-bundle/pom.xml
index 7cc2171..96ccddc 100644
--- a/nifi-nar-bundles/nifi-geo-bundle/pom.xml
+++ 

[22/39] nifi git commit: - Setting the user details in the web cluster manager and removing unnecessary code. - Deprecating the unnecessary methods. - Code clean up. - Fixing checkstyle issues in PutK

[mosermw]

- Setting the user details in the web cluster manager and removing unnecessary 
code.
- Deprecating the unnecessary methods.
- Code clean up.
- Fixing checkstyle issues in PutKafka.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fd6eb669
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fd6eb669
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fd6eb669

Branch: refs/heads/support/nifi-0.7.x
Commit: fd6eb669efcf27d3148b624355e2916d3c3e55a5
Parents: 5593be4
Author: Matt Gilman 
Authored: Tue Feb 14 16:11:05 2017 -0500
Committer: Matt Gilman 
Committed: Tue Feb 14 16:33:56 2017 -0500

--
 .../apache/nifi/web/NiFiWebContextConfig.java   |   5 +
 .../apache/nifi/web/NiFiWebRequestContext.java  |   5 +
 .../cluster/manager/impl/WebClusterManager.java | 129 +-
 .../nifi/web/HttpServletRequestContext.java |  39 +--
 .../web/HttpServletRequestContextConfig.java|  40 +---
 .../nifi/web/StandardNiFiContentAccess.java |  21 --
 .../StandardNiFiWebConfigurationContext.java|  22 --
 .../apache/nifi/web/StandardNiFiWebContext.java |  60 ++---
 .../nifi/web/api/ApplicationResource.java   |  24 --
 .../apache/nifi/web/ContentRequestContext.java  |   5 +
 .../nifi/web/ContentViewerController.java   |  23 +-
 .../web/security/NiFiAuthenticationFilter.java  |  24 +-
 .../nifi/web/security/ProxiedEntitiesUtils.java | 134 +++
 .../security/ProxiedEntitiesUtilsTest.groovy| 235 +++
 .../apache/nifi/processors/kafka/PutKafka.java  |  35 ++-
 15 files changed, 472 insertions(+), 329 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/fd6eb669/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java 
b/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
index 2df94e4..c86599f 100644
--- a/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
+++ b/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebContextConfig.java
@@ -48,8 +48,13 @@ public interface NiFiWebContextConfig {
  * 
CN=original-proxied-entityCN=first-proxyCN=second-proxy...
  * 
  *
+ * Update:
+ * This method has been deprecated since the entire proxy
+ * chain is able to be rebuilt using the current user if necessary.
+ *
  * @return the proxied entities chain or null if no chain
  */
+@Deprecated
 String getProxiedEntitiesChain();
 
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/fd6eb669/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebRequestContext.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebRequestContext.java 
b/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebRequestContext.java
index 9dd44ab..bb3bbd3 100644
--- a/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebRequestContext.java
+++ b/nifi-api/src/main/java/org/apache/nifi/web/NiFiWebRequestContext.java
@@ -49,8 +49,13 @@ public interface NiFiWebRequestContext {
  * 
CN=original-proxied-entityCN=first-proxyCN=second-proxy...
  * 
  *
+ * Update:
+ * This method has been deprecated since the entire proxy
+ * chain is able to be rebuilt using the current user if necessary.
+ *
  * @return the proxied entities chain or null if no chain
  */
+@Deprecated
 String getProxiedEntitiesChain();
 
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/fd6eb669/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index b74ea50..fc0f10f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -16,58 +16,7 @@
  */
 package org.apache.nifi.cluster.manager.impl;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.net.URI;
-import 

[24/39] nifi git commit: NIFI-2890 Provenance Repository Corruption (0.x) * Corrected handling of corrupt journal file records that prevents instance startup and loss of records from corrupt files. Sp

[mosermw]

NIFI-2890 Provenance Repository Corruption (0.x)
* Corrected handling of corrupt journal file records that prevents instance 
startup and loss of records from corrupt files.  Specifically, exception 
handling was expanded to cover failures on records after the first the same as 
failures on the first record.
* Adjusted log messages  to reflect that the remainder or all of the journal 
will be skipped, not just the current record.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7d23bd7a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7d23bd7a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7d23bd7a

Branch: refs/heads/support/nifi-0.7.x
Commit: 7d23bd7ac6af228a3e723d18253063231c919cf9
Parents: 1c7e123
Author: Joe Skora 
Authored: Tue Feb 7 21:02:19 2017 +
Committer: Mike Moser 
Committed: Wed Feb 15 20:45:47 2017 +

--
 .../PersistentProvenanceRepository.java |  27 +-
 .../TestPersistentProvenanceRepository.java | 332 +--
 2 files changed, 324 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7d23bd7a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
index 8b971b5..4cec8aa 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
@@ -1564,16 +1564,19 @@ public class PersistentProvenanceRepository implements 
ProvenanceEventRepository
 try {
 record = reader.nextRecord();
 } catch (final EOFException eof) {
+// record will be null and reader can no longer be used
 } catch (final Exception e) {
-logger.warn("Failed to generate Provenance Event Record 
from Journal due to " + e + "; it's possible that the record wasn't "
-+ "completely written to the file. This record 
will be skipped.");
+logger.warn("Failed to generate Provenance Event Record 
from Journal due to " + e + "; it's "
++ "possible that the record wasn't completely 
written to the file. This journal will be "
++ "skipped.");
 if (logger.isDebugEnabled()) {
 logger.warn("", e);
 }
 
 if (eventReporter != null) {
-eventReporter.reportEvent(Severity.WARNING, 
EVENT_CATEGORY, "Failed to read Provenance Event Record from Journal due to " + 
e +
-"; it's possible that hte record wasn't completely 
written to the file. This record will be skipped.");
+eventReporter.reportEvent(Severity.WARNING, 
EVENT_CATEGORY, "Failed to read Provenance Event "
++ "Record from Journal due to " + e + "; it's 
possible that the record wasn't "
++ "completely written to the file. This 
journal will be skipped.");
 }
 }
 
@@ -1710,6 +1713,22 @@ public class PersistentProvenanceRepository implements 
ProvenanceEventRepository
 try {
 nextRecord = reader.nextRecord();
 } catch (final EOFException eof) {
+// record will be null and reader can no 
longer be used
+} catch (final Exception e) {
+logger.warn("Failed to generate Provenance 
Event Record from Journal due to " + e
++ "; it's possible that the record 
wasn't completely written to the file. "
++ "The remainder of this journal will 
be skipped.");
+if (logger.isDebugEnabled()) {
+logger.warn("", e);
+}
+
+if (eventReporter != 

[12/39] nifi git commit: NIFI-2861 ControlRate should accept more than one flow file per execution

[mosermw]

NIFI-2861 ControlRate should accept more than one flow file per execution

Signed-off-by: Mike Moser 

This closes #1128


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a3d95dc1
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a3d95dc1
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a3d95dc1

Branch: refs/heads/support/nifi-0.7.x
Commit: a3d95dc1582f2edfd7997c5d8a23105e88729d11
Parents: 954201a
Author: Joe Skora 
Authored: Thu Oct 13 02:18:23 2016 -0400
Committer: Mike Moser 
Committed: Thu Jan 12 15:28:45 2017 -0500

--
 .../nifi/processors/standard/ControlRate.java   | 20 ++--
 .../processors/standard/TestControlRate.java| 32 
 2 files changed, 50 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a3d95dc1/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
index 5612d4f..18d6ff9 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
@@ -77,6 +77,9 @@ public class ControlRate extends AbstractProcessor {
 public static final AllowableValue ATTRIBUTE_RATE_VALUE = new 
AllowableValue(ATTRIBUTE_RATE, ATTRIBUTE_RATE,
 "Rate is controlled by accumulating the value of a specified 
attribute that is transferred per time duration");
 
+// based on testing to balance commits and 10,000 FF swap limit
+public static final int MAX_FLOW_FILES_PER_BATCH = 1000;
+
 public static final PropertyDescriptor RATE_CONTROL_CRITERIA = new 
PropertyDescriptor.Builder()
 .name("Rate Control Criteria")
 .description("Indicates the criteria that is used to control the 
throughput rate. Changing this value resets the rate counters.")
@@ -233,7 +236,7 @@ public class ControlRate extends AbstractProcessor {
 
 @Override
 public void onTrigger(final ProcessContext context, final ProcessSession 
session) throws ProcessException {
-List flowFiles = session.get(new ThrottleFilter());
+List flowFiles = session.get(new 
ThrottleFilter(MAX_FLOW_FILES_PER_BATCH));
 if (flowFiles.isEmpty()) {
 context.yield();
 return;
@@ -381,6 +384,13 @@ public class ControlRate extends AbstractProcessor {
 
 private class ThrottleFilter implements FlowFileFilter {
 
+private final int flowFilesPerBatch;
+private int flowFilesInBatch = 0;
+
+ThrottleFilter(final int maxFFPerBatch) {
+flowFilesPerBatch = maxFFPerBatch;
+}
+
 @Override
 public FlowFileFilterResult filter(FlowFile flowFile) {
 long accrual = getFlowFileAccrual(flowFile);
@@ -409,7 +419,13 @@ public class ControlRate extends AbstractProcessor {
 throttle.lock();
 try {
 if (throttle.tryAdd(accrual)) {
-return FlowFileFilterResult.ACCEPT_AND_TERMINATE;
+flowFilesInBatch += 1;
+if (flowFilesInBatch>= flowFilesPerBatch) {
+flowFilesInBatch = 0;
+return FlowFileFilterResult.ACCEPT_AND_TERMINATE;
+} else {
+return FlowFileFilterResult.ACCEPT_AND_CONTINUE;
+}
 }
 } finally {
 throttle.unlock();

http://git-wip-us.apache.org/repos/asf/nifi/blob/a3d95dc1/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
index 2e6ce45..050f818 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
+++ 

[15/39] nifi git commit: NIFI-3363: PutKafka NPE with User-Defined partition

[mosermw]

NIFI-3363: PutKafka NPE with User-Defined partition

- Marked PutKafka Partition Strategy property as deprecated, as
  Kafka 0.8 client doesn't use 'partitioner.class' as producer property, we 
don't have to specify it.
- Changed Partition Strategy property from a required one to a dynamic 
property, so that existing processor config can stay in valid state.
- Fixed partition property to work.
- Route a flow file if it failed to be published due to invalid partition.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/008bffd9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/008bffd9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/008bffd9

Branch: refs/heads/support/nifi-0.7.x
Commit: 008bffd9cd1787295840b411f1498439265bc8c5
Parents: 3a09481
Author: Koji Kawamura 
Authored: Wed Jan 18 17:44:40 2017 +0900
Committer: Oleg Zhurakousky 
Committed: Fri Jan 27 12:43:24 2017 -0500

--
 .../apache/nifi/processors/kafka/PutKafka.java  | 77 ++--
 .../nifi/processors/kafka/PutKafkaTest.java | 59 ++-
 2 files changed, 95 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/008bffd9/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
--
diff --git 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
index abdf73d..38ec20c 100644
--- 
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
+++ 
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/processors/kafka/PutKafka.java
@@ -54,8 +54,7 @@ import 
org.apache.nifi.processors.kafka.KafkaPublisher.KafkaPublisherResult;
 
 @InputRequirement(Requirement.INPUT_REQUIRED)
 @Tags({ "Apache", "Kafka", "Put", "Send", "Message", "PubSub", "0.8.x"})
-@CapabilityDescription("Sends the contents of a FlowFile as a message to 
Apache Kafka, , specifically for 0.8.x versions. " +
-"The messages to send may be individual FlowFiles or may be delimited, 
using a "
+@CapabilityDescription("Sends the contents of a FlowFile as a message to 
Apache Kafka, specifically for 0.8.x versions. The messages to send may be 
individual FlowFiles or may be delimited, using a "
 + "user-specified delimiter, such as a new-line. The complementary 
NiFi processor for fetching messages is GetKafka.")
 @DynamicProperty(name = "The name of a Kafka configuration property.", value = 
"The value of a given Kafka configuration property.",
  description = "These properties will be added on the Kafka 
configuration after loading any provided configuration properties."
@@ -98,11 +97,20 @@ public class PutKafka extends 
AbstractKafkaProcessor {
 public static final AllowableValue COMPRESSION_CODEC_SNAPPY = new 
AllowableValue("snappy", "Snappy",
 "Compress messages using Snappy");
 
+/**
+ * @deprecated Kafka 0.8.x producer doesn't use 'partitioner.class' 
property.
+ */
 static final AllowableValue ROUND_ROBIN_PARTITIONING = new 
AllowableValue("Round Robin", "Round Robin",
 "Messages will be assigned partitions in a round-robin fashion, 
sending the first message to Partition 1, "
 + "the next Partition to Partition 2, and so on, wrapping 
as necessary.");
+/**
+ * @deprecated Kafka 0.8.x producer doesn't use 'partitioner.class' 
property.
+ */
 static final AllowableValue RANDOM_PARTITIONING = new 
AllowableValue("Random Robin", "Random",
 "Messages will be assigned to random partitions.");
+/**
+ * @deprecated Kafka 0.8.x producer doesn't use 'partitioner.class' 
property. To specify partition, simply configure the 'partition' property.
+ */
 static final AllowableValue USER_DEFINED_PARTITIONING = new 
AllowableValue("User-Defined", "User-Defined",
 "The  property will be used to determine the partition. 
All messages within the same FlowFile will be "
 + "assigned to the same partition.");
@@ -121,19 +129,22 @@ public class PutKafka extends 
AbstractKafkaProcessor {
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
 .expressionLanguageSupported(true)
 .build();
+/**
+ * @deprecated Kafka 0.8.x producer doesn't use 'partitioner.class' 
property.
+ * This property is still valid as a dynamic property, so that existing 
processor configuration can stay 

[07/39] nifi git commit: NIFI-2920 This is a 0.x version of Mark Payne's patch for NIFI-2925

[mosermw]

NIFI-2920 This is a 0.x version of Mark Payne's patch for NIFI-2925


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a9395bc6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a9395bc6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a9395bc6

Branch: refs/heads/support/nifi-0.7.x
Commit: a9395bc67c2de4fa6ba82ca0573ad210ccc67434
Parents: 05d5fba
Author: Bryan Bende 
Authored: Thu Oct 27 14:31:53 2016 -0400
Committer: Bryan Bende 
Committed: Mon Oct 31 10:02:51 2016 -0400

--
 .../repository/claim/ResourceClaimManager.java  | 14 -
 .../nifi/controller/FileSystemSwapManager.java  |  9 +++-
 .../apache/nifi/controller/FlowController.java  | 11 ++--
 .../repository/FileSystemRepository.java|  5 +-
 .../repository/VolatileContentRepository.java   |  2 +-
 .../WriteAheadFlowFileRepository.java   |  2 +-
 .../claim/StandardResourceClaimManager.java | 54 +++-
 .../controller/TestFileSystemSwapManager.java   |  7 ++-
 .../repository/TestStandardProcessSession.java  | 20 
 .../TestVolatileContentRepository.java  |  2 +-
 .../TestWriteAheadFlowFileRepository.java   |  4 +-
 .../claim/TestStandardResourceClaimManager.java |  2 +-
 12 files changed, 94 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a9395bc6/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java
--
diff --git 
a/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java
 
b/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java
index b430df0..68643f9 100644
--- 
a/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java
+++ 
b/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ResourceClaimManager.java
@@ -32,9 +32,21 @@ public interface ResourceClaimManager {
  * @param container of claim
  * @param section of claim
  * @param lossTolerant of claim
+ * @param writable whether or not the claim should be made writable
  * @return new claim
  */
-ResourceClaim newResourceClaim(String container, String section, String 
id, boolean lossTolerant);
+ResourceClaim newResourceClaim(String container, String section, String 
id, boolean lossTolerant, boolean writable);
+
+/**
+ * Returns the Resource Claim with the given id, container, and section, 
if one exists, null otherwise
+ *
+ * @param id of claim
+ * @param container of claim
+ * @param section of claim
+ * @return the existing resource claim or null if none exists
+ */
+ResourceClaim getResourceClaim(String container, String section, String 
id);
+
 
 /**
  * @param claim to obtain reference count for

http://git-wip-us.apache.org/repos/asf/nifi/blob/a9395bc6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
index 156389b..15a90cb 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
@@ -492,7 +492,14 @@ public class FileSystemSwapManager implements 
FlowFileSwapManager {
 lossTolerant = false;
 }
 
-resourceClaim = claimManager.newResourceClaim(container, 
section, claimId, lossTolerant);
+resourceClaim = claimManager.getResourceClaim(container, 
section, claimId);
+if (resourceClaim == null) {
+logger.error("Swap file indicates that FlowFile was 
referencing Resource Claim at container={}, section={}, claimId={}, "
++ "but this Resource Claim cannot be found! Will 
create a temporary Resource Claim, but this may affect the framework's "
++ "ability to properly clean up this resource", 
container, section, claimId);
+resourceClaim = 
claimManager.newResourceClaim(container, section, claimId, lossTolerant, true);
+}
+
 

nifi git commit: NIFI-2752 Correct ReplaceText default pattern and unit tests (0.x)

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x d38a324b3 -> 2328d1b0f


NIFI-2752 Correct ReplaceText default pattern and unit tests (0.x)

Signed-off-by: Mike Moser 

This closes #1732.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2328d1b0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2328d1b0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2328d1b0

Branch: refs/heads/0.x
Commit: 2328d1b0f39cff30eadfa97408c6f1d8d995456f
Parents: d38a324
Author: Joe Skora 
Authored: Tue May 2 13:14:28 2017 -0400
Committer: Mike Moser 
Committed: Tue May 2 18:53:59 2017 +

--
 .../nifi/processors/standard/ReplaceText.java   |  9 +--
 .../processors/standard/TestReplaceText.java| 60 +++-
 2 files changed, 60 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2328d1b0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
index 1df7b91..61c5f1f 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
@@ -84,7 +84,7 @@ public class ReplaceText extends AbstractProcessor {
 public static final String literalReplaceValue = "Literal Replace";
 public static final String alwaysReplace = "Always Replace";
 private static final Pattern backReferencePattern = 
Pattern.compile("\\$(\\d+)");
-private static final String DEFAULT_REGEX = "(?s:^.*$)";
+private static final String DEFAULT_REGEX = "(?s)(^.*$)";
 private static final String DEFAULT_REPLACEMENT_VALUE = "$1";
 
 // Prepend and Append will just insert the replacement value at the 
beginning or end
@@ -214,13 +214,6 @@ public class ReplaceText extends AbstractProcessor {
 String unsubstitutedReplacement = 
context.getProperty(REPLACEMENT_VALUE).getValue();
 final String replacementStrategy = 
context.getProperty(REPLACEMENT_STRATEGY).getValue();
 
-if (replacementStrategy.equalsIgnoreCase(regexReplaceValue) && 
unsubstitutedRegex.equals(DEFAULT_REGEX) && 
unsubstitutedReplacement.equals(DEFAULT_REPLACEMENT_VALUE)) {
-// This pattern says replace content with itself. We can highly 
optimize this process by simply transferring
-// all FlowFiles to the 'success' relationship
-session.transfer(flowFiles, REL_SUCCESS);
-return;
-}
-
 final Charset charset = 
Charset.forName(context.getProperty(CHARACTER_SET).getValue());
 final int maxBufferSize = 
context.getProperty(MAX_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/2328d1b0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
index a6e0971..b65bff1 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
@@ -30,10 +30,15 @@ import org.apache.nifi.util.MockFlowFile;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class TestReplaceText {
 
+@Rule
+public ExpectedException exception = ExpectedException.none();
+
 @Test
 public void testConfigurationCornerCase() throws IOException {
 final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
@@ -64,7 +69,7 @@ public class TestReplaceText {
 }
 
 @Test
-public void testWithEscaped$InReplacemenmt() throws IOException {
+public void testWithEscaped$InReplacement() 

nifi git commit: NIFI-3517 If HandleHttpResponse cannot write response remove entry from HttpContextMap. * Add test for failure not clear context map. * Add handler to remove context map entry if Proc

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 8a18d2666 -> ceec0ecfd


NIFI-3517 If HandleHttpResponse cannot write response remove entry from 
HttpContextMap.
* Add test for failure not clear context map.
* Add handler to remove context map entry if ProcessException occurs during 
while exporting response.

Signed-off-by: Mike Moser 

This closes #1567.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ceec0ecf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ceec0ecf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ceec0ecf

Branch: refs/heads/0.x
Commit: ceec0ecfd75d1c5387f98278b11278e497ca8428
Parents: 8a18d26
Author: Joe Skora 
Authored: Mon Mar 6 20:25:06 2017 -0500
Committer: Mike Moser 
Committed: Mon May 1 20:43:29 2017 +

--
 .../processors/standard/HandleHttpResponse.java |  5 +++
 .../standard/TestHandleHttpResponse.java| 41 +---
 2 files changed, 40 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ceec0ecf/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
index e15abcc..2244ca6 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
@@ -165,6 +165,11 @@ public class HandleHttpResponse extends AbstractProcessor {
 try {
 session.exportTo(flowFile, response.getOutputStream());
 response.flushBuffer();
+} catch (final ProcessException e) {
+session.transfer(flowFile, REL_FAILURE);
+getLogger().error("Failed to respond to HTTP request for {} due to 
{}", new Object[]{flowFile, e});
+contextMap.complete(contextIdentifier);
+return;
 } catch (final Exception e) {
 session.transfer(flowFile, REL_FAILURE);
 getLogger().error("Failed to respond to HTTP request for {} due to 
{}", new Object[]{flowFile, e});

http://git-wip-us.apache.org/repos/asf/nifi/blob/ceec0ecf/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
index bdf1cdc..ba402d4 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.nifi.controller.AbstractControllerService;
 import org.apache.nifi.http.HttpContextMap;
 import org.apache.nifi.processor.exception.FlowFileAccessException;
+import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.processors.standard.util.HTTPUtils;
 import org.apache.nifi.provenance.ProvenanceEventType;
 import org.apache.nifi.reporting.InitializationException;
@@ -56,7 +57,7 @@ public class TestHandleHttpResponse {
 public void testEnsureCompleted() throws InitializationException {
 final TestRunner runner = 
TestRunners.newTestRunner(HandleHttpResponse.class);
 
-final MockHttpContextMap contextMap = new MockHttpContextMap("my-id", 
false);
+final MockHttpContextMap contextMap = new MockHttpContextMap("my-id", 
"");
 runner.addControllerService("http-context-map", contextMap);
 runner.enableControllerService(contextMap);
 runner.setProperty(HandleHttpResponse.HTTP_CONTEXT_MAP, 
"http-context-map");
@@ -95,7 +96,7 @@ public class TestHandleHttpResponse {
 public void testWithExceptionThrown() throws InitializationException {
 final TestRunner runner = 
TestRunners.newTestRunner(HandleHttpResponse.class);
 
-  

nifi git commit: NIFI-3710: Port S3 Signer V4 Fixes to 0.x

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 7d00c0177 -> a1bb7a7ee


NIFI-3710: Port S3 Signer V4 Fixes to 0.x

* Port of S3 changes for selecting the S3 signer to allow v2 or v4.
* Necessary for supporting S3-compatible, non-AWS stores in recent SDKs.
* Includes original code from NIFI-2763 and fix from NIFI-2902.

This closes #1680
Signed-off-by: Mike Moser 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a1bb7a7e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a1bb7a7e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a1bb7a7e

Branch: refs/heads/0.x
Commit: a1bb7a7ee6d1a554b296bf8365e747e0fa2f97ec
Parents: 7d00c01
Author: d810146 
Authored: Wed Sep 28 16:16:21 2016 +1000
Committer: Mike Moser 
Committed: Wed Apr 19 16:31:02 2017 +

--
 .../processors/aws/s3/AbstractS3Processor.java  | 24 +++-
 .../nifi/processors/aws/s3/DeleteS3Object.java  |  2 +-
 .../nifi/processors/aws/s3/FetchS3Object.java   |  2 +-
 .../apache/nifi/processors/aws/s3/ListS3.java   |  2 +-
 .../nifi/processors/aws/s3/PutS3Object.java |  4 +-
 .../processors/aws/s3/ITDeleteS3Object.java |  3 +-
 .../nifi/processors/aws/s3/ITFetchS3Object.java |  3 +-
 .../apache/nifi/processors/aws/s3/ITListS3.java |  3 +-
 .../nifi/processors/aws/s3/ITPutS3Object.java   |  3 +-
 .../nifi/processors/aws/s3/TestPutS3Object.java | 64 
 10 files changed, 100 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a1bb7a7e/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
index ee46690..b96c05e 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.processor.ProcessContext;
@@ -114,7 +115,16 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 .expressionLanguageSupported(true)
 .defaultValue("${filename}")
 .build();
-
+public static final PropertyDescriptor SIGNER_OVERRIDE = new 
PropertyDescriptor.Builder()
+.name("Signer Override")
+.description("The AWS libraries use the default signer but this 
property allows you to specify a custom signer to support older S3-compatible 
services.")
+.required(false)
+.allowableValues(
+new AllowableValue("Default Signature", "Default 
Signature"),
+new AllowableValue("AWSS3V4SignerType", "Signature v4"),
+new AllowableValue("S3SignerType", "Signature v2"))
+.defaultValue("Default Signature")
+.build();
 /**
  * Create client using credentials provider. This is the preferred way for 
creating clients
  */
@@ -122,6 +132,8 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 protected AmazonS3Client createClient(final ProcessContext context, final 
AWSCredentialsProvider credentialsProvider, final ClientConfiguration config) {
 getLogger().info("Creating client with credentials provider");
 
+initializeSignerOverride(context, config);
+
 final AmazonS3Client s3 = new AmazonS3Client(credentialsProvider, 
config);
 
 initalizeEndpointOverride(context, s3);
@@ -138,6 +150,14 @@ public abstract class AbstractS3Processor extends 
AbstractAWSCredentialsProvider
 }
 }
 
+private void initializeSignerOverride(final ProcessContext context, final 
ClientConfiguration config) {
+String signer = context.getProperty(SIGNER_OVERRIDE).getValue();
+
+if (signer != null && 
!signer.equals(SIGNER_OVERRIDE.getDefaultValue())) {
+config.setSignerOverride(signer);
+}
+}
+
 /**
  * Create client using AWSCredentials
  *
@@ -147,6 +167,8 @@ public abstract class AbstractS3Processor extends 

nifi git commit: NIFI-3702 AWS SDK Update:

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 32a93be54 -> 7d00c0177


NIFI-3702 AWS SDK Update:

* Updated the AWS SDK dependency version to 1.11.8
* Removed GetDynamoDBTest references to JsonObject class dropped from AWS SDK
* Fixed integration test ITPutSNS.testPublish() - exception from not evaluating 
expressions
* Ignored integration test ITPutS3Object.testS3MultipartAgeoff() - did not work 
before or after SDK update
* Updated NOTICE information in nifi-assembly and nifi-aws-bundle


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7d00c017
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7d00c017
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7d00c017

Branch: refs/heads/0.x
Commit: 7d00c017705e88e27eaa7bb17e3157a3b3b2b6fd
Parents: 32a93be
Author: James Wing 
Authored: Tue Jun 21 13:06:02 2016 -0700
Committer: Mike Moser 
Committed: Tue Apr 18 18:05:27 2017 +

--
 nifi-assembly/NOTICE   | 1 -
 .../nifi-aws-nar/src/main/resources/META-INF/NOTICE| 1 -
 .../apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java   | 6 ++
 .../java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java  | 1 +
 .../test/java/org/apache/nifi/processors/aws/sns/ITPutSNS.java | 1 +
 pom.xml| 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-assembly/NOTICE
--
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index ebada22..6afaf78 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -683,7 +683,6 @@ The following binary components are provided under the 
Apache Software License v
   **
   This software includes third party software subject to the following 
copyrights:
   - XML parsing and utility functions from JetS3t - Copyright 2006-2009 
James Murty.
-  - JSON parsing and utility functions from JSON.org - Copyright 2002 
JSON.org.
   - PKCS#1 PEM encoded private key parsing and utility functions from 
oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
 
(ASLv2) Apache Commons DBCP

http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
index 38cb6eb..5ae7a45 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
@@ -68,7 +68,6 @@ The following binary components are provided under the Apache 
Software License v
   **
   This software includes third party software subject to the following 
copyrights:
   - XML parsing and utility functions from JetS3t - Copyright 2006-2009 
James Murty.
-  - JSON parsing and utility functions from JSON.org - Copyright 2002 
JSON.org.
   - PKCS#1 PEM encoded private key parsing and utility functions from 
oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/7d00c017/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
index 5bc3360..5ee15b1 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDBTest.java
@@ -45,8 +45,6 @@ import 
com.amazonaws.services.dynamodbv2.document.TableKeysAndAttributes;
 import com.amazonaws.services.dynamodbv2.model.AttributeValue;
 import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult;
 import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes;
-import com.amazonaws.util.json.JSONException;
-import com.amazonaws.util.json.JSONObject;
 
 public class GetDynamoDBTest extends AbstractDynamoDBTest {
 protected GetDynamoDB getDynamoDB;
@@ -177,7 +175,7 @@ public class GetDynamoDBTest extends 

nifi git commit: NIFI-3579 Fix for Windows FileStore issue

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 942483641 -> 78382c66b


NIFI-3579 Fix for Windows FileStore issue

Signed-off-by: Mike Moser 

This closes #1580


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/78382c66
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/78382c66
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/78382c66

Branch: refs/heads/master
Commit: 78382c66bc93181b3cfa2268a13da60074c9962f
Parents: 9424836
Author: Puspendu Banerjee 
Authored: Wed Mar 8 23:26:43 2017 -0600
Committer: Mike Moser 
Committed: Tue Mar 14 13:58:06 2017 -0400

--
 .../repository/FileSystemRepository.java| 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/78382c66/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 67df539..b899a36 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
@@ -199,13 +199,16 @@ public class FileSystemRepository implements 
ContentRepository {
 for (final Map.Entry container : 
containers.entrySet()) {
 final String containerName = container.getKey();
 
-final long capacity = 
Files.getFileStore(container.getValue()).getTotalSpace();
+final long capacity = 
container.getValue().toFile().getTotalSpace();
+if(capacity==0) {
+throw new RuntimeException("System returned total space of 
the partition for " + containerName + " is zero byte. Nifi can not create a 
zero sized FileSystemRepository");
+}
 final long maxArchiveBytes = (long) (capacity * (1D - 
(maxArchiveRatio - 0.02)));
 minUsableContainerBytesForArchive.put(container.getKey(), 
Long.valueOf(maxArchiveBytes));
 LOG.info("Maximum Threshold for Container {} set to {} bytes; 
if volume exceeds this size, archived data will be deleted until it no longer 
exceeds this size",
 containerName, maxArchiveBytes);
 
-final long backPressureBytes = (long) 
(Files.getFileStore(container.getValue()).getTotalSpace() * 
archiveBackPressureRatio);
+final long backPressureBytes = (long) 
(container.getValue().toFile().getTotalSpace() * archiveBackPressureRatio);
 final ContainerState containerState = new 
ContainerState(containerName, true, backPressureBytes, capacity);
 containerStateMap.put(containerName, containerState);
 }
@@ -382,8 +385,12 @@ public class FileSystemRepository implements 
ContentRepository {
 if (path == null) {
 throw new IllegalArgumentException("No container exists with name 
" + containerName);
 }
+long capacity = path.toFile().getTotalSpace();
+if(capacity==0) {
+throw new RuntimeException("System returned total space of the 
partition for " + containerName + " is zero byte. Nifi can not create a zero 
sized FileSystemRepository");
+}
 
-return Files.getFileStore(path).getTotalSpace();
+return capacity;
 }
 
 @Override
@@ -392,8 +399,11 @@ public class FileSystemRepository implements 
ContentRepository {
 if (path == null) {
 throw new IllegalArgumentException("No container exists with name 
" + containerName);
 }
-
-return Files.getFileStore(path).getUsableSpace();
+long usableSpace=path.toFile().getUsableSpace();
+if(usableSpace==0) {
+throw new RuntimeException("System returned usable space of the 
partition for " + containerName + " is zero byte. Nifi can not create a zero 
sized FileSystemRepository");
+}
+return usableSpace;
 }
 
 @Override

nifi git commit: NIFI-2890 Provenance Repository Corruption (0.x) * Corrected handling of corrupt journal file records that prevents instance startup and loss of records from corrupt files. Specifical

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 1c7e1236c -> 7d23bd7ac


NIFI-2890 Provenance Repository Corruption (0.x)
* Corrected handling of corrupt journal file records that prevents instance 
startup and loss of records from corrupt files.  Specifically, exception 
handling was expanded to cover failures on records after the first the same as 
failures on the first record.
* Adjusted log messages  to reflect that the remainder or all of the journal 
will be skipped, not just the current record.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7d23bd7a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7d23bd7a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7d23bd7a

Branch: refs/heads/0.x
Commit: 7d23bd7ac6af228a3e723d18253063231c919cf9
Parents: 1c7e123
Author: Joe Skora 
Authored: Tue Feb 7 21:02:19 2017 +
Committer: Mike Moser 
Committed: Wed Feb 15 20:45:47 2017 +

--
 .../PersistentProvenanceRepository.java |  27 +-
 .../TestPersistentProvenanceRepository.java | 332 +--
 2 files changed, 324 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/7d23bd7a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
index 8b971b5..4cec8aa 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
@@ -1564,16 +1564,19 @@ public class PersistentProvenanceRepository implements 
ProvenanceEventRepository
 try {
 record = reader.nextRecord();
 } catch (final EOFException eof) {
+// record will be null and reader can no longer be used
 } catch (final Exception e) {
-logger.warn("Failed to generate Provenance Event Record 
from Journal due to " + e + "; it's possible that the record wasn't "
-+ "completely written to the file. This record 
will be skipped.");
+logger.warn("Failed to generate Provenance Event Record 
from Journal due to " + e + "; it's "
++ "possible that the record wasn't completely 
written to the file. This journal will be "
++ "skipped.");
 if (logger.isDebugEnabled()) {
 logger.warn("", e);
 }
 
 if (eventReporter != null) {
-eventReporter.reportEvent(Severity.WARNING, 
EVENT_CATEGORY, "Failed to read Provenance Event Record from Journal due to " + 
e +
-"; it's possible that hte record wasn't completely 
written to the file. This record will be skipped.");
+eventReporter.reportEvent(Severity.WARNING, 
EVENT_CATEGORY, "Failed to read Provenance Event "
++ "Record from Journal due to " + e + "; it's 
possible that the record wasn't "
++ "completely written to the file. This 
journal will be skipped.");
 }
 }
 
@@ -1710,6 +1713,22 @@ public class PersistentProvenanceRepository implements 
ProvenanceEventRepository
 try {
 nextRecord = reader.nextRecord();
 } catch (final EOFException eof) {
+// record will be null and reader can no 
longer be used
+} catch (final Exception e) {
+logger.warn("Failed to generate Provenance 
Event Record from Journal due to " + e
++ "; it's possible that the record 
wasn't completely written to the file. "
++ "The remainder of this journal will 
be skipped.");
+if (logger.isDebugEnabled()) {
+logger.warn("", e);
+

nifi git commit: NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (1.x) * Remove function based on JDK source. * Add new function to find bytes based on RFC3629. * Add field name to log

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x de8d01349 -> e97d7460a


NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (1.x)
* Remove function based on JDK source.
* Add new function to find bytes based on RFC3629.
* Add field name to log entry when field is truncated.

Signed-off-by: Mike Moser 
This closes #1481


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e97d7460
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e97d7460
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e97d7460

Branch: refs/heads/0.x
Commit: e97d7460a0fe0563b52969a378a0b21172a3c347
Parents: de8d013
Author: Joe Skora 
Authored: Tue Feb 7 17:09:20 2017 +
Committer: Mike Moser 
Committed: Mon Feb 13 16:07:03 2017 -0500

--
 .../nifi/provenance/StandardRecordWriter.java   | 84 ++--
 1 file changed, 43 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/e97d7460/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
index f015cc8..b14726a 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
@@ -87,7 +87,7 @@ public class StandardRecordWriter implements RecordWriter {
 lastBlockOffset = rawOutStream.getBytesWritten();
 resetWriteStream(firstEventId);
 
-writeUTFLimited(out, 
PersistentProvenanceRepository.class.getName());
+writeUTFLimited(out, 
PersistentProvenanceRepository.class.getName(), 
"PersistentProvenanceRepository.class.name");
 out.writeInt(PersistentProvenanceRepository.SERIALIZATION_VERSION);
 out.flush();
 } catch (final IOException ioe) {
@@ -165,7 +165,7 @@ public class StandardRecordWriter implements RecordWriter {
 }
 
 out.writeLong(recordIdentifier);
-writeUTFLimited(out, record.getEventType().name());
+writeUTFLimited(out, record.getEventType().name(), "EventType");
 out.writeLong(record.getEventTime());
 out.writeLong(record.getFlowFileEntryDate());
 out.writeLong(record.getEventDuration());
@@ -173,10 +173,10 @@ public class StandardRecordWriter implements RecordWriter 
{
 writeUUIDs(out, record.getLineageIdentifiers());
 out.writeLong(record.getLineageStartDate());
 
-writeNullableString(out, record.getComponentId());
-writeNullableString(out, record.getComponentType());
+writeNullableString(out, record.getComponentId(), "ComponentId");
+writeNullableString(out, record.getComponentType(), 
"ComponentType");
 writeUUID(out, record.getFlowFileUuid());
-writeNullableString(out, record.getDetails());
+writeNullableString(out, record.getDetails(), "Details");
 
 // Write FlowFile attributes
 final Map attrs = record.getPreviousAttributes();
@@ -196,9 +196,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If Content Claim Info is present, write out a 'TRUE' followed 
by claim info. Else, write out 'false'.
 if (record.getContentClaimSection() != null && 
record.getContentClaimContainer() != null && record.getContentClaimIdentifier() 
!= null) {
 out.writeBoolean(true);
-writeUTFLimited(out, record.getContentClaimContainer());
-writeUTFLimited(out, record.getContentClaimSection());
-writeUTFLimited(out, record.getContentClaimIdentifier());
+writeUTFLimited(out, record.getContentClaimContainer(), 
"ContentClaimContainer");
+writeUTFLimited(out, record.getContentClaimSection(), 
"ContentClaimSection");
+writeUTFLimited(out, record.getContentClaimIdentifier(), 
"ContentClaimIdentifier");
 if (record.getContentClaimOffset() == null) {
 out.writeLong(0L);
 } else {
@@ -212,9 +212,9 @@ public class 

nifi git commit: NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (1.x) * Remove function based on JDK source. * Add new function to find bytes based on RFC3629. * Add field name to log

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 2bc7d5262 -> 41ad03215


NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (1.x)
* Remove function based on JDK source.
* Add new function to find bytes based on RFC3629.
* Add field name to log entry when field is truncated.

Signed-off-by: Mike Moser 
This closes #1475


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/41ad0321
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/41ad0321
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/41ad0321

Branch: refs/heads/master
Commit: 41ad032151ffaf0b56b18400be61e12e2742a58d
Parents: 2bc7d52
Author: Joe Skora 
Authored: Mon Feb 6 18:55:01 2017 +
Committer: Mike Moser 
Committed: Mon Feb 13 20:15:59 2017 +

--
 .../repository/schema/SchemaRecordWriter.java   | 47 +--
 .../schema/TestSchemaRecordReaderWriter.java| 84 ++--
 .../nifi/provenance/StandardRecordWriter.java   | 82 +--
 3 files changed, 108 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/41ad0321/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
--
diff --git 
a/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
 
b/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
index 81043bc..3e4a059 100644
--- 
a/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
+++ 
b/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
@@ -113,7 +113,7 @@ public class SchemaRecordWriter {
 out.writeLong((Long) value);
 break;
 case STRING:
-writeUTFLimited(out, (String) value);
+writeUTFLimited(out, (String) value, field.getFieldName());
 break;
 case LONG_STRING:
 final byte[] charArray = ((String) 
value).getBytes(StandardCharsets.UTF_8);
@@ -134,7 +134,7 @@ public class SchemaRecordWriter {
 break;
 case UNION:
 final NamedValue namedValue = (NamedValue) value;
-writeUTFLimited(out, namedValue.getName());
+writeUTFLimited(out, namedValue.getName(), 
field.getFieldName());
 final Record childRecord = (Record) namedValue.getValue();
 writeRecordFields(childRecord, out);
 break;
@@ -145,14 +145,14 @@ public class SchemaRecordWriter {
 }
 }
 
-private void writeUTFLimited(final DataOutputStream out, final String 
utfString) throws IOException {
+private void writeUTFLimited(final DataOutputStream out, final String 
utfString, final String fieldName) throws IOException {
 try {
 out.writeUTF(utfString);
 } catch (UTFDataFormatException e) {
-final String truncated = utfString.substring(0, 
getCharsInUTFLength(utfString, MAX_ALLOWED_UTF_LENGTH));
-logger.warn("Truncating repository record value!  Attempted to 
write {} chars that encode to a UTF byte length greater than "
+final String truncated = utfString.substring(0, 
getCharsInUTF8Limit(utfString, MAX_ALLOWED_UTF_LENGTH));
+logger.warn("Truncating repository record value for field '{}'!  
Attempted to write {} chars that encode to a UTF8 byte length greater than "
 + "supported maximum ({}), truncating to {} 
chars.",
-utfString.length(), MAX_ALLOWED_UTF_LENGTH, 
truncated.length());
+(fieldName == null) ? "" : fieldName, utfString.length(), 
MAX_ALLOWED_UTF_LENGTH, truncated.length());
 if (logger.isDebugEnabled()) {
 logger.warn("String value was:\n{}", truncated);
 }
@@ -160,28 +160,29 @@ public class SchemaRecordWriter {
 }
 }
 
-
-static int getCharsInUTFLength(final String str, final int utfLimit) {
-// see java.io.DataOutputStream.writeUTF()
-int strlen = str.length();
-int utflen = 0;
-int c;
-
-/* use charAt instead of copying String to Char array */
-for (int i = 0; i < strlen; i++) {
-c = str.charAt(i);
-if ((c >= 0x0001) & (c <= 0x007F)) {
-utflen++;
-} else if (c > 0x07FF) {
-utflen += 3;
+static int getCharsInUTF8Limit(final String str, final int utf8Limit) {
+// Calculate how much of String fits within UTF8 byte limit based on 
RFC3629.

[2/2] nifi git commit: NIFI-3403 - Fix NPE in InvokeHTTP

[mosermw]

NIFI-3403 - Fix NPE in InvokeHTTP

Signed-off-by: Mike Moser 

This closes #1494


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/de8d0134
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/de8d0134
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/de8d0134

Branch: refs/heads/0.x
Commit: de8d01349e80965de0fba989888c6951217270ad
Parents: 97d064f
Author: Pierre Villard 
Authored: Thu Feb 9 20:10:33 2017 +0100
Committer: Mike Moser 
Committed: Fri Feb 10 17:20:42 2017 -0500

--
 .../nifi/processors/standard/InvokeHTTP.java|  2 +-
 .../standard/util/TestInvokeHttpCommon.java | 29 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/de8d0134/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 6befbf4..a3b23f8 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -855,7 +855,7 @@ public final class InvokeHTTP extends AbstractProcessor {
 // iterate through the flowfile attributes, adding any attribute that
 // matches the attributes-to-send pattern. if the pattern is not set
 // (it's an optional property), ignore that attribute entirely
-if (regexAttributesToSend != null) {
+if (regexAttributesToSend != null && requestFlowFile != null) {
 Map attributes = requestFlowFile.getAttributes();
 Matcher m = regexAttributesToSend.matcher("");
 for (Map.Entry entry : attributes.entrySet()) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/de8d0134/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
index a0dade1..27eda3b 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
@@ -449,6 +449,35 @@ public abstract class TestInvokeHttpCommon {
 }
 
 @Test
+public void testNoInputWithAttributes() throws Exception {
+addHandler(new GetOrHeadHandler());
+
+runner.setProperty(InvokeHTTP.PROP_URL, url + "/status/200");
+runner.setProperty(InvokeHTTP.PROP_METHOD, "GET");
+runner.setProperty(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, "myAttribute");
+runner.setIncomingConnection(false);
+runner.setNonLoopConnection(false);
+
+runner.run();
+
+runner.assertTransferCount(InvokeHTTP.REL_SUCCESS_REQ, 0);
+runner.assertTransferCount(InvokeHTTP.REL_RESPONSE, 1);
+runner.assertTransferCount(InvokeHTTP.REL_RETRY, 0);
+runner.assertTransferCount(InvokeHTTP.REL_NO_RETRY, 0);
+runner.assertTransferCount(InvokeHTTP.REL_FAILURE, 0);
+runner.assertPenalizeCount(0);
+
+// expected in response
+// status code, status message, all headers from server response --> 
ff attributes
+// server response message body into payload of ff
+final MockFlowFile bundle1 = 
runner.getFlowFilesForRelationship(InvokeHTTP.REL_RESPONSE).get(0);
+bundle1.assertContentEquals("/status/200".getBytes("UTF-8"));
+bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
+bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
+bundle1.assertAttributeEquals("Content-Type", "text/plain; 
charset=ISO-8859-1");
+}
+
+@Test
 public void testNoInputFail() throws Exception {
 addHandler(new GetOrHeadHandler());
 

[1/2] nifi git commit: NIFI-1125 InvokeHTTP throws NullPointerException

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 4f72e3491 -> de8d01349


NIFI-1125 InvokeHTTP throws NullPointerException

Added null check in onPropertyModified to avoid NPE.

This closes #1477.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97d064ff
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97d064ff
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97d064ff

Branch: refs/heads/0.x
Commit: 97d064ff5c1bc2d6eee615aa39a59f909fc98a0a
Parents: 4f72e34
Author: Koji Kawamura 
Authored: Tue Feb 7 11:08:06 2017 +0900
Committer: Mike Moser 
Committed: Fri Feb 10 16:22:42 2017 -0500

--
 .../nifi/processors/standard/InvokeHTTP.java|  2 +-
 .../processors/standard/TestInvokeHTTP.java | 29 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/97d064ff/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 8c5dc4d..6befbf4 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -460,7 +460,7 @@ public final class InvokeHTTP extends AbstractProcessor {
 } else {
 // compile the attributes-to-send filter pattern
 if 
(PROP_ATTRIBUTES_TO_SEND.getName().equalsIgnoreCase(descriptor.getName())) {
-if (newValue.isEmpty()) {
+if (newValue == null || newValue.isEmpty()) {
 regexAttributesToSend = null;
 } else {
 final String trimmedValue = 
StringUtils.trimToEmpty(newValue);

http://git-wip-us.apache.org/repos/asf/nifi/blob/97d064ff/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
index 3f64c3c..29ec0bb 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
@@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +40,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class TestInvokeHTTP extends TestInvokeHttpCommon {
 
@@ -208,4 +211,30 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon {
 }
 }
 }
+
+@Test
+public void testOnPropertyModified() throws Exception {
+final InvokeHTTP processor = new InvokeHTTP();
+final Field regexAttributesToSendField = 
InvokeHTTP.class.getDeclaredField("regexAttributesToSend");
+regexAttributesToSendField.setAccessible(true);
+
+assertNull(regexAttributesToSendField.get(processor));
+
+// Set Attributes to Send.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, null, 
"uuid");
+assertNotNull(regexAttributesToSendField.get(processor));
+
+// Null clear Attributes to Send. NIFI-1125: Throws 
NullPointerException.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, 
"uuid", null);
+assertNull(regexAttributesToSendField.get(processor));
+
+// Set Attributes to Send.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, null, 
"uuid");
+assertNotNull(regexAttributesToSendField.get(processor));
+
+// Clear Attributes to Send with empty string.
+processor.onPropertyModified(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, 
"uuid", "");
+   

nifi git commit: NIFI-3403 - Fix NPE in InvokeHTTP

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 4e4d14f86 -> 2e1b87fa4


NIFI-3403 - Fix NPE in InvokeHTTP

Signed-off-by: Mike Moser 

This closes #1494


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2e1b87fa
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2e1b87fa
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2e1b87fa

Branch: refs/heads/master
Commit: 2e1b87fa43e8af05ae9f08970b5d78c60e58c1c8
Parents: 4e4d14f
Author: Pierre Villard 
Authored: Thu Feb 9 20:10:33 2017 +0100
Committer: Mike Moser 
Committed: Fri Feb 10 20:59:18 2017 +

--
 .../nifi/processors/standard/InvokeHTTP.java|  2 +-
 .../standard/util/TestInvokeHttpCommon.java | 29 
 2 files changed, 30 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/2e1b87fa/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index c95b639..66f7561 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -863,7 +863,7 @@ public final class InvokeHTTP extends AbstractProcessor {
 // iterate through the flowfile attributes, adding any attribute that
 // matches the attributes-to-send pattern. if the pattern is not set
 // (it's an optional property), ignore that attribute entirely
-if (regexAttributesToSend != null) {
+if (regexAttributesToSend != null && requestFlowFile != null) {
 Map attributes = requestFlowFile.getAttributes();
 Matcher m = regexAttributesToSend.matcher("");
 for (Map.Entry entry : attributes.entrySet()) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/2e1b87fa/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
index 5b63243..5b1e404 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
@@ -449,6 +449,35 @@ public abstract class TestInvokeHttpCommon {
 }
 
 @Test
+public void testNoInputWithAttributes() throws Exception {
+addHandler(new GetOrHeadHandler());
+
+runner.setProperty(InvokeHTTP.PROP_URL, url + "/status/200");
+runner.setProperty(InvokeHTTP.PROP_METHOD, "GET");
+runner.setProperty(InvokeHTTP.PROP_ATTRIBUTES_TO_SEND, "myAttribute");
+runner.setIncomingConnection(false);
+runner.setNonLoopConnection(false);
+
+runner.run();
+
+runner.assertTransferCount(InvokeHTTP.REL_SUCCESS_REQ, 0);
+runner.assertTransferCount(InvokeHTTP.REL_RESPONSE, 1);
+runner.assertTransferCount(InvokeHTTP.REL_RETRY, 0);
+runner.assertTransferCount(InvokeHTTP.REL_NO_RETRY, 0);
+runner.assertTransferCount(InvokeHTTP.REL_FAILURE, 0);
+runner.assertPenalizeCount(0);
+
+// expected in response
+// status code, status message, all headers from server response --> 
ff attributes
+// server response message body into payload of ff
+final MockFlowFile bundle1 = 
runner.getFlowFilesForRelationship(InvokeHTTP.REL_RESPONSE).get(0);
+bundle1.assertContentEquals("/status/200".getBytes("UTF-8"));
+bundle1.assertAttributeEquals(InvokeHTTP.STATUS_CODE, "200");
+bundle1.assertAttributeEquals(InvokeHTTP.STATUS_MESSAGE, "OK");
+bundle1.assertAttributeEquals("Content-Type", 
"text/plain;charset=iso-8859-1");
+}
+
+@Test
 public void testNoInputFail() throws Exception {
 

nifi git commit: Updated documentation of ListenHTTP

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 376af83a3 -> adfaffc77


Updated documentation of ListenHTTP


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/adfaffc7
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/adfaffc7
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/adfaffc7

Branch: refs/heads/master
Commit: adfaffc7736a6b85fe8c65d138043d717ccc7198
Parents: 376af83
Author: Pierre Villard 
Authored: Thu Dec 29 15:46:18 2016 +0100
Committer: Mike Moser 
Committed: Fri Feb 3 22:53:29 2017 +

--
 .../java/org/apache/nifi/processors/standard/ListenHTTP.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/adfaffc7/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
index 82eee92..0c38331 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
@@ -65,7 +65,9 @@ import java.util.regex.Pattern;
 
 @InputRequirement(Requirement.INPUT_FORBIDDEN)
 @Tags({"ingest", "http", "https", "rest", "listen"})
-@CapabilityDescription("Starts an HTTP Server that is used to receive 
FlowFiles from remote sources. The default URI of the Service will be 
http://{hostname}:{port}/contentListener;)
+@CapabilityDescription("Starts an HTTP Server and listens on a given base path 
to transform incoming requests into FlowFiles. "
++ "The default URI of the Service will be 
http://{hostname}:{port}/contentListener. Only HEAD and POST requests are "
++ "supported. GET, PUT, and DELETE will result in an error and the 
HTTP response status code 405.")
 public class ListenHTTP extends AbstractSessionFactoryProcessor {
 
 private Set relationships;

nifi git commit: NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (0.x) * Updated StandardRecordWriter to consider the encoding behavior of * java.io.DataOutputStream.writeUTF() and tru

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 2276c6ac1 -> 4f72e3491


NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException (0.x)
* Updated StandardRecordWriter to consider the encoding behavior of
* java.io.DataOutputStream.writeUTF() and truncate string values such that
* the UTF representation will not be longer than that DataOutputStream's
* 64K byte UTF format limit.
* Add test to confirm handling of large UTF strings.

Signed-off-by: Mike Moser 
This closes #1470.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4f72e349
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4f72e349
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4f72e349

Branch: refs/heads/0.x
Commit: 4f72e3491f2372c8c45afb96a765c1f5cdd2f07d
Parents: 2276c6a
Author: Joe Skora 
Authored: Thu Feb 2 19:11:05 2017 +
Committer: Mike Moser 
Committed: Fri Feb 3 17:10:30 2017 -0500

--
 .../nifi/provenance/StandardRecordWriter.java   | 62 
 .../TestStandardRecordReaderWriter.java | 44 ++
 2 files changed, 96 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4f72e349/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
--
diff --git 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
index a5c121a..f015cc8 100644
--- 
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
+++ 
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UTFDataFormatException;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,6 +38,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class StandardRecordWriter implements RecordWriter {
+
+public static final int MAX_ALLOWED_UTF_LENGTH = 65_535;
+
 private static final Logger logger = 
LoggerFactory.getLogger(StandardRecordWriter.class);
 
 private final File file;
@@ -83,7 +87,7 @@ public class StandardRecordWriter implements RecordWriter {
 lastBlockOffset = rawOutStream.getBytesWritten();
 resetWriteStream(firstEventId);
 
-out.writeUTF(PersistentProvenanceRepository.class.getName());
+writeUTFLimited(out, 
PersistentProvenanceRepository.class.getName());
 out.writeInt(PersistentProvenanceRepository.SERIALIZATION_VERSION);
 out.flush();
 } catch (final IOException ioe) {
@@ -161,7 +165,7 @@ public class StandardRecordWriter implements RecordWriter {
 }
 
 out.writeLong(recordIdentifier);
-out.writeUTF(record.getEventType().name());
+writeUTFLimited(out, record.getEventType().name());
 out.writeLong(record.getEventTime());
 out.writeLong(record.getFlowFileEntryDate());
 out.writeLong(record.getEventDuration());
@@ -192,9 +196,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If Content Claim Info is present, write out a 'TRUE' followed 
by claim info. Else, write out 'false'.
 if (record.getContentClaimSection() != null && 
record.getContentClaimContainer() != null && record.getContentClaimIdentifier() 
!= null) {
 out.writeBoolean(true);
-out.writeUTF(record.getContentClaimContainer());
-out.writeUTF(record.getContentClaimSection());
-out.writeUTF(record.getContentClaimIdentifier());
+writeUTFLimited(out, record.getContentClaimContainer());
+writeUTFLimited(out, record.getContentClaimSection());
+writeUTFLimited(out, record.getContentClaimIdentifier());
 if (record.getContentClaimOffset() == null) {
 out.writeLong(0L);
 } else {
@@ -208,9 +212,9 @@ public class StandardRecordWriter implements RecordWriter {
 // If Previous Content Claim Info is present, write out a 'TRUE' 
followed by claim info. Else, 

nifi git commit: NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException * Updated StandardRecordWriter, even though it is now deprecated to consider the encoding behavior of java.io.DataOutpu

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 2d6d7710c -> 376af83a3


NIFI-3055 StandardRecordWriter Can Throw UTFDataFormatException
* Updated StandardRecordWriter, even though it is now deprecated to consider 
the encoding behavior of java.io.DataOutputStream.writeUTF() and truncate 
string values such that the UTF representation will not be longer than that 
DataOutputStream's 64K UTF format limit.
* Updated the new SchemaRecordWriter class to similarly truncate long Strings 
that will be written as UTF.
* Add tests to confirm handling of large UTF strings and various edge 
conditions of UTF string handling.

Signed-off-by: Mike Moser 

This closes #1469.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/376af83a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/376af83a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/376af83a

Branch: refs/heads/master
Commit: 376af83a3dcfa5361be0859b54d91d30c685494e
Parents: 2d6d771
Author: Joe Skora 
Authored: Thu Feb 2 18:24:56 2017 +
Committer: Mike Moser 
Committed: Fri Feb 3 20:52:32 2017 +

--
 nifi-commons/nifi-schema-utils/pom.xml  |   5 +
 .../repository/schema/SchemaRecordWriter.java   |  52 +++-
 .../schema/TestSchemaRecordReaderWriter.java| 130 +++
 .../pom.xml |   5 +
 .../nifi/provenance/StandardRecordWriter.java   |  61 +++--
 .../TestStandardRecordReaderWriter.java |  43 ++
 6 files changed, 285 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/376af83a/nifi-commons/nifi-schema-utils/pom.xml
--
diff --git a/nifi-commons/nifi-schema-utils/pom.xml 
b/nifi-commons/nifi-schema-utils/pom.xml
index 11c62aa..a1fecb3 100644
--- a/nifi-commons/nifi-schema-utils/pom.xml
+++ b/nifi-commons/nifi-schema-utils/pom.xml
@@ -21,6 +21,11 @@
 
 nifi-schema-utils
 
+
+org.apache.commons
+commons-lang3
+test
+
 
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/376af83a/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
--
diff --git 
a/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
 
b/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
index 4693889..81043bc 100644
--- 
a/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
+++ 
b/nifi-commons/nifi-schema-utils/src/main/java/org/apache/nifi/repository/schema/SchemaRecordWriter.java
@@ -17,9 +17,13 @@
 
 package org.apache.nifi.repository.schema;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UTFDataFormatException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
@@ -27,6 +31,10 @@ import java.util.Map;
 
 public class SchemaRecordWriter {
 
+public static final int MAX_ALLOWED_UTF_LENGTH = 65_535;
+
+private static final Logger logger = 
LoggerFactory.getLogger(SchemaRecordWriter.class);
+
 public void writeRecord(final Record record, final OutputStream out) 
throws IOException {
 // write sentinel value to indicate that there is a record. This 
allows the reader to then read one
 // byte and check if -1. If so, the reader knows there are no more 
records. If not, then the reader
@@ -105,7 +113,7 @@ public class SchemaRecordWriter {
 out.writeLong((Long) value);
 break;
 case STRING:
-out.writeUTF((String) value);
+writeUTFLimited(out, (String) value);
 break;
 case LONG_STRING:
 final byte[] charArray = ((String) 
value).getBytes(StandardCharsets.UTF_8);
@@ -126,7 +134,7 @@ public class SchemaRecordWriter {
 break;
 case UNION:
 final NamedValue namedValue = (NamedValue) value;
-out.writeUTF(namedValue.getName());
+writeUTFLimited(out, namedValue.getName());
 final Record childRecord = (Record) namedValue.getValue();
 writeRecordFields(childRecord, out);
 break;
@@ -136,4 +144,44 @@ public class SchemaRecordWriter {
 break;
 }
 }
+
+private void writeUTFLimited(final DataOutputStream out, final String 
utfString) throws IOException {
+  

nifi git commit: NIFI-2861 ControlRate should accept more than one flow file per execution * Support multiple files per onTrigger call.

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 2fbeabb95 -> 4d533a99b


NIFI-2861 ControlRate should accept more than one flow file per execution
 * Support multiple files per onTrigger call.

Signed-off-by: Mike Moser 

This closes #1412.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4d533a99
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4d533a99
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4d533a99

Branch: refs/heads/master
Commit: 4d533a99b3790ec842a7230fd6cae0d59158c2b5
Parents: 2fbeabb
Author: Joe Skora 
Authored: Thu Jan 12 16:28:34 2017 +
Committer: Mike Moser 
Committed: Thu Jan 12 21:43:12 2017 +

--
 .../nifi/processors/standard/ControlRate.java   | 24 ---
 .../processors/standard/TestControlRate.java| 32 
 2 files changed, 52 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4d533a99/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
index bce67ac..006b8ed 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
@@ -77,6 +77,9 @@ public class ControlRate extends AbstractProcessor {
 public static final AllowableValue ATTRIBUTE_RATE_VALUE = new 
AllowableValue(ATTRIBUTE_RATE, ATTRIBUTE_RATE,
 "Rate is controlled by accumulating the value of a specified 
attribute that is transferred per time duration");
 
+// based on testing to balance commits and 10,000 FF swap limit
+public static final int MAX_FLOW_FILES_PER_BATCH = 1000;
+
 public static final PropertyDescriptor RATE_CONTROL_CRITERIA = new 
PropertyDescriptor.Builder()
 .name("Rate Control Criteria")
 .description("Indicates the criteria that is used to control the 
throughput rate. Changing this value resets the rate counters.")
@@ -233,7 +236,7 @@ public class ControlRate extends AbstractProcessor {
 
 @Override
 public void onTrigger(final ProcessContext context, final ProcessSession 
session) throws ProcessException {
-List flowFiles = session.get(new ThrottleFilter());
+List flowFiles = session.get(new 
ThrottleFilter(MAX_FLOW_FILES_PER_BATCH));
 if (flowFiles.isEmpty()) {
 context.yield();
 return;
@@ -292,11 +295,11 @@ public class ControlRate extends AbstractProcessor {
 case ATTRIBUTE_RATE:
 final String attributeValue = 
flowFile.getAttribute(rateControlAttribute);
 if (attributeValue == null) {
-return -1l;
+return -1L;
 }
 
 if (!POSITIVE_LONG_PATTERN.matcher(attributeValue).matches()) {
-return -1l;
+return -1L;
 }
 rateValue = Long.parseLong(attributeValue);
 break;
@@ -381,6 +384,13 @@ public class ControlRate extends AbstractProcessor {
 
 private class ThrottleFilter implements FlowFileFilter {
 
+private final int flowFilesPerBatch;
+private int flowFilesInBatch = 0;
+
+ThrottleFilter(final int maxFFPerBatch) {
+flowFilesPerBatch = maxFFPerBatch;
+}
+
 @Override
 public FlowFileFilterResult filter(FlowFile flowFile) {
 long accrual = getFlowFileAccrual(flowFile);
@@ -409,7 +419,13 @@ public class ControlRate extends AbstractProcessor {
 throttle.lock();
 try {
 if (throttle.tryAdd(accrual)) {
-return FlowFileFilterResult.ACCEPT_AND_TERMINATE;
+flowFilesInBatch += 1;
+if (flowFilesInBatch>= flowFilesPerBatch) {
+flowFilesInBatch = 0;
+return FlowFileFilterResult.ACCEPT_AND_TERMINATE;
+} else {
+return FlowFileFilterResult.ACCEPT_AND_CONTINUE;
+}
 }
 } finally {
 throttle.unlock();

nifi git commit: NIFI-2861 ControlRate should accept more than one flow file per execution

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 954201a4d -> a3d95dc15


NIFI-2861 ControlRate should accept more than one flow file per execution

Signed-off-by: Mike Moser 

This closes #1128


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a3d95dc1
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a3d95dc1
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a3d95dc1

Branch: refs/heads/0.x
Commit: a3d95dc1582f2edfd7997c5d8a23105e88729d11
Parents: 954201a
Author: Joe Skora 
Authored: Thu Oct 13 02:18:23 2016 -0400
Committer: Mike Moser 
Committed: Thu Jan 12 15:28:45 2017 -0500

--
 .../nifi/processors/standard/ControlRate.java   | 20 ++--
 .../processors/standard/TestControlRate.java| 32 
 2 files changed, 50 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a3d95dc1/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
index 5612d4f..18d6ff9 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java
@@ -77,6 +77,9 @@ public class ControlRate extends AbstractProcessor {
 public static final AllowableValue ATTRIBUTE_RATE_VALUE = new 
AllowableValue(ATTRIBUTE_RATE, ATTRIBUTE_RATE,
 "Rate is controlled by accumulating the value of a specified 
attribute that is transferred per time duration");
 
+// based on testing to balance commits and 10,000 FF swap limit
+public static final int MAX_FLOW_FILES_PER_BATCH = 1000;
+
 public static final PropertyDescriptor RATE_CONTROL_CRITERIA = new 
PropertyDescriptor.Builder()
 .name("Rate Control Criteria")
 .description("Indicates the criteria that is used to control the 
throughput rate. Changing this value resets the rate counters.")
@@ -233,7 +236,7 @@ public class ControlRate extends AbstractProcessor {
 
 @Override
 public void onTrigger(final ProcessContext context, final ProcessSession 
session) throws ProcessException {
-List flowFiles = session.get(new ThrottleFilter());
+List flowFiles = session.get(new 
ThrottleFilter(MAX_FLOW_FILES_PER_BATCH));
 if (flowFiles.isEmpty()) {
 context.yield();
 return;
@@ -381,6 +384,13 @@ public class ControlRate extends AbstractProcessor {
 
 private class ThrottleFilter implements FlowFileFilter {
 
+private final int flowFilesPerBatch;
+private int flowFilesInBatch = 0;
+
+ThrottleFilter(final int maxFFPerBatch) {
+flowFilesPerBatch = maxFFPerBatch;
+}
+
 @Override
 public FlowFileFilterResult filter(FlowFile flowFile) {
 long accrual = getFlowFileAccrual(flowFile);
@@ -409,7 +419,13 @@ public class ControlRate extends AbstractProcessor {
 throttle.lock();
 try {
 if (throttle.tryAdd(accrual)) {
-return FlowFileFilterResult.ACCEPT_AND_TERMINATE;
+flowFilesInBatch += 1;
+if (flowFilesInBatch>= flowFilesPerBatch) {
+flowFilesInBatch = 0;
+return FlowFileFilterResult.ACCEPT_AND_TERMINATE;
+} else {
+return FlowFileFilterResult.ACCEPT_AND_CONTINUE;
+}
 }
 } finally {
 throttle.unlock();

http://git-wip-us.apache.org/repos/asf/nifi/blob/a3d95dc1/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
index 2e6ce45..050f818 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
+++ 

nifi git commit: NIFI-2774 added configurable QoS options to ConsumeJMS

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 5c0c1d3bb -> 40618364e


NIFI-2774 added configurable QoS options to ConsumeJMS

Signed-off-by: Mike Moser 

This closes #1036.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/40618364
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/40618364
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/40618364

Branch: refs/heads/0.x
Commit: 40618364e70a966f9c1e425674b53b22b1fb0fb0
Parents: 5c0c1d3
Author: Oleg Zhurakousky 
Authored: Tue Sep 20 10:49:22 2016 -0400
Committer: Mike Moser 
Committed: Tue Oct 11 11:14:52 2016 -0400

--
 .../jms/processors/AbstractJMSProcessor.java|  12 +--
 .../apache/nifi/jms/processors/ConsumeJMS.java  |  96 ++
 .../apache/nifi/jms/processors/JMSConsumer.java |  84 +++-
 .../apache/nifi/jms/processors/PublishJMS.java  |   2 +-
 .../apache/nifi/jms/processors/CommonTest.java  |  10 +-
 .../processors/JMSPublisherConsumerTest.java| 100 +--
 6 files changed, 239 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/40618364/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
index 54e2d89..d5b704b 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
@@ -102,12 +102,12 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
  * all other lifecycle methods are invoked multiple times.
  */
 static {
-propertyDescriptors.add(USER);
-propertyDescriptors.add(PASSWORD);
+propertyDescriptors.add(CF_SERVICE);
 propertyDescriptors.add(DESTINATION);
 propertyDescriptors.add(DESTINATION_TYPE);
+propertyDescriptors.add(USER);
+propertyDescriptors.add(PASSWORD);
 propertyDescriptors.add(SESSION_CACHE_SIZE);
-propertyDescriptors.add(CF_SERVICE);
 }
 
 protected volatile T targetResource;
@@ -174,7 +174,7 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
  * @see JMSPublisher
  * @see JMSConsumer
  */
-protected abstract T finishBuildingTargetResource(JmsTemplate jmsTemplate);
+protected abstract T finishBuildingTargetResource(JmsTemplate jmsTemplate, 
ProcessContext processContext);
 
 /**
  * This method essentially performs initialization of this Processor by
@@ -202,9 +202,9 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
 
jmsTemplate.setPubSubDomain(TOPIC.equals(context.getProperty(DESTINATION_TYPE).getValue()));
 
 // set of properties that may be good candidates for exposure via 
configuration
-jmsTemplate.setReceiveTimeout(1);
+jmsTemplate.setReceiveTimeout(1000);
 
-this.targetResource = 
this.finishBuildingTargetResource(jmsTemplate);
+this.targetResource = 
this.finishBuildingTargetResource(jmsTemplate, context);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/40618364/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
--
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
index 131d113..c031ec1 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
@@ -18,20 +18,27 @@ package org.apache.nifi.jms.processors;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import javax.jms.Session;
+
 import org.apache.nifi.annotation.behavior.InputRequirement;
 import 

nifi git commit: NIFI-2774 added configurable QoS options to ConsumeJMS

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 4a4c87fa1 -> ee14ae8af


NIFI-2774 added configurable QoS options to ConsumeJMS

Signed-off-by: Mike Moser 

This closes #1036.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ee14ae8a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ee14ae8a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ee14ae8a

Branch: refs/heads/master
Commit: ee14ae8af0740b4ca442b2662c48f422c53b144e
Parents: 4a4c87f
Author: Oleg Zhurakousky 
Authored: Tue Sep 20 10:49:22 2016 -0400
Committer: Mike Moser 
Committed: Tue Oct 11 10:32:00 2016 -0400

--
 .../jms/processors/AbstractJMSProcessor.java|  15 ++-
 .../apache/nifi/jms/processors/ConsumeJMS.java  |  95 ++
 .../apache/nifi/jms/processors/JMSConsumer.java |  84 +++-
 .../nifi/jms/processors/JMSPublisher.java   |   2 +-
 .../apache/nifi/jms/processors/PublishJMS.java  |   2 +-
 .../apache/nifi/jms/processors/CommonTest.java  |  10 +-
 .../processors/JMSPublisherConsumerTest.java| 100 +--
 7 files changed, 238 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/ee14ae8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
index cae3dc2..d5b704b 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
@@ -102,20 +102,18 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
  * all other lifecycle methods are invoked multiple times.
  */
 static {
-propertyDescriptors.add(USER);
-propertyDescriptors.add(PASSWORD);
+propertyDescriptors.add(CF_SERVICE);
 propertyDescriptors.add(DESTINATION);
 propertyDescriptors.add(DESTINATION_TYPE);
+propertyDescriptors.add(USER);
+propertyDescriptors.add(PASSWORD);
 propertyDescriptors.add(SESSION_CACHE_SIZE);
-propertyDescriptors.add(CF_SERVICE);
 }
 
 protected volatile T targetResource;
 
 private volatile CachingConnectionFactory cachingConnectionFactory;
 
-protected volatile String destinationName;
-
 /**
  *
  */
@@ -176,7 +174,7 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
  * @see JMSPublisher
  * @see JMSConsumer
  */
-protected abstract T finishBuildingTargetResource(JmsTemplate jmsTemplate);
+protected abstract T finishBuildingTargetResource(JmsTemplate jmsTemplate, 
ProcessContext processContext);
 
 /**
  * This method essentially performs initialization of this Processor by
@@ -201,13 +199,12 @@ abstract class AbstractJMSProcessor 
extends AbstractProcess
 
 JmsTemplate jmsTemplate = new JmsTemplate();
 jmsTemplate.setConnectionFactory(this.cachingConnectionFactory);
-this.destinationName = 
context.getProperty(DESTINATION).evaluateAttributeExpressions().getValue();
 
jmsTemplate.setPubSubDomain(TOPIC.equals(context.getProperty(DESTINATION_TYPE).getValue()));
 
 // set of properties that may be good candidates for exposure via 
configuration
-jmsTemplate.setReceiveTimeout(1);
+jmsTemplate.setReceiveTimeout(1000);
 
-this.targetResource = 
this.finishBuildingTargetResource(jmsTemplate);
+this.targetResource = 
this.finishBuildingTargetResource(jmsTemplate, context);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/ee14ae8a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
--
diff --git 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
index b76a1a7..d85d26f 100644
--- 
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
+++ 
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
@@ 

nifi git commit: NIFI-2874: Ensure that when reading more data from an InputStream the StreamDemarcator appropriately updates the max index that can be read from the buffer

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x db189e3b3 -> 5c0c1d3bb


NIFI-2874: Ensure that when reading more data from an InputStream the 
StreamDemarcator appropriately updates the max index that can be read from the 
buffer

Signed-off-by: Mike Moser 

This closes #1114.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5c0c1d3b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5c0c1d3b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5c0c1d3b

Branch: refs/heads/0.x
Commit: 5c0c1d3bb41fa75622a3a7502ccf86ec49d2fe4d
Parents: db189e3
Author: Mark Payne 
Authored: Fri Oct 7 09:52:03 2016 -0400
Committer: Mike Moser 
Committed: Fri Oct 7 14:24:54 2016 -0400

--
 .../nifi/stream/io/util/StreamDemarcator.java   |  1 +
 .../nifi/stream/io/util/StreamDemarcatorTest.java   | 16 
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/5c0c1d3b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/StreamDemarcator.java
--
diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/StreamDemarcator.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/StreamDemarcator.java
index 3064f1c..96dc619 100644
--- 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/StreamDemarcator.java
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/util/StreamDemarcator.java
@@ -138,6 +138,7 @@ public class StreamDemarcator {
 System.arraycopy(this.buffer, this.mark, this.buffer, 0, 
length);
 this.index = length;
 this.mark = 0;
+this.readAheadLength = length;
 }
 }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/5c0c1d3b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
--
diff --git 
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
 
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
index 93082a2..355cbb6 100644
--- 
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
+++ 
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/util/StreamDemarcatorTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -218,6 +219,21 @@ public class StreamDemarcatorTest {
 }
 
 @Test
+public void testOnBufferSplitNoTrailingDelimiter() throws IOException {
+final byte[] inputData = "Yes\nNo".getBytes(StandardCharsets.UTF_8);
+ByteArrayInputStream is = new ByteArrayInputStream(inputData);
+StreamDemarcator scanner = new StreamDemarcator(is, "\n".getBytes(), 
1000, 3);
+
+final byte[] first = scanner.nextToken();
+final byte[] second = scanner.nextToken();
+assertNotNull(first);
+assertNotNull(second);
+
+assertArrayEquals(first, new byte[] {'Y', 'e', 's'});
+assertArrayEquals(second, new byte[] {'N', 'o'});
+}
+
+@Test
 public void verifyScannerHandlesNegativeOneByteDelimiter() {
 ByteArrayInputStream is = new ByteArrayInputStream(new byte[] { 0, 0, 
0, 0, -1, 0, 0, 0 });
 StreamDemarcator scanner = new StreamDemarcator(is, new byte[] { -1 }, 
20, 1024);

nifi git commit: NIFI-2611: Fixing bugs in UnpackContent with flow file unpackers

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 087622ead -> 17dec0493


NIFI-2611: Fixing bugs in UnpackContent with flow file unpackers

Signed-off-by: Mike Moser 

This closes #905


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/17dec049
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/17dec049
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/17dec049

Branch: refs/heads/master
Commit: 17dec04939efda59345f5c2de49b575fd7d8dfcc
Parents: 087622e
Author: Joe Gresock 
Authored: Sun Aug 21 16:35:39 2016 +
Committer: Mike Moser 
Committed: Mon Aug 22 14:47:24 2016 -0400

--
 .../nifi/processors/standard/UnpackContent.java | 52 +-
 .../processors/standard/TestUnpackContent.java  | 56 +++-
 2 files changed, 57 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/17dec049/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
index 36cd4ad..d2de33c 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
@@ -102,6 +102,13 @@ public class UnpackContent extends AbstractProcessor {
 public static final String FRAGMENT_COUNT = "fragment.count";
 public static final String SEGMENT_ORIGINAL_FILENAME = 
"segment.original.filename";
 
+public static final String AUTO_DETECT_FORMAT_NAME = "use mime.type 
attribute";
+public static final String TAR_FORMAT_NAME = "tar";
+public static final String ZIP_FORMAT_NAME = "zip";
+public static final String FLOWFILE_STREAM_FORMAT_V3_NAME = 
"flowfile-stream-v3";
+public static final String FLOWFILE_STREAM_FORMAT_V2_NAME = 
"flowfile-stream-v2";
+public static final String FLOWFILE_TAR_FORMAT_NAME = "flowfile-tar-v1";
+
 public static final String OCTET_STREAM = "application/octet-stream";
 
 public static final PropertyDescriptor PACKAGING_FORMAT = new 
PropertyDescriptor.Builder()
@@ -144,9 +151,6 @@ public class UnpackContent extends AbstractProcessor {
 
 private Unpacker tarUnpacker;
 private Unpacker zipUnpacker;
-private Unpacker flowFileStreamV3Unpacker;
-private Unpacker flowFileStreamV2Unpacker;
-private Unpacker flowFileTarUnpacker;
 
 @Override
 protected void init(final ProcessorInitializationContext context) {
@@ -184,14 +188,6 @@ public class UnpackContent extends AbstractProcessor {
 fileFilter = 
Pattern.compile(context.getProperty(FILE_FILTER).getValue());
 tarUnpacker = new TarUnpacker(fileFilter);
 zipUnpacker = new ZipUnpacker(fileFilter);
-flowFileStreamV3Unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV3());
-flowFileStreamV2Unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV2());
-flowFileTarUnpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV1());
-}
-
-PackageFormat format = 
PackageFormat.getFormat(context.getProperty(PACKAGING_FORMAT).getValue());
-if (format != PackageFormat.AUTO_DETECT_FORMAT && unpacker == null) {
-initUnpacker(format);
 }
 }
 
@@ -207,15 +203,15 @@ public class UnpackContent extends AbstractProcessor {
 addFragmentAttrs = true;
 break;
 case FLOWFILE_STREAM_FORMAT_V2:
-unpacker = flowFileStreamV2Unpacker;
+unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV2());
 addFragmentAttrs = false;
 break;
 case FLOWFILE_STREAM_FORMAT_V3:
-unpacker = flowFileStreamV3Unpacker;
+unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV3());
 addFragmentAttrs = false;
 break;
 case FLOWFILE_TAR_FORMAT:
-unpacker = flowFileTarUnpacker;
+unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV1());
 addFragmentAttrs = false;
 break;
 case AUTO_DETECT_FORMAT:
@@ -254,6 +250,8 @@ public class UnpackContent extends AbstractProcessor {
 

nifi git commit: NIFI-2611: Fixing bugs in UnpackContent with flow file unpackers

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 58868abad -> fd7462b65


NIFI-2611: Fixing bugs in UnpackContent with flow file unpackers

Signed-off-by: Mike Moser 

This closes #905


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fd7462b6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fd7462b6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fd7462b6

Branch: refs/heads/0.x
Commit: fd7462b6532728373071314d44171be92762dc43
Parents: 58868ab
Author: Joe Gresock 
Authored: Sun Aug 21 16:35:39 2016 +
Committer: Mike Moser 
Committed: Mon Aug 22 14:44:42 2016 -0400

--
 .../nifi/processors/standard/UnpackContent.java | 52 +-
 .../processors/standard/TestUnpackContent.java  | 56 +++-
 2 files changed, 57 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/fd7462b6/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
index c9c8191..45e17c1 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
@@ -102,6 +102,13 @@ public class UnpackContent extends AbstractProcessor {
 public static final String FRAGMENT_COUNT = "fragment.count";
 public static final String SEGMENT_ORIGINAL_FILENAME = 
"segment.original.filename";
 
+public static final String AUTO_DETECT_FORMAT_NAME = "use mime.type 
attribute";
+public static final String TAR_FORMAT_NAME = "tar";
+public static final String ZIP_FORMAT_NAME = "zip";
+public static final String FLOWFILE_STREAM_FORMAT_V3_NAME = 
"flowfile-stream-v3";
+public static final String FLOWFILE_STREAM_FORMAT_V2_NAME = 
"flowfile-stream-v2";
+public static final String FLOWFILE_TAR_FORMAT_NAME = "flowfile-tar-v1";
+
 public static final String OCTET_STREAM = "application/octet-stream";
 
 public static final PropertyDescriptor PACKAGING_FORMAT = new 
PropertyDescriptor.Builder()
@@ -144,9 +151,6 @@ public class UnpackContent extends AbstractProcessor {
 
 private Unpacker tarUnpacker;
 private Unpacker zipUnpacker;
-private Unpacker flowFileStreamV3Unpacker;
-private Unpacker flowFileStreamV2Unpacker;
-private Unpacker flowFileTarUnpacker;
 
 @Override
 protected void init(final ProcessorInitializationContext context) {
@@ -184,14 +188,6 @@ public class UnpackContent extends AbstractProcessor {
 fileFilter = 
Pattern.compile(context.getProperty(FILE_FILTER).getValue());
 tarUnpacker = new TarUnpacker(fileFilter);
 zipUnpacker = new ZipUnpacker(fileFilter);
-flowFileStreamV3Unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV3());
-flowFileStreamV2Unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV2());
-flowFileTarUnpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV1());
-}
-
-PackageFormat format = 
PackageFormat.getFormat(context.getProperty(PACKAGING_FORMAT).getValue());
-if (format != PackageFormat.AUTO_DETECT_FORMAT && unpacker == null) {
-initUnpacker(format);
 }
 }
 
@@ -207,15 +203,15 @@ public class UnpackContent extends AbstractProcessor {
 addFragmentAttrs = true;
 break;
 case FLOWFILE_STREAM_FORMAT_V2:
-unpacker = flowFileStreamV2Unpacker;
+unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV2());
 addFragmentAttrs = false;
 break;
 case FLOWFILE_STREAM_FORMAT_V3:
-unpacker = flowFileStreamV3Unpacker;
+unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV3());
 addFragmentAttrs = false;
 break;
 case FLOWFILE_TAR_FORMAT:
-unpacker = flowFileTarUnpacker;
+unpacker = new FlowFileStreamUnpacker(new 
FlowFileUnpackagerV1());
 addFragmentAttrs = false;
 break;
 case AUTO_DETECT_FORMAT:
@@ -254,6 +250,8 @@ public class UnpackContent extends AbstractProcessor {
 } else 

nifi git commit: NIFI-1829 - Create new DebugFlow processor.

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 6e74c10f4 -> 4723f8e24


NIFI-1829 - Create new DebugFlow processor.

Signed-off-by: Mike Moser 
This closes #458


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4723f8e2
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4723f8e2
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4723f8e2

Branch: refs/heads/master
Commit: 4723f8e24c83b3fda68a091be7deabfd84f2b40a
Parents: 6e74c10
Author: Joe Skora 
Authored: Fri May 20 11:25:03 2016 -0400
Committer: Mike Moser 
Committed: Thu Jun 16 17:23:19 2016 -0400

--
 .../nifi/processors/standard/DebugFlow.java | 486 +++
 .../org.apache.nifi.processor.Processor |   1 +
 .../additionalDetails.html  |  48 ++
 .../nifi/processors/standard/TestDebugFlow.java | 361 ++
 4 files changed, 896 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/4723f8e2/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
new file mode 100644
index 000..1374c10
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
@@ -0,0 +1,486 @@
+/*
+ * 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.processors.standard;
+
+import org.apache.http.annotation.ThreadSafe;
+import org.apache.nifi.annotation.behavior.EventDriven;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.Validator;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.util.StandardValidators;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+@ThreadSafe()
+@EventDriven()
+@Tags({"test", "debug", "processor", "utility", "flow", "FlowFile"})
+@CapabilityDescription("The DebugFlow processor aids testing and debugging the 
FlowFile framework by allowing various "
++ "responses to be explicitly triggered in response to the receipt of 
a FlowFile or a timer event without a "
++ "FlowFile if using timer or cron based scheduling.  It can force 
responses needed to exercise or test "
++ "various failure modes that can occur when a processor runs.")
+public class DebugFlow extends AbstractProcessor {
+
+private final AtomicReference relationships = new 
AtomicReference<>();
+
+static final Relationship REL_SUCCESS = new Relationship.Builder()
+.name("success")
+.description("FlowFiles processed successfully.")
+.build();
+static final Relationship REL_FAILURE = new Relationship.Builder()
+.name("failure")
+.description("FlowFiles that failed to process.")
+   

nifi git commit: NIFI-1829 - Create new DebugFlow processor.

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 9e9af204a -> 19fcc40c8


NIFI-1829 - Create new DebugFlow processor.

Signed-off-by: Mike Moser 
This closes #458


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/19fcc40c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/19fcc40c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/19fcc40c

Branch: refs/heads/0.x
Commit: 19fcc40c82ea4417ce3a3917ce3b54c44826b4c6
Parents: 9e9af20
Author: Joe Skora 
Authored: Fri May 20 11:25:03 2016 -0400
Committer: Mike Moser 
Committed: Thu Jun 16 12:40:43 2016 -0400

--
 .../nifi/processors/standard/DebugFlow.java | 486 +++
 .../org.apache.nifi.processor.Processor |   1 +
 .../additionalDetails.html  |  48 ++
 .../nifi/processors/standard/TestDebugFlow.java | 361 ++
 4 files changed, 896 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/19fcc40c/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
new file mode 100644
index 000..1374c10
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
@@ -0,0 +1,486 @@
+/*
+ * 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.processors.standard;
+
+import org.apache.http.annotation.ThreadSafe;
+import org.apache.nifi.annotation.behavior.EventDriven;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.Validator;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.util.StandardValidators;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+@ThreadSafe()
+@EventDriven()
+@Tags({"test", "debug", "processor", "utility", "flow", "FlowFile"})
+@CapabilityDescription("The DebugFlow processor aids testing and debugging the 
FlowFile framework by allowing various "
++ "responses to be explicitly triggered in response to the receipt of 
a FlowFile or a timer event without a "
++ "FlowFile if using timer or cron based scheduling.  It can force 
responses needed to exercise or test "
++ "various failure modes that can occur when a processor runs.")
+public class DebugFlow extends AbstractProcessor {
+
+private final AtomicReference relationships = new 
AtomicReference<>();
+
+static final Relationship REL_SUCCESS = new Relationship.Builder()
+.name("success")
+.description("FlowFiles processed successfully.")
+.build();
+static final Relationship REL_FAILURE = new Relationship.Builder()
+.name("failure")
+.description("FlowFiles that failed to process.")
+

nifi git commit: NIFI-1118 adding SplitText features of size limit and header marker characters

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master a490c29a4 -> 1ac44a0a4


NIFI-1118 adding SplitText features of size limit and header marker characters

Signed-off-by: Mike Moser 

This closes #444


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1ac44a0a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1ac44a0a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1ac44a0a

Branch: refs/heads/master
Commit: 1ac44a0a4be94da5c88a994a39b7c803e12a291b
Parents: a490c29
Author: Mark Bean 
Authored: Sun May 15 20:07:04 2016 -0400
Committer: Mike Moser 
Committed: Tue Jun 7 11:37:23 2016 -0400

--
 .../nifi/processors/standard/SplitText.java | 432 +--
 .../nifi/processors/standard/TestSplitText.java | 297 +
 2 files changed, 590 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/1ac44a0a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
index 39eb4e8..0f1abfd 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
@@ -16,11 +16,14 @@
  */
 package org.apache.nifi.processors.standard;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -41,10 +44,13 @@ import 
org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.SeeAlso;
 import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.DataUnit;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -56,7 +62,9 @@ import org.apache.nifi.stream.io.BufferedInputStream;
 import org.apache.nifi.stream.io.BufferedOutputStream;
 import org.apache.nifi.stream.io.ByteArrayOutputStream;
 import org.apache.nifi.stream.io.ByteCountingInputStream;
+import org.apache.nifi.stream.io.ByteCountingOutputStream;
 import org.apache.nifi.util.IntegerHolder;
+import org.apache.nifi.util.LongHolder;
 import org.apache.nifi.util.ObjectHolder;
 
 @EventDriven
@@ -64,9 +72,15 @@ import org.apache.nifi.util.ObjectHolder;
 @SupportsBatching
 @Tags({"split", "text"})
 @InputRequirement(Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Splits a text file into multiple smaller text files on 
line boundaries, each having up to a configured number of lines.")
+@CapabilityDescription("Splits a text file into multiple smaller text files on 
line boundaries limited by maximum number of lines "
++ "or total size of fragment. Each output split file will contain no 
more than the configured number of lines or bytes. "
++ "If both Line Split Count and Maximum Fragment Size are specified, 
the split occurs at whichever limit is reached first. "
++ "If the first line of a fragment exceeds the Maximum Fragment Size, 
that line will be output in a single split file which "
++" exceeds the configured maximum size limit.")
 @WritesAttributes({
 @WritesAttribute(attribute = "text.line.count", description = "The number 
of lines of text from the original FlowFile that were copied to this FlowFile"),
+@WritesAttribute(attribute = "fragment.size", description = "The number of 
bytes from the original FlowFile that were copied to this FlowFile, " +
+"including header, if applicable, which is duplicated in each 
split FlowFile"),
 @WritesAttribute(attribute = "fragment.identifier", description = "All 
split FlowFiles produced from the same parent FlowFile 

nifi git commit: NIFI-1118 adding SplitText features of size limit and header marker characters

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 258fa660d -> a77fcdf66


NIFI-1118 adding SplitText features of size limit and header marker characters

Signed-off-by: Mike Moser 

This closes #444


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a77fcdf6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a77fcdf6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a77fcdf6

Branch: refs/heads/0.x
Commit: a77fcdf6602abb7d6f76d33cf308e43b44b1b79c
Parents: 258fa66
Author: Mark Bean 
Authored: Sun May 15 20:07:04 2016 -0400
Committer: Mike Moser 
Committed: Fri Jun 3 16:11:01 2016 -0400

--
 .../nifi/processors/standard/SplitText.java | 432 +--
 .../nifi/processors/standard/TestSplitText.java | 297 +
 2 files changed, 590 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/a77fcdf6/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
--
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
index 8c59d88..45bb728 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
@@ -16,11 +16,14 @@
  */
 package org.apache.nifi.processors.standard;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -41,10 +44,13 @@ import 
org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.SeeAlso;
 import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
 import org.apache.nifi.logging.ProcessorLog;
 import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.DataUnit;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -56,7 +62,9 @@ import org.apache.nifi.stream.io.BufferedInputStream;
 import org.apache.nifi.stream.io.BufferedOutputStream;
 import org.apache.nifi.stream.io.ByteArrayOutputStream;
 import org.apache.nifi.stream.io.ByteCountingInputStream;
+import org.apache.nifi.stream.io.ByteCountingOutputStream;
 import org.apache.nifi.util.IntegerHolder;
+import org.apache.nifi.util.LongHolder;
 import org.apache.nifi.util.ObjectHolder;
 
 @EventDriven
@@ -64,9 +72,15 @@ import org.apache.nifi.util.ObjectHolder;
 @SupportsBatching
 @Tags({"split", "text"})
 @InputRequirement(Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Splits a text file into multiple smaller text files on 
line boundaries, each having up to a configured number of lines.")
+@CapabilityDescription("Splits a text file into multiple smaller text files on 
line boundaries limited by maximum number of lines "
++ "or total size of fragment. Each output split file will contain no 
more than the configured number of lines or bytes. "
++ "If both Line Split Count and Maximum Fragment Size are specified, 
the split occurs at whichever limit is reached first. "
++ "If the first line of a fragment exceeds the Maximum Fragment Size, 
that line will be output in a single split file which "
++" exceeds the configured maximum size limit.")
 @WritesAttributes({
 @WritesAttribute(attribute = "text.line.count", description = "The number 
of lines of text from the original FlowFile that were copied to this FlowFile"),
+@WritesAttribute(attribute = "fragment.size", description = "The number of 
bytes from the original FlowFile that were copied to this FlowFile, " +
+"including header, if applicable, which is duplicated in each 
split FlowFile"),
 @WritesAttribute(attribute = "fragment.identifier", description = "All 
split FlowFiles produced from the same parent FlowFile will 

nifi git commit: Fix 0.x branch nifi-mongodb-bundle POM reference to 1.0 branch and AbstractMongoProcessor import errors referencing 1.0 package changes.

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/0.x 7858310f0 -> 52c5c8956


Fix 0.x branch nifi-mongodb-bundle POM reference to 1.0 branch and 
AbstractMongoProcessor import errors referencing 1.0 package changes.

Signed-off-by: Mike Moser 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/52c5c895
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/52c5c895
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/52c5c895

Branch: refs/heads/0.x
Commit: 52c5c89562eb9ffd51a61dde8ea269da7ee152aa
Parents: 7858310
Author: Joe Skora 
Authored: Wed Apr 20 10:50:58 2016 -0400
Committer: Mike Moser 
Committed: Wed Apr 20 12:10:03 2016 -0400

--
 .../org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java | 2 +-
 .../apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java | 2 +-
 nifi-nar-bundles/nifi-mongodb-bundle/pom.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/52c5c895/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
 
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
index 7e3a196..1988b1c 100644
--- 
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
+++ 
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
@@ -27,7 +27,7 @@ import javax.net.ssl.SSLContext;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.nifi.annotation.lifecycle.OnScheduled;
 import org.apache.nifi.annotation.lifecycle.OnStopped;
-import org.apache.nifi.authentication.exception.ProviderCreationException;
+import org.apache.nifi.authorization.exception.ProviderCreationException;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessContext;

http://git-wip-us.apache.org/repos/asf/nifi/blob/52c5c895/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
--
diff --git 
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
 
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
index 1750cc2..1b56756 100644
--- 
a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
+++ 
b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/test/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessorTest.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.any;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.nifi.authentication.exception.ProviderCreationException;
+import org.apache.nifi.authorization.exception.ProviderCreationException;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.exception.ProcessException;

http://git-wip-us.apache.org/repos/asf/nifi/blob/52c5c895/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
--
diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml 
b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
index 609cadd..aa1ae34 100644
--- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml
@@ -35,7 +35,7 @@
 
 org.apache.nifi
 nifi-mongodb-processors
-1.0.0-SNAPSHOT
+0.7.0-SNAPSHOT
 
 
 

nifi git commit: NIFI-965 penalized failed flowfiles in S3 Processors. Also discovered a typo in a static final that I corrected

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master cf7bfe9e1 -> 6ed5f28f2


NIFI-965 penalized failed flowfiles in S3 Processors. Also discovered a typo in 
a static final that I corrected

Signed-off-by: Mike Moser 


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6ed5f28f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6ed5f28f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6ed5f28f

Branch: refs/heads/master
Commit: 6ed5f28f260d47ba6691a91facf81c06da669ad7
Parents: cf7bfe9
Author: Tony Kurc 
Authored: Sat Nov 7 23:27:18 2015 -0500
Committer: Mike Moser 
Committed: Tue Nov 10 15:14:28 2015 -0500

--
 .../org/apache/nifi/processors/aws/AbstractAWSProcessor.java | 6 +++---
 .../org/apache/nifi/processors/aws/s3/DeleteS3Object.java| 3 ++-
 .../org/apache/nifi/processors/aws/s3/FetchS3Object.java | 3 ++-
 .../java/org/apache/nifi/processors/aws/s3/PutS3Object.java  | 3 ++-
 .../main/java/org/apache/nifi/processors/aws/sns/PutSNS.java | 3 ++-
 .../java/org/apache/nifi/processors/aws/sqs/DeleteSQS.java   | 6 +-
 .../main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java | 2 +-
 .../main/java/org/apache/nifi/processors/aws/sqs/PutSQS.java | 3 ++-
 .../apache/nifi/processors/aws/s3/TestDeleteS3Object.java| 8 
 .../org/apache/nifi/processors/aws/s3/TestFetchS3Object.java | 6 +++---
 .../org/apache/nifi/processors/aws/s3/TestPutS3Object.java   | 8 
 .../java/org/apache/nifi/processors/aws/sns/TestPutSNS.java  | 2 +-
 .../java/org/apache/nifi/processors/aws/sqs/TestGetSQS.java  | 2 +-
 .../java/org/apache/nifi/processors/aws/sqs/TestPutSQS.java  | 2 +-
 14 files changed, 33 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6ed5f28f/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
index 165a759..61c3c85 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java
@@ -58,7 +58,7 @@ public abstract class AbstractAWSProcessor relationships = 
Collections.unmodifiableSet(
 new HashSet<>(Arrays.asList(REL_SUCCESS, REL_FAILURE)));
 
-public static final PropertyDescriptor CREDENTAILS_FILE = new 
PropertyDescriptor.Builder()
+public static final PropertyDescriptor CREDENTIALS_FILE = new 
PropertyDescriptor.Builder()
 .name("Credentials File")
 .expressionLanguageSupported(false)
 .required(false)
@@ -127,7 +127,7 @@ public abstract class AbstractAWSProcessorhttp://git-wip-us.apache.org/repos/asf/nifi/blob/6ed5f28f/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
index 056ff01..3d2a9a6 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
@@ -53,7 +53,7 @@ public class DeleteS3Object extends AbstractS3Processor {
 .build();
 
 public static final List properties = 
Collections.unmodifiableList(
-Arrays.asList(KEY, BUCKET, ACCESS_KEY, SECRET_KEY, 
CREDENTAILS_FILE, REGION, TIMEOUT, VERSION_ID,
+Arrays.asList(KEY, BUCKET, ACCESS_KEY, SECRET_KEY, 
CREDENTIALS_FILE, REGION, TIMEOUT, VERSION_ID,
 FULL_CONTROL_USER_LIST, READ_USER_LIST, WRITE_USER_LIST, 
READ_ACL_LIST, WRITE_ACL_LIST, OWNER));
 
 @Override
@@ -88,6 +88,7 @@ public class DeleteS3Object extends AbstractS3Processor {
 }
 } catch (final AmazonServiceException ase) {
 getLogger().error("Failed to delete S3 Object for {}; routing to 
failure", new Object[]{flowFile, ase});
+flowFile = session.penalize(flowFile);
 session.transfer(flowFile, 

[1/2] nifi git commit: NIFI-1085 WebClusterManager fair locking and HeartbeatMonitoringTimerTask scheduling

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/master 41f387534 -> b75af5b34


NIFI-1085 WebClusterManager fair locking and HeartbeatMonitoringTimerTask 
scheduling


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6add372b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6add372b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6add372b

Branch: refs/heads/master
Commit: 6add372bc142304ef25e0bafb49709654a995f08
Parents: 201eac0
Author: Mike Moser 
Authored: Wed Nov 4 12:14:46 2015 -0500
Committer: Mike Moser 
Committed: Wed Nov 4 12:19:00 2015 -0500

--
 .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6add372b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index 8d246c1..c22e1ec 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -330,7 +330,7 @@ public class WebClusterManager implements 
HttpClusterManager, ProtocolHandler, C
 private final OptimisticLockingManager optimisticLockingManager;
 private final StringEncryptor encryptor;
 private final Queue pendingHeartbeats = new 
ConcurrentLinkedQueue<>();
-private final ReentrantReadWriteLock resourceRWLock = new 
ReentrantReadWriteLock();
+private final ReentrantReadWriteLock resourceRWLock = new 
ReentrantReadWriteLock(true);
 private final ClusterManagerLock readLock = new 
ClusterManagerLock(resourceRWLock.readLock(), "Read");
 private final ClusterManagerLock writeLock = new 
ClusterManagerLock(resourceRWLock.writeLock(), "Write");
 
@@ -480,7 +480,7 @@ public class WebClusterManager implements 
HttpClusterManager, ProtocolHandler, C
 try {
 // setup heartbeat monitoring
 heartbeatMonitor = new Timer("Heartbeat Monitor", /* is daemon 
*/ true);
-heartbeatMonitor.scheduleAtFixedRate(new 
HeartbeatMonitoringTimerTask(), 0, getHeartbeatMonitoringIntervalSeconds() * 
1000);
+heartbeatMonitor.schedule(new HeartbeatMonitoringTimerTask(), 
0, getHeartbeatMonitoringIntervalSeconds() * 1000);
 
 heartbeatProcessor = new Timer("Process Pending Heartbeats", 
true);
 final int processPendingHeartbeatDelay = 1000 * Math.max(1, 
getClusterProtocolHeartbeatSeconds() / 2);

[2/2] nifi git commit: Merge branch 'NIFI-1085'

[mosermw]

Merge branch 'NIFI-1085'


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b75af5b3
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b75af5b3
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b75af5b3

Branch: refs/heads/master
Commit: b75af5b344bc13abd15a6ad413336909a62322cc
Parents: 41f3875 6add372
Author: Mike Moser 
Authored: Mon Nov 9 16:13:12 2015 -0500
Committer: Mike Moser 
Committed: Mon Nov 9 16:13:12 2015 -0500

--
 .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

nifi git commit: NIFI-1085 WebClusterManager fair locking and HeartbeatMonitoringTimerTask scheduling

[mosermw]

Repository: nifi
Updated Branches:
  refs/heads/NIFI-1085 [created] 6add372bc


NIFI-1085 WebClusterManager fair locking and HeartbeatMonitoringTimerTask 
scheduling


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6add372b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6add372b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6add372b

Branch: refs/heads/NIFI-1085
Commit: 6add372bc142304ef25e0bafb49709654a995f08
Parents: 201eac0
Author: Mike Moser 
Authored: Wed Nov 4 12:14:46 2015 -0500
Committer: Mike Moser 
Committed: Wed Nov 4 12:19:00 2015 -0500

--
 .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6add372b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
--
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index 8d246c1..c22e1ec 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -330,7 +330,7 @@ public class WebClusterManager implements 
HttpClusterManager, ProtocolHandler, C
 private final OptimisticLockingManager optimisticLockingManager;
 private final StringEncryptor encryptor;
 private final Queue pendingHeartbeats = new 
ConcurrentLinkedQueue<>();
-private final ReentrantReadWriteLock resourceRWLock = new 
ReentrantReadWriteLock();
+private final ReentrantReadWriteLock resourceRWLock = new 
ReentrantReadWriteLock(true);
 private final ClusterManagerLock readLock = new 
ClusterManagerLock(resourceRWLock.readLock(), "Read");
 private final ClusterManagerLock writeLock = new 
ClusterManagerLock(resourceRWLock.writeLock(), "Write");
 
@@ -480,7 +480,7 @@ public class WebClusterManager implements 
HttpClusterManager, ProtocolHandler, C
 try {
 // setup heartbeat monitoring
 heartbeatMonitor = new Timer("Heartbeat Monitor", /* is daemon 
*/ true);
-heartbeatMonitor.scheduleAtFixedRate(new 
HeartbeatMonitoringTimerTask(), 0, getHeartbeatMonitoringIntervalSeconds() * 
1000);
+heartbeatMonitor.schedule(new HeartbeatMonitoringTimerTask(), 
0, getHeartbeatMonitoringIntervalSeconds() * 1000);
 
 heartbeatProcessor = new Timer("Process Pending Heartbeats", 
true);
 final int processPendingHeartbeatDelay = 1000 * Math.max(1, 
getClusterProtocolHeartbeatSeconds() / 2);