(nifi) branch support/nifi-1.x updated: NIFI-12446 Refactor FilterAttribute to align with code conventions
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 c565e08ccc NIFI-12446 Refactor FilterAttribute to align with code
conventions
c565e08ccc is described below
commit c565e08ccca6c1fce17b1d3de49d7a160cfbee38
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Fri Dec 1 17:46:29 2023 +0100
NIFI-12446 Refactor FilterAttribute to align with code conventions
This closes #8098
Signed-off-by: David Handermann
---
.../nifi/processors/standard/FilterAttribute.java | 210 -
.../processors/standard/TestFilterAttribute.java | 14 +-
2 files changed, 129 insertions(+), 95 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
index 0822868a02..8a913cddf2 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java
@@ -23,7 +23,7 @@ import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
-import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.DescribedValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
@@ -34,7 +34,6 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -52,87 +51,58 @@ import java.util.stream.Collectors;
public class FilterAttribute extends AbstractProcessor {
public static final Relationship REL_SUCCESS = new Relationship.Builder()
-.description("All successful FlowFiles are routed to this
relationship").name("success").build();
-
-private final static Set relationships =
Collections.singleton(REL_SUCCESS);
-
-
-public static final AllowableValue FILTER_MODE_VALUE_RETAIN = new
AllowableValue(
-"RETAIN",
-"Retain",
-"Retains only the attributes matching the filter, all other
attributes are removed."
-);
-
-public static final AllowableValue FILTER_MODE_VALUE_REMOVE = new
AllowableValue(
-"REMOVE",
-"Remove",
-"Removes the attributes matching the filter, all other attributes
are retained."
-);
+.name("success")
+.description("All successful FlowFiles are routed to this
relationship")
+.build();
public static final PropertyDescriptor FILTER_MODE = new
PropertyDescriptor.Builder()
-.name("FILTER_MODE")
-.displayName("Filter mode")
+.name("Filter Mode")
+.displayName("Filter Mode")
.description("Specifies the strategy to apply on filtered
attributes. Either 'Remove' or 'Retain' only the matching attributes.")
.required(true)
-.allowableValues(FILTER_MODE_VALUE_RETAIN,
FILTER_MODE_VALUE_REMOVE)
+.allowableValues(FilterMode.class)
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
-.defaultValue(FILTER_MODE_VALUE_RETAIN.getValue())
+.defaultValue(FilterMode.RETAIN.getValue())
.build();
-public static final AllowableValue MATCHING_STRATEGY_VALUE_ENUMERATION =
new AllowableValue(
-"ENUMERATION",
-"Enumerate attributes",
-"Provides a set of attribute keys to filter for, separated by a
comma delimiter ','."
-);
-
-public static final AllowableValue MATCHING_STRATEGY_VALUE_REGEX = new
AllowableValue(
-"REGEX",
-"Use regular expression",
-"Provides a regular expression to match keys of attributes to
filter for."
-);
-
public static final PropertyDescriptor MATCHING_STRATEGY = new
PropertyDescriptor.Builder()
-.name("MATCHING_STRATEGY")
-.displayName("Attribute matching strategy")
+.name("Attribute Matching Strategy")
+.displayName("Attribute Matching Strategy")
.description("Specifies the strategy to filter
(nifi) 06/06: NIFI-12466 Upgraded MongoDB Driver from 4.10.2 to 4.11.1
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 commit b13e41ebbad9f739cf98cf2876f29b5b91f0be54 Author: mr1716 AuthorDate: Mon Dec 4 10:25:14 2023 -0500 NIFI-12466 Upgraded MongoDB Driver from 4.10.2 to 4.11.1 This closes #8118 Signed-off-by: David Handermann (cherry picked from commit d1c7e6c6b8d176d026a33f15eca277ef8c20b81a) --- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index a76fec0427..9535e48e2c 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -36,7 +36,7 @@ -4.10.2 +4.11.1
(nifi) 04/06: NIFI-12463 Upgraded maven-artifact from 3.8.5 to 3.8.8
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 commit 0101bf8f176d0d2f5ca29bd559952549a657e491 Author: mr1716 AuthorDate: Mon Dec 4 09:45:29 2023 -0500 NIFI-12463 Upgraded maven-artifact from 3.8.5 to 3.8.8 This closes #8115 Signed-off-by: David Handermann (cherry picked from commit 29dda4208a47c15476363f09911a4cc6bf4cd362) --- .../nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index 8f679b7a08..322a59236a 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -164,7 +164,7 @@ org.apache.maven maven-artifact -3.8.5 +3.8.8 test
(nifi) 05/06: NIFI-12465 Upgraded mysql-binlog-connector-java from 0.28.1 to 0.28.3
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 commit 9d1a8c5556b377584ee2d735b3be567b6ed79075 Author: mr1716 AuthorDate: Mon Dec 4 10:05:27 2023 -0500 NIFI-12465 Upgraded mysql-binlog-connector-java from 0.28.1 to 0.28.3 This closes #8117 Signed-off-by: David Handermann (cherry picked from commit d6bac808ba8aa13272eab6df00a0e332a74175aa) --- .../nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml index 7897c91d10..a1e5a4a010 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml @@ -41,7 +41,7 @@ language governing permissions and limitations under the License. --> com.zendesk mysql-binlog-connector-java -0.28.1 +0.28.3 org.apache.nifi
(nifi) 01/06: NIFI-12455 Upgraded JAXB Runtime from 2.3.8 to 2.3.9
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 commit a1cf0787186a2cd8a4fcd8672342991bb72e649a Author: mr1716 AuthorDate: Sat Dec 2 10:18:09 2023 -0500 NIFI-12455 Upgraded JAXB Runtime from 2.3.8 to 2.3.9 This closes #8106 Signed-off-by: David Handermann (cherry picked from commit 30c139000ceeb495c82e04be011ff8c197852977) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb8e0c8cea..15db8dbbf5 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 9.4.53.v20231009 2.15.3 1.11.3 -2.3.8 +2.3.9 1.3.2 2.3.3 2.4.11
(nifi) 03/06: NIFI-12461 Upgraded jsoup from 1.16.2 to 1.17.1
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 commit e5ce57d7637f6e89be62d86bd254d0b257f27856 Author: mr1716 AuthorDate: Mon Dec 4 09:42:33 2023 -0500 NIFI-12461 Upgraded jsoup from 1.16.2 to 1.17.1 This closes #8113 Signed-off-by: David Handermann (cherry picked from commit d180ff936693a3fbdd3fdce025d771eea3640cb0) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15db8dbbf5..794eae327f 100644 --- a/pom.xml +++ b/pom.xml @@ -682,7 +682,7 @@ org.jsoup jsoup -1.16.2 +1.17.1 com.github.ben-manes.caffeine
(nifi) branch support/nifi-1.x updated (60fe794906 -> b13e41ebba)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 60fe794906 NIFI-12450 This closes #8103. Added Deprecation Warning for Bootstrap Notifications new a1cf078718 NIFI-12455 Upgraded JAXB Runtime from 2.3.8 to 2.3.9 new edafb452bc NIFI-12460 Upgraded OpenCSV from 5.8 to 5.9 new e5ce57d763 NIFI-12461 Upgraded jsoup from 1.16.2 to 1.17.1 new 0101bf8f17 NIFI-12463 Upgraded maven-artifact from 3.8.5 to 3.8.8 new 9d1a8c5556 NIFI-12465 Upgraded mysql-binlog-connector-java from 0.28.1 to 0.28.3 new b13e41ebba NIFI-12466 Upgraded MongoDB Driver from 4.10.2 to 4.11.1 The 6 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-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml | 2 +- .../nifi-elasticsearch-client-service/pom.xml | 2 +- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
(nifi) 02/06: NIFI-12460 Upgraded OpenCSV from 5.8 to 5.9
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 commit edafb452bcf9c2a5529a89c0dfa3f8401888d3b8 Author: mr1716 AuthorDate: Mon Dec 4 09:36:45 2023 -0500 NIFI-12460 Upgraded OpenCSV from 5.8 to 5.9 This closes #8112 Signed-off-by: David Handermann (cherry picked from commit 53f932bdecdfb2e0c819dbd603a0ef53e94b84fa) --- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index 33bb505a41..4d0de05534 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -125,7 +125,7 @@ com.opencsv opencsv -5.8 +5.9 commons-logging
(nifi) 06/06: NIFI-12466 Upgraded MongoDB Driver from 4.10.2 to 4.11.1
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 commit d1c7e6c6b8d176d026a33f15eca277ef8c20b81a Author: mr1716 AuthorDate: Mon Dec 4 10:25:14 2023 -0500 NIFI-12466 Upgraded MongoDB Driver from 4.10.2 to 4.11.1 This closes #8118 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index cc0cafc909..ec8c5d05bb 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -36,7 +36,7 @@ -4.10.2 +4.11.1
(nifi) 04/06: NIFI-12463 Upgraded maven-artifact from 3.8.5 to 3.8.8
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 commit 29dda4208a47c15476363f09911a4cc6bf4cd362 Author: mr1716 AuthorDate: Mon Dec 4 09:45:29 2023 -0500 NIFI-12463 Upgraded maven-artifact from 3.8.5 to 3.8.8 This closes #8115 Signed-off-by: David Handermann --- .../nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index bb081768fb..0db055191b 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -155,7 +155,7 @@ org.apache.maven maven-artifact -3.8.5 +3.8.8 test
(nifi) 02/06: NIFI-12460 Upgraded OpenCSV from 5.8 to 5.9
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 commit 53f932bdecdfb2e0c819dbd603a0ef53e94b84fa Author: mr1716 AuthorDate: Mon Dec 4 09:36:45 2023 -0500 NIFI-12460 Upgraded OpenCSV from 5.8 to 5.9 This closes #8112 Signed-off-by: David Handermann --- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index d77c87ec1f..dd5ee61502 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -141,7 +141,7 @@ com.opencsv opencsv -5.8 +5.9 commons-logging
(nifi) 03/06: NIFI-12461 Upgraded jsoup from 1.16.2 to 1.17.1
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 commit d180ff936693a3fbdd3fdce025d771eea3640cb0 Author: mr1716 AuthorDate: Mon Dec 4 09:42:33 2023 -0500 NIFI-12461 Upgraded jsoup from 1.16.2 to 1.17.1 This closes #8113 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37cedfdba3..322a9044e3 100644 --- a/pom.xml +++ b/pom.xml @@ -706,7 +706,7 @@ org.jsoup jsoup -1.16.2 +1.17.1 com.github.ben-manes.caffeine
(nifi) branch main updated (456cf7d88d -> d1c7e6c6b8)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 456cf7d88d NIFI-12451 This closes #8104. Removed Bootstrap Notification Services new 30c139000c NIFI-12455 Upgraded JAXB Runtime from 2.3.8 to 2.3.9 new 53f932bdec NIFI-12460 Upgraded OpenCSV from 5.8 to 5.9 new d180ff9366 NIFI-12461 Upgraded jsoup from 1.16.2 to 1.17.1 new 29dda4208a NIFI-12463 Upgraded maven-artifact from 3.8.5 to 3.8.8 new d6bac808ba NIFI-12465 Upgraded mysql-binlog-connector-java from 0.28.1 to 0.28.3 new d1c7e6c6b8 NIFI-12466 Upgraded MongoDB Driver from 4.10.2 to 4.11.1 The 6 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-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml | 2 +- .../nifi-elasticsearch-client-service/pom.xml | 2 +- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
(nifi) 01/06: NIFI-12455 Upgraded JAXB Runtime from 2.3.8 to 2.3.9
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 commit 30c139000ceeb495c82e04be011ff8c197852977 Author: mr1716 AuthorDate: Sat Dec 2 10:18:09 2023 -0500 NIFI-12455 Upgraded JAXB Runtime from 2.3.8 to 2.3.9 This closes #8106 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2027ae1da2..37cedfdba3 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ 10.0.18 2.15.3 1.11.3 -2.3.8 +2.3.9 1.3.2 2.3.3 2.4.11
(nifi) 05/06: NIFI-12465 Upgraded mysql-binlog-connector-java from 0.28.1 to 0.28.3
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 commit d6bac808ba8aa13272eab6df00a0e332a74175aa Author: mr1716 AuthorDate: Mon Dec 4 10:05:27 2023 -0500 NIFI-12465 Upgraded mysql-binlog-connector-java from 0.28.1 to 0.28.3 This closes #8117 Signed-off-by: David Handermann --- .../nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml index cf51a55def..de27787488 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml @@ -39,7 +39,7 @@ language governing permissions and limitations under the License. --> com.zendesk mysql-binlog-connector-java -0.28.1 +0.28.3 org.apache.nifi
(nifi) branch support/nifi-1.x updated: NIFI-12450 This closes #8103. Added Deprecation Warning for Bootstrap Notifications
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 60fe794906 NIFI-12450 This closes #8103. Added Deprecation Warning for
Bootstrap Notifications
60fe794906 is described below
commit 60fe7949067764f27ae898a7335aed569f64097c
Author: exceptionfactory
AuthorDate: Fri Dec 1 20:31:18 2023 -0600
NIFI-12450 This closes #8103. Added Deprecation Warning for Bootstrap
Notifications
Signed-off-by: Joseph Witt
---
nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index 586b6fc53a..ee5c193f04 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -419,6 +419,7 @@ public class RunNiFi {
defaultLogger.info("Registered no Notification Services for
Notification Type {}", type);
return;
}
+deprecationLogger.warn("Bootstrap Notification Services are deprecated
[{}]", serviceIds);
int registered = 0;
for (final String id : serviceIds.split(",")) {
(nifi) branch main updated: NIFI-12457: Added additional use case based documentation and fixed some typos/made some clarifications in related docs
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 283abadf97 NIFI-12457: Added additional use case based documentation
and fixed some typos/made some clarifications in related docs
283abadf97 is described below
commit 283abadf97abbf2ecef38140511661a84a343c37
Author: Mark Payne
AuthorDate: Sun Dec 3 16:07:56 2023 -0500
NIFI-12457: Added additional use case based documentation and fixed some
typos/made some clarifications in related docs
Signed-off-by: Pierre Villard
This closes #8108.
---
.../nifi/processors/aws/s3/FetchS3Object.java | 57 ++
.../nifi/processors/standard/PartitionRecord.java | 2 +-
.../nifi/processors/standard/RouteOnAttribute.java | 46 +++--
.../nifi/processors/standard/UpdateRecord.java | 23 -
4 files changed, 111 insertions(+), 17 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
index 7a99ed3cfa..c0cae164b8 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
@@ -129,6 +129,63 @@ import java.util.concurrent.TimeUnit;
)
}
)
+@MultiProcessorUseCase(
+description = "Retrieve only files from S3 that meet some specified
criteria",
+keywords = {"s3", "state", "retrieve", "filter", "select", "fetch",
"criteria"},
+configurations = {
+@ProcessorConfiguration(
+processorClass = ListS3.class,
+configuration = """
+The "Bucket" property should be set to the name of the S3
bucket that files reside in. If the flow being built is to be reused elsewhere,
it's a good idea to parameterize \
+this property by setting it to something like
`#{S3_SOURCE_BUCKET}`.
+The "Region" property must be set to denote the S3 region that
the Bucket resides in. If the flow being built is to be reused elsewhere, it's
a good idea to parameterize \
+this property by setting it to something like
`#{S3_SOURCE_REGION}`.
+
+The "AWS Credentials Provider service" property should specify
an instance of the AWSCredentialsProviderControllerService in order to provide
credentials for accessing the bucket.
+
+The 'success' Relationship of this Processor is then connected
to RouteOnAttribute.
+"""
+),
+@ProcessorConfiguration(
+processorClassName =
"org.apache.nifi.processors.standard.RouteOnAttribute",
+configuration = """
+If you would like to "OR" together all of the conditions
(i.e., the file should be retrieved if any of the conditions are met), \
+set "Routing Strategy" to "Route to 'matched' if any matches".
+If you would like to "AND" together all of the conditions
(i.e., the file should only be retrieved if all of the conditions are met), \
+set "Routing Strategy" to "Route to 'matched' if all match".
+
+For each condition that you would like to filter on, add a new
property. The name of the property should describe the condition. \
+The value of the property should be an Expression Language
expression that returns `true` if the file meets the condition or `false` \
+if the file does not meet the condition.
+
+Some attributes that you may consider filtering on are:
+- `filename` (the name of the file)
+- `s3.length` (the number of bytes in the file)
+- `s3.tag.` (the value of the s3 tag with the name
`tag name`)
+- `s3.user.metadata.` (the value of the user
metadata with the key named `key name`)
+
+For example, to fetch only files that are at least 1 MB and
have a filename ending in `.zip` we would set the following properties:
+- "Routing Strategy" = "Route to 'matched' if all match"
+- "At least 1 MB" = "${s3.length:ge(100)}"
+- "Ends in .zip" = "${filename:endsWith('.zip')}"
+
+Auto-terminate the `unmatched` Relationship.
+Connect the `matched` Relationship to the FetchS3Object
processor.
+"""
+),
+@ProcessorConfiguration(
+processorClass = FetchS3Object.class,
+configuration = """
+"Bucket" = "${s3.bucket}"
+"Object
(nifi) branch main updated: NIFI-12458: Upgrade Groovy to 4.0.16 from 4.0.15
This is an automated email from the ASF dual-hosted git repository. pvillard 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 4f26b93615 NIFI-12458: Upgrade Groovy to 4.0.16 from 4.0.15 4f26b93615 is described below commit 4f26b9361554d5aa5f052c02ce5ac74ae7b5820e Author: Matt Burgess AuthorDate: Sun Dec 3 18:23:11 2023 -0500 NIFI-12458: Upgrade Groovy to 4.0.16 from 4.0.15 Signed-off-by: Pierre Villard This closes #8110. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc24a67d59..2027ae1da2 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ 1.3.2 2.3.3 2.4.11 -4.0.15 +4.0.16 3.1.2 3.3.6 1.2.1
