[nifi] branch support/nifi-1.x updated: NIFI-11737: Improved performance of FlowSynchronizationIT
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 a47f5b8045 NIFI-11737: Improved performance of FlowSynchronizationIT
a47f5b8045 is described below
commit a47f5b8045f84d5e2e5aa6482f10a908c55f4565
Author: Mark Payne
AuthorDate: Fri Jun 16 14:57:42 2023 -0400
NIFI-11737: Improved performance of FlowSynchronizationIT
- FlowSynchronizationIT no longer requires
isDestroyEnvironmentAfterEachTest to return true
This closes #7420
Signed-off-by: David Handermann
(cherry picked from commit 9709bd6fb749e1a1c7bc52076e69d96f5235802a)
---
.../system/clustering/FlowSynchronizationIT.java | 46 ++
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
index aff856f05d..d758529b12 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
@@ -96,16 +96,11 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
);
}
-@Override
-protected boolean isDestroyEnvironmentAfterEachTest() {
-return true;
-}
-
@Test
public void testParameterUpdateWhileNodeDisconnected() throws
NiFiClientException, IOException, InterruptedException {
// Add Parameter context with Param1 = 1
-final ParameterContextEntity parameterContextEntity =
getClientUtil().createParameterContext("Context1",
Collections.singletonMap("Param1", "1"));
+final ParameterContextEntity parameterContextEntity =
getClientUtil().createParameterContext("testParameterUpdateWhileNodeDisconnected",
Collections.singletonMap("Param1", "1"));
getClientUtil().setParameterContext("root", parameterContextEntity);
// Create a GenerateFlowFile that adds an attribute with name 'attr'
and a value that references the parameter
@@ -166,7 +161,7 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
final ProcessorEntity countEvents3 =
getClientUtil().createProcessor("CountEvents");
// Create parameter context with a sensitive parameter and set that on
the root group
-final ParameterContextEntity paramContext =
getClientUtil().createParameterContext("context1", "MyParameter", "Our Secret",
true);
+final ParameterContextEntity paramContext =
getClientUtil().createParameterContext("testSensitivePropertiesInherited",
"MyParameter", "Our Secret", true);
getClientUtil().setParameterContext("root", paramContext);
// Set sensitive property of 1 processor to an explicit value and
sensitive property of another to a sensitive parameter.
@@ -202,13 +197,14 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
@Test
public void testComponentsRecreatedOnRejoinCluster() throws
NiFiClientException, IOException, InterruptedException {
+final ProcessGroupEntity topLevel =
getClientUtil().createProcessGroup("testComponentsRecreatedOnRejoinCluster",
"root");
// Build dataflow with processors at root level and an inner group
that contains an input port, output port, and a processor, as well as a
Controller Service that the processor will use.
-final ProcessorEntity generate =
getClientUtil().createProcessor("GenerateFlowFile");
-final ProcessGroupEntity group =
getClientUtil().createProcessGroup("Inner Group", "root");
+final ProcessorEntity generate =
getClientUtil().createProcessor("GenerateFlowFile", topLevel.getId());
+final ProcessGroupEntity group =
getClientUtil().createProcessGroup("Inner Group", topLevel.getId());
final PortEntity inPort = getClientUtil().createInputPort("In",
group.getId());
final PortEntity outPort = getClientUtil().createOutputPort("Out",
group.getId());
final ProcessorEntity count =
getClientUtil().createProcessor("CountFlowFiles", group.getId());
-final ProcessorEntity terminate =
getClientUtil().createProcessor("TerminateFlowFile");
+final ProcessorEntity terminate =
getClientUtil().createProcessor("TerminateFlowFile", topLevel.getId());
getClientUtil().updateProcessorSchedulingPeriod(generate, "60 sec");
final ControllerServiceEntity countService =
getClientUtil().createControllerService("StandardCountService", group.getId());
@@ -230,7 +226,7 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
[nifi] branch main updated: NIFI-11737: Improved performance of FlowSynchronizationIT
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 9709bd6fb7 NIFI-11737: Improved performance of FlowSynchronizationIT
9709bd6fb7 is described below
commit 9709bd6fb749e1a1c7bc52076e69d96f5235802a
Author: Mark Payne
AuthorDate: Fri Jun 16 14:57:42 2023 -0400
NIFI-11737: Improved performance of FlowSynchronizationIT
- FlowSynchronizationIT no longer requires
isDestroyEnvironmentAfterEachTest to return true
This closes #7420
Signed-off-by: David Handermann
---
.../system/clustering/FlowSynchronizationIT.java | 46 ++
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
index aff856f05d..d758529b12 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
@@ -96,16 +96,11 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
);
}
-@Override
-protected boolean isDestroyEnvironmentAfterEachTest() {
-return true;
-}
-
@Test
public void testParameterUpdateWhileNodeDisconnected() throws
NiFiClientException, IOException, InterruptedException {
// Add Parameter context with Param1 = 1
-final ParameterContextEntity parameterContextEntity =
getClientUtil().createParameterContext("Context1",
Collections.singletonMap("Param1", "1"));
+final ParameterContextEntity parameterContextEntity =
getClientUtil().createParameterContext("testParameterUpdateWhileNodeDisconnected",
Collections.singletonMap("Param1", "1"));
getClientUtil().setParameterContext("root", parameterContextEntity);
// Create a GenerateFlowFile that adds an attribute with name 'attr'
and a value that references the parameter
@@ -166,7 +161,7 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
final ProcessorEntity countEvents3 =
getClientUtil().createProcessor("CountEvents");
// Create parameter context with a sensitive parameter and set that on
the root group
-final ParameterContextEntity paramContext =
getClientUtil().createParameterContext("context1", "MyParameter", "Our Secret",
true);
+final ParameterContextEntity paramContext =
getClientUtil().createParameterContext("testSensitivePropertiesInherited",
"MyParameter", "Our Secret", true);
getClientUtil().setParameterContext("root", paramContext);
// Set sensitive property of 1 processor to an explicit value and
sensitive property of another to a sensitive parameter.
@@ -202,13 +197,14 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
@Test
public void testComponentsRecreatedOnRejoinCluster() throws
NiFiClientException, IOException, InterruptedException {
+final ProcessGroupEntity topLevel =
getClientUtil().createProcessGroup("testComponentsRecreatedOnRejoinCluster",
"root");
// Build dataflow with processors at root level and an inner group
that contains an input port, output port, and a processor, as well as a
Controller Service that the processor will use.
-final ProcessorEntity generate =
getClientUtil().createProcessor("GenerateFlowFile");
-final ProcessGroupEntity group =
getClientUtil().createProcessGroup("Inner Group", "root");
+final ProcessorEntity generate =
getClientUtil().createProcessor("GenerateFlowFile", topLevel.getId());
+final ProcessGroupEntity group =
getClientUtil().createProcessGroup("Inner Group", topLevel.getId());
final PortEntity inPort = getClientUtil().createInputPort("In",
group.getId());
final PortEntity outPort = getClientUtil().createOutputPort("Out",
group.getId());
final ProcessorEntity count =
getClientUtil().createProcessor("CountFlowFiles", group.getId());
-final ProcessorEntity terminate =
getClientUtil().createProcessor("TerminateFlowFile");
+final ProcessorEntity terminate =
getClientUtil().createProcessor("TerminateFlowFile", topLevel.getId());
getClientUtil().updateProcessorSchedulingPeriod(generate, "60 sec");
final ControllerServiceEntity countService =
getClientUtil().createControllerService("StandardCountService", group.getId());
@@ -230,7 +226,7 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
reportingTaskProperties.put("Text", "${now():toNumber()}");
[nifi] branch main updated: NIFI-11734 Upgraded Apache Accumulo from 2.1.0 to 2.1.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 3ddac48c6d NIFI-11734 Upgraded Apache Accumulo from 2.1.0 to 2.1.1 3ddac48c6d is described below commit 3ddac48c6dceb9b5543a90e7dec5be998188873d Author: exceptionfactory AuthorDate: Wed Jun 21 09:43:34 2023 -0500 NIFI-11734 Upgraded Apache Accumulo from 2.1.0 to 2.1.1 This closes #7418 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml index 15b3f237b3..ba4618b006 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml @@ -19,7 +19,7 @@ -2.1.0 +2.1.1 32.0.1-jre
[nifi] branch main updated: NIFI-11733 Upgraded Netty from 4.1.93 to 4.1.94
This is an automated email from the ASF dual-hosted git repository. mattyb149 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 6ede080f5f NIFI-11733 Upgraded Netty from 4.1.93 to 4.1.94 6ede080f5f is described below commit 6ede080f5fae78332e8e83a5b6e4e0de2b6a41df Author: exceptionfactory AuthorDate: Wed Jun 21 08:59:17 2023 -0500 NIFI-11733 Upgraded Netty from 4.1.93 to 4.1.94 Signed-off-by: Matt Burgess This closes #7417 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afa8570591..ffc940645a 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 4.11.0 3.10.6.Final 2.0 -4.1.93.Final +4.1.94.Final 5.3.27 5.8.3 1.6.11
[nifi] branch support/nifi-1.x updated: NIFI-11733 Upgraded Netty from 4.1.93 to 4.1.94
This is an automated email from the ASF dual-hosted git repository. mattyb149 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 6f5e830e83 NIFI-11733 Upgraded Netty from 4.1.93 to 4.1.94 6f5e830e83 is described below commit 6f5e830e838fb5dc9125b35be1862b1922303195 Author: exceptionfactory AuthorDate: Wed Jun 21 08:59:17 2023 -0500 NIFI-11733 Upgraded Netty from 4.1.93 to 4.1.94 Signed-off-by: Matt Burgess --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2bace53f2..bbd56b51a3 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 4.11.0 3.10.6.Final 2.0 -4.1.93.Final +4.1.94.Final 5.3.27 5.8.3 1.6.11
[nifi] branch main updated: NIFI-11732 Upgraded Saxon from 12.1 to 12.2
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 f62e1eb1e9 NIFI-11732 Upgraded Saxon from 12.1 to 12.2 f62e1eb1e9 is described below commit f62e1eb1e9f1d2d42e2adda2548b07e2c1cf2a6b Author: mr1716 AuthorDate: Tue Jun 20 09:17:17 2023 -0400 NIFI-11732 Upgraded Saxon from 12.1 to 12.2 - Adjusted spacing in test HTML to match Saxon 12.2 serialization This closes #7414 Co-authored-by: David Handermann Signed-off-by: David Handermann --- .../src/test/resources/TestTransformXml/employee.html | 3 ++- .../src/test/resources/TestTransformXml/math.html | 3 ++- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html index 931b9834f1..1f0abafe0a 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html @@ -1,4 +1,5 @@ - + + Employee diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html index 129ed34248..4934ec656a 100755 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html @@ -1,4 +1,5 @@ -http://www.w3.org/2001/XMLSchema;> + +http://www.w3.org/2001/XMLSchema;> Test for mod Should say "1": 1 diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 78d248bc37..ee0d546b26 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -169,7 +169,7 @@ net.sf.saxon Saxon-HE -12.1 +12.2 javax.jms
[nifi] branch support/nifi-1.x updated: NIFI-11732 Upgraded Saxon from 12.1 to 12.2
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 a79544b5d1 NIFI-11732 Upgraded Saxon from 12.1 to 12.2 a79544b5d1 is described below commit a79544b5d15a01c473c63e20c5c14c2c3d0d4887 Author: mr1716 AuthorDate: Tue Jun 20 09:17:17 2023 -0400 NIFI-11732 Upgraded Saxon from 12.1 to 12.2 - Adjusted spacing in test HTML to match Saxon 12.2 serialization This closes #7414 Co-authored-by: David Handermann Signed-off-by: David Handermann (cherry picked from commit f62e1eb1e9f1d2d42e2adda2548b07e2c1cf2a6b) --- .../src/test/resources/TestTransformXml/employee.html | 3 ++- .../src/test/resources/TestTransformXml/math.html | 3 ++- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html index 931b9834f1..1f0abafe0a 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/employee.html @@ -1,4 +1,5 @@ - + + Employee diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html index 129ed34248..4934ec656a 100755 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestTransformXml/math.html @@ -1,4 +1,5 @@ -http://www.w3.org/2001/XMLSchema;> + +http://www.w3.org/2001/XMLSchema;> Test for mod Should say "1": 1 diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index da1c6814e7..66f5509ce3 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -169,7 +169,7 @@ net.sf.saxon Saxon-HE -12.1 +12.2 javax.jms
[nifi] branch support/nifi-1.x updated: NIFI-7016: Fix Groovy File functions available for FlowFile in ExecuteGroovyScript
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 b00fd9bc57 NIFI-7016: Fix Groovy File functions available for FlowFile
in ExecuteGroovyScript
b00fd9bc57 is described below
commit b00fd9bc57dbf01f5b0193a766b3ae574deefbdb
Author: Matt Burgess
AuthorDate: Tue Jun 20 16:56:59 2023 -0400
NIFI-7016: Fix Groovy File functions available for FlowFile in
ExecuteGroovyScript
This closes #7016
Signed-off-by: Mike Thomsen
---
.../processors/groovyx/flow/GroovySessionFile.java | 39 +++---
.../groovyx/ExecuteGroovyScriptTest.java | 17 ++
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
index 831b0a4287..6afcec6ef7 100644
---
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
+++
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
@@ -109,7 +109,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param c Closure that will receive writer as a parameter to write
file content
* @return reference to self
*/
-public GroovySessionFile write(String charset, Closure c) {
+public GroovySessionFile write(String charset, Closure c) {
this.write(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
Writer w = new OutputStreamWriter(out, charset);
@@ -166,7 +166,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* or two parameters InputStream and OutputStream to perform read
and write.
* @return reference to self
*/
-public GroovySessionFile write(Closure c) {
+public GroovySessionFile write(Closure c) {
if (c.getMaximumNumberOfParameters() == 1) {
this.write(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
@@ -189,7 +189,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param c Closure that receives one parameter OutputStream to perform
append.
* @return reference to self
*/
-public GroovySessionFile append(Closure c) {
+public GroovySessionFile append(Closure c) {
this.append(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
c.call(out);
@@ -224,7 +224,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param c Closure with one parameter - Writer.
* @return reference to self
*/
-public GroovySessionFile append(String charset, Closure c) {
+public GroovySessionFile append(String charset, Closure c) {
this.append(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
Writer w = new OutputStreamWriter(out, charset);
@@ -260,9 +260,9 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
*
* @param c Closure with one parameter InputStream.
*/
-public void read(Closure c) {
+public void read(Closure c) {
this.read(new InputStreamCallback() {
-public void process(InputStream in) throws IOException {
+public void process(InputStream in) {
c.call(in);
}
});
@@ -274,7 +274,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param charset charset to use for Reader
* @param c Closure with one parameter Reader.
*/
-public void read(String charset, Closure c) {
+public void read(String charset, Closure c) {
this.read(new InputStreamCallback() {
public void process(InputStream in) throws IOException {
InputStreamReader r = new InputStreamReader(in, charset);
@@ -284,34 +284,33 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
});
}
-public GroovySessionFile withInputStream(Closure c) throws IOException {
+public Object withInputStream(Closure c) throws IOException {
InputStream inStream = session.read(this);
-c.call(inStream);
+final Object returnObject = c.call(inStream);
inStream.close();
-return this;
+return
[nifi] branch main updated: NIFI-7016: Fix Groovy File functions available for FlowFile in ExecuteGroovyScript
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 84fdb5e32f NIFI-7016: Fix Groovy File functions available for FlowFile
in ExecuteGroovyScript
84fdb5e32f is described below
commit 84fdb5e32ff1a96e36b36a314006d33e1f0aa913
Author: Matt Burgess
AuthorDate: Tue Jun 20 16:56:59 2023 -0400
NIFI-7016: Fix Groovy File functions available for FlowFile in
ExecuteGroovyScript
This closes #7016
Signed-off-by: Mike Thomsen
---
.../processors/groovyx/flow/GroovySessionFile.java | 39 +++---
.../groovyx/ExecuteGroovyScriptTest.java | 17 ++
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
index 831b0a4287..6afcec6ef7 100644
---
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
+++
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/flow/GroovySessionFile.java
@@ -109,7 +109,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param c Closure that will receive writer as a parameter to write
file content
* @return reference to self
*/
-public GroovySessionFile write(String charset, Closure c) {
+public GroovySessionFile write(String charset, Closure c) {
this.write(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
Writer w = new OutputStreamWriter(out, charset);
@@ -166,7 +166,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* or two parameters InputStream and OutputStream to perform read
and write.
* @return reference to self
*/
-public GroovySessionFile write(Closure c) {
+public GroovySessionFile write(Closure c) {
if (c.getMaximumNumberOfParameters() == 1) {
this.write(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
@@ -189,7 +189,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param c Closure that receives one parameter OutputStream to perform
append.
* @return reference to self
*/
-public GroovySessionFile append(Closure c) {
+public GroovySessionFile append(Closure c) {
this.append(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
c.call(out);
@@ -224,7 +224,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param c Closure with one parameter - Writer.
* @return reference to self
*/
-public GroovySessionFile append(String charset, Closure c) {
+public GroovySessionFile append(String charset, Closure c) {
this.append(new OutputStreamCallback() {
public void process(OutputStream out) throws IOException {
Writer w = new OutputStreamWriter(out, charset);
@@ -260,9 +260,9 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
*
* @param c Closure with one parameter InputStream.
*/
-public void read(Closure c) {
+public void read(Closure c) {
this.read(new InputStreamCallback() {
-public void process(InputStream in) throws IOException {
+public void process(InputStream in) {
c.call(in);
}
});
@@ -274,7 +274,7 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
* @param charset charset to use for Reader
* @param c Closure with one parameter Reader.
*/
-public void read(String charset, Closure c) {
+public void read(String charset, Closure c) {
this.read(new InputStreamCallback() {
public void process(InputStream in) throws IOException {
InputStreamReader r = new InputStreamReader(in, charset);
@@ -284,34 +284,33 @@ public class GroovySessionFile extends SessionFile
implements GroovyObject {
});
}
-public GroovySessionFile withInputStream(Closure c) throws IOException {
+public Object withInputStream(Closure c) throws IOException {
InputStream inStream = session.read(this);
-c.call(inStream);
+final Object returnObject = c.call(inStream);
inStream.close();
-return this;
+return returnObject;
}
-
[nifi] branch support/nifi-1.x updated: NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 2d57625249 NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1 2d57625249 is described below commit 2d57625249cd5e944b5ff22f10f73e92e437334b Author: exceptionfactory AuthorDate: Mon Jun 19 20:52:44 2023 -0500 NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1 - Updated OWASP suppressions to exclude several JSON and Kafka false positives - Excluded JUnit dependency from Hive 3 JDBC This closes #7411 Signed-off-by: Mike Thomsen --- nifi-dependency-check-maven/suppressions.xml | 75 ++ .../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 4 ++ pom.xml| 2 +- 3 files changed, 40 insertions(+), 41 deletions(-) diff --git a/nifi-dependency-check-maven/suppressions.xml b/nifi-dependency-check-maven/suppressions.xml index 5d36569eaa..e4e0cdac1d 100644 --- a/nifi-dependency-check-maven/suppressions.xml +++ b/nifi-dependency-check-maven/suppressions.xml @@ -19,16 +19,6 @@ ^pkg:maven/org\.apache\.nifi.*$ ^cpe:.*$ - -Jetty SSLEngine is incorrectly identified with Jetty Server -^pkg:maven/org\.mortbay\.jetty/jetty\-sslengine@.*$ -^cpe:.*$ - - -H2 1.4.200 is shaded and repackaged without vulnerable components in nifi-h2-database for migration -pkg:maven/com.h2database/h2@1.4.200 -^CVE.*$ - CVE-2022-45868 requires running H2 from a command not applicable to project references ^pkg:maven/com\.h2database/h2@2.*$ @@ -154,11 +144,6 @@ ^pkg:maven/org\.elasticsearch\.client/elasticsearch\-.*?\-client-sniffer@.*$ ^cpe:/a:elastic.*$ - -CVE-2022-34271 applies to Atlas Server not the Atlas client library -^pkg:maven/org\.apache\.atlas/.*$ -CVE-2022-34271 - CVE-2022-30187 applies to Azure Blob not the EventHubs Checkpoint Store Blob library ^pkg:maven/com\.azure/azure\-messaging\-eventhubs\-checkpointstore\-blob@.*$ @@ -169,21 +154,11 @@ ^pkg:maven/org\.apache\.calcite/calcite\-druid@.*$ CVE-2022-39135 - -CVE-2018-8016 applies to Apache Cassandra server not the client library -^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-extras@.*$ -CVE-2018-8016 - CVE-2018-1000873 applies to Jackson Java 8 Time modules not Jackson Annotations ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-annotations@.*$ CVE-2018-1000873 - -CVE-2021-34371 applies to Neo4j server not the driver library -^pkg:maven/org\.opencypher\.gremlin/cypher\-gremlin\-neo4j\-driver@.*$ -CVE-2021-34371 - CVE-2010-1151 applies to mod_auth_shadow in Apache HTTP Server not the FTP server library ^pkg:maven/org\.apache\.ftpserver/.*$ @@ -194,21 +169,6 @@ ^pkg:maven/com\.h2database/h2@.*$ CVE-2018-14335 - -CVE-2022-31160 included in hadoop-client-api is not used -^pkg:javascript/jquery\-ui@.*$ -CVE-2022-31160 - - -CVE-2021-37533 applies to the Commons Net FTP Client which is not used in the version bundled with hadoop-client-runtime for Accumulo -^pkg:maven/commons\-net/commons\-net@.*$ -CVE-2021-37533 - - -CVE-2021-0341 applies to Android not OkHttp -^pkg:maven/com\.squareup\.okhttp/okhttp@.*$ -CVE-2021-0341 - CVE-2023-25613 applies to an LDAP backend class for Apache Kerby not the Token Provider library ^pkg:maven/org\.apache\.kerby/token\-provider@.*$ @@ -264,4 +224,39 @@ ^pkg:maven/org\.apache\.hbase/hbase\-hadoop2\-compat@.*$ cpe:/a:apache:hadoop + +CVE-2022-45688 applies to hutools-json not org.json +^pkg:maven/org\.json/json@.*$ +CVE-2022-45688 + + +The Jackson maintainers dispute the applicability of CVE-2023-35116 based on cyclic nature of reported concern +^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ +CVE-2023-35116 + + +CVE-2023-25194 applies to Kafka Connect workers not client libraries +^pkg:maven/org\.apache\.kafka/kafka.*?@.*$ +CVE-2023-25194 + + +CVE-2022-34917 applies to Kafka brokers not client libraries +^pkg:maven/org\.apache\.kafka/kafka.*?@.*$ +CVE-2022-34917 + + +CVE-2023-25613 applies to the LDAP Identity Backend for Kerby Server which is not used in runtime NiFi configurations +^pkg:maven/org\.apache\.kerby/kerb.*?@.*$ +CVE-2023-25613 + + +
[nifi] branch main updated: NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 26d02fff49 NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1 26d02fff49 is described below commit 26d02fff490805fb71047afa034d5597c02382d8 Author: exceptionfactory AuthorDate: Mon Jun 19 20:52:44 2023 -0500 NIFI-11729 Upgraded OWASP Dependency Check from 8.2.1 to 8.3.1 - Updated OWASP suppressions to exclude several JSON and Kafka false positives - Excluded JUnit dependency from Hive 3 JDBC This closes #7411 Signed-off-by: Mike Thomsen --- nifi-dependency-check-maven/suppressions.xml | 70 +++--- .../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 4 ++ pom.xml| 2 +- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/nifi-dependency-check-maven/suppressions.xml b/nifi-dependency-check-maven/suppressions.xml index 83c36fae39..e4e0cdac1d 100644 --- a/nifi-dependency-check-maven/suppressions.xml +++ b/nifi-dependency-check-maven/suppressions.xml @@ -19,11 +19,6 @@ ^pkg:maven/org\.apache\.nifi.*$ ^cpe:.*$ - -Jetty SSLEngine is incorrectly identified with Jetty Server -^pkg:maven/org\.mortbay\.jetty/jetty\-sslengine@.*$ -^cpe:.*$ - CVE-2022-45868 requires running H2 from a command not applicable to project references ^pkg:maven/com\.h2database/h2@2.*$ @@ -149,11 +144,6 @@ ^pkg:maven/org\.elasticsearch\.client/elasticsearch\-.*?\-client-sniffer@.*$ ^cpe:/a:elastic.*$ - -CVE-2022-34271 applies to Atlas Server not the Atlas client library -^pkg:maven/org\.apache\.atlas/.*$ -CVE-2022-34271 - CVE-2022-30187 applies to Azure Blob not the EventHubs Checkpoint Store Blob library ^pkg:maven/com\.azure/azure\-messaging\-eventhubs\-checkpointstore\-blob@.*$ @@ -164,21 +154,11 @@ ^pkg:maven/org\.apache\.calcite/calcite\-druid@.*$ CVE-2022-39135 - -CVE-2018-8016 applies to Apache Cassandra server not the client library -^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-extras@.*$ -CVE-2018-8016 - CVE-2018-1000873 applies to Jackson Java 8 Time modules not Jackson Annotations ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-annotations@.*$ CVE-2018-1000873 - -CVE-2021-34371 applies to Neo4j server not the driver library -^pkg:maven/org\.opencypher\.gremlin/cypher\-gremlin\-neo4j\-driver@.*$ -CVE-2021-34371 - CVE-2010-1151 applies to mod_auth_shadow in Apache HTTP Server not the FTP server library ^pkg:maven/org\.apache\.ftpserver/.*$ @@ -189,21 +169,6 @@ ^pkg:maven/com\.h2database/h2@.*$ CVE-2018-14335 - -CVE-2022-31160 included in hadoop-client-api is not used -^pkg:javascript/jquery\-ui@.*$ -CVE-2022-31160 - - -CVE-2021-37533 applies to the Commons Net FTP Client which is not used in the version bundled with hadoop-client-runtime for Accumulo -^pkg:maven/commons\-net/commons\-net@.*$ -CVE-2021-37533 - - -CVE-2021-0341 applies to Android not OkHttp -^pkg:maven/com\.squareup\.okhttp/okhttp@.*$ -CVE-2021-0341 - CVE-2023-25613 applies to an LDAP backend class for Apache Kerby not the Token Provider library ^pkg:maven/org\.apache\.kerby/token\-provider@.*$ @@ -259,4 +224,39 @@ ^pkg:maven/org\.apache\.hbase/hbase\-hadoop2\-compat@.*$ cpe:/a:apache:hadoop + +CVE-2022-45688 applies to hutools-json not org.json +^pkg:maven/org\.json/json@.*$ +CVE-2022-45688 + + +The Jackson maintainers dispute the applicability of CVE-2023-35116 based on cyclic nature of reported concern +^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ +CVE-2023-35116 + + +CVE-2023-25194 applies to Kafka Connect workers not client libraries +^pkg:maven/org\.apache\.kafka/kafka.*?@.*$ +CVE-2023-25194 + + +CVE-2022-34917 applies to Kafka brokers not client libraries +^pkg:maven/org\.apache\.kafka/kafka.*?@.*$ +CVE-2022-34917 + + +CVE-2023-25613 applies to the LDAP Identity Backend for Kerby Server which is not used in runtime NiFi configurations +^pkg:maven/org\.apache\.kerby/kerb.*?@.*$ +CVE-2023-25613 + + +CVE-2022-24823 applies to Netty HTTP decoding which is not applicable to Apache Kudu clients +^pkg:maven/io\.netty/netty.*?@.*$ +CVE-2022-24823 + + +CVE-2022-41915 applies to
