[nifi] branch support/nifi-1.x updated: NIFI-12215 Upgraded ZooKeeper from 3.9.0 to 3.9.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 The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new 1647682709 NIFI-12215 Upgraded ZooKeeper from 3.9.0 to 3.9.1 1647682709 is described below commit 1647682709eae4fbe2f3728916c6abee5f8aeaea Author: Joseph Witt AuthorDate: Wed Oct 11 19:28:16 2023 -0500 NIFI-12215 Upgraded ZooKeeper from 3.9.0 to 3.9.1 - Resolves CVE-2023-44981 This closes #7872 Signed-off-by: David Handermann (cherry picked from commit 2bcdcab5dd6dfb03924db8b4450c3b755315dbb9) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88d364fa13..a55265fcc2 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 5.8.7 1.6.11 2.2.224 -3.9.0 +3.9.1 2.9.3
[nifi] branch main updated: NIFI-12215 Upgraded ZooKeeper from 3.9.0 to 3.9.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 The following commit(s) were added to refs/heads/main by this push: new 2bcdcab5dd NIFI-12215 Upgraded ZooKeeper from 3.9.0 to 3.9.1 2bcdcab5dd is described below commit 2bcdcab5dd6dfb03924db8b4450c3b755315dbb9 Author: Joseph Witt AuthorDate: Wed Oct 11 17:28:16 2023 -0700 NIFI-12215 Upgraded ZooKeeper from 3.9.0 to 3.9.1 - Resolves CVE-2023-44981 This closes #7872 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca72f96693..91943c70f6 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 5.8.7 1.6.11 2.2.224 -3.9.0 +3.9.1 3.1.8
[nifi] branch support/nifi-1.x updated: NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style
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 ac435ed7a1 NIFI-12214 This closes #7869. ConsumeElasticsearch Query
Builder properties do not dependOn the Query Definition Style
ac435ed7a1 is described below
commit ac435ed7a18fe1266fed97dfae2864b3ce9123ac
Author: Chris Sampson
AuthorDate: Wed Oct 11 21:00:09 2023 +0100
NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties
do not dependOn the Query Definition Style
Signed-off-by: Joseph Witt
---
.../apache/nifi/components/PropertyDescriptor.java | 30
.../nifi/components/TestPropertyDescriptor.java| 33 ++
.../elasticsearch/ConsumeElasticsearch.java| 32 +
.../elasticsearch/ConsumeElasticsearchTest.java| 8 +++---
.../integration/AbstractElasticsearchITBase.java | 2 +-
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +--
6 files changed, 102 insertions(+), 7 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index 2e18ba9c73..f497b4123c 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -438,6 +438,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clears all Allowable Values from this Property
+ *
+ * @return the builder
+ */
+public Builder clearAllowableValues() {
+this.allowableValues = null;
+return this;
+}
+
/**
* Sets the Allowable Values for this Property
*
@@ -480,6 +490,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clear all Validators from this Property
+ *
+ * @return the builder
+ */
+public Builder clearValidators() {
+validators.clear();
+return this;
+}
+
/**
* Specifies that this property provides the identifier of a Controller
* Service that implements the given interface
@@ -632,6 +652,16 @@ public final class PropertyDescriptor implements
Comparable
return dependsOn(property, dependentValues);
}
+/**
+ * Clear all Dependencies from this Property
+ *
+ * @return the builder
+ */
+public Builder clearDependsOn() {
+this.dependencies = new HashSet<>();
+return this;
+}
+
private AllowableValue toAllowableValue(DescribedValue describedValue)
{
return new AllowableValue(describedValue.getValue(),
describedValue.getDisplayName(), describedValue.getDescription());
}
diff --git
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
index 288fbcb2ea..6d2769a145 100644
---
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
+++
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
@@ -35,6 +35,7 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -188,4 +189,36 @@ public class TestPropertyDescriptor {
// Test the literal value 'target'
assertTrue(withElNotAllowed.validate("target",
validationContext).isValid());
}
+
+@Test
+void testClearingValues() {
+final PropertyDescriptor dep1 = new PropertyDescriptor.Builder()
+.name("dep1")
+.allowableValues("delVal1")
+.build();
+
+final PropertyDescriptor pd1 = new PropertyDescriptor.Builder()
+.name("test")
+.addValidator(Validator.VALID)
+.allowableValues("val1")
+.dependsOn(dep1, "depVal1")
+.build();
+
+final PropertyDescriptor pd2 = new PropertyDescriptor.Builder()
+.fromPropertyDescriptor(pd1)
+.clearValidators()
+.clearAllowableValues()
+.clearDependsOn()
+.build();
+
+assertEquals("test",
[nifi] 02/03: NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style
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 584b3fc1652809e49f7d8f34602208ad20e6e1d0
Author: Chris Sampson
AuthorDate: Wed Oct 11 21:00:09 2023 +0100
NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties
do not dependOn the Query Definition Style
Signed-off-by: Joseph Witt
---
.../apache/nifi/components/PropertyDescriptor.java | 30
.../nifi/components/TestPropertyDescriptor.java| 33 ++
.../elasticsearch/ConsumeElasticsearch.java| 32 +
.../elasticsearch/ConsumeElasticsearchTest.java| 8 +++---
.../integration/AbstractElasticsearchITBase.java | 2 +-
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +--
6 files changed, 102 insertions(+), 7 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index be359544e4..48bc181f85 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -413,6 +413,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clears all Allowable Values from this Property
+ *
+ * @return the builder
+ */
+public Builder clearAllowableValues() {
+this.allowableValues = null;
+return this;
+}
+
/**
* Sets the Allowable Values for this Property
*
@@ -455,6 +465,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clear all Validators from this Property
+ *
+ * @return the builder
+ */
+public Builder clearValidators() {
+validators.clear();
+return this;
+}
+
/**
* Specifies that this property provides the identifier of a Controller
* Service that implements the given interface
@@ -607,6 +627,16 @@ public final class PropertyDescriptor implements
Comparable
return dependsOn(property, dependentValues);
}
+/**
+ * Clear all Dependencies from this Property
+ *
+ * @return the builder
+ */
+public Builder clearDependsOn() {
+this.dependencies = new HashSet<>();
+return this;
+}
+
private AllowableValue toAllowableValue(DescribedValue describedValue)
{
return new AllowableValue(describedValue.getValue(),
describedValue.getDisplayName(), describedValue.getDescription());
}
diff --git
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
index 7eeac9a61a..8e20a82e52 100644
---
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
+++
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
@@ -35,6 +35,7 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -188,4 +189,36 @@ public class TestPropertyDescriptor {
// Test the literal value 'target'
assertTrue(withElNotAllowed.validate("target",
validationContext).isValid());
}
+
+@Test
+void testClearingValues() {
+final PropertyDescriptor dep1 = new PropertyDescriptor.Builder()
+.name("dep1")
+.allowableValues("delVal1")
+.build();
+
+final PropertyDescriptor pd1 = new PropertyDescriptor.Builder()
+.name("test")
+.addValidator(Validator.VALID)
+.allowableValues("val1")
+.dependsOn(dep1, "depVal1")
+.build();
+
+final PropertyDescriptor pd2 = new PropertyDescriptor.Builder()
+.fromPropertyDescriptor(pd1)
+.clearValidators()
+.clearAllowableValues()
+.clearDependsOn()
+.build();
+
+assertEquals("test", pd1.getName());
+assertFalse(pd1.getValidators().isEmpty());
+assertFalse(pd1.getDependencies().isEmpty());
+assertNotNull(pd1.getAllowableValues());
+
+assertEquals("test", pd2.getName());
+assertTrue(pd2.getValidators().isEmpty());
[nifi] 03/03: NIFI-12211: This closes #7868. add Validator.VALID to username/password on TinkerpopClientService
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 1a0f509ffc4a2d0b9620d1d322807d3588deb6e4 Author: levilentz AuthorDate: Wed Oct 11 10:36:44 2023 -0700 NIFI-12211: This closes #7868. add Validator.VALID to username/password on TinkerpopClientService Signed-off-by: Joseph Witt --- .../src/main/java/org/apache/nifi/graph/TinkerpopClientService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java index f94a5ba0c5..ac01bb7a3a 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java @@ -167,6 +167,7 @@ public class TinkerpopClientService extends AbstractControllerService implements " Note: when using a remote.yaml file, this username value (if set) will overload any " + "username set in the YAML file.") .required(false) +.addValidator(Validator.VALID) .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); @@ -178,6 +179,7 @@ public class TinkerpopClientService extends AbstractControllerService implements "password set in the YAML file") .required(false) .sensitive(true) +.addValidator(Validator.VALID) .build(); public static final PropertyDescriptor EXTRA_RESOURCE = new PropertyDescriptor.Builder()
[nifi] 01/03: NIFI-12213 This closes #7871. add nifi-utils dependency to NARs that do not use nifi-standard-services-api-nar as a parent
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 f2927525f30934c9566b0d0b400b268cac0e9297 Author: Mike Moser AuthorDate: Wed Oct 11 20:38:46 2023 + NIFI-12213 This closes #7871. add nifi-utils dependency to NARs that do not use nifi-standard-services-api-nar as a parent Signed-off-by: Joseph Witt --- .../nifi-kerberos-iaa-providers-nar/pom.xml | 5 + .../nifi-ldap-iaa-providers-nar/pom.xml | 5 + 2 files changed, 10 insertions(+) diff --git a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml index 1faa60f814..4e3519dadc 100644 --- a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml +++ b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/nifi-kerberos-iaa-providers-nar/pom.xml @@ -37,6 +37,11 @@ nifi-security-utils-api compile + +org.apache.nifi +nifi-utils +compile + nifi-kerberos-iaa-providers-nar \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml index 0180c97403..44c47bfdb9 100644 --- a/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml +++ b/nifi-nar-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers-nar/pom.xml @@ -37,6 +37,11 @@ nifi-security-utils-api compile + +org.apache.nifi +nifi-utils +compile + nifi-ldap-iaa-providers-nar \ No newline at end of file
[nifi] branch main updated (9627c4c0e8 -> 1a0f509ffc)
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 9627c4c0e8 NIFI-12174 Upgraded AWS PutLambda Processor to SDK 2 new f2927525f3 NIFI-12213 This closes #7871. add nifi-utils dependency to NARs that do not use nifi-standard-services-api-nar as a parent new 584b3fc165 NIFI-12214 This closes #7869. ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style new 1a0f509ffc NIFI-12211: This closes #7868. add Validator.VALID to username/password on TinkerpopClientService 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: .../apache/nifi/components/PropertyDescriptor.java | 30 .../nifi/components/TestPropertyDescriptor.java| 33 ++ .../elasticsearch/ConsumeElasticsearch.java| 32 + .../elasticsearch/ConsumeElasticsearchTest.java| 8 +++--- .../integration/AbstractElasticsearchITBase.java | 2 +- nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +-- .../apache/nifi/graph/TinkerpopClientService.java | 2 ++ .../nifi-kerberos-iaa-providers-nar/pom.xml| 5 .../nifi-ldap-iaa-providers-nar/pom.xml| 5 9 files changed, 114 insertions(+), 7 deletions(-)
[nifi] branch main updated: NIFI-12174 Upgraded AWS PutLambda Processor to SDK 2
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 9627c4c0e8 NIFI-12174 Upgraded AWS PutLambda Processor to SDK 2 9627c4c0e8 is described below commit 9627c4c0e85403c8da18c1a9a6910aa71f656bca Author: Joe Gresock AuthorDate: Fri Oct 6 14:33:23 2023 -0400 NIFI-12174 Upgraded AWS PutLambda Processor to SDK 2 This closes #7851 Signed-off-by: David Handermann --- .../nifi-aws-abstract-processors/pom.xml | 8 +- .../nifi/processors/aws/lambda/PutLambda.java | 106 ++--- .../nifi/processors/aws/lambda/ITPutLambda.java| 4 +- .../nifi/processors/aws/lambda/TestPutLambda.java | 49 ++ 4 files changed, 84 insertions(+), 83 deletions(-) diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml index 95bef9c10f..470e9136ac 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml @@ -47,6 +47,10 @@ software.amazon.awssdk kinesis + +software.amazon.awssdk +lambda + software.amazon.awssdk sns @@ -88,10 +92,6 @@ org.slf4j jcl-over-slf4j - -com.amazonaws -aws-java-sdk-lambda - com.amazonaws aws-java-sdk-s3 diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java index a88ace107e..4a1c0ddc20 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java @@ -16,22 +16,6 @@ */ package org.apache.nifi.processors.aws.lambda; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.ClientConfiguration; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.client.builder.AwsClientBuilder; -import com.amazonaws.regions.Region; -import com.amazonaws.services.lambda.AWSLambdaClient; -import com.amazonaws.services.lambda.model.InvalidParameterValueException; -import com.amazonaws.services.lambda.model.InvalidRequestContentException; -import com.amazonaws.services.lambda.model.InvocationType; -import com.amazonaws.services.lambda.model.InvokeRequest; -import com.amazonaws.services.lambda.model.InvokeResult; -import com.amazonaws.services.lambda.model.LogType; -import com.amazonaws.services.lambda.model.RequestTooLargeException; -import com.amazonaws.services.lambda.model.ResourceNotFoundException; -import com.amazonaws.services.lambda.model.TooManyRequestsException; -import com.amazonaws.services.lambda.model.UnsupportedMediaTypeException; import com.amazonaws.util.Base64; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.annotation.behavior.InputRequirement; @@ -46,10 +30,22 @@ import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.ProcessSession; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.nifi.processors.aws.AbstractAWSCredentialsProviderProcessor; +import org.apache.nifi.processors.aws.v2.AbstractAwsSyncProcessor; +import software.amazon.awssdk.awscore.exception.AwsServiceException; +import software.amazon.awssdk.core.SdkBytes; +import software.amazon.awssdk.services.lambda.LambdaClient; +import software.amazon.awssdk.services.lambda.LambdaClientBuilder; +import software.amazon.awssdk.services.lambda.model.InvalidParameterValueException; +import software.amazon.awssdk.services.lambda.model.InvalidRequestContentException; +import software.amazon.awssdk.services.lambda.model.InvocationType; +import software.amazon.awssdk.services.lambda.model.InvokeRequest; +import software.amazon.awssdk.services.lambda.model.InvokeResponse; +import software.amazon.awssdk.services.lambda.model.LogType; +import software.amazon.awssdk.services.lambda.model.RequestTooLargeException; +import software.amazon.awssdk.services.lambda.model.ResourceNotFoundException; +import software.amazon.awssdk.services.lambda.model.TooManyRequestsException; +import software.amazon.awssdk.services.lambda.model.UnsupportedMediaTypeException; -import java.io.ByteArrayOutputStream; -import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.HashMap; import java.util.List; @@ -70,10 +66,10 @@ import
[nifi] branch NIFI-12214 deleted (was 2282a96c61)
This is an automated email from the ASF dual-hosted git repository. chriss pushed a change to branch NIFI-12214 in repository https://gitbox.apache.org/repos/asf/nifi.git was 2282a96c61 NIFI-12214 ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style This change permanently discards the following revisions: discard 2282a96c61 NIFI-12214 ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style
[nifi] 01/01: NIFI-12214 ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style
This is an automated email from the ASF dual-hosted git repository.
chriss pushed a commit to branch NIFI-12214
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 2282a96c615ca8191b17bdd7d4fbdc1a4545dea2
Author: Chris Sampson
AuthorDate: Wed Oct 11 21:00:09 2023 +0100
NIFI-12214 ConsumeElasticsearch Query Builder properties do not dependOn
the Query Definition Style
---
.../apache/nifi/components/PropertyDescriptor.java | 30
.../nifi/components/TestPropertyDescriptor.java| 33 ++
.../elasticsearch/ConsumeElasticsearch.java| 32 +
.../elasticsearch/ConsumeElasticsearchTest.java| 8 +++---
.../integration/AbstractElasticsearchITBase.java | 2 +-
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 4 +--
6 files changed, 102 insertions(+), 7 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index be359544e4..48bc181f85 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -413,6 +413,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clears all Allowable Values from this Property
+ *
+ * @return the builder
+ */
+public Builder clearAllowableValues() {
+this.allowableValues = null;
+return this;
+}
+
/**
* Sets the Allowable Values for this Property
*
@@ -455,6 +465,16 @@ public final class PropertyDescriptor implements
Comparable
return this;
}
+/**
+ * Clear all Validators from this Property
+ *
+ * @return the builder
+ */
+public Builder clearValidators() {
+validators.clear();
+return this;
+}
+
/**
* Specifies that this property provides the identifier of a Controller
* Service that implements the given interface
@@ -607,6 +627,16 @@ public final class PropertyDescriptor implements
Comparable
return dependsOn(property, dependentValues);
}
+/**
+ * Clear all Dependencies from this Property
+ *
+ * @return the builder
+ */
+public Builder clearDependsOn() {
+this.dependencies = new HashSet<>();
+return this;
+}
+
private AllowableValue toAllowableValue(DescribedValue describedValue)
{
return new AllowableValue(describedValue.getValue(),
describedValue.getDisplayName(), describedValue.getDescription());
}
diff --git
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
index 7eeac9a61a..8e20a82e52 100644
---
a/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
+++
b/nifi-api/src/test/java/org/apache/nifi/components/TestPropertyDescriptor.java
@@ -35,6 +35,7 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
@@ -188,4 +189,36 @@ public class TestPropertyDescriptor {
// Test the literal value 'target'
assertTrue(withElNotAllowed.validate("target",
validationContext).isValid());
}
+
+@Test
+void testClearingValues() {
+final PropertyDescriptor dep1 = new PropertyDescriptor.Builder()
+.name("dep1")
+.allowableValues("delVal1")
+.build();
+
+final PropertyDescriptor pd1 = new PropertyDescriptor.Builder()
+.name("test")
+.addValidator(Validator.VALID)
+.allowableValues("val1")
+.dependsOn(dep1, "depVal1")
+.build();
+
+final PropertyDescriptor pd2 = new PropertyDescriptor.Builder()
+.fromPropertyDescriptor(pd1)
+.clearValidators()
+.clearAllowableValues()
+.clearDependsOn()
+.build();
+
+assertEquals("test", pd1.getName());
+assertFalse(pd1.getValidators().isEmpty());
+assertFalse(pd1.getDependencies().isEmpty());
+assertNotNull(pd1.getAllowableValues());
+
+assertEquals("test", pd2.getName());
+assertTrue(pd2.getValidators().isEmpty());
+
[nifi] branch NIFI-12214 created (now 2282a96c61)
This is an automated email from the ASF dual-hosted git repository. chriss pushed a change to branch NIFI-12214 in repository https://gitbox.apache.org/repos/asf/nifi.git at 2282a96c61 NIFI-12214 ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style This branch includes the following new commits: new 2282a96c61 NIFI-12214 ConsumeElasticsearch Query Builder properties do not dependOn the Query Definition Style The 1 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.
[nifi] branch support/nifi-1.x updated: NIFI-12207 Upgraded Netty from 4.1.99 to 4.1.100
This is an automated email from the ASF dual-hosted git repository. pvillard 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 9caca92a83 NIFI-12207 Upgraded Netty from 4.1.99 to 4.1.100 9caca92a83 is described below commit 9caca92a83647700c1da83c071dd872cae76cd1d Author: exceptionfactory AuthorDate: Wed Oct 11 08:30:41 2023 -0500 NIFI-12207 Upgraded Netty from 4.1.99 to 4.1.100 Signed-off-by: Pierre Villard This closes #7865. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 811bf3ef42..88d364fa13 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 1.3.11 3.10.6.Final 2.2 -4.1.99.Final +4.1.100.Final 5.3.30 5.8.7 1.6.11
[nifi] branch main updated: NIFI-12207 Upgraded Netty from 4.1.99 to 4.1.100
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 1b57980067 NIFI-12207 Upgraded Netty from 4.1.99 to 4.1.100 1b57980067 is described below commit 1b57980067416187dd068adc35e9577bca3dbb8b Author: exceptionfactory AuthorDate: Wed Oct 11 08:30:41 2023 -0500 NIFI-12207 Upgraded Netty from 4.1.99 to 4.1.100 Signed-off-by: Pierre Villard This closes #7865. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 627c3bb727..ca72f96693 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 5.5.0 3.10.6.Final 2.2 -4.1.99.Final +4.1.100.Final 5.3.30 5.8.7 1.6.11
[nifi] branch main updated: NIFI-12208 Upgraded Jetty from 10.0.16 to 10.0.17
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 b236200a84 NIFI-12208 Upgraded Jetty from 10.0.16 to 10.0.17 b236200a84 is described below commit b236200a84991559823954165484df9de2bf9d79 Author: exceptionfactory AuthorDate: Wed Oct 11 08:38:00 2023 -0500 NIFI-12208 Upgraded Jetty from 10.0.16 to 10.0.17 Signed-off-by: Pierre Villard This closes #7866. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0519da9786..627c3bb727 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ 2.0.9 10.16.1.1 2.4.0 -10.0.16 +10.0.17 2.15.2 1.11.3 2.3.8
[nifi] branch support/nifi-1.x updated: NIFI-12209 Upgraded Jetty from 9.4.52 to 9.4.53
This is an automated email from the ASF dual-hosted git repository. pvillard 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 e7888d177c NIFI-12209 Upgraded Jetty from 9.4.52 to 9.4.53 e7888d177c is described below commit e7888d177ccbc06ae796778399730113d263fe1f Author: exceptionfactory AuthorDate: Wed Oct 11 08:41:17 2023 -0500 NIFI-12209 Upgraded Jetty from 9.4.52 to 9.4.53 Signed-off-by: Pierre Villard This closes #7867. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0a48fe3c3..811bf3ef42 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ 1.19.1 2.0.9 2.4.0 -9.4.52.v20230823 +9.4.53.v20231009 2.15.2 1.11.3 2.3.8
