(nifi) branch main updated: NIFI-13200: Do not allow 'filename' or 'path' attribute to removed from FlowFile This closes #8791
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
The following commit(s) were added to refs/heads/main by this push:
new 9cf5f947e8 NIFI-13200: Do not allow 'filename' or 'path' attribute to
removed from FlowFile This closes #8791
9cf5f947e8 is described below
commit 9cf5f947e8dda4b57cf1eb4c429a8c1159af341a
Author: Mark Payne
AuthorDate: Thu May 9 16:37:28 2024 -0400
NIFI-13200: Do not allow 'filename' or 'path' attribute to removed from
FlowFile
This closes #8791
Signed-off-by: Joseph Witt
---
.../repository/StandardProcessSession.java | 83 --
1 file changed, 47 insertions(+), 36 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 64ef1c5aff..5d6dc605ba 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -16,40 +16,6 @@
*/
package org.apache.nifi.controller.repository;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.Closeable;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.components.state.StateMap;
@@ -104,6 +70,41 @@ import org.apache.nifi.util.FormatUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
/**
*
* Provides a ProcessSession that ensures all accesses, changes and transfers
@@ -116,6 +117,12 @@ import org.slf4j.LoggerFactory;
*
*/
public class StandardProcessSession implements ProcessSession,
ProvenanceEventEnricher {
+private static final Set REQUIRED_ATTRIBUTES = Set.of(
+CoreAttributes.UUID.key(),
+CoreAttributes.FILENAME.key(),
+CoreAttributes.PATH.key()
+);
+
private static final long VERSION_INCREMENT = 1;
private static final String INITIAL_VERSION =
String.valueOf(VERSION_INCREMENT);
private static final AtomicLong idGenerator = new AtomicLong(0L);
@@ -2271,7 +2278,7 @@ public class StandardProcessSession implements
ProcessSession, ProvenanceEventEn
verifyTaskActive();
flowFile = validateRecordState(flowFile);
-if (CoreAttributes.UUID.key().equals(key)) {
+if (REQUIRED_ATTRIBUTES.contains(key)) {
return flowFile;
}
@@ -2295,6 +2302,10 @@ public class StandardProcessSession implements
(nifi) branch main updated: NIFI-13202 Removed Accumulo Processors and Services This closes #8794.
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 The following commit(s) were added to refs/heads/main by this push: new 72b45f3114 NIFI-13202 Removed Accumulo Processors and Services This closes #8794. 72b45f3114 is described below commit 72b45f311488a40e518e97a039dd7ecc5378a3f3 Author: exceptionfactory AuthorDate: Thu May 9 15:45:16 2024 -0500 NIFI-13202 Removed Accumulo Processors and Services This closes #8794. Signed-off-by: Joseph Witt --- nifi-assembly/pom.xml | 30 - nifi-code-coverage/pom.xml | 10 - nifi-docs/src/main/asciidoc/developer-guide.adoc | 1 - .../nifi-accumulo-bundle/README.md | 23 - .../nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml | 41 -- .../nifi-accumulo-processors/pom.xml | 66 --- .../accumulo/data/AccumuloRecordConfiguration.java | 159 - .../org/apache/nifi/accumulo/data/KeySchema.java | 136 - .../accumulo/processors/BaseAccumuloProcessor.java | 86 --- .../accumulo/processors/PutAccumuloRecord.java | 658 - .../nifi/accumulo/processors/ScanAccumulo.java | 390 .../services/org.apache.nifi.processor.Processor | 16 - .../nifi-accumulo-services-api-nar/pom.xml | 40 -- .../nifi-accumulo-services-api/pom.xml | 35 -- .../controllerservices/BaseAccumuloService.java| 33 -- .../nifi-accumulo-services-nar/pom.xml | 41 -- .../nifi-accumulo-services/pom.xml | 70 --- .../controllerservices/AccumuloService.java| 324 -- .../org.apache.nifi.controller.ControllerService | 15 - .../controllerservices/TestAccumuloService.java| 214 --- .../nifi-accumulo-bundle/pom.xml | 85 --- nifi-extension-bundles/pom.xml | 1 - 22 files changed, 2474 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 6501ad0e66..e06bf20559 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -1094,36 +1094,6 @@ language governing permissions and limitations under the License. --> - -include-accumulo - - -false - -allProfiles - - - - -org.apache.nifi -nifi-accumulo-nar -2.0.0-SNAPSHOT -nar - - -org.apache.nifi -nifi-accumulo-services-api-nar -2.0.0-SNAPSHOT -nar - - -org.apache.nifi -nifi-accumulo-services-nar -2.0.0-SNAPSHOT -nar - - - targz diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index c8e3f5a23e..50e5767338 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -701,16 +701,6 @@ - -org.apache.nifi -nifi-accumulo-processors -2.0.0-SNAPSHOT - - -org.apache.nifi -nifi-accumulo-services -2.0.0-SNAPSHOT - org.apache.nifi nifi-airtable-processors diff --git a/nifi-docs/src/main/asciidoc/developer-guide.adoc b/nifi-docs/src/main/asciidoc/developer-guide.adoc index 5f6cc76a27..7dd0ddb961 100644 --- a/nifi-docs/src/main/asciidoc/developer-guide.adoc +++ b/nifi-docs/src/main/asciidoc/developer-guide.adoc @@ -2698,7 +2698,6 @@ deprecationLogger.warn( [options="header,footer"] |== | Package| Maven Profile | Description -| Apache Accumulo Bundle | include-accumulo | Adds support for https://accumulo.apache.org[Apache Accumulo]. | Apache Hadoop Bundle | include-hadoop| Adds support for Apache Hadoop with HDFS and Parquet components | Apache HBase Bundle| include-hbase | Adds support for Apache HBase | Apache IoTDB Bundle| include-iotdb | Adds support for Apache IoTDB diff --git a/nifi-extension-bundles/nifi-accumulo-bundle/README.md b/nifi-extension-bundles/nifi-accumulo-bundle/README.md deleted file mode 100644 index e431586c24..00 --- a/nifi-extension-bundles/nifi-accumulo-bundle/README.md +++ /dev/null @@ -1,23 +0,0 @@ - -# nifi-accumulo - -This is a basic NiFi->Accumulo integration. Running `mvn install` will create your NAR, which can be added -to Apache NiFi. This is
(nifi) branch support/nifi-1.x updated: NIFI-13201 Deprecated Accumulo Components for Removal This closes #8793
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 99603eb6b8 NIFI-13201 Deprecated Accumulo Components for Removal This closes #8793 99603eb6b8 is described below commit 99603eb6b8a1aacf1b30f6091a36bcbc66ec0798 Author: exceptionfactory AuthorDate: Thu May 9 00:56:59 2024 -0500 NIFI-13201 Deprecated Accumulo Components for Removal This closes #8793 Signed-off-by: Joseph Witt --- .../java/org/apache/nifi/accumulo/processors/PutAccumuloRecord.java | 2 ++ .../src/main/java/org/apache/nifi/accumulo/processors/ScanAccumulo.java | 2 ++ .../org/apache/nifi/accumulo/controllerservices/AccumuloService.java| 2 ++ 3 files changed, 6 insertions(+) diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/PutAccumuloRecord.java b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/PutAccumuloRecord.java index 07cbadc58d..6af9f6f4c4 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/PutAccumuloRecord.java +++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/PutAccumuloRecord.java @@ -37,6 +37,7 @@ import org.apache.nifi.annotation.behavior.EventDriven; 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.DeprecationNotice; import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnDisabled; import org.apache.nifi.annotation.lifecycle.OnScheduled; @@ -79,6 +80,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +@DeprecationNotice(reason = "Planned for removal in version 2.0") @EventDriven @SupportsBatching @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/ScanAccumulo.java b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/ScanAccumulo.java index 18c162eb37..0bd9282529 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/ScanAccumulo.java +++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/src/main/java/org/apache/nifi/accumulo/processors/ScanAccumulo.java @@ -31,6 +31,7 @@ import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.SupportsBatching; import org.apache.nifi.annotation.configuration.DefaultSchedule; 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.components.PropertyDescriptor; @@ -76,6 +77,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.LongAdder; +@DeprecationNotice(reason = "Planned for removal in version 2.0") @EventDriven @SupportsBatching @InputRequirement(InputRequirement.Requirement.INPUT_ALLOWED) diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/main/java/org/apache/nifi/accumulo/controllerservices/AccumuloService.java b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/main/java/org/apache/nifi/accumulo/controllerservices/AccumuloService.java index bd9f7856e4..ad664fc20c 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/main/java/org/apache/nifi/accumulo/controllerservices/AccumuloService.java +++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/main/java/org/apache/nifi/accumulo/controllerservices/AccumuloService.java @@ -26,6 +26,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading; 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.OnDisabled; import org.apache.nifi.annotation.lifecycle.OnEnabled; @@ -59,6 +60,7 @@ import java.util.Properties; * Justification: Centralizes the configuration of the connecting accumulo code. This also will be used * for any
(nifi) branch main updated: NIFI-13203: Include s3.url attribute in FetchS3Object, PutS3Object This closes #8795
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
The following commit(s) were added to refs/heads/main by this push:
new db7e073368 NIFI-13203: Include s3.url attribute in FetchS3Object,
PutS3Object This closes #8795
db7e073368 is described below
commit db7e073368eeec2a17da73f74415d64d81e55458
Author: Mark Payne
AuthorDate: Thu May 9 17:02:18 2024 -0400
NIFI-13203: Include s3.url attribute in FetchS3Object, PutS3Object
This closes #8795
Signed-off-by: Joseph Witt
---
.../java/org/apache/nifi/processors/aws/s3/FetchS3Object.java| 8
.../main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java | 8
.../java/org/apache/nifi/processors/aws/s3/ITPutS3Object.java| 9 -
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
index 21f6371c61..7d5ae411f3 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
@@ -70,6 +70,7 @@ import static
org.apache.nifi.processors.aws.util.RegionUtilV1.S3_REGION;
@Tags({"Amazon", "S3", "AWS", "Get", "Fetch"})
@CapabilityDescription("Retrieves the contents of an S3 Object and writes it
to the content of a FlowFile")
@WritesAttributes({
+@WritesAttribute(attribute = "s3.url", description = "The URL that can be
used to access the S3 object"),
@WritesAttribute(attribute = "s3.bucket", description = "The name of the
S3 bucket"),
@WritesAttribute(attribute = "path", description = "The path of the file"),
@WritesAttribute(attribute = "absolute.path", description = "The path of
the file"),
@@ -439,12 +440,11 @@ public class FetchS3Object extends AbstractS3Processor {
throw ffae;
}
-if (!attributes.isEmpty()) {
-flowFile = session.putAllAttributes(flowFile, attributes);
-}
+final String url = client.getResourceUrl(bucket, key);
+attributes.put("s3.url", url);
+flowFile = session.putAllAttributes(flowFile, attributes);
session.transfer(flowFile, REL_SUCCESS);
-final String url = client.getResourceUrl(bucket, key);
final long transferMillis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
getLogger().info("Successfully retrieved S3 Object for {} in {}
millis; routing to success", new Object[]{flowFile, transferMillis});
session.getProvenanceReporter().fetch(flowFile, url, transferMillis);
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
index 9237f4..80c3645f7d 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java
@@ -105,6 +105,7 @@ import static
org.apache.nifi.processors.transfer.ResourceTransferUtils.getFileR
expressionLanguageScope = ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
@ReadsAttribute(attribute = "filename", description = "Uses the FlowFile's
filename as the filename for the S3 object")
@WritesAttributes({
+@WritesAttribute(attribute = "s3.url", description = "The URL that can be
used to access the S3 object"),
@WritesAttribute(attribute = "s3.bucket", description = "The S3 bucket
where the Object was put in S3"),
@WritesAttribute(attribute = "s3.key", description = "The S3 key within
where the Object was put in S3"),
@WritesAttribute(attribute = "s3.contenttype", description = "The S3
content type of the S3 Object that put in S3"),
@@ -857,12 +858,11 @@ public class PutS3Object extends AbstractS3Processor {
throw e;
}
-if (!attributes.isEmpty()) {
-flowFile = session.putAllAttributes(flowFile, attributes);
-}
+final String url = s3.getResourceUrl(bucket, key);
+attributes.put("s3.url", url);
+flowFile = session.putAllAttributes(flowFile, attributes);
session.transfer(flowFile, REL_SUCCESS);
-final String url = s3.getResourceUrl(bucket, key);
final long millis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
(nifi) branch main updated: NIFI-13113: upgrade Iceberg from 1.5.0 to 1.5.2 This closes #8796
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 The following commit(s) were added to refs/heads/main by this push: new 7584a5c6f5 NIFI-13113: upgrade Iceberg from 1.5.0 to 1.5.2 This closes #8796 7584a5c6f5 is described below commit 7584a5c6f560eecb0c758c5d222a4824c0eea0dc Author: sullis AuthorDate: Thu May 9 14:30:23 2024 -0700 NIFI-13113: upgrade Iceberg from 1.5.0 to 1.5.2 This closes #8796 Signed-off-by: Joseph Witt --- nifi-extension-bundles/nifi-iceberg-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml b/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml index 70702928d4..bf7f431a36 100644 --- a/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-iceberg-bundle/pom.xml @@ -26,7 +26,7 @@ pom -1.5.0 +1.5.2 3.1.3
(nifi) branch main updated (e005d5f8c1 -> 8b2e770ebd)
This is an automated email from the ASF dual-hosted git repository. mcgilman pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from e005d5f8c1 NIFI-13195 Corrected Replicated Request Header Removal for HTTP/2 (#8789) add 8b2e770ebd NIFI-13060: Using ellipsis and normal line height in the property table (#8792) No new revisions were added by this update. Summary of changes: .../src/app/ui/common/property-table/property-table.component.html| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(nifi) branch main updated: NIFI-13195 Corrected Replicated Request Header Removal for HTTP/2 (#8789)
This is an automated email from the ASF dual-hosted git repository.
mcgilman 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 e005d5f8c1 NIFI-13195 Corrected Replicated Request Header Removal for
HTTP/2 (#8789)
e005d5f8c1 is described below
commit e005d5f8c176b6d907d5b45dd3a3b7200e42
Author: David Handermann
AuthorDate: Thu May 9 17:02:44 2024 -0500
NIFI-13195 Corrected Replicated Request Header Removal for HTTP/2 (#8789)
- Added findHeaderName method to look for header names regardless of casing
This closes #8789
---
.../replication/ThreadPoolRequestReplicator.java | 77 +++---
1 file changed, 54 insertions(+), 23 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ThreadPoolRequestReplicator.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ThreadPoolRequestReplicator.java
index 739b11ba50..6d9ec3a596 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ThreadPoolRequestReplicator.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/replication/ThreadPoolRequestReplicator.java
@@ -69,6 +69,7 @@ import java.util.List;
import java.util.LongSummaryStatistics;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
@@ -93,6 +94,9 @@ public class ThreadPoolRequestReplicator implements
RequestReplicator {
private static final Logger logger =
LoggerFactory.getLogger(ThreadPoolRequestReplicator.class);
private static final Pattern SNIPPET_URI_PATTERN =
Pattern.compile("/nifi-api/snippets/[a-f0-9\\-]{36}");
+private static final String COOKIE_HEADER = "Cookie";
+private static final String HOST_HEADER = "Host";
+
private final int maxConcurrentRequests; // maximum number of concurrent
requests
private final HttpResponseMapper responseMapper;
private final EventReporter eventReporter;
@@ -100,8 +104,8 @@ public class ThreadPoolRequestReplicator implements
RequestReplicator {
private final ClusterCoordinator clusterCoordinator;
private final NiFiProperties nifiProperties;
-private ThreadPoolExecutor executorService;
-private ScheduledExecutorService maintenanceExecutor;
+private final ThreadPoolExecutor executorService;
+private final ScheduledExecutorService maintenanceExecutor;
private final ConcurrentMap
responseMap = new ConcurrentHashMap<>();
private final ConcurrentMap
sequentialLongRequestCounts = new ConcurrentHashMap<>();
@@ -110,7 +114,7 @@ public class ThreadPoolRequestReplicator implements
RequestReplicator {
private final Lock readLock = rwLock.readLock();
private final Lock writeLock = rwLock.writeLock();
-private HttpReplicationClient httpClient;
+private final HttpReplicationClient httpClient;
/**
@@ -151,17 +155,14 @@ public class ThreadPoolRequestReplicator implements
RequestReplicator {
executorService = new ThreadPoolExecutor(maxPoolSize, maxPoolSize, 5,
TimeUnit.SECONDS, new LinkedBlockingQueue<>(), threadFactory);
executorService.allowCoreThreadTimeOut(true);
-maintenanceExecutor = Executors.newScheduledThreadPool(1, new
ThreadFactory() {
-@Override
-public Thread newThread(final Runnable r) {
-final Thread t = Executors.defaultThreadFactory().newThread(r);
-t.setDaemon(true);
-t.setName(ThreadPoolRequestReplicator.class.getSimpleName() +
" Maintenance Thread");
-return t;
-}
+maintenanceExecutor = Executors.newScheduledThreadPool(1, r -> {
+final Thread t = Executors.defaultThreadFactory().newThread(r);
+t.setDaemon(true);
+t.setName(ThreadPoolRequestReplicator.class.getSimpleName() + "
Maintenance Thread");
+return t;
});
-maintenanceExecutor.scheduleWithFixedDelay(() ->
purgeExpiredRequests(), 1, 1, TimeUnit.SECONDS);
+maintenanceExecutor.scheduleWithFixedDelay(this::purgeExpiredRequests,
1, 1, TimeUnit.SECONDS);
}
@Override
@@ -187,7 +188,7 @@ public class ThreadPoolRequestReplicator implements
RequestReplicator {
final List connecting =
stateMap.get(NodeConnectionState.CONNECTING);
if (connecting != null && !connecting.isEmpty()) {
if (connecting.size() == 1) {
-throw new ConnectingNodeMutableRequestException("Node " +
connecting.iterator().next() + " is
(nifi) branch main updated (53207a20a0 -> 1592b98298)
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 53207a20a0 NIFI-12857 Simplified implementation of QueuePrioritizer and added tests add 1592b98298 NIFI-13194 Removed InvokeAWSGatewayApi Processor No new revisions were added by this update. Summary of changes: .../aws/wag/AbstractAWSGatewayApiProcessor.java| 630 -- .../processors/aws/wag/InvokeAWSGatewayApi.java| 401 -- .../services/org.apache.nifi.processor.Processor |1 - .../aws/wag/TestInvokeAWSGatewayApiCommon.java | 1319 .../aws/wag/TestInvokeAmazonGatewayApi.java| 54 - .../aws/wag/TestInvokeAmazonGatewayApiMock.java| 214 6 files changed, 2619 deletions(-) delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/wag/AbstractAWSGatewayApiProcessor.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/wag/InvokeAWSGatewayApi.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAmazonGatewayApi.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAmazonGatewayApiMock.java
(nifi) branch support/nifi-1.x updated (dc39334b37 -> d2993b2463)
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 dc39334b37 NIFI-13181 Updated msal4j to 1.15.0 This closes #8777 add d2993b2463 NIFI-13191 Deprecated InvokeAWSGatewayApi No new revisions were added by this update. Summary of changes: .../java/org/apache/nifi/processors/aws/wag/InvokeAWSGatewayApi.java| 2 ++ 1 file changed, 2 insertions(+)
(nifi) branch main updated: NIFI-12857 Simplified implementation of QueuePrioritizer and added tests
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 53207a20a0 NIFI-12857 Simplified implementation of QueuePrioritizer
and added tests
53207a20a0 is described below
commit 53207a20a0d2692437368ffaee594ae6e796a647
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat Mar 2 00:34:07 2024 +0100
NIFI-12857 Simplified implementation of QueuePrioritizer and added tests
This closes #8466
Signed-off-by: David Handermann
---
.../nifi/controller/queue/QueuePrioritizer.java| 71 ---
.../nifi/controller/TestStandardFlowFileQueue.java | 12 +-
.../controller/queue/QueuePrioritizerTest.java | 136 +
3 files changed, 159 insertions(+), 60 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
index 7c2c1a87e5..643f8d1089 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
@@ -18,74 +18,47 @@
package org.apache.nifi.controller.queue;
import org.apache.nifi.controller.repository.FlowFileRecord;
-import org.apache.nifi.controller.repository.claim.ContentClaim;
import org.apache.nifi.flowfile.FlowFilePrioritizer;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
public class QueuePrioritizer implements Comparator,
Serializable {
private static final long serialVersionUID = 1L;
-private final transient List prioritizers = new
ArrayList<>();
+private static final Comparator penaltyComparator =
Comparator
+.comparing(FlowFileRecord::isPenalized)
+.thenComparingLong(record -> record.isPenalized() ?
record.getPenaltyExpirationMillis() : 0);
+private static final Comparator claimComparator =
Comparator
+.comparing(FlowFileRecord::getContentClaim,
Comparator.nullsFirst(Comparator.naturalOrder()))
+.thenComparingLong(FlowFileRecord::getContentClaimOffset);
+private static final Comparator idComparator =
Comparator.comparingLong(FlowFileRecord::getId);
+
+private final transient List prioritizers;
public QueuePrioritizer(final List priorities) {
-if (null != priorities) {
-prioritizers.addAll(priorities);
-}
+prioritizers = priorities == null ? List.of() :
List.copyOf(priorities);
}
@Override
public int compare(final FlowFileRecord f1, final FlowFileRecord f2) {
-int returnVal = 0;
-final boolean f1Penalized = f1.isPenalized();
-final boolean f2Penalized = f2.isPenalized();
-
-if (f1Penalized && !f2Penalized) {
-return 1;
-} else if (!f1Penalized && f2Penalized) {
-return -1;
-}
-
-if (f1Penalized && f2Penalized) {
-if (f1.getPenaltyExpirationMillis() <
f2.getPenaltyExpirationMillis()) {
-return -1;
-} else if (f1.getPenaltyExpirationMillis() >
f2.getPenaltyExpirationMillis()) {
-return 1;
-}
+final int penaltyComparisonResult = penaltyComparator.compare(f1, f2);
+if (penaltyComparisonResult != 0) {
+return penaltyComparisonResult;
}
-if (!prioritizers.isEmpty()) {
-for (final FlowFilePrioritizer prioritizer : prioritizers) {
-returnVal = prioritizer.compare(f1, f2);
-if (returnVal != 0) {
-return returnVal;
-}
+for (FlowFilePrioritizer comparator : prioritizers) {
+final int prioritizerComparisonResult = comparator.compare(f1, f2);
+if (prioritizerComparisonResult != 0) {
+return prioritizerComparisonResult;
}
}
-final ContentClaim claim1 = f1.getContentClaim();
-final ContentClaim claim2 = f2.getContentClaim();
-
-
-// put the one without a claim first
-if (claim1 == null && claim2 != null) {
-return -1;
-} else if (claim1 != null && claim2 == null) {
-return 1;
-} else if (claim1 != null && claim2 != null) {
-final int claimComparison = claim1.compareTo(claim2);
-if (claimComparison != 0) {
-return claimComparison;
-}
-
-final int claimOffsetComparison =
Long.compare(f1.getContentClaimOffset(),
(nifi) branch main updated (326df914bc -> 5a3b47353e)
This is an automated email from the ASF dual-hosted git repository. markap14 pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 326df914bc NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779) add 5a3b47353e NIFI-13146 ConsumeSlack rate limit error mitigation (#8748) No new revisions were added by this update. Summary of changes: .../apache/nifi/processors/slack/ConsumeSlack.java | 90 +++--- .../slack/consume/ConsumeSlackClient.java | 2 + .../nifi/processors/slack/TestConsumeSlack.java| 17 +++- 3 files changed, 79 insertions(+), 30 deletions(-)
(nifi) branch main updated: NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779)
This is an automated email from the ASF dual-hosted git repository. rfellows 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 326df914bc NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779) 326df914bc is described below commit 326df914bc1169267e88d3286ef27551d56d05aa Author: Matt Gilman AuthorDate: Thu May 9 14:41:06 2024 -0400 NIFI-13175: Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes (#8779) * NIFI-13175: - Updating dialog layout and sizes to prevent a double scroll bar on smaller screen sizes. Now the dialog content is set to 50vh and content scrolls as needed. * NIFI-13175: - Removing some unneeded padding. * NIFI-13175: - Fixing double scroll bar issues in non tabbed dialogs. * NIFI-13175: - Fixing double scroll bar issues in more non tabbed dialogs. * NIFI-13175: - Renaming dialog content style in status history to avoid conflicting with new general style. This closes #8779 --- .../action-details/action-details.component.scss | 11 +- .../create-connection.component.html | 22 +- .../create-connection.component.scss | 10 - .../edit-connection/edit-connection.component.html | 22 +- .../edit-connection/edit-connection.component.scss | 10 - .../change-version-dialog.html | 6 +- .../local-changes-dialog/local-changes-dialog.html | 2 +- .../local-changes-table/local-changes-table.html | 4 +- .../label/edit-label/edit-label.component.html | 2 +- .../edit-process-group.component.html | 22 +- .../edit-process-group.component.scss | 10 - .../edit-processor/edit-processor.component.html | 48 +-- .../edit-processor/edit-processor.component.scss | 10 - .../create-remote-process-group.component.html | 2 +- .../edit-remote-process-group.component.html | 6 +- .../edit-parameter-context.component.html | 32 +- .../edit-parameter-context.component.scss | 15 - .../parameter-table/parameter-table.component.html | 6 +- .../flowfile-dialog/flowfile-dialog.component.html | 70 ++-- .../flowfile-dialog/flowfile-dialog.component.scss | 17 +- .../edit-flow-analysis-rule.component.html | 32 +- .../edit-flow-analysis-rule.component.scss | 10 - .../edit-parameter-provider.component.html | 35 +- .../edit-parameter-provider.component.scss | 10 - ...ch-parameter-provider-parameters.component.html | 2 +- ...ch-parameter-provider-parameters.component.scss | 10 - .../edit-registry-client.component.html| 24 +- .../edit-registry-client.component.scss| 10 - .../edit-reporting-task.component.html | 32 +- .../edit-reporting-task.component.scss | 10 - .../cluster-summary-dialog.component.html | 6 +- .../cluster-summary-dialog.component.scss | 17 +- .../connection-cluster-table.component.html| 4 +- .../port-cluster-table.component.html | 4 +- .../process-group-cluster-table.component.html | 4 +- .../processor-cluster-table.component.html | 4 +- ...mote-process-group-cluster-table.component.html | 4 +- .../user-access-policies.component.html| 6 +- .../component-state/component-state.component.html | 80 +++-- .../disable-controller-service.component.scss | 5 - .../edit-controller-service.component.html | 32 +- .../edit-controller-service.component.scss | 10 - .../enable-controller-service.component.scss | 5 - .../extension-creation.component.html | 144 .../property-table/property-table.component.html | 6 +- .../provenance-event-dialog.component.html | 81 +++-- .../provenance-event-dialog.component.scss | 15 +- .../status-history-chart.component.ts | 4 +- .../status-history/status-history.component.html | 2 +- .../system-diagnostics-dialog.component.html | 398 +++-- .../system-diagnostics-dialog.component.scss | 9 +- .../src/main/nifi/src/assets/styles/_app.scss | 9 + 52 files changed, 618 insertions(+), 733 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss index e54ff14552..41941962bd 100644 ---
(nifi) branch main updated: NIFI-13105 Implemented FlowRegistryClient using GitHub for versioning
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 7cd1a30948 NIFI-13105 Implemented FlowRegistryClient using GitHub for
versioning
7cd1a30948 is described below
commit 7cd1a30948638c1fec113a47c835cb991a3a44fb
Author: Bryan Bende
AuthorDate: Tue Jan 30 17:29:31 2024 -0500
NIFI-13105 Implemented FlowRegistryClient using GitHub for versioning
This closes #8765
Signed-off-by: David Handermann
---
.../nifi/registry/flow/FlowRegistryClient.java | 14 +-
nifi-assembly/pom.xml | 6 +
.../nifi-github-extensions/pom.xml | 43 ++
.../apache/nifi/github/FlowSnapshotSerializer.java | 34 ++
.../nifi/github/GitHubAuthenticationType.java | 29 +
.../nifi/github/GitHubCreateContentRequest.java| 101 +++
.../nifi/github/GitHubFlowRegistryClient.java | 677 +
.../apache/nifi/github/GitHubRepositoryClient.java | 471 ++
.../nifi/github/JacksonFlowSnapshotSerializer.java | 58 ++
.../nifi/github/VersionedComponentModule.java | 64 ++
...rg.apache.nifi.registry.flow.FlowRegistryClient | 15 +
.../nifi/github/GitHubFlowRegistryClientTest.java | 202 ++
.../nifi-github-bundle/nifi-github-nar/pom.xml | 42 ++
nifi-extension-bundles/nifi-github-bundle/pom.xml | 36 ++
nifi-extension-bundles/pom.xml | 1 +
.../flow/FlowAnalyzingRegistryClientNode.java | 5 +
.../flow/StandardFlowRegistryClientNode.java | 7 +-
.../nifi/registry/flow/FlowRegistryClientNode.java | 2 +
.../apache/nifi/web/StandardNiFiServiceFacade.java | 10 +-
.../org/apache/nifi/web/api/VersionsResource.java | 2 +-
.../nifi/web/dao/impl/StandardFlowRegistryDAO.java | 7 +-
21 files changed, 1817 insertions(+), 9 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
b/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
index 749e5b880f..4436c55ef7 100644
---
a/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
+++
b/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
@@ -21,6 +21,7 @@ import org.apache.nifi.components.ConfigurableComponent;
import java.io.IOException;
import java.util.Optional;
import java.util.Set;
+import java.util.UUID;
/**
*
@@ -146,7 +147,7 @@ public interface FlowRegistryClient extends
ConfigurableComponent {
FlowRegistryBucket getBucket(FlowRegistryClientConfigurationContext
context, BucketLocation bucketLocation) throws FlowRegistryException,
IOException;
/**
- * Registers the given RegisteredFlow into the the Flow Registry.
+ * Registers the given RegisteredFlow into the Flow Registry.
*
* @param context Configuration context.
* @param flow The RegisteredFlow to add to the Registry.
@@ -252,4 +253,15 @@ public interface FlowRegistryClient extends
ConfigurableComponent {
* @throws IOException If there is issue with the communication between
NiFi and the Flow Registry.
*/
Optional getLatestVersion(FlowRegistryClientConfigurationContext
context, FlowLocation flowLocation) throws FlowRegistryException, IOException;
+
+/**
+ * Generates the id for registering a flow.
+ *
+ * @param flowName the name of the flow
+ * @return the generated id
+ */
+default String generateFlowId(final String flowName) {
+return UUID.randomUUID().toString();
+}
+
}
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 00ee910d70..6501ad0e66 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -872,6 +872,12 @@ language governing permissions and limitations under the
License. -->
2.0.0-SNAPSHOT
nar
+
+org.apache.nifi
+nifi-github-nar
+2.0.0-SNAPSHOT
+nar
+
org.aspectj
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
new file mode 100644
index 00..be73f95343
--- /dev/null
+++ b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
@@ -0,0 +1,43 @@
+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-github-bundle
+2.0.0-SNAPSHOT
+
+nifi-github-extensions
+jar
+
+
+org.apache.nifi
+nifi-api
+
+
+org.apache.nifi
+nifi-utils
+
+
+
(nifi) branch main updated (4faad38c16 -> fe90baae8c)
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 4faad38c16 NIFI-13187 - Modernize Archetypes This closes #8783.
new d305a169b3 NIFI-13186 Corrected Provenance dependency for
lucene-backward-codecs
new 44dddbd739 NIFI-13189 Upgraded AWS SDK with Testcontainers and picocli
new fe90baae8c NIFI-13188 Upgraded dependency-check plugin from 8.4.3 to
9.1.0
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:
.../minifi-toolkit-encrypt-config/pom.xml | 2 +-
.../nifi-persistent-provenance-repository/pom.xml | 15 ++
.../apache/nifi/provenance/IndexConfiguration.java | 2 +-
.../index/lucene/IndexDirectoryManager.java| 24 +++-
.../provenance/index/lucene/LuceneEventIndex.java | 31 +
.../index/lucene/MigrateDefunctIndex.java | 13 +
.../provenance/StartupAgainstOldLuceneIndexIT.java | 9 +++---
.../index/lucene/TestIndexDirectoryManager.java| 26 +-
.../index/lucene/TestLuceneEventIndex.java | 32 +++---
.../_0.fdt | 0
.../_0.fdx | 0
.../_1.fdt | 0
.../_1.fdx | 0
.../nifi-provenance-repository-bundle/pom.xml | 10 ---
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 2 +-
pom.xml| 8 +++---
16 files changed, 61 insertions(+), 113 deletions(-)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_0.fdt (100%)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_0.fdx (100%)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_1.fdt (100%)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_1.fdx (100%)
(nifi) 01/03: NIFI-13186 Corrected Provenance dependency for lucene-backward-codecs
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 d305a169b3d0a2f7627c1f7b76e2e16d2ba533d1
Author: Joseph Witt
AuthorDate: Wed May 8 17:20:30 2024 -0700
NIFI-13186 Corrected Provenance dependency for lucene-backward-codecs
- Updated references to lucene-9 indexes and removed legacy old style
indexes
This closes #8782
Signed-off-by: David Handermann i
---
.../nifi-persistent-provenance-repository/pom.xml | 15 ++
.../apache/nifi/provenance/IndexConfiguration.java | 2 +-
.../index/lucene/IndexDirectoryManager.java| 24 +++-
.../provenance/index/lucene/LuceneEventIndex.java | 31 +
.../index/lucene/MigrateDefunctIndex.java | 13 +
.../provenance/StartupAgainstOldLuceneIndexIT.java | 9 +++---
.../index/lucene/TestIndexDirectoryManager.java| 26 +-
.../index/lucene/TestLuceneEventIndex.java | 32 +++---
.../_0.fdt | 0
.../_0.fdx | 0
.../_1.fdt | 0
.../_1.fdx | 0
.../nifi-provenance-repository-bundle/pom.xml | 10 ---
13 files changed, 55 insertions(+), 107 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
index 8912b20012..19515b4341 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
@@ -52,13 +52,16 @@
nifi-repository-encryption
2.0.0-SNAPSHOT
-
org.apache.lucene
lucene-core
+
+org.apache.lucene
+lucene-backward-codecs
+runtime
+
-
@@ -68,10 +71,10 @@
src/test/resources/lucene-4-prov-repo/0.prov
src/test/resources/lucene-4-prov-repo/toc/0.toc
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_0.fdt
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_0.fdx
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_1.fdt
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_1.fdx
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdx
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
index 0133686e54..cb280d4ddb 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
@@ -170,7 +170,7 @@ public class IndexConfiguration {
if (firstEntryTime == null) {
firstEntryTime = newIndexTimestamp;
}
-return new File(storageDirectory, "lucene-8-index-" + firstEntryTime);
+return new File(storageDirectory, "lucene-9-index-" + firstEntryTime);
}
public List getIndexDirectories() {
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/IndexDirectoryManager.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/IndexDirectoryManager.java
index 7dc4e16861..3d68332843 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/IndexDirectoryManager.java
+++
(nifi) 03/03: NIFI-13188 Upgraded dependency-check plugin from 8.4.3 to 9.1.0
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 fe90baae8ceb669e1c42c0a1f16d8d18187543c8 Author: Joseph Witt AuthorDate: Wed May 8 22:43:26 2024 -0700 NIFI-13188 Upgraded dependency-check plugin from 8.4.3 to 9.1.0 This closes #8784 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71db4df5e5..89660403d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1194,7 +1194,7 @@ org.owasp dependency-check-maven -8.4.3 +9.1.0 false
(nifi) 02/03: NIFI-13189 Upgraded AWS SDK with Testcontainers and picocli
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 44dddbd739b63168d39e4fa8a1d54ba31c1cb24f Author: Joseph Witt AuthorDate: Wed May 8 22:56:59 2024 -0700 NIFI-13189 Upgraded AWS SDK with Testcontainers and picocli - Upgraded picocli from 4.7.5 to 4.7.6 - Upgraded Testcontainers from 1.19.7 to 1.19.8 - Upgraded AWS SDK 1 from 1.12.716 to 1.12.718 - Upgraded AWS SDK 2 from 2.25.46 to 2.25.48 This closes #8785 Signed-off-by: David Handermann --- minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml| 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml index c5544ff384..d4fce1b908 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml +++ b/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml @@ -27,7 +27,7 @@ info.picocli picocli -4.7.5 +4.7.6 org.apache.nifi diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml index db194ee877..1e1d4d4218 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml @@ -77,7 +77,7 @@ info.picocli picocli -4.7.5 +4.7.6 org.slf4j diff --git a/pom.xml b/pom.xml index a048a57444..71db4df5e5 100644 --- a/pom.xml +++ b/pom.xml @@ -110,8 +110,8 @@ UTF-8 UTF-8 2014 -1.12.716 - 2.25.46 +1.12.718 + 2.25.48 2.10.1 6.12.1 1.9.24 @@ -129,7 +129,7 @@ 4.5.14 4.4.16 1.78.1 -1.19.7 +1.19.8 2.0.13 2.9.0 10.17.1.0
(nifi) branch main updated: NIFI-13187 - Modernize Archetypes This closes #8783.
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
The following commit(s) were added to refs/heads/main by this push:
new 4faad38c16 NIFI-13187 - Modernize Archetypes This closes #8783.
4faad38c16 is described below
commit 4faad38c16560a47fe408122c51f52069b19ba90
Author: bob
AuthorDate: Wed May 8 20:28:36 2024 -0500
NIFI-13187 - Modernize Archetypes
This closes #8783.
Signed-off-by: Joseph Witt
---
.../src/main/java/MyProcessor.java | 24 +-
.../src/main/java/StandardMyService.java | 13 +++-
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
index 56432c1a15..7ecf9c15a5 100644
---
a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
+++
b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
@@ -33,9 +33,6 @@ import
org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.util.StandardValidators;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -47,16 +44,17 @@ import java.util.Set;
public class MyProcessor extends AbstractProcessor {
public static final PropertyDescriptor MY_PROPERTY = new PropertyDescriptor
-.Builder().name("MY_PROPERTY")
-.displayName("My property")
+.Builder()
+.name("My Property")
+.displayName("My Property")
.description("Example Property")
.required(true)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
-public static final Relationship MY_RELATIONSHIP = new
Relationship.Builder()
-.name("MY_RELATIONSHIP")
-.description("Example relationship")
+public static final Relationship REL_SUCCESS = new Relationship.Builder()
+.name("success")
+.description("Example success relationship")
.build();
private List descriptors;
@@ -65,13 +63,9 @@ public class MyProcessor extends AbstractProcessor {
@Override
protected void init(final ProcessorInitializationContext context) {
-descriptors = new ArrayList<>();
-descriptors.add(MY_PROPERTY);
-descriptors = Collections.unmodifiableList(descriptors);
+descriptors = List.of(MY_PROPERTY);
-relationships = new HashSet<>();
-relationships.add(MY_RELATIONSHIP);
-relationships = Collections.unmodifiableSet(relationships);
+relationships = Set.of(REL_SUCCESS);
}
@Override
@@ -96,5 +90,7 @@ public class MyProcessor extends AbstractProcessor {
return;
}
// TODO implement
+
+session.transfer(flowFile, REL_SUCCESS);
}
}
diff --git
a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/main/java/StandardMyService.java
b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/main/java/StandardMyService.java
index 688004da52..6f4698831a 100644
---
a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/main/java/StandardMyService.java
+++
b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/main/java/StandardMyService.java
@@ -16,8 +16,6 @@
*/
package ${package};
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
@@ -35,20 +33,15 @@ import org.apache.nifi.reporting.InitializationException;
public class StandardMyService extends AbstractControllerService implements
MyService {
public static final PropertyDescriptor MY_PROPERTY = new PropertyDescriptor
-.Builder().name("MY_PROPERTY")
+.Builder()
+.name("My Property")
.displayName("My Property")
.description("Example Property")
.required(true)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
-private static final List properties;
-
-static {
(nifi) branch main updated (a840c14c84 -> a61bf2afc2)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from a840c14c84 [NIFI-13158] - Fix: need to prevent/diable keyboard hotkeys when a dialog is open or when typeing in the search bar. (#8781) add a61bf2afc2 [NIFI-13183] add drop shadow to connections to increase visibility on… (#8778) No new revisions were added by this update. Summary of changes: .../flow-designer/ui/canvas/_canvas.component-theme.scss| 13 - 1 file changed, 8 insertions(+), 5 deletions(-)
