[nifi] branch support/nifi-1.x updated: NIFI-12108 This closes #7773. Deprecated SpringContextProcessor for removal
This is an automated email from the ASF dual-hosted git repository.
joewitt 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 1a5798b1fe NIFI-12108 This closes #7773. Deprecated
SpringContextProcessor for removal
1a5798b1fe is described below
commit 1a5798b1fe620e037c99e4900b85c8e6f8e4270b
Author: exceptionfactory
AuthorDate: Thu Sep 21 15:58:50 2023 -0500
NIFI-12108 This closes #7773. Deprecated SpringContextProcessor for removal
Signed-off-by: Joseph Witt
---
.../src/main/java/org/apache/nifi/spring/SpringContextProcessor.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
index c6497db850..a1d7edcee4 100644
---
a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
+++
b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java
@@ -19,6 +19,7 @@ package org.apache.nifi.spring;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.TriggerWhenEmpty;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
@@ -133,6 +134,7 @@ import java.util.concurrent.TimeUnit;
* representation of the content that is being exchanged between NiFi and
* Spring.
*/
+@DeprecationNotice(reason = "Alternative event-handling solutions should be
used")
@TriggerWhenEmpty
@Tags({ "Spring", "Message", "Get", "Put", "Integration" })
@CapabilityDescription("A Processor that supports sending and receiving data
from application defined in "
[nifi] branch support/nifi-1.x updated: NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30
This is an automated email from the ASF dual-hosted git repository. joewitt 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 e7215bf5c1 NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 e7215bf5c1 is described below commit e7215bf5c12fd9b87af40b15b5b2e9327dc5cdaa Author: exceptionfactory AuthorDate: Thu Sep 21 16:11:15 2023 -0500 NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 - Upgraded Spring Boot from 2.7.15 to 2.7.16 for Registry Signed-off-by: Joseph Witt --- nifi-registry/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 49db50ef04..21f2e0648b 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.15 +2.7.16 8.5.13 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index 4a12becce1..a5d282e28f 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ 3.10.6.Final 2.2 4.1.97.Final -5.3.29 +5.3.30 5.8.7 1.6.11 2.2.224
[nifi] 02/03: NIFI-12109 This closes #7774. Removed SpringContextProcessor
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit a832b134b17fe45ae71b1ee763841ba90161f834 Author: exceptionfactory AuthorDate: Thu Sep 21 16:01:40 2023 -0500 NIFI-12109 This closes #7774. Removed SpringContextProcessor Signed-off-by: Joseph Witt --- nifi-assembly/pom.xml | 6 - .../nifi-spring-bundle/nifi-spring-nar/pom.xml | 35 -- .../src/main/resources/META-INF/LICENSE| 209 -- .../src/main/resources/META-INF/NOTICE | 19 - .../nifi-spring-processors/pom.xml | 70 .../apache/nifi/spring/SpringContextFactory.java | 151 --- .../apache/nifi/spring/SpringContextProcessor.java | 442 - .../apache/nifi/spring/SpringDataExchanger.java| 78 .../apache/nifi/spring/SpringNiFiConstants.java| 27 -- .../spring/bootstrap/SpringContextDelegate.java| 146 --- .../services/org.apache.nifi.processor.Processor | 15 - .../additionalDetails.html | 94 - .../nifi/spring/SpringContextFactoryTests.java | 116 -- .../nifi/spring/SpringContextProcessorTest.java| 153 --- .../src/test/resources/aggregated.xml | 26 -- .../src/test/resources/context.xml | 14 - .../src/test/resources/fromSpringOnly.xml | 27 -- .../src/test/resources/log4j.properties| 21 - .../src/test/resources/requestReply.xml| 27 -- .../src/test/resources/toSpringOnly.xml| 17 - nifi-nar-bundles/nifi-spring-bundle/pom.xml| 37 -- nifi-nar-bundles/pom.xml | 1 - 22 files changed, 1731 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 0daf8209d0..abcbd91366 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -606,12 +606,6 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar - -org.apache.nifi -nifi-spring-nar -2.0.0-SNAPSHOT -nar - org.apache.nifi nifi-registry-nar diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml deleted file mode 100644 index faf3f76afa..00 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> - -4.0.0 - -org.apache.nifi -nifi-spring-bundle -2.0.0-SNAPSHOT - -nifi-spring-nar -nar -NiFi NAR for interacting with Spring - -true -true - - - -org.apache.nifi -nifi-spring-processors - - - diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE deleted file mode 100644 index f3c8ecef26..00 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,209 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited
[nifi] 03/03: NIFI-12095 This closes #7762. Increase default Xmx to 1g
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 9ae69212723d32edcdbfa1538b742ff2887d25c9 Author: Nandor Soma Abonyi AuthorDate: Wed Sep 20 11:06:38 2023 +0200 NIFI-12095 This closes #7762. Increase default Xmx to 1g Signed-off-by: Joseph Witt --- .../nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml index 5c430f5aef..7766f7ba60 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml @@ -25,8 +25,8 @@ Holds common resources used to build installers -512m -512m +1g +1g true
[nifi] branch main updated (b6bcce4fe1 -> 9ae6921272)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from b6bcce4fe1 NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15 new 4169352a2f NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 new a832b134b1 NIFI-12109 This closes #7774. Removed SpringContextProcessor new 9ae6921272 NIFI-12095 This closes #7762. Increase default Xmx to 1g The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: nifi-assembly/pom.xml | 6 - .../nifi-framework/nifi-resources/pom.xml | 4 +- .../nifi-spring-bundle/nifi-spring-nar/pom.xml | 35 -- .../src/main/resources/META-INF/LICENSE| 209 -- .../src/main/resources/META-INF/NOTICE | 19 - .../nifi-spring-processors/pom.xml | 70 .../apache/nifi/spring/SpringContextFactory.java | 151 --- .../apache/nifi/spring/SpringContextProcessor.java | 442 - .../apache/nifi/spring/SpringDataExchanger.java| 78 .../apache/nifi/spring/SpringNiFiConstants.java| 27 -- .../spring/bootstrap/SpringContextDelegate.java| 146 --- .../services/org.apache.nifi.processor.Processor | 15 - .../additionalDetails.html | 94 - .../nifi/spring/SpringContextFactoryTests.java | 116 -- .../nifi/spring/SpringContextProcessorTest.java| 153 --- .../src/test/resources/aggregated.xml | 26 -- .../src/test/resources/context.xml | 14 - .../src/test/resources/fromSpringOnly.xml | 27 -- .../src/test/resources/log4j.properties| 21 - .../src/test/resources/requestReply.xml| 27 -- .../src/test/resources/toSpringOnly.xml| 17 - nifi-nar-bundles/nifi-spring-bundle/pom.xml| 37 -- nifi-nar-bundles/pom.xml | 1 - nifi-registry/pom.xml | 2 +- pom.xml| 2 +- 25 files changed, 4 insertions(+), 1735 deletions(-) delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/pom.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/LICENSE delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-nar/src/main/resources/META-INF/NOTICE delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextFactory.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringContextProcessor.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringDataExchanger.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/SpringNiFiConstants.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/java/org/apache/nifi/spring/bootstrap/SpringContextDelegate.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/main/resources/docs/org.apache.nifi.spring.SpringContextProcessor/additionalDetails.html delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextFactoryTests.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextProcessorTest.java delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/aggregated.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/context.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/fromSpringOnly.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/log4j.properties delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/requestReply.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/resources/toSpringOnly.xml delete mode 100644 nifi-nar-bundles/nifi-spring-bundle/pom.xml
[nifi] 01/03: NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 4169352a2ff75685c7ef4b199833a1f011fee67b Author: exceptionfactory AuthorDate: Thu Sep 21 16:11:15 2023 -0500 NIFI-12110 This closes #7775. Upgraded Spring Framework from 5.3.29 to 5.3.30 - Upgraded Spring Boot from 2.7.15 to 2.7.16 for Registry Signed-off-by: Joseph Witt --- nifi-registry/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 5d176243f1..23a9db16b8 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.15 +2.7.16 8.5.13 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index dd48e2159e..5b4361ffdd 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 3.10.6.Final 2.2 4.1.97.Final -5.3.29 +5.3.30 5.8.7 1.6.11 2.2.224
[nifi] branch support/nifi-1.x updated: NIFI-12086 Removed TemplateSerializerTest for jgit test removal
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 b32d75a3ce NIFI-12086 Removed TemplateSerializerTest for jgit test
removal
b32d75a3ce is described below
commit b32d75a3cec5ba01132eb7e294809631aab3089a
Author: exceptionfactory
AuthorDate: Thu Sep 21 15:13:07 2023 -0500
NIFI-12086 Removed TemplateSerializerTest for jgit test removal
Signed-off-by: David Handermann
---
.../nifi/persistence/TemplateSerializerTest.java | 121 -
1 file changed, 121 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TemplateSerializerTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TemplateSerializerTest.java
deleted file mode 100644
index 2948c55114..00
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/persistence/TemplateSerializerTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.persistence;
-
-import org.apache.nifi.util.ComponentIdGenerator;
-import org.apache.nifi.web.api.dto.FlowSnippetDTO;
-import org.apache.nifi.web.api.dto.ProcessorDTO;
-import org.apache.nifi.web.api.dto.TemplateDTO;
-import org.apache.nifi.xml.processing.stream.StandardXMLStreamReaderProvider;
-import org.apache.nifi.xml.processing.stream.XMLStreamReaderProvider;
-import org.eclipse.jgit.diff.DiffFormatter;
-import org.eclipse.jgit.diff.EditList;
-import org.eclipse.jgit.diff.HistogramDiff;
-import org.eclipse.jgit.diff.RawText;
-import org.eclipse.jgit.diff.RawTextComparator;
-import org.junit.jupiter.api.Test;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.stream.StreamSource;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class TemplateSerializerTest {
-
-@Test
-public void validateDiffWithChangingComponentIdAndAdditionalElements()
throws Exception {
-
-// Create initial template (TemplateDTO)
-FlowSnippetDTO snippet = new FlowSnippetDTO();
-Set procs = new HashSet<>();
-for (int i = 4; i > 0; i--) {
-ProcessorDTO procDTO = new ProcessorDTO();
-procDTO.setType("Processor" + i + ".class");
-procDTO.setId(ComponentIdGenerator.generateId().toString());
-procs.add(procDTO);
-}
-snippet.setProcessors(procs);
-TemplateDTO origTemplate = new TemplateDTO();
-origTemplate.setDescription("MyTemplate");
-origTemplate.setId("MyTemplate");
-origTemplate.setSnippet(snippet);
-byte[] serTemplate = TemplateSerializer.serialize(origTemplate);
-
-// Deserialize Template into TemplateDTO
-ByteArrayInputStream in = new ByteArrayInputStream(serTemplate);
-JAXBContext context = JAXBContext.newInstance(TemplateDTO.class);
-Unmarshaller unmarshaller = context.createUnmarshaller();
-final XMLStreamReaderProvider provider = new
StandardXMLStreamReaderProvider();
-XMLStreamReader xsr = provider.getStreamReader(new StreamSource(in));
-JAXBElement templateElement = unmarshaller.unmarshal(xsr,
TemplateDTO.class);
-TemplateDTO deserTemplate = templateElement.getValue();
-
-// Modify deserialized template
-FlowSnippetDTO deserSnippet = deserTemplate.getSnippet();
-Set deserProcs = deserSnippet.getProcessors();
-int c = 0;
-for (ProcessorDTO processorDTO :
[nifi] branch support/nifi-1.x updated: NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15
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 fcedd5a9fe NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15 fcedd5a9fe is described below commit fcedd5a9febc33b719a4f870e9c884009a69b6e5 Author: mr1716 AuthorDate: Thu Sep 21 14:17:17 2023 -0400 NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15 This closes #7772 Signed-off-by: David Handermann (cherry picked from commit b6bcce4fe138b15a816f3f37940f5627abab812f) --- nifi-registry/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index ccf5d5948f..49db50ef04 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.14 +2.7.15 8.5.13 7.0.0 3.12.0
[nifi] branch main updated: NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15
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 b6bcce4fe1 NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15 b6bcce4fe1 is described below commit b6bcce4fe138b15a816f3f37940f5627abab812f Author: mr1716 AuthorDate: Thu Sep 21 14:17:17 2023 -0400 NIFI-12106 Upgraded Spring Boot from 2.7.14 to 2.7.15 This closes #7772 Signed-off-by: David Handermann --- nifi-registry/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 441e5e3afa..5d176243f1 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -36,7 +36,7 @@ 2.1.1 -2.7.14 +2.7.15 8.5.13 7.0.0 3.12.0
[nifi] branch support/nifi-1.x updated: NIFI-12033 Removed unused imports from AgeKeyValidator
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 e6323d4b24 NIFI-12033 Removed unused imports from AgeKeyValidator e6323d4b24 is described below commit e6323d4b24dd7cd119f257f3cfb1f527a621f39f Author: exceptionfactory AuthorDate: Thu Sep 21 14:49:51 2023 -0500 NIFI-12033 Removed unused imports from AgeKeyValidator Signed-off-by: David Handermann --- .../java/org/apache/nifi/processors/cipher/age/AgeKeyValidator.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/age/AgeKeyValidator.java b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/age/AgeKeyValidator.java index f6538c457d..cef6f3a370 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/age/AgeKeyValidator.java +++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/age/AgeKeyValidator.java @@ -32,8 +32,6 @@ import java.io.InputStreamReader; import java.util.Collections; import java.util.Optional; import java.util.Set; -import java.util.function.Predicate; -import java.util.regex.Matcher; import java.util.stream.Collectors; /**
[nifi] branch support/nifi-1.x updated: NIFI-12019 Improved reliability of TestSynchronousFileWatcher
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 9b7dadb214 NIFI-12019 Improved reliability of
TestSynchronousFileWatcher
9b7dadb214 is described below
commit 9b7dadb21414af15a4a8c662617e6d7fd70fa42b
Author: Mike Moser
AuthorDate: Thu Sep 21 16:55:54 2023 +
NIFI-12019 Improved reliability of TestSynchronousFileWatcher
This closes #7770
Signed-off-by: David Handermann
(cherry picked from commit 1f87c16ab8473e98df5c31a4932c0ff92c7d031a)
---
.../nifi/util/file/monitor/TestSynchronousFileWatcher.java | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
index 4f348f2246..9c7e2b3367 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
@@ -37,9 +37,8 @@ public class TestSynchronousFileWatcher {
Files.copy(new ByteArrayInputStream("Hello,
World!".getBytes("UTF-8")), path, StandardCopyOption.REPLACE_EXISTING);
final UpdateMonitor monitor = new DigestUpdateMonitor();
-final SynchronousFileWatcher watcher = new
SynchronousFileWatcher(path, monitor, 40L);
+final SynchronousFileWatcher watcher = new
SynchronousFileWatcher(path, monitor, 0L);
assertFalse(watcher.checkAndReset());
-Thread.sleep(41L);
assertFalse(watcher.checkAndReset());
try (FileOutputStream fos = new FileOutputStream(path.toFile())) {
@@ -47,11 +46,7 @@ public class TestSynchronousFileWatcher {
fos.getFD().sync();
}
-// immediately after file changes, but before the next check time is
reached, answer should be false
-assertFalse(watcher.checkAndReset());
-
-// after check time has passed, answer should be true
-Thread.sleep(41L);
+// file has changed, answer should be true once
assertTrue(watcher.checkAndReset());
assertFalse(watcher.checkAndReset());
}
[nifi] branch main updated: NIFI-12019 Improved reliability of TestSynchronousFileWatcher
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 1f87c16ab8 NIFI-12019 Improved reliability of
TestSynchronousFileWatcher
1f87c16ab8 is described below
commit 1f87c16ab8473e98df5c31a4932c0ff92c7d031a
Author: Mike Moser
AuthorDate: Thu Sep 21 16:55:54 2023 +
NIFI-12019 Improved reliability of TestSynchronousFileWatcher
This closes #7770
Signed-off-by: David Handermann
---
.../nifi/util/file/monitor/TestSynchronousFileWatcher.java | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
index 4f348f2246..9c7e2b3367 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/monitor/TestSynchronousFileWatcher.java
@@ -37,9 +37,8 @@ public class TestSynchronousFileWatcher {
Files.copy(new ByteArrayInputStream("Hello,
World!".getBytes("UTF-8")), path, StandardCopyOption.REPLACE_EXISTING);
final UpdateMonitor monitor = new DigestUpdateMonitor();
-final SynchronousFileWatcher watcher = new
SynchronousFileWatcher(path, monitor, 40L);
+final SynchronousFileWatcher watcher = new
SynchronousFileWatcher(path, monitor, 0L);
assertFalse(watcher.checkAndReset());
-Thread.sleep(41L);
assertFalse(watcher.checkAndReset());
try (FileOutputStream fos = new FileOutputStream(path.toFile())) {
@@ -47,11 +46,7 @@ public class TestSynchronousFileWatcher {
fos.getFD().sync();
}
-// immediately after file changes, but before the next check time is
reached, answer should be false
-assertFalse(watcher.checkAndReset());
-
-// after check time has passed, answer should be true
-Thread.sleep(41L);
+// file has changed, answer should be true once
assertTrue(watcher.checkAndReset());
assertFalse(watcher.checkAndReset());
}
[nifi] branch support/nifi-1.x updated: NIFI-12041 Converted Groovy tests to Java in nifi-scripting-processors
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 990d0807c9 NIFI-12041 Converted Groovy tests to Java in
nifi-scripting-processors
990d0807c9 is described below
commit 990d0807c9cbc19cda4b41998c2ab55da52fd898
Author: dan-s1
AuthorDate: Mon Sep 18 20:37:13 2023 +
NIFI-12041 Converted Groovy tests to Java in nifi-scripting-processors
This closes #7752
Signed-off-by: David Handermann
(cherry picked from commit 9b591a2fe374fa21dc4a5778edad904af6a7bbe5)
---
.../org/apache/nifi/util/MockProcessContext.java | 2 +-
.../nifi-scripting-processors/pom.xml | 1 +
.../lookup/script/TestScriptedLookupService.java | 133 +
.../script/TestSimpleScriptedLookupService.java| 86 +++
.../processors/script/ExecuteScriptGroovyTest.java | 126
.../nifi/record/script/ScriptedReaderTest.java | 150 +++
.../record/script/ScriptedRecordSetWriterTest.java | 130
.../script/ScriptedReportingTaskTest.java | 165 +
.../src/test/resources/xmlRecord.xml | 17 +++
9 files changed, 809 insertions(+), 1 deletion(-)
diff --git
a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
index daa8ceee52..79a73eef50 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -532,7 +532,7 @@ public class MockProcessContext extends
MockControllerServiceLookup implements P
return componentName;
}
-protected void setMaxConcurrentTasks(int maxConcurrentTasks) {
+public void setMaxConcurrentTasks(int maxConcurrentTasks) {
this.maxConcurrentTasks = maxConcurrentTasks;
}
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index ec594f3b78..3e81d79002 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -165,6 +165,7 @@
apache-rat-plugin
+src/test/resources/xmlRecord.xml
src/test/resources/jython/test_compress.py
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/lookup/script/TestScriptedLookupService.java
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/lookup/script/TestScriptedLookupService.java
new file mode 100644
index 00..43db8be24e
--- /dev/null
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/lookup/script/TestScriptedLookupService.java
@@ -0,0 +1,133 @@
+/*
+ * 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.lookup.script;
+
+import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper;
+import org.apache.nifi.script.ScriptingComponentHelper;
+import org.apache.nifi.script.ScriptingComponentUtils;
+import org.apache.nifi.util.NoOpProcessor;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Unit tests
[nifi] branch main updated: NIFI-12041 Converted Groovy tests to Java in nifi-scripting-processors
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 9b591a2fe3 NIFI-12041 Converted Groovy tests to Java in
nifi-scripting-processors
9b591a2fe3 is described below
commit 9b591a2fe374fa21dc4a5778edad904af6a7bbe5
Author: dan-s1
AuthorDate: Mon Sep 18 20:37:13 2023 +
NIFI-12041 Converted Groovy tests to Java in nifi-scripting-processors
This closes #7752
Signed-off-by: David Handermann
---
.../org/apache/nifi/util/MockProcessContext.java | 2 +-
.../nifi-scripting-processors/pom.xml | 1 +
.../lookup/script/TestScriptedLookupService.java | 133 +
.../script/TestSimpleScriptedLookupService.java| 86 +++
.../processors/script/ExecuteScriptGroovyTest.java | 126
.../nifi/record/script/ScriptedReaderTest.java | 150 +++
.../record/script/ScriptedRecordSetWriterTest.java | 130
.../script/ScriptedReportingTaskTest.java | 165 +
.../src/test/resources/xmlRecord.xml | 17 +++
9 files changed, 809 insertions(+), 1 deletion(-)
diff --git
a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
index a63951f8c7..c3aa4feb1b 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -519,7 +519,7 @@ public class MockProcessContext extends
MockControllerServiceLookup implements P
return componentName;
}
-protected void setMaxConcurrentTasks(int maxConcurrentTasks) {
+public void setMaxConcurrentTasks(int maxConcurrentTasks) {
this.maxConcurrentTasks = maxConcurrentTasks;
}
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index 760f1d4a91..3b098525ef 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -151,6 +151,7 @@
apache-rat-plugin
+src/test/resources/xmlRecord.xml
src/test/resources/jython/test_compress.py
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/lookup/script/TestScriptedLookupService.java
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/lookup/script/TestScriptedLookupService.java
new file mode 100644
index 00..43db8be24e
--- /dev/null
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/lookup/script/TestScriptedLookupService.java
@@ -0,0 +1,133 @@
+/*
+ * 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.lookup.script;
+
+import org.apache.nifi.processors.script.AccessibleScriptingComponentHelper;
+import org.apache.nifi.script.ScriptingComponentHelper;
+import org.apache.nifi.script.ScriptingComponentUtils;
+import org.apache.nifi.util.NoOpProcessor;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Unit tests for the ScriptedLookupService controller service
+ */
+public class TestScriptedLookupService {
+
[nifi] branch support/nifi-1.x updated: NIFI-12102 Fixed deprecation warnings when instantiating primitive types
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 96bbdfe97f NIFI-12102 Fixed deprecation warnings when instantiating
primitive types
96bbdfe97f is described below
commit 96bbdfe97f7d49bfc709749fc6e2f1f145662b55
Author: Pierre Villard
AuthorDate: Thu Sep 21 16:34:40 2023 +0200
NIFI-12102 Fixed deprecation warnings when instantiating primitive types
This closes #7769
Signed-off-by: David Handermann
(cherry picked from commit 5405a3b08b8a20c5f65102b684b525a9a4f7c01c)
---
.../serialization/record/TestDataTypeUtils.java| 2 +-
.../util/crypto/PBKDF2SecureHasherTest.java| 2 +-
.../reporting/datadog/metrics/MetricsService.java | 88 +++---
.../apache/nifi/controller/TestFlowController.java | 4 +-
.../org/apache/nifi/hbase/TestPutHBaseRecord.java | 2 +-
.../java/org/apache/nifi/ModifyHTMLElement.java| 2 +-
.../nifi/mongodb/MongoDBLookupServiceIT.java | 6 +-
.../org/apache/nifi/redis/state/RedisStateMap.java | 4 +-
.../map/TestDistributedMapServerAndClient.java | 8 +-
.../cli/impl/command/nifi/AbstractNiFiCommand.java | 2 +-
10 files changed, 60 insertions(+), 60 deletions(-)
diff --git
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index 863949b486..16a1a64128 100644
---
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -519,7 +519,7 @@ public class TestDataTypeUtils {
@Test
public void testIsCompatibleDataTypeInteger() {
final DataType dataType = RecordFieldType.INT.getDataType();
-assertTrue(DataTypeUtils.isCompatibleDataType(new Integer("1234567"),
dataType));
+
assertTrue(DataTypeUtils.isCompatibleDataType(Integer.valueOf("1234567"),
dataType));
assertTrue(DataTypeUtils.isCompatibleDataType("1234567", dataType));
assertFalse(DataTypeUtils.isCompatibleDataType(new
BigInteger("12345678901234567890"), dataType));
assertFalse(DataTypeUtils.isCompatibleDataType(1234567890123456789L,
dataType));
diff --git
a/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
b/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
index a895f95a7f..76b7ed75b5 100644
---
a/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
+++
b/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
@@ -290,7 +290,7 @@ public class PBKDF2SecureHasherTest {
List validHLengths = Arrays.asList(32, 64);
// MAX_VALUE + 1 will become MIN_VALUE because of signed integer math
-List invalidDKLengths = Arrays.asList(-1, 0,
Integer.MAX_VALUE + 1, new Integer(Integer.MAX_VALUE * 2 - 1));
+List invalidDKLengths = Arrays.asList(-1, 0,
Integer.MAX_VALUE + 1, Integer.valueOf(Integer.MAX_VALUE * 2 - 1));
// Act and Assert
validHLengths.forEach(hLen -> {
diff --git
a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
index 6c743b6ff8..b46b3ceefc 100644
---
a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
+++
b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
@@ -35,12 +35,12 @@ public class MetricsService {
//processor - specific metrics
public Map getProcessorMetrics(ProcessorStatus status) {
final Map metrics = new HashMap<>();
-metrics.put(MetricNames.FLOW_FILES_RECEIVED, new
Double(status.getInputCount()));
-metrics.put(MetricNames.FLOW_FILES_SENT, new
Double(status.getOutputCount()));
-metrics.put(MetricNames.BYTES_READ, new
Double(status.getInputBytes()));
-metrics.put(MetricNames.BYTES_WRITTEN, new
Double(status.getOutputBytes()));
-metrics.put(MetricNames.ACTIVE_THREADS, new
Double(status.getActiveThreadCount()));
-metrics.put(MetricNames.TOTAL_TASK_DURATION, new
Double(status.getProcessingNanos()));
+metrics.put(MetricNames.FLOW_FILES_RECEIVED,
[nifi] branch main updated: NIFI-12102 Fixed deprecation warnings when instantiating primitive types
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 5405a3b08b NIFI-12102 Fixed deprecation warnings when instantiating
primitive types
5405a3b08b is described below
commit 5405a3b08b8a20c5f65102b684b525a9a4f7c01c
Author: Pierre Villard
AuthorDate: Thu Sep 21 16:34:40 2023 +0200
NIFI-12102 Fixed deprecation warnings when instantiating primitive types
This closes #7769
Signed-off-by: David Handermann
---
.../serialization/record/TestDataTypeUtils.java| 2 +-
.../util/crypto/PBKDF2SecureHasherTest.java| 2 +-
.../reporting/datadog/metrics/MetricsService.java | 88 +++---
.../apache/nifi/controller/TestFlowController.java | 4 +-
.../org/apache/nifi/hbase/TestPutHBaseRecord.java | 2 +-
.../java/org/apache/nifi/ModifyHTMLElement.java| 2 +-
.../nifi/mongodb/MongoDBLookupServiceIT.java | 6 +-
.../org/apache/nifi/redis/state/RedisStateMap.java | 4 +-
.../map/TestDistributedMapServerAndClient.java | 8 +-
.../cli/impl/command/nifi/AbstractNiFiCommand.java | 2 +-
10 files changed, 60 insertions(+), 60 deletions(-)
diff --git
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index 863949b486..16a1a64128 100644
---
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -519,7 +519,7 @@ public class TestDataTypeUtils {
@Test
public void testIsCompatibleDataTypeInteger() {
final DataType dataType = RecordFieldType.INT.getDataType();
-assertTrue(DataTypeUtils.isCompatibleDataType(new Integer("1234567"),
dataType));
+
assertTrue(DataTypeUtils.isCompatibleDataType(Integer.valueOf("1234567"),
dataType));
assertTrue(DataTypeUtils.isCompatibleDataType("1234567", dataType));
assertFalse(DataTypeUtils.isCompatibleDataType(new
BigInteger("12345678901234567890"), dataType));
assertFalse(DataTypeUtils.isCompatibleDataType(1234567890123456789L,
dataType));
diff --git
a/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
b/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
index a895f95a7f..76b7ed75b5 100644
---
a/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
+++
b/nifi-commons/nifi-security-utils/src/test/java/org/apache/nifi/security/util/crypto/PBKDF2SecureHasherTest.java
@@ -290,7 +290,7 @@ public class PBKDF2SecureHasherTest {
List validHLengths = Arrays.asList(32, 64);
// MAX_VALUE + 1 will become MIN_VALUE because of signed integer math
-List invalidDKLengths = Arrays.asList(-1, 0,
Integer.MAX_VALUE + 1, new Integer(Integer.MAX_VALUE * 2 - 1));
+List invalidDKLengths = Arrays.asList(-1, 0,
Integer.MAX_VALUE + 1, Integer.valueOf(Integer.MAX_VALUE * 2 - 1));
// Act and Assert
validHLengths.forEach(hLen -> {
diff --git
a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
index 6c743b6ff8..b46b3ceefc 100644
---
a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
+++
b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java
@@ -35,12 +35,12 @@ public class MetricsService {
//processor - specific metrics
public Map getProcessorMetrics(ProcessorStatus status) {
final Map metrics = new HashMap<>();
-metrics.put(MetricNames.FLOW_FILES_RECEIVED, new
Double(status.getInputCount()));
-metrics.put(MetricNames.FLOW_FILES_SENT, new
Double(status.getOutputCount()));
-metrics.put(MetricNames.BYTES_READ, new
Double(status.getInputBytes()));
-metrics.put(MetricNames.BYTES_WRITTEN, new
Double(status.getOutputBytes()));
-metrics.put(MetricNames.ACTIVE_THREADS, new
Double(status.getActiveThreadCount()));
-metrics.put(MetricNames.TOTAL_TASK_DURATION, new
Double(status.getProcessingNanos()));
+metrics.put(MetricNames.FLOW_FILES_RECEIVED,
Double.valueOf(status.getInputCount()));
+metrics.put(MetricNames.FLOW_FILES_SENT,
[nifi] branch support/nifi-1.x updated: NIFI-12033 Added EncryptContentAge and DecryptContentAge Processors
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 68dc0653c3 NIFI-12033 Added EncryptContentAge and DecryptContentAge Processors 68dc0653c3 is described below commit 68dc0653c33a28d73de2859a4ce8af5743059e71 Author: exceptionfactory AuthorDate: Sat Sep 9 09:38:54 2023 -0500 NIFI-12033 Added EncryptContentAge and DecryptContentAge Processors This closes #7676 Signed-off-by: Paul Grey (cherry picked from commit ebe8b9a2e78d1d87046eb1d6c9f86e86203b6744) --- .../nifi-cipher-processors/pom.xml | 12 + .../nifi/processors/cipher/DecryptContentAge.java | 299 + .../nifi/processors/cipher/EncryptContentAge.java | 299 + .../cipher/age/AbstractAgeKeyReader.java | 78 ++ .../processors/cipher/age/AgeKeyIndicator.java | 47 .../nifi/processors/cipher/age/AgeKeyReader.java | 37 +++ .../processors/cipher/age/AgeKeyValidator.java | 146 ++ .../processors/cipher/age/AgePrivateKeyReader.java | 72 + .../processors/cipher/age/AgeProviderResolver.java | 72 + .../processors/cipher/age/AgePublicKeyReader.java | 72 + .../nifi/processors/cipher/age/FileEncoding.java | 49 .../nifi/processors/cipher/age/KeySource.java | 49 .../cipher/io/ChannelStreamCallback.java | 98 +++ .../services/org.apache.nifi.processor.Processor | 2 + .../processors/cipher/DecryptContentAgeTest.java | 232 .../processors/cipher/EncryptContentAgeTest.java | 246 + .../cipher/age/AgePrivateKeyReaderTest.java| 66 + .../cipher/age/AgePublicKeyReaderTest.java | 66 + .../cipher/io/ChannelStreamCallbackTest.java | 123 + nifi-nar-bundles/nifi-cipher-bundle/pom.xml| 12 + 20 files changed, 2077 insertions(+) diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml index 0948704dcc..4b9149a012 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml @@ -43,6 +43,18 @@ org.bouncycastle bcprov-jdk18on + +com.exceptionfactory.jagged +jagged-x25519 + + +com.exceptionfactory.jagged +jagged-framework + + +com.exceptionfactory.jagged +jagged-api + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java new file mode 100644 index 00..833e4a47c8 --- /dev/null +++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java @@ -0,0 +1,299 @@ +/* + * 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.cipher; + +import com.exceptionfactory.jagged.DecryptingChannelFactory; +import com.exceptionfactory.jagged.RecipientStanzaReader; +import com.exceptionfactory.jagged.framework.armor.ArmoredDecryptingChannelFactory; +import com.exceptionfactory.jagged.framework.stream.StandardDecryptingChannelFactory; + +import org.apache.nifi.annotation.behavior.InputRequirement; +import org.apache.nifi.annotation.behavior.SupportsBatching; +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.annotation.lifecycle.OnScheduled; +import org.apache.nifi.components.ConfigVerificationResult; +import org.apache.nifi.components.PropertyDescriptor; +import
[nifi] branch support/nifi-1.x updated: NIFI-12022 Extract verification logic from JMSConnectionFactoryProvider
This is an automated email from the ASF dual-hosted git repository.
turcsanyi 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 ed1ab84cd8 NIFI-12022 Extract verification logic from
JMSConnectionFactoryProvider
ed1ab84cd8 is described below
commit ed1ab84cd8e14ade0da226fbf68e5e7608c15ed7
Author: Nandor Soma Abonyi
AuthorDate: Mon Aug 28 10:39:30 2023 +0200
NIFI-12022 Extract verification logic from JMSConnectionFactoryProvider
This closes #7667.
Signed-off-by: Peter Turcsanyi
(cherry picked from commit badbc1aca66684187093ff82fde6bfb28db549c7)
---
.../cf/AbstractJMSConnectionFactoryProvider.java} | 66 ++-
.../jms/cf/CachedJMSConnectionFactoryHandler.java | 53 +
.../cf/JMSConnectionFactoryHandlerDefinition.java} | 20 +---
.../nifi/jms/cf/JMSConnectionFactoryHandler.java | 80 ++---
.../nifi/jms/cf/JMSConnectionFactoryProvider.java | 126 +
.../jms/cf/JndiJmsConnectionFactoryHandler.java| 24 +---
.../jms/cf/JMSConnectionFactoryHandlerForTest.java | 6 +-
.../cf/JMSConnectionFactoryProviderForTest.java| 1 -
8 files changed, 111 insertions(+), 265 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/AbstractJMSConnectionFactoryProvider.java
similarity index 64%
copy from
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
copy to
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/AbstractJMSConnectionFactoryProvider.java
index 8a8c4b12fe..a2be311727 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/AbstractJMSConnectionFactoryProvider.java
@@ -16,23 +16,14 @@
*/
package org.apache.nifi.jms.cf;
-import org.apache.nifi.annotation.behavior.DynamicProperty;
-import org.apache.nifi.annotation.behavior.Restricted;
-import org.apache.nifi.annotation.behavior.Restriction;
-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.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.RequiredPermission;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.ConfigVerificationResult.Outcome;
+import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.VerifiableControllerService;
+import org.apache.nifi.logging.ComponentLog;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -45,52 +36,19 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
/**
- * Provides a factory service that creates and initializes
- * {@link ConnectionFactory} specific to the third party JMS system.
- *
- * It accomplishes it by adjusting current classpath by adding to it the
- * additional resources (i.e., JMS client libraries) provided by the user via
- * {@link JMSConnectionFactoryProperties#JMS_CLIENT_LIBRARIES}, allowing it
then to create an instance of the
- * target {@link ConnectionFactory} based on the provided
- * {@link JMSConnectionFactoryProperties#JMS_CONNECTION_FACTORY_IMPL} which
can be than access via
- * {@link #getConnectionFactory()} method.
+ * Base JMS controller service implementation that provides verification logic.
*/
-@Tags({"jms", "messaging", "integration", "queue", "topic", "publish",
"subscribe"})
-@CapabilityDescription("Provides a generic service to create vendor specific
javax.jms.ConnectionFactory implementations. "
-+ "The Connection Factory can be served once this service is
configured successfully.")
-@DynamicProperty(name = "The name of a Connection Factory configuration
property.", value = "The value of a given Connection Factory configuration
property.",
-description = "The properties that are set following Java Beans
convention where a property name is derived from the 'set*' method of the
vendor "
-+ "specific ConnectionFactory's implementation. For example,
[nifi] branch main updated: NIFI-12022 Extract verification logic from JMSConnectionFactoryProvider
This is an automated email from the ASF dual-hosted git repository.
turcsanyi 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 badbc1aca6 NIFI-12022 Extract verification logic from
JMSConnectionFactoryProvider
badbc1aca6 is described below
commit badbc1aca66684187093ff82fde6bfb28db549c7
Author: Nandor Soma Abonyi
AuthorDate: Mon Aug 28 10:39:30 2023 +0200
NIFI-12022 Extract verification logic from JMSConnectionFactoryProvider
This closes #7667.
Signed-off-by: Peter Turcsanyi
---
.../cf/AbstractJMSConnectionFactoryProvider.java} | 66 ++-
.../jms/cf/CachedJMSConnectionFactoryHandler.java | 53 +
.../cf/JMSConnectionFactoryHandlerDefinition.java} | 20 +---
.../nifi/jms/cf/JMSConnectionFactoryHandler.java | 80 ++---
.../nifi/jms/cf/JMSConnectionFactoryProvider.java | 126 +
.../jms/cf/JndiJmsConnectionFactoryHandler.java| 24 +---
.../jms/cf/JMSConnectionFactoryHandlerForTest.java | 6 +-
.../cf/JMSConnectionFactoryProviderForTest.java| 1 -
8 files changed, 111 insertions(+), 265 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/AbstractJMSConnectionFactoryProvider.java
similarity index 64%
copy from
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
copy to
nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/AbstractJMSConnectionFactoryProvider.java
index 8a8c4b12fe..a2be311727 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service/src/main/java/org/apache/nifi/jms/cf/AbstractJMSConnectionFactoryProvider.java
@@ -16,23 +16,14 @@
*/
package org.apache.nifi.jms.cf;
-import org.apache.nifi.annotation.behavior.DynamicProperty;
-import org.apache.nifi.annotation.behavior.Restricted;
-import org.apache.nifi.annotation.behavior.Restriction;
-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.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.RequiredPermission;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.controller.ConfigurationContext;
-import org.apache.nifi.expression.ExpressionLanguageScope;
-import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.ConfigVerificationResult.Outcome;
+import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.controller.VerifiableControllerService;
+import org.apache.nifi.logging.ComponentLog;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -45,52 +36,19 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
/**
- * Provides a factory service that creates and initializes
- * {@link ConnectionFactory} specific to the third party JMS system.
- *
- * It accomplishes it by adjusting current classpath by adding to it the
- * additional resources (i.e., JMS client libraries) provided by the user via
- * {@link JMSConnectionFactoryProperties#JMS_CLIENT_LIBRARIES}, allowing it
then to create an instance of the
- * target {@link ConnectionFactory} based on the provided
- * {@link JMSConnectionFactoryProperties#JMS_CONNECTION_FACTORY_IMPL} which
can be than access via
- * {@link #getConnectionFactory()} method.
+ * Base JMS controller service implementation that provides verification logic.
*/
-@Tags({"jms", "messaging", "integration", "queue", "topic", "publish",
"subscribe"})
-@CapabilityDescription("Provides a generic service to create vendor specific
javax.jms.ConnectionFactory implementations. "
-+ "The Connection Factory can be served once this service is
configured successfully.")
-@DynamicProperty(name = "The name of a Connection Factory configuration
property.", value = "The value of a given Connection Factory configuration
property.",
-description = "The properties that are set following Java Beans
convention where a property name is derived from the 'set*' method of the
vendor "
-+ "specific ConnectionFactory's implementation. For example,
'com.ibm.mq.jms.MQConnectionFactory.setChannel(String)' would imply 'channel' "
-+
[nifi] branch main updated: NIFI-12033 Added EncryptContentAge and DecryptContentAge Processors
This is an automated email from the ASF dual-hosted git repository. greyp 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 ebe8b9a2e7 NIFI-12033 Added EncryptContentAge and DecryptContentAge Processors ebe8b9a2e7 is described below commit ebe8b9a2e78d1d87046eb1d6c9f86e86203b6744 Author: exceptionfactory AuthorDate: Sat Sep 9 09:38:54 2023 -0500 NIFI-12033 Added EncryptContentAge and DecryptContentAge Processors This closes #7676 Signed-off-by: Paul Grey --- .../nifi-cipher-processors/pom.xml | 12 + .../nifi/processors/cipher/DecryptContentAge.java | 299 + .../nifi/processors/cipher/EncryptContentAge.java | 299 + .../cipher/age/AbstractAgeKeyReader.java | 78 ++ .../processors/cipher/age/AgeKeyIndicator.java | 47 .../nifi/processors/cipher/age/AgeKeyReader.java | 37 +++ .../processors/cipher/age/AgeKeyValidator.java | 146 ++ .../processors/cipher/age/AgePrivateKeyReader.java | 72 + .../processors/cipher/age/AgeProviderResolver.java | 72 + .../processors/cipher/age/AgePublicKeyReader.java | 72 + .../nifi/processors/cipher/age/FileEncoding.java | 49 .../nifi/processors/cipher/age/KeySource.java | 49 .../cipher/io/ChannelStreamCallback.java | 98 +++ .../services/org.apache.nifi.processor.Processor | 2 + .../processors/cipher/DecryptContentAgeTest.java | 232 .../processors/cipher/EncryptContentAgeTest.java | 246 + .../cipher/age/AgePrivateKeyReaderTest.java| 66 + .../cipher/age/AgePublicKeyReaderTest.java | 66 + .../cipher/io/ChannelStreamCallbackTest.java | 123 + nifi-nar-bundles/nifi-cipher-bundle/pom.xml| 12 + 20 files changed, 2077 insertions(+) diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml index 920c9b68da..1df0a3fa6c 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/pom.xml @@ -43,6 +43,18 @@ org.bouncycastle bcprov-jdk18on + +com.exceptionfactory.jagged +jagged-x25519 + + +com.exceptionfactory.jagged +jagged-framework + + +com.exceptionfactory.jagged +jagged-api + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java new file mode 100644 index 00..833e4a47c8 --- /dev/null +++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java @@ -0,0 +1,299 @@ +/* + * 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.cipher; + +import com.exceptionfactory.jagged.DecryptingChannelFactory; +import com.exceptionfactory.jagged.RecipientStanzaReader; +import com.exceptionfactory.jagged.framework.armor.ArmoredDecryptingChannelFactory; +import com.exceptionfactory.jagged.framework.stream.StandardDecryptingChannelFactory; + +import org.apache.nifi.annotation.behavior.InputRequirement; +import org.apache.nifi.annotation.behavior.SupportsBatching; +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.annotation.lifecycle.OnScheduled; +import org.apache.nifi.components.ConfigVerificationResult; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.resource.ResourceCardinality; +import org.apache.nifi.components.resource.ResourceReference; +import
[nifi-minifi-cpp] branch main updated: MINIFICPP-2204 Fix build with clang16 and upgrade in CI
This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git The following commit(s) were added to refs/heads/main by this push: new fe7abb230 MINIFICPP-2204 Fix build with clang16 and upgrade in CI fe7abb230 is described below commit fe7abb230d837bc5de3684e16c6533c1c02dcae4 Author: Gabor Gyimesi AuthorDate: Mon Aug 28 13:40:13 2023 +0200 MINIFICPP-2204 Fix build with clang16 and upgrade in CI Also revise clang tidy checks: - List all checks individually to avoid alias checks being added - Remove checks cert-dcl37-c, cert-dcl51-cpp, bugprone-reserved-identifier and readability-identifier-naming as each of their runtime is over 3 minutes. This change reduced the runtime of the tested file from 13 minutes to 18 seconds. Signed-off-by: Ferenc Gerlits This closes #1642 --- .clang-tidy | 89 +++- .github/workflows/ci.yml | 42 ++--- CMakeLists.txt | 9 cmake/Abseil.cmake | 10 +++- cmake/BundledLibcURL.cmake | 6 ++- libminifi/include/utils/TimeUtil.h | 13 +- run_clang_tidy.sh| 2 +- thirdparty/abseil/rename-crc32.patch | 74 ++ thirdparty/curl/strerror.patch | 31 + 9 files changed, 232 insertions(+), 44 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 6dac184f4..2345a2425 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,16 +1,82 @@ Checks: > -clang-analyzer-optin.cplusplus.VirtualCall, - boost*, - portability*, - bugprone*, - -bugprone-narrowing-conversions, - -bugprone-implicit-widening-of-multiplication-result, - -bugprone-macro-parentheses, - -bugprone-easily-swappable-parameters, - -bugprone-exception-escape, - cert*, - -cert-err58-cpp, - -cert-err33-c, + boost-use-to-string, + portability-restrict-system-includes, + portability-simd-intrinsics, + portability-std-allocator-const, + bugprone-argument-comment, + bugprone-assert-side-effect, + bugprone-assignment-in-if-condition, + bugprone-bad-signal-to-kill-thread, + bugprone-bool-pointer-implicit-conversion, + bugprone-branch-clone, + bugprone-copy-constructor-init, + bugprone-dangling-handle, + bugprone-dynamic-static-initializers, + bugprone-fold-init-type, + bugprone-forward-declaration-namespace, + bugprone-forwarding-reference-overload, + bugprone-inaccurate-erase, + bugprone-incorrect-roundings, + bugprone-infinite-loop, + bugprone-integer-division, + bugprone-lambda-function-name, + bugprone-macro-repeated-side-effects, + bugprone-misplaced-operator-in-strlen-in-alloc, + bugprone-misplaced-pointer-arithmetic-in-alloc, + bugprone-misplaced-widening-cast, + bugprone-move-forwarding-reference, + bugprone-multiple-statement-macro, + bugprone-no-escape, + bugprone-not-null-terminated-result, + bugprone-parent-virtual-call, + bugprone-posix-return, + bugprone-redundant-branch-condition, + bugprone-shared-ptr-array-mismatch, + bugprone-signal-handler, + bugprone-signed-char-misuse, + bugprone-sizeof-container, + bugprone-sizeof-expression, + bugprone-spuriously-wake-up-functions, + bugprone-standalone-empty, + bugprone-string-constructor, + bugprone-string-integer-assignment, + bugprone-string-literal-with-embedded-nul, + bugprone-stringview-nullptr, + bugprone-suspicious-enum-usage, + bugprone-suspicious-include, + bugprone-suspicious-memory-comparison, + bugprone-suspicious-memset-usage, + bugprone-suspicious-missing-comma, + bugprone-suspicious-realloc-usage, + bugprone-suspicious-semicolon, + bugprone-suspicious-string-compare, + bugprone-swapped-arguments, + bugprone-terminating-continue, + bugprone-throw-keyword-missing, + bugprone-too-small-loop-variable, + bugprone-unchecked-optional-access, + bugprone-undefined-memory-manipulation, + bugprone-undelegated-constructor, + bugprone-unhandled-exception-at-new, + bugprone-unhandled-self-assignment, + bugprone-unused-raii, + bugprone-unused-return-value, + bugprone-use-after-move, + bugprone-virtual-near-miss, + cert-dcl21-cpp, + cert-dcl50-cpp, + cert-dcl58-cpp, + cert-err33-c, + cert-err34-c, + cert-err52-cpp, + cert-err60-cpp, + cert-flp30-c, + cert-mem57-cpp, + cert-msc50-cpp, + cert-msc51-cpp, + cert-oop57-cpp, + cert-oop58-cpp, hicpp-avoid-goto, hicpp-exception-baseclass, hicpp-multiway-paths-covered, @@ -68,7 +134,6 @@ Checks: > readability-delete-null-pointer, readability-duplicate-include, readability-function-size, - readability-identifier-naming, readability-inconsistent-declaration-parameter-name, readability-isolate-declaration, readability-make-member-function-const, diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 265a5d339..d1ea8189c 100644 ---
[nifi-minifi-cpp] branch MINIFICPP-2204 updated (fb26b462c -> 63959bd2c)
This is an automated email from the ASF dual-hosted git repository. lordgamez pushed a change to branch MINIFICPP-2204 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git from fb26b462c Increase timeout and free up disk space for clang add 63959bd2c Revise clang tidy checks No new revisions were added by this update. Summary of changes: .clang-tidy | 89 - 1 file changed, 77 insertions(+), 12 deletions(-)
[nifi-minifi-cpp] 03/04: MINIFICPP-2218 Refactor expected monadic functions
This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 4780b541bb0ee5c6a4419840f02f6d64c10d72ad
Author: Marton Szasz
AuthorDate: Sat Sep 16 05:14:58 2023 +0200
MINIFICPP-2218 Refactor expected monadic functions
Signed-off-by: Ferenc Gerlits
This closes #1659
---
CPPLINT.cfg| 2 +-
extensions/aws/processors/FetchS3Object.cpp| 2 +-
extensions/aws/s3/S3Wrapper.cpp| 10 +-
extensions/expression-language/Expression.cpp | 4 +-
extensions/http-curl/processors/InvokeHTTP.cpp | 10 +-
.../mqtt/processors/AbstractMQTTProcessor.cpp | 6 +-
extensions/mqtt/processors/ConsumeMQTT.cpp | 12 +-
extensions/mqtt/processors/PublishMQTT.cpp | 4 +-
.../rocksdb-repos/DatabaseContentRepository.cpp| 8 +-
extensions/rocksdb-repos/RocksDbRepository.cpp | 8 +-
extensions/sftp/processors/ListSFTP.cpp| 2 +-
.../processors/DefragmentText.cpp | 2 +-
.../standard-processors/processors/ListFile.cpp| 2 +-
.../standard-processors/processors/PutUDP.cpp | 4 +-
.../standard-processors/processors/RouteText.cpp | 2 +-
extensions/systemd/ConsumeJournald.cpp | 14 +-
.../CollectorInitiatedSubscription.cpp | 2 +-
libminifi/include/DiskSpaceWatchdog.h | 16 +--
libminifi/include/EventDrivenSchedulingAgent.h | 2 +-
libminifi/include/SchedulingAgent.h| 2 +-
.../include/core/logging/LoggerConfiguration.h | 2 +-
libminifi/include/properties/Decryptor.h | 2 +-
libminifi/include/utils/OptionalUtils.h| 10 +-
.../utils/detail/MonadicOperationWrappers.h| 16 ++-
libminifi/include/utils/expected.h | 124 ++---
libminifi/src/DiskSpaceWatchdog.cpp| 17 +--
libminifi/src/RootProcessGroupWrapper.cpp | 4 +-
libminifi/src/c2/C2Agent.cpp | 6 +-
libminifi/src/c2/C2MetricsPublisher.cpp| 2 +-
libminifi/src/core/FlowConfiguration.cpp | 2 +-
libminifi/src/utils/crypto/EncryptionManager.cpp | 4 +-
libminifi/src/utils/crypto/EncryptionProvider.cpp | 2 +-
libminifi/test/integration/IntegrationBase.h | 2 +-
libminifi/test/unit/ExpectedTest.cpp | 155 ++---
libminifi/test/unit/OptionalTest.cpp | 14 +-
minifi_main/MiNiFiMain.cpp | 6 +-
36 files changed, 277 insertions(+), 205 deletions(-)
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index 30b47e390..77f9a737d 100644
--- a/CPPLINT.cfg
+++ b/CPPLINT.cfg
@@ -1,2 +1,2 @@
set noparent
-filter=-runtime/reference,-runtime/string,-build/c++11,-build/include_subdir,-whitespace/forcolon,-build/namespaces_literals,-readability/check
+filter=-runtime/reference,-runtime/string,-build/c++11,-build/include_subdir,-whitespace/forcolon,-build/namespaces_literals,-readability/check,-build/include_what_you_use
diff --git a/extensions/aws/processors/FetchS3Object.cpp
b/extensions/aws/processors/FetchS3Object.cpp
index 311af7cf8..a2bc62687 100644
--- a/extensions/aws/processors/FetchS3Object.cpp
+++ b/extensions/aws/processors/FetchS3Object.cpp
@@ -86,7 +86,7 @@ void FetchS3Object::onTrigger(const
std::shared_ptr
std::optional result;
session->write(flow_file, [_object_params, , this](const
std::shared_ptr& stream) -> int64_t {
result = s3_wrapper_.getObject(*get_object_params, *stream);
-return (result |
minifi::utils::map(::GetObjectResult::write_size)).value_or(0);
+return (result |
minifi::utils::transform(::GetObjectResult::write_size)).value_or(0);
});
if (result) {
diff --git a/extensions/aws/s3/S3Wrapper.cpp b/extensions/aws/s3/S3Wrapper.cpp
index 29c180f0d..059332233 100644
--- a/extensions/aws/s3/S3Wrapper.cpp
+++ b/extensions/aws/s3/S3Wrapper.cpp
@@ -204,16 +204,16 @@ std::optional
S3Wrapper::putObjectMultipart(const PutObjectRequ
if (auto upload_state = getMultipartUploadState(put_object_params)) {
logger_->log_info("Found previous multipart upload state for %s in bucket
%s, continuing upload", put_object_params.object_key, put_object_params.bucket);
return uploadParts(put_object_params, stream, std::move(*upload_state))
- | minifi::utils::flatMap([&, this](const auto& upload_parts_result) {
return completeMultipartUpload(put_object_params, upload_parts_result); })
- | minifi::utils::map([this](const auto&
complete_multipart_upload_result) { return
createPutObjectResult(complete_multipart_upload_result); });
+ | minifi::utils::andThen([&, this](const auto& upload_parts_result) {
return completeMultipartUpload(put_object_params, upload_parts_result); })
+ | minifi::utils::transform([this](const auto&
[nifi-minifi-cpp] 01/04: MINIFICPP-1774 Set properties from command line arguments
This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 1dfab222d44100186e3450cd0fc964f04708734b
Author: Gabor Gyimesi
AuthorDate: Tue Aug 22 15:08:27 2023 +0200
MINIFICPP-1774 Set properties from command line arguments
Signed-off-by: Ferenc Gerlits
This closes #1638
---
CMakeLists.txt | 7 +-
LICENSE | 32 ++-
NOTICE | 1 +
cmake/{CxxOpts.cmake => ArgParse.cmake} | 19 +---
controller/CMakeLists.txt | 6 +-
controller/MiNiFiController.cpp | 140 ---
encrypt-config/ArgParser.cpp| 164
encrypt-config/ArgParser.h | 74 --
encrypt-config/CMakeLists.txt | 3 +-
encrypt-config/CommandException.h | 36 ---
encrypt-config/EncryptConfigMain.cpp| 33 ---
extensions/ExtensionHeader.txt | 2 +-
libminifi/CMakeLists.txt| 6 +-
minifi_main/CMakeLists.txt | 6 +-
minifi_main/MiNiFiMain.cpp | 144 +++-
nanofi/CMakeLists.txt | 2 +-
nanofi/ecu/CMakeLists.txt | 2 +-
nanofi/examples/CMakeLists.txt | 2 +-
18 files changed, 236 insertions(+), 443 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f602449c3..e74e7ed0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,7 @@
cmake_minimum_required(VERSION 3.24)
cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in
PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK}
cmake_policy(SET CMP0065 OLD) # default export policy, required for self-dlopen
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
-cmake_policy(SET CMP0135 NEW) # policy to set the timestamps of extracted
contents to the time of extraction
-endif()
+cmake_policy(SET CMP0135 NEW) # policy to set the timestamps of extracted
contents to the time of extraction
project(nifi-minifi-cpp VERSION 0.15.0)
set(PROJECT_NAME "nifi-minifi-cpp")
@@ -296,9 +294,6 @@ add_library(RapidJSON INTERFACE)
target_include_directories(RapidJSON SYSTEM INTERFACE
"${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/rapidjson-48fbd8cd202ca54031fe799db2ad44ffa8e77c13/include")
target_compile_definitions(RapidJSON INTERFACE RAPIDJSON_HAS_STDSTRING)
-# cxxopts
-include(CxxOpts)
-
include(Coroutines)
enable_coroutines()
diff --git a/LICENSE b/LICENSE
index 82cee2dcf..6d2a0d4f7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1250,28 +1250,6 @@ Redistribution and use in source and binary forms, with
or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFI [...]
-This product bundles 'cxxopts' which is available under an MIT license.
-
-Copyright (c) 2014 Jarryd Beck
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
This product bundles zlib which is available under the zlib license:
(C) 1995-2017 Jean-loup Gailly and Mark Adler
@@ -3416,3 +3394,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+This product bundles 'argparse' which is available under The MIT License.
+
+Copyright (c) 2018 Pranav Srinivas Kumar
+
+Permission is hereby granted, free of charge,
[nifi-minifi-cpp] 02/04: MINIFICPP-2193 - Add manifest to debug bundle
This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 9ec2010a0dce27e67124eefe07e9182e2467c055
Author: Adam Debreceni
AuthorDate: Wed Sep 6 07:54:39 2023 +0200
MINIFICPP-2193 - Add manifest to debug bundle
Signed-off-by: Ferenc Gerlits
This closes #1651
---
extensions/http-curl/tests/C2DebugBundleTest.cpp | 5 -
libminifi/src/c2/C2Agent.cpp | 19 ++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/extensions/http-curl/tests/C2DebugBundleTest.cpp
b/extensions/http-curl/tests/C2DebugBundleTest.cpp
index b68bd7b7c..315e73e2c 100644
--- a/extensions/http-curl/tests/C2DebugBundleTest.cpp
+++ b/extensions/http-curl/tests/C2DebugBundleTest.cpp
@@ -91,7 +91,9 @@ class C2DebugBundleHandler : public ServerAwareHandler {
}
static int field_get(const char* /*key*/, const char* value, size_t
valuelen, void* user_data) {
auto& file_content = *static_cast*>(user_data);
-file_content = "";
+if (!file_content) {
+ file_content = "";
+}
(*file_content) += std::string(value, valuelen);
return MG_FORM_FIELD_HANDLE_GET;
}
@@ -183,6 +185,7 @@ int main() {
log_text.resize(log_stream->size());
log_stream->read(as_writable_bytes(std::span(log_text)));
assert(log_text.find("Tis but a scratch") != std::string::npos);
+assert(archive_content["manifest.json"].find("minifi-archive-extensions")
!= std::string::npos);
return true;
});
diff --git a/libminifi/src/c2/C2Agent.cpp b/libminifi/src/c2/C2Agent.cpp
index 9891fb9de..64464a602 100644
--- a/libminifi/src/c2/C2Agent.cpp
+++ b/libminifi/src/c2/C2Agent.cpp
@@ -676,7 +676,7 @@ C2Payload C2Agent::bundleDebugInfo(std::mapsize();
if (!archiver->newEntry({filename, file_size})) {
throw C2DebugBundleError("Couldn't initialize archive entry for '" +
filename + "'");
@@ -686,6 +686,23 @@ C2Payload C2Agent::bundleDebugInfo(std::mapgetAgentManifest();
+std::string manifest_str = state::response::SerializedResponseNode{
+ .name = std::move(reported_manifest.name),
+ .array = reported_manifest.is_array,
+ .children = std::move(reported_manifest.serialized_nodes)
+}.to_pretty_string();
+if (!archiver->newEntry({MANIFEST_FILE_NAME, manifest_str.size()})) {
+ throw C2DebugBundleError(fmt::format("Couldn't initialize archive entry
for '{}'", MANIFEST_FILE_NAME));
+}
+io::BufferStream manifest_stream;
+manifest_stream.write(as_bytes(std::span(manifest_str)));
+if (gsl::narrow(manifest_stream.size()) !=
internal::pipe(manifest_stream, *archiver)) {
+ throw C2DebugBundleError(fmt::format("Error while writing file '{}'",
MANIFEST_FILE_NAME));
+}
+ }
if (!archiver->finish()) {
throw C2DebugBundleError("Failed to complete debug bundle archive");
}
[nifi-minifi-cpp] branch main updated (73ccd5eef -> 1bf566ca8)
This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from 73ccd5eef MINIFICPP-2223 Add .asf.yaml file to configure repository
labels
new 1dfab222d MINIFICPP-1774 Set properties from command line arguments
new 9ec2010a0 MINIFICPP-2193 - Add manifest to debug bundle
new 4780b541b MINIFICPP-2218 Refactor expected monadic functions
new 1bf566ca8 MINIFICPP-2146 Add support for SMB networking protocol
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 9 +-
CPPLINT.cfg| 2 +-
LICENSE| 32 +-
NOTICE | 1 +
PROCESSORS.md | 100 +
README.md | 1 +
cmake/{Catch2.cmake => ArgParse.cmake} | 12 +-
cmake/CxxOpts.cmake| 33 --
cmake/MiNiFiOptions.cmake | 1 +
controller/CMakeLists.txt | 6 +-
controller/MiNiFiController.cpp| 140 +++---
encrypt-config/ArgParser.cpp | 164 ---
encrypt-config/ArgParser.h | 74
encrypt-config/CMakeLists.txt | 3 +-
encrypt-config/CommandException.h | 36 --
encrypt-config/EncryptConfigMain.cpp | 33 +-
extensions/ExtensionHeader.txt | 2 +-
extensions/aws/processors/FetchS3Object.cpp| 2 +-
extensions/aws/s3/S3Wrapper.cpp| 10 +-
extensions/bustache/tests/ApplyTemplateTests.cpp | 144 ---
extensions/expression-language/Expression.cpp | 4 +-
.../tests/ExpressionLanguageTests.cpp | 2 +-
extensions/http-curl/processors/InvokeHTTP.cpp | 10 +-
extensions/http-curl/tests/C2DebugBundleTest.cpp | 5 +-
extensions/http-curl/tests/unit/AlertTests.cpp | 2 +-
.../mqtt/processors/AbstractMQTTProcessor.cpp | 6 +-
extensions/mqtt/processors/ConsumeMQTT.cpp | 12 +-
extensions/mqtt/processors/PublishMQTT.cpp | 4 +-
extensions/python/ExecutePythonProcessor.h | 2 +-
.../python/tests/ExecutePythonProcessorTests.cpp | 1 -
.../rocksdb-repos/DatabaseContentRepository.cpp| 8 +-
extensions/rocksdb-repos/RocksDbRepository.cpp | 8 +-
extensions/sftp/processors/ListSFTP.cpp| 2 +-
extensions/sftp/tests/FetchSFTPTests.cpp | 2 +-
extensions/sftp/tests/ListSFTPTests.cpp| 2 +-
extensions/sftp/tests/ListThenFetchSFTPTests.cpp | 4 +-
extensions/sftp/tests/PutSFTPTests.cpp | 2 +-
extensions/{pdh => smb}/CMakeLists.txt | 12 +-
extensions/smb/FetchSmb.cpp| 73
extensions/smb/FetchSmb.h | 89
extensions/smb/ListSmb.cpp | 144 +++
.../processors/ListFile.h => smb/ListSmb.h}| 119 +++---
extensions/smb/PutSmb.cpp | 94
extensions/smb/PutSmb.h| 94
extensions/smb/SmbConnectionControllerService.cpp | 121 ++
extensions/smb/SmbConnectionControllerService.h| 103 +
extensions/{pdh => smb}/tests/CMakeLists.txt | 16 +-
extensions/smb/tests/FetchSmbTests.cpp | 108 +
extensions/smb/tests/ListAndFetchSmbTests.cpp | 72
extensions/smb/tests/ListSmbTests.cpp | 146 +++
extensions/smb/tests/PutSmbTests.cpp | 184
.../tests/SmbConnectionControllerServiceTests.cpp | 71
.../utils/MockSmbConnectionControllerService.h | 106 +
extensions/smb/tests/utils/TempSmbShare.h | 76
.../processors/DefragmentText.cpp | 2 +-
.../standard-processors/processors/FetchFile.cpp | 6 +-
.../standard-processors/processors/GetFile.cpp | 2 +-
.../standard-processors/processors/ListFile.cpp| 137 ++
.../standard-processors/processors/ListFile.h | 25 +-
.../standard-processors/processors/PutFile.cpp | 220 +++---
.../standard-processors/processors/PutFile.h | 55 +--
.../standard-processors/processors/PutUDP.cpp | 4 +-
.../standard-processors/processors/RouteText.cpp | 2 +-
.../tests/unit/PutFileTests.cpp| 12 -
extensions/systemd/ConsumeJournald.cpp | 14 +-
.../CollectorInitiatedSubscription.cpp | 2 +-
.../windows-event-log/wel/MetadataWalker.cpp | 4 -
libminifi/CMakeLists.txt
