(nifi-api) branch main created (now 42a3500)
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-api.git at 42a3500 NIFI-13732 Initial commit of nifi-api 2.0.0-SNAPSHOT This branch includes the following new commits: new 42a3500 NIFI-13732 Initial commit of nifi-api 2.0.0-SNAPSHOT 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 main updated: NIFI-13736 Updated Expression Language Guide join function example (#9256)
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 9b7b246dcc NIFI-13736 Updated Expression Language Guide join function
example (#9256)
9b7b246dcc is described below
commit 9b7b246dcc1f57c2d94d9816c3615f89bb7fe8bf
Author: markobean
AuthorDate: Sat Sep 14 16:07:48 2024 -0400
NIFI-13736 Updated Expression Language Guide join function example (#9256)
Signed-off-by: David Handermann
---
nifi-docs/src/main/asciidoc/expression-language-guide.adoc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index e2c30cb6fb..4356e5218a 100644
--- a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -2865,14 +2865,14 @@ provides several functions for evaluating the same
conditions against groups of
*Return Type*: [.returnType]#String#
-*Examples*: Given that the "abc" attribute contains the value "hello world",
"xyz" contains "good bye world",
- and "filename" contains "file.txt" consider the following examples:
+*Examples*: Given that the "abc" attribute contains the value "hello world",
"xyz" contains "goodbye world",
+ consider the following examples:
.join Examples
|===
| Expression | Value
-| `${allMatchingAttributes("[ax].*"):substringBefore(" "):join("-")}` |
`hello-good`
-| `${allAttributes("abc", "xyz"):join(" now")}` | `hello world nowgood bye
world now`
+| `${allMatchingAttributes("[ax].*"):substringBefore(" "):join("-")}` |
`hello-goodbye`
+| `${allAttributes("abc", "xyz"):join(" now ")}` | `hello world now goodbye
world`
|===
(nifi) branch main updated: NIFI-7583 Document that Prioritizers do not fully sort a queue when swapping (#9263)
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 80b3cde95c NIFI-7583 Document that Prioritizers do not fully sort a queue when swapping (#9263) 80b3cde95c is described below commit 80b3cde95c319cc5e62e561d9aa2fce5c3a16d52 Author: Eric Secules AuthorDate: Sat Sep 14 13:03:25 2024 -0700 NIFI-7583 Document that Prioritizers do not fully sort a queue when swapping (#9263) Signed-off-by: David Handermann --- nifi-docs/src/main/asciidoc/administration-guide.adoc | 3 +++ nifi-docs/src/main/asciidoc/user-guide.adoc | 4 2 files changed, 7 insertions(+) diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index 7236464d75..edc43faa1e 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -3112,6 +3112,9 @@ available again. These properties govern how that process occurs. |`nifi.swap.manager.implementation`| The Swap Manager implementation. The default value is `org.apache.nifi.controller.FileSystemSwapManager`. |`nifi.queue.swap.threshold`|The queue threshold at which NiFi starts to swap FlowFile information to disk. The default value is `2`. | +NOTE: When a queue begins swapping to disk, NiFi does not guarantee that all the FlowFiles in the queue are sorted in the +order specified by the <> configured on the queue. New FlowFiles arriving at the queue are written to +the swap file without considering prioritizers. They are prioritized when the swap file is read back into memory. === Content Repository diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc b/nifi-docs/src/main/asciidoc/user-guide.adoc index 07de4a10fb..a2e5fdf872 100644 --- a/nifi-docs/src/main/asciidoc/user-guide.adoc +++ b/nifi-docs/src/main/asciidoc/user-guide.adoc @@ -1444,6 +1444,10 @@ processing order is not further specified but an implementation detail that migh NOTE: With a <> configured, the connection has a queue per node in addition to the local queue. The prioritizer will sort the data in each queue independently. +NOTE: When a connection has more FlowFiles than the `nifi.queue.swap.threshold`, new FlowFiles arriving at that connection +are not prioritized against the active queue, instead they are sent directly to swap. They will be prioritized when they +get brought back into memory. + Changing Configuration and Context Menu Options After a connection has been drawn between two components, the connection's configuration may be changed, and the connection may be moved to a new destination; however, the processors on either side of the connection must be stopped before a configuration or destination change may be made.
(nifi) branch main updated: NIFI-13751 Upgraded SSHJ from 0.38.0 to 0.39.0 (#9266)
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 00c7a78119 NIFI-13751 Upgraded SSHJ from 0.38.0 to 0.39.0 (#9266)
00c7a78119 is described below
commit 00c7a781195782f90afc6623adfcf82cce87125e
Author: Lucas <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat Sep 14 21:59:29 2024 +0200
NIFI-13751 Upgraded SSHJ from 0.38.0 to 0.39.0 (#9266)
Signed-off-by: David Handermann
---
.../org/apache/nifi/processors/standard/util/TestSFTPTransfer.java | 3 ++-
nifi-extension-bundles/nifi-standard-bundle/pom.xml| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestSFTPTransfer.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestSFTPTransfer.java
index 04a069debe..3272c55225 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestSFTPTransfer.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestSFTPTransfer.java
@@ -33,6 +33,7 @@ import
org.apache.nifi.processor.util.file.transfer.FileTransfer;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.MockPropertyValue;
import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
import java.io.File;
import java.io.IOException;
@@ -262,7 +263,7 @@ public class TestSFTPTransfer {
when(processContext.getProperty(eq(FileTransfer.REMOTE_PATH))).thenReturn(new
MockPropertyValue("."));
try (SFTPClient sftpClient = mock(SFTPClient.class)) {
-when(sftpClient.ls(any(), any())).then(invocation -> {
+when(sftpClient.ls(any(),
ArgumentMatchers.any())).then(invocation -> {
final Map extended = new LinkedHashMap<>();
final List list = new ArrayList<>();
list.add(new RemoteResourceInfo(
diff --git a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
index 3ce2c5b057..d51fab1231 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
@@ -67,7 +67,7 @@
com.hierynomus
sshj
-0.38.0
+0.39.0
jakarta.activation
(nifi-site) branch main updated: Updated Apache Analytics Base URI
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-site.git
The following commit(s) were added to refs/heads/main by this push:
new e4f8ffa6 Updated Apache Analytics Base URI
e4f8ffa6 is described below
commit e4f8ffa6b4d3cd650402dcd4519b68abfdaf248f
Author: exceptionfactory
AuthorDate: Thu Sep 5 21:02:21 2024 -0500
Updated Apache Analytics Base URI
---
themes/nifi/layouts/partials/matomo.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/nifi/layouts/partials/matomo.html
b/themes/nifi/layouts/partials/matomo.html
index fca0004d..8bdb09cf 100644
--- a/themes/nifi/layouts/partials/matomo.html
+++ b/themes/nifi/layouts/partials/matomo.html
@@ -4,7 +4,7 @@
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
-var baseUri = "//matomo.privacy.apache.org/";
+var baseUri = "//analytics.apache.org/";
_paq.push(['setTrackerUrl', baseUri + 'matomo.php']);
_paq.push(['setSiteId', '{{ .Site.Params.matomoSiteId }}']);
var trackerElement = document.createElement('script');
(nifi) branch support/nifi-1.x updated: NIFI-13620 Resolved MaxWaitTime Issue in QueryCassandra (#9232)
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 3b67a8a0cd NIFI-13620 Resolved MaxWaitTime Issue in QueryCassandra
(#9232)
3b67a8a0cd is described below
commit 3b67a8a0cd16b152d0104304cb436d7197aa727b
Author: Rahul937303
AuthorDate: Fri Sep 6 02:07:43 2024 +0530
NIFI-13620 Resolved MaxWaitTime Issue in QueryCassandra (#9232)
Signed-off-by: David Handermann
---
.../org/apache/nifi/processors/cassandra/QueryCassandra.java | 9 +++--
.../org/apache/nifi/processors/cassandra/QueryCassandraTest.java | 4
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
index eef2543bae..48af342fb6 100644
---
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
+++
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/QueryCassandra.java
@@ -21,6 +21,9 @@ import com.datastax.driver.core.DataType;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
+import com.datastax.driver.core.SimpleStatement;
+import com.datastax.driver.core.Statement;
+
import com.datastax.driver.core.exceptions.NoHostAvailableException;
import com.datastax.driver.core.exceptions.QueryExecutionException;
import com.datastax.driver.core.exceptions.QueryValidationException;
@@ -125,7 +128,7 @@ public class QueryCassandra extends
AbstractCassandraProcessor {
.name("Max Wait Time")
.description("The maximum amount of time allowed for a running CQL
select query. Must be of format "
+ " where is a
non-negative integer and TimeUnit is a supported "
-+ "Time Unit, such as: nanos, millis, secs, mins, hrs,
days. A value of zero means there is no limit. ")
++ "Time Unit, such as: millis, secs, mins, hrs, days. A
value of zero means there is no limit. ")
.defaultValue("0 seconds")
.required(true)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
@@ -277,7 +280,9 @@ public class QueryCassandra extends
AbstractCassandraProcessor {
final ResultSet resultSet;
if (queryTimeout > 0) {
-resultSet = connectionSession.execute(selectQuery,
queryTimeout, TimeUnit.MILLISECONDS);
+Statement statement = new SimpleStatement(selectQuery);
+statement.setReadTimeoutMillis(Math.toIntExact(queryTimeout));
+resultSet = connectionSession.execute(statement);
}else{
resultSet = connectionSession.execute(selectQuery);
}
diff --git
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java
index c2ad29b7d6..bdf8e36222 100644
---
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java
+++
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/test/java/org/apache/nifi/processors/cassandra/QueryCassandraTest.java
@@ -25,9 +25,11 @@ import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.SniEndPoint;
+import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.core.exceptions.InvalidQueryException;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
import com.datastax.driver.core.exceptions.ReadTimeoutException;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.avro.Schema;
import org.apache.nifi.processor.exception.ProcessException;
@@ -540,6 +542,7 @@ public class QueryCassandraTest {
} else {
when(mockSession.execute(anyString(),any(),
any())).thenReturn(rs);
when(mockSession.execute(anyString())).thenReturn(rs);
+
when(mockSession.execute(any(SimpleStatement.class))).thenReturn(rs);
}
} catch (Exception e) {
fail(e.getMessage());
@@ -585,6 +588
(nifi) branch main updated: NIFI-13706 Handled Exceptions Fetching Parameters on Startup (#9227)
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 0510e716b4 NIFI-13706 Handled Exceptions Fetching Parameters on
Startup (#9227)
0510e716b4 is described below
commit 0510e716b480e8e6b20db2170d3cf21c7ce1e6c2
Author: David Handermann
AuthorDate: Tue Sep 3 16:29:32 2024 -0500
NIFI-13706 Handled Exceptions Fetching Parameters on Startup (#9227)
---
.../controller/serialization/VersionedFlowSynchronizer.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
index d8b5998d4b..eb5c78b7e7 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
@@ -1067,8 +1067,14 @@ public class VersionedFlowSynchronizer implements
FlowSynchronizer {
}
private Map getProvidedParameters(final
ParameterProviderNode parameterProviderNode, final String parameterGroupName) {
-logger.debug("Fetching Parameters for Group [{}] from Provider [{}]",
parameterGroupName, parameterProviderNode.getIdentifier());
-parameterProviderNode.fetchParameters();
+final String providerId = parameterProviderNode.getIdentifier();
+logger.debug("Fetching Parameters for Group [{}] from Provider [{}]",
parameterGroupName, providerId);
+
+try {
+parameterProviderNode.fetchParameters();
+} catch (final Exception e) {
+logger.warn("Fetching Parameters for Group [{}] from Provider [{}]
failed", parameterGroupName, providerId, e);
+}
final Map parameters;
final Optional foundParameterGroup =
parameterProviderNode.findFetchedParameterGroup(parameterGroupName);
@@ -1082,7 +1088,7 @@ public class VersionedFlowSynchronizer implements
FlowSynchronizer {
parameters = Collections.emptyMap();
}
-logger.info("Fetched Parameters [{}] for Group [{}] from Provider
[{}]", parameters.size(), parameterGroupName,
parameterProviderNode.getIdentifier());
+logger.info("Fetched Parameters [{}] for Group [{}] from Provider
[{}]", parameters.size(), parameterGroupName, providerId);
return parameters;
}
(nifi) branch main updated (6b78c42928 -> d1432d6be9)
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 6b78c42928 NIFI-13697 Clarify documentation in ProcessSession regarding StateManager interactions add b80ef7eed9 NIFI-12852 Refactor TestRecordPath to improve expressiveness and reduce duplication add 1ad9d86a26 NIFI-13701 Remove deprecated property CACHE_SCHEMA from QueryRecord add d1432d6be9 NIFI-13702 Remove deprecated property STATE_UPDATE_INTERVAL from CaptureChangeMySQL No new revisions were added by this update. Summary of changes: .../apache/nifi/record/path/TestRecordPath.java| 4622 +++- .../cdc/mysql/processors/CaptureChangeMySQL.java | 71 +- .../mysql/processors/CaptureChangeMySQLTest.java |8 +- .../nifi/processors/standard/QueryRecord.java | 18 +- 4 files changed, 2699 insertions(+), 2020 deletions(-)
(nifi) branch main updated: NIFI-13578 Add Schema Branch Name and Schema Version in ValidateRecord (#9108)
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 f92f6f1def NIFI-13578 Add Schema Branch Name and Schema Version in
ValidateRecord (#9108)
f92f6f1def is described below
commit f92f6f1def97d0252dd16eef56b6147efe86ca52
Author: Juldrixx <31806759+juldr...@users.noreply.github.com>
AuthorDate: Sat Aug 31 17:54:26 2024 +0200
NIFI-13578 Add Schema Branch Name and Schema Version in ValidateRecord
(#9108)
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/util/Triple.java | 21 +
.../serialization/record/MockSchemaRegistry.java | 37 +-
.../nifi/processors/standard/ValidateRecord.java | 59 ++-
.../processors/standard/TestValidateRecord.java| 453 -
4 files changed, 421 insertions(+), 149 deletions(-)
diff --git
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/Triple.java
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/Triple.java
new file mode 100644
index 00..a5a8b807e4
--- /dev/null
+++ b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/Triple.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.util;
+
+public record Triple(A first, B second, C third) {
+
+}
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockSchemaRegistry.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockSchemaRegistry.java
index 972044b973..eac76b8ffa 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockSchemaRegistry.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockSchemaRegistry.java
@@ -22,8 +22,8 @@ import org.apache.nifi.schema.access.SchemaField;
import org.apache.nifi.schema.access.SchemaNotFoundException;
import org.apache.nifi.schemaregistry.services.SchemaRegistry;
import org.apache.nifi.util.Tuple;
+import org.apache.nifi.util.Triple;
-import java.io.IOException;
import java.util.EnumSet;
import java.util.Optional;
import java.util.OptionalInt;
@@ -33,40 +33,53 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
public class MockSchemaRegistry extends AbstractControllerService implements
SchemaRegistry {
-private final ConcurrentMap schemaNameMap = new
ConcurrentHashMap<>();
+private final ConcurrentMap, RecordSchema>
schemaNameMap = new ConcurrentHashMap<>();
private final ConcurrentMap, RecordSchema>
schemaIdVersionMap = new ConcurrentHashMap<>();
public void addSchema(final String name, final RecordSchema schema) {
-schemaNameMap.put(name, schema);
+addSchema(name, null, null, schema);
}
-RecordSchema retrieveSchemaByName(final SchemaIdentifier schemaIdentifier)
throws IOException, SchemaNotFoundException {
+public void addSchema(final String name, final String branch, final
RecordSchema schema) {
+addSchema(name, branch, null, schema);
+}
+
+public void addSchema(final String name, final Integer version, final
RecordSchema schema) {
+addSchema(name, null, version, schema);
+}
+
+public void addSchema(final String name, final String branch, final
Integer version, final RecordSchema schema) {
+schemaNameMap.put(new Triple<>(name, branch, version), schema);
+}
+
+RecordSchema retrieveSchemaByName(final SchemaIdentifier schemaIdentifier)
throws SchemaNotFoundException {
final Optional schemaName = schemaIdentifier.getName();
-if (!schemaName.isPresent()) {
+if (schemaName.isEmpty()) {
throw new
org.apache.nifi.schema.access.SchemaNotFoundException(&qu
(nifi) branch main updated: NIFI-13664 Support Component Search on NAR Bundle ID
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 ba13c5d48a NIFI-13664 Support Component Search on NAR Bundle ID
ba13c5d48a is described below
commit ba13c5d48ae4bd71660730b7f0d8de739fba47bb
Author: Mike Moser
AuthorDate: Fri Aug 23 16:34:49 2024 +
NIFI-13664 Support Component Search on NAR Bundle ID
This closes #9197
Signed-off-by: David Handermann
---
nifi-docs/src/main/asciidoc/user-guide.adoc| 2 +-
.../web/configuration/WebSearchConfiguration.java | 3 ++
.../search/attributematchers/BundleMatcher.java| 32
.../attributematchers/BundleMatcherTest.java | 57 ++
4 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc
b/nifi-docs/src/main/asciidoc/user-guide.adoc
index 0631146166..6a6ac8ffae 100644
--- a/nifi-docs/src/main/asciidoc/user-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/user-guide.adoc
@@ -2069,7 +2069,7 @@ image:align-horizontally-after.png["Align Horizontally
Example Before"]
[[search]]
== Search Components in DataFlow
-NiFi UI provides searching functionality in order to help easily find
components on the canvas. You can use search to find components by name, type,
identifier, configuration properties, and their values. Search also makes it
possible to refine and narrow the search result based on certain conditions
using Filters and Keywords.
+NiFi UI provides searching functionality in order to help easily find
components on the canvas. You can use search to find components by name, type,
identifier, bundle, configuration properties, and configuration values. Search
also makes it possible to refine and narrow the search result based on certain
conditions using Filters and Keywords.
[caption="Example 1: "]
.The result will contain components that match for "processor1".
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/configuration/WebSearchConfiguration.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/configuration/WebSearchConfiguration.java
index 2f0feb4d3d..f01bfec5d3 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/configuration/WebSearchConfiguration.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/configuration/WebSearchConfiguration.java
@@ -22,6 +22,7 @@ import org.apache.nifi.web.controller.ControllerSearchService;
import org.apache.nifi.web.search.ComponentMatcherFactory;
import org.apache.nifi.web.search.attributematchers.BackPressureMatcher;
import org.apache.nifi.web.search.attributematchers.BasicMatcher;
+import org.apache.nifi.web.search.attributematchers.BundleMatcher;
import org.apache.nifi.web.search.attributematchers.ConnectionMatcher;
import
org.apache.nifi.web.search.attributematchers.ConnectionRelationshipMatcher;
import org.apache.nifi.web.search.attributematchers.ConnectivityMatcher;
@@ -95,6 +96,7 @@ public class WebSearchConfiguration {
controllerSearchService.setMatcherForControllerServiceNode(factory.getInstanceForControllerServiceNode(
List.of(
new ControllerServiceNodeMatcher(),
+new BundleMatcher<>(),
new PropertyMatcher<>()
)
));
@@ -153,6 +155,7 @@ public class WebSearchConfiguration {
new ScheduledStateMatcher(),
new RelationshipMatcher<>(),
new ProcessorMetadataMatcher(),
+new BundleMatcher<>(),
new PropertyMatcher<>(),
searchableMatcher
)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BundleMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BundleMatcher.java
new file mode 100644
index 00..8caa59f566
--- /dev/null
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BundleMatcher.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ *
(nifi) branch main updated: NIFI-12080 Added support for KV_2 in HashiCorp Parameter Provider
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 f828907df5 NIFI-12080 Added support for KV_2 in HashiCorp Parameter
Provider
f828907df5 is described below
commit f828907df50de98abdc73cb6d1c08cba4c4f8271
Author: Pierre Villard
AuthorDate: Wed Aug 28 22:12:41 2024 +0200
NIFI-12080 Added support for KV_2 in HashiCorp Parameter Provider
This closes #9209
Signed-off-by: David Handermann
---
.../HashiCorpVaultCommunicationService.java| 19 +
...StandardHashiCorpVaultCommunicationService.java | 18 ++--
.../hashicorp/HashiCorpVaultParameterProvider.java | 24 ++
.../TestHashiCorpVaultParameterProvider.java | 18 ++--
4 files changed, 63 insertions(+), 16 deletions(-)
diff --git
a/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java
b/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java
index adbb4764b0..33ab496f66 100644
---
a/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java
+++
b/nifi-commons/nifi-hashicorp-vault-api/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultCommunicationService.java
@@ -89,10 +89,29 @@ public interface HashiCorpVaultCommunicationService {
*/
Map readKeyValueSecretMap(String keyValuePath, String
secretKey);
+/**
+ * Reads a secret with multiple key/value pairs from Vault's Key/Value
Secrets Engine.
+ *
+ * @see https://www.vaultproject.io/api-docs/secret/kv";>https://www.vaultproject.io/api-docs/secret/kv
+ * @param keyValuePath The Vault path to use for the configured Key/Value
Secrets Engine
+ * @param secretKey The secret key
+ * @param version the Key/Vault Secrets engine version
+ * @return A map from key to value from the secret key/values, or an empty
map if not found
+ */
+Map readKeyValueSecretMap(String keyValuePath, String
secretKey, String version);
+
/**
* Lists the secrets at the given Key/Value Version 1 Secrets Engine path.
* @param keyValuePath The Vault path to list
* @return The list of secret names
*/
List listKeyValueSecrets(String keyValuePath);
+
+/**
+ * Lists the secrets at the given Key/Value Secrets Engine path.
+ * @param keyValuePath The Vault path to list
+ * @param version the Key/Vault Secrets engine version
+ * @return The list of secret names
+ */
+List listKeyValueSecrets(String keyValuePath, String version);
}
diff --git
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
index 38a6e5dfc6..533672af46 100644
---
a/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
+++
b/nifi-commons/nifi-hashicorp-vault/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultCommunicationService.java
@@ -136,17 +136,23 @@ public class StandardHashiCorpVaultCommunicationService
implements HashiCorpVaul
@Override
public Map readKeyValueSecretMap(final String
keyValuePath, final String key) {
-final VaultKeyValueOperations keyValueOperations =
keyValueOperationsMap
-.computeIfAbsent(keyValuePath, path ->
vaultTemplate.opsForKeyValue(path, keyValueBackend));
-final VaultResponseSupport response = keyValueOperations.get(key,
Map.class);
+return readKeyValueSecretMap(keyValuePath, key,
keyValueBackend.name());
+}
+
+@Override
+public Map readKeyValueSecretMap(final String
keyValuePath, final String key, final String version) {
+final VaultResponseSupport response =
vaultTemplate.opsForKeyValue(keyValuePath,
KeyValueBackend.valueOf(version)).get(key, Map.class);
return response == null ? Collections.emptyMap() : (Map) response.getRequiredData();
}
@Override
public List listKeyValueSecrets(final String keyValuePath) {
-final VaultKeyValueOperations keyValueOperations =
keyValueOperationsMap
-.computeIfAbsent(keyValuePath, path ->
vaultTemplate.opsForKeyValue(path, KeyValueBackend.KV_1));
-return keyValueOperations.list("/");
+return listKeyValueSecrets(keyValuePath, KeyValueBackend.KV_1.name());
+}
+
+@Override
+public List listKeyValueSecrets(final String keyValuePath, final
String version) {
+return vaultTemplat
(nifi) branch main updated: NIFI-13695 Fixed Redirect Handling for Custom UI Extensions
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 31a3014696 NIFI-13695 Fixed Redirect Handling for Custom UI Extensions
31a3014696 is described below
commit 31a301469612807413c1322edb4d11b2f97ff869
Author: Matt Gilman
AuthorDate: Fri Aug 30 10:20:23 2024 -0400
NIFI-13695 Fixed Redirect Handling for Custom UI Extensions
Appending a trailing slash when opening a custom UI and in the query string
to fragment filter to avoid a Jetty-based redirect that could lead to losing
the proxy path.
This closes #9222
Signed-off-by: David Handermann
---
.../apache/nifi/web/servlet/filter/QueryStringToFragmentFilter.java| 3 ++-
.../apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/nifi-commons/nifi-web-servlet-shared/src/main/java/org/apache/nifi/web/servlet/filter/QueryStringToFragmentFilter.java
b/nifi-commons/nifi-web-servlet-shared/src/main/java/org/apache/nifi/web/servlet/filter/QueryStringToFragmentFilter.java
index e6f9a967c8..4113aabbda 100644
---
a/nifi-commons/nifi-web-servlet-shared/src/main/java/org/apache/nifi/web/servlet/filter/QueryStringToFragmentFilter.java
+++
b/nifi-commons/nifi-web-servlet-shared/src/main/java/org/apache/nifi/web/servlet/filter/QueryStringToFragmentFilter.java
@@ -40,7 +40,8 @@ public class QueryStringToFragmentFilter implements Filter {
// Some NiFi front ends use hash based routing, so they don't need
to know the baseHref. With hash based
// routing query parameters are implemented within the URL
fragment. Because of this any query parameters on the
// original URL are not considered. This filter captures those and
adds them to the fragment.
-final RequestUriBuilder requestUriBuilder =
RequestUriBuilder.fromHttpServletRequest(httpServletRequest).path(httpServletRequest.getContextPath()).fragment("/?"
+ queryString);
+final String contextPath = httpServletRequest.getContextPath() +
"/";
+final RequestUriBuilder requestUriBuilder =
RequestUriBuilder.fromHttpServletRequest(httpServletRequest).path(contextPath).fragment("/?"
+ queryString);
final URI redirectUri = requestUriBuilder.build();
final HttpServletResponse httpServletResponse =
(HttpServletResponse) response;
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
index bb7258edac..6481897d12 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
@@ -81,7 +81,7 @@ export class AdvancedUi {
.set('editable', params.editable)
.set('disconnectedNodeAcknowledged',
params.disconnectedNodeAcknowledged)
.toString();
-const url = `${params.url}?${queryParams}`;
+const url = `${params.url}/?${queryParams}`;
const sanitizedUrl = this.domSanitizer.sanitize(SecurityContext.URL,
url);
(nifi) branch main updated (e540f72989 -> 5845d631cf)
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 e540f72989 NIFI-13688 Run Validation on Parameter Providers before fetching add 5845d631cf NIFI-13694 Remove MissingComponentsCheck from VersionFlowSynchronizer (#9217) No new revisions were added by this update. Summary of changes: .../inheritance/MissingComponentsCheck.java| 106 - .../serialization/VersionedFlowSynchronizer.java | 8 -- 2 files changed, 114 deletions(-) delete mode 100644 nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/inheritance/MissingComponentsCheck.java
(nifi) branch support/nifi-1.x updated: NIFI-13686 Make TestListFile.testFilterAge() more resilient to time delays (#9207)
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 dead747486 NIFI-13686 Make TestListFile.testFilterAge() more resilient
to time delays (#9207)
dead747486 is described below
commit dead747486d6cb8b93f21fb56f94627c9397b36f
Author: jrsteinebrey
AuthorDate: Thu Aug 29 09:45:44 2024 -0500
NIFI-13686 Make TestListFile.testFilterAge() more resilient to time delays
(#9207)
Signed-off-by: David Handermann
---
.../nifi/processors/standard/TestListFile.java | 75 ++
1 file changed, 33 insertions(+), 42 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
index 014e6880c6..41e698136a 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
@@ -44,8 +44,9 @@ import java.nio.file.FileStore;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -80,8 +81,7 @@ public class TestListFile {
// age#filter are filter label strings for the filter properties
private Long syncTime = getTestModifiedTime();
private Long time0millis, time1millis, time2millis, time3millis,
time4millis, time5millis;
-private Long age0millis, age1millis, age2millis, age3millis, age4millis,
age5millis;
-private String age0, age1, age2, age3, age4, age5;
+private String age0, age2, age4, age5;
@RegisterExtension
private final ListProcessorTestWatcher dumpState = new
ListProcessorTestWatcher(
@@ -258,27 +258,26 @@ public class TestListFile {
@Test
public void testFilterAge() throws Exception {
-
-final File file1 = new File(TESTDIR + "/age1.txt");
-assertTrue(file1.createNewFile());
+final File file0 = new File(TESTDIR + "/age0.txt");
+assertTrue(file0.createNewFile());
final File file2 = new File(TESTDIR + "/age2.txt");
assertTrue(file2.createNewFile());
-final File file3 = new File(TESTDIR + "/age3.txt");
-assertTrue(file3.createNewFile());
+final File file4 = new File(TESTDIR + "/age4.txt");
+assertTrue(file4.createNewFile());
final Function runNext = resetAges -> {
if (resetAges) {
resetAges();
-assertTrue(file1.setLastModified(time0millis));
+assertTrue(file0.setLastModified(time0millis));
assertTrue(file2.setLastModified(time2millis));
-assertTrue(file3.setLastModified(time4millis));
+assertTrue(file4.setLastModified(time4millis));
}
-assertTrue(file1.lastModified() > time3millis &&
file1.lastModified() <= time0millis);
+assertTrue(file0.lastModified() > time3millis &&
file0.lastModified() <= time0millis);
assertTrue(file2.lastModified() > time3millis &&
file2.lastModified() < time1millis);
-assertTrue(file3.lastModified() < time3millis);
+assertTrue(file4.lastModified() < time3millis);
try {
runNext();
@@ -292,6 +291,11 @@ public class TestListFile {
runner.setProperty(ListFile.DIRECTORY, testDir.getAbsolutePath());
runNext.apply(true);
runner.assertTransferCount(ListFile.REL_SUCCESS, 3);
+final List successFiles1 =
runner.getFlowFilesForRelationship(ListFile.REL_SUCCESS);
+assertEquals(3, successFiles1.size());
+assertEquals(file4.getName(),
successFiles1.get(0).getAttribute("filename"));
+assertEquals(file2.getName(),
successFiles1.get(1).getAttribute("filename"));
+assertEquals(file0.getName(),
successFiles1.get(2).getAttribute("filename"));
assertVerificationOutcome(Outcome.SUCCESSFUL, "Successfully listed .*
Found 3 objects. Of those, 3 match the filter.");
// processor updates internal state, it shouldn't pick the same ones.
@@ -300,36 +304,33 @@ public class TestListFile {
// exclude oldest
r
(nifi) branch support/nifi-1.x updated: NIFI-13692 Catch All Exceptions in ResizeImage (#9216)
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 0987009733 NIFI-13692 Catch All Exceptions in ResizeImage (#9216)
0987009733 is described below
commit 09870097331b0a1386eaa263d63fc476a447c94a
Author: Mike
AuthorDate: Thu Aug 29 10:29:58 2024 -0400
NIFI-13692 Catch All Exceptions in ResizeImage (#9216)
Widening the scope of caught Exceptions for routing to failure ensures that
the Processor can catch pretty much everything a user could throw at this
processor.
Signed-off-by: David Handermann
---
.../main/java/org/apache/nifi/processors/image/ResizeImage.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
index ca860b4758..8d7076bffb 100644
---
a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
+++
b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
@@ -23,7 +23,6 @@ import java.awt.Image;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.BufferedInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
@@ -171,7 +170,7 @@ public class ResizeImage extends AbstractProcessor {
reader.setInput(iis, true);
image = reader.read(0);
}
-} catch (final IOException | RuntimeException ex) {
+} catch (final Exception ex) {
getLogger().error("Failed to read {} due to {}", flowFile, ex);
session.transfer(flowFile, REL_FAILURE);
return;
@@ -190,8 +189,8 @@ public class ResizeImage extends AbstractProcessor {
height = finalDimension.height;
}
-} catch (final NumberFormatException nfe) {
-getLogger().error("Failed to resize {} due to {}", flowFile, nfe);
+} catch (final Exception ex) {
+getLogger().error("Failed to resize {} due to {}", flowFile, ex);
session.transfer(flowFile, REL_FAILURE);
return;
}
@@ -218,7 +217,7 @@ public class ResizeImage extends AbstractProcessor {
}
ImageIO.write(scaledBufferedImg, formatName, out);
-} catch (final IOException | NegativeArraySizeException ex) {
+} catch (final Exception ex) {
getLogger().error("Failed to write {} due to {}", flowFile, ex);
session.transfer(flowFile, REL_FAILURE);
return;
(nifi) branch main updated: NIFI-13692 Catch All Exceptions in ResizeImage (#9213)
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 2fc0ca1b7b NIFI-13692 Catch All Exceptions in ResizeImage (#9213)
2fc0ca1b7b is described below
commit 2fc0ca1b7bc468892c80cf28ccb650d682359ae4
Author: Mike
AuthorDate: Thu Aug 29 10:29:15 2024 -0400
NIFI-13692 Catch All Exceptions in ResizeImage (#9213)
Widening the scope of caught Exceptions for routing to failure ensures that
the Processor can catch pretty much everything a user could throw at this
processor.
Signed-off-by: David Handermann
---
.../main/java/org/apache/nifi/processors/image/ResizeImage.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
index 1ad9e12502..3e24005398 100644
---
a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
+++
b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
@@ -23,7 +23,6 @@ import java.awt.Image;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.BufferedInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
@@ -169,7 +168,7 @@ public class ResizeImage extends AbstractProcessor {
reader.setInput(iis, true);
image = reader.read(0);
}
-} catch (final IOException | RuntimeException ex) {
+} catch (final Exception ex) {
getLogger().error("Failed to read {} due to {}", flowFile, ex);
session.transfer(flowFile, REL_FAILURE);
return;
@@ -188,8 +187,8 @@ public class ResizeImage extends AbstractProcessor {
height = finalDimension.height;
}
-} catch (final NumberFormatException nfe) {
-getLogger().error("Failed to resize {} due to {}", flowFile, nfe);
+} catch (final Exception e) {
+getLogger().error("Failed to resize {} due to {}", flowFile, e);
session.transfer(flowFile, REL_FAILURE);
return;
}
@@ -216,7 +215,7 @@ public class ResizeImage extends AbstractProcessor {
}
ImageIO.write(scaledBufferedImg, formatName, out);
-} catch (final IOException | NegativeArraySizeException ex) {
+} catch (final Exception ex) {
getLogger().error("Failed to write {} due to {}", flowFile, ex);
session.transfer(flowFile, REL_FAILURE);
return;
(nifi) branch main updated: NIFI-13659 Call migrateProperties on components changed in synchronization (#9201)
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 71face8ea7 NIFI-13659 Call migrateProperties on components changed in
synchronization (#9201)
71face8ea7 is described below
commit 71face8ea788a85a53a48df2b0a872d2ea0a2f89
Author: Bryan Bende
AuthorDate: Thu Aug 29 10:25:49 2024 -0400
NIFI-13659 Call migrateProperties on components changed in synchronization
(#9201)
Signed-off-by: David Handermann
---
.../StandardVersionedComponentSynchronizer.java| 41 --
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
index 47aadddb6b..335762b448 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
@@ -154,7 +154,7 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
private final VersionedFlowSynchronizationContext context;
private final Set updatedVersionedComponentIds = new HashSet<>();
-private final List createdExtensions = new ArrayList<>();
+private final List
createdAndModifiedExtensions = new ArrayList<>();
private FlowSynchronizationOptions syncOptions;
private final ConnectableAdditionTracker connectableAdditionTracker = new
ConnectableAdditionTracker();
@@ -181,7 +181,7 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
final FlowComparison flowComparison = flowComparator.compare();
updatedVersionedComponentIds.clear();
-createdExtensions.clear();
+createdAndModifiedExtensions.clear();
setSynchronizationOptions(options);
for (final FlowDifference diff : flowComparison.getDifferences()) {
@@ -255,9 +255,9 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
}
});
-for (final CreatedExtension createdExtension : createdExtensions) {
-final ComponentNode extension = createdExtension.extension();
-final Map originalPropertyValues =
createdExtension.propertyValues();
+for (final CreatedOrModifiedExtension createdOrModifiedExtension :
createdAndModifiedExtensions) {
+final ComponentNode extension =
createdOrModifiedExtension.extension();
+final Map originalPropertyValues =
createdOrModifiedExtension.propertyValues();
final ControllerServiceFactory serviceFactory = new
StandardControllerServiceFactory(context.getExtensionManager(),
context.getFlowManager(),
context.getControllerServiceProvider(), extension);
@@ -603,6 +603,9 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
if
(updatedVersionedComponentIds.contains(proposedService.getIdentifier())) {
updateControllerService(service, proposedService,
topLevelGroup);
+// Any existing component that is modified during
synchronization may have its properties reverted to a pre-migration state,
+// so we then add it to the set to allow migrateProperties to
be called again to get it back to the migrated state
+createdAndModifiedExtensions.add(new
CreatedOrModifiedExtension(service, getPropertyValues(service)));
LOG.info("Updated {}", service);
}
}
@@ -1050,6 +1053,9 @@ public class StandardVersionedComponentSynchronizer
implements VersionedComponen
LOG.info("Added {} to {}", added, group);
} else if
(updatedVersionedComponentIds.contains(proposedProcessor.getIdentifier())) {
updateProcessor(processor, proposedProcessor, topLevelGroup);
+// Any existing component that is modified during
synchronization may have its properties reverted to a pre-migration state,
+// so we then add it to the set to allow migrateProperties to
be called again to get it back to the migrated state
+createdAndModifiedExtensions.add(new
CreatedOrModifiedExtension(processor, getPropertyValues(processor)));
LOG.info("Updated {}", processor);
} else {
(nifi) branch support/nifi-1.x updated: NIFI-13690 Upgraded AWS SDK to 2.27.14 and other dependencies
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 8bdafb58c5 NIFI-13690 Upgraded AWS SDK to 2.27.14 and other dependencies 8bdafb58c5 is described below commit 8bdafb58c5ac930e795158b3cacabcceffba34c6 Author: Matt Burgess AuthorDate: Wed Aug 28 15:32:11 2024 -0400 NIFI-13690 Upgraded AWS SDK to 2.27.14 and other dependencies Upgraded brotli4j from 1.16.0 to 1.17.0 Upgraded AWS SDK from 1.12.767 to 1.12.770 Upgraded AWS SDK from 2.27.1 to 2.27.14 Upgraded Commons CLI from 1.7.0 to 1.9.0 Upgraded Dropwizard Metrics from 4.2.26 to 4.2.27 Upgraded Commons Compress from 1.27.0 to 1.27.1 Upgraded Slack API from 1.40.3 to 1.42.0 Upgraded Project Reactor Core from 3.6.8 to 3.6.9 Upgraded Iceberg from 1.6.0 to 1.6.1 Upgraded PostgreSQL from 42.7.3 to 42.7.4 This closes #9208 Signed-off-by: David Handermann --- nifi-commons/nifi-metrics/pom.xml | 2 +- nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml | 2 +- .../nifi-compress-bundle/nifi-compress-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml | 2 +- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml | 2 +- pom.xml | 8 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml index 55aaf40b79..a6ddcaac43 100644 --- a/nifi-commons/nifi-metrics/pom.xml +++ b/nifi-commons/nifi-metrics/pom.xml @@ -32,7 +32,7 @@ io.dropwizard.metrics metrics-jvm -4.2.25 +4.2.27 diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml index fa194971b7..e946deabdb 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml @@ -198,7 +198,7 @@ io.projectreactor reactor-test -3.6.8 +3.6.9 test diff --git a/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml b/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml index 6c69af8962..6d53d883a2 100644 --- a/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml +++ b/nifi-nar-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml @@ -46,7 +46,7 @@ language governing permissions and limitations under the License. --> com.aayushatharva.brotli4j brotli4j -1.16.0 +1.17.0 org.tukaani diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index 6dae0d5ffe..64955bc17f 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -25,7 +25,7 @@ pom -1.6.0 +1.6.1 3.1.3 diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml index 065c49952e..7837cb7690 100644 --- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml +++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml @@ -34,7 +34,7 @@ com.slack.api bolt-socket-mode -1.40.3 +1.42.0 diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml index 2bce384f07..dd40dca7c0 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml @@ -64,7 +64,7 @@ org.postgresql postgresql -42.7.2 +42.7.4 diff --git a/pom.xml b/pom.xml index 56160bb2e8..7ed313598e 100644 --- a/pom.xml +++ b/pom.xml @@ -104,15 +104,15 @@ UTF-8 UTF-8 2014 -1.12.767 -2.27.1 +1.12.770 + 2.27.14 2.10.1 1.9.25 4.12.0 3.9.0 -1.7.0 +1.9.0 1.17.1 - 1.27.0 + 1.27.1 1.5.6-4 3.16.0 3.10.0
(nifi) branch main updated: NIFI-13690 Upgraded AWS SDK to 2.27.14 and other dependencies
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 a8e204aceb NIFI-13690 Upgraded AWS SDK to 2.27.14 and other dependencies a8e204aceb is described below commit a8e204aceb6f69eb99e45a1dcd679895bcbce98c Author: Joseph Witt AuthorDate: Wed Aug 28 08:35:16 2024 -0700 NIFI-13690 Upgraded AWS SDK to 2.27.14 and other dependencies - Upgraded Logback from 1.5.6 to 1.5.7 - Upgraded brotli4j from 1.16.0 to 1.17.0 - Upgraded AWS SDK from 1.12.767 to 1.12.770 - Upgraded AWS SDK from 2.27.1 to 2.27.14 - Upgraded H2 from 2.3.230 to 2.3.232 - Upgraded Commons CLI from 1.8.0 to 1.9.0 - Upgraded Dropwizard Metrics from 4.2.26 to 4.2.27 - Upgraded Kubernetes Client from 6.13.2 to 6.13.3 - Upgraded Reactor Netty from 1.1.21 to 1.1.22 - Upgraded Commons Compress from 1.27.0 to 1.27.1 - Upgraded Mockito from 5.12.0 to 5.13.0 - Upgraded Slack API from 1.40.3 to 1.42.0 - Upgraded Project Reactor Core from 3.6.8 to 3.6.9 - Upgraded Iceberg from 1.6.0 to 1.6.1 - Upgraded FlywayDB from 10.17.0 to 10.17.2 - Upgraded GitHub API 1.323 to 1.324 - Upgraded PostgreSQL from 42.7.3 to 42.7.4 - Upgraded Spring Integration from 6.3.2 to 6.3.3 - Upgraded Spring Retry 2.0.7 to 2.0.8 - Upgraded Spring Vault from 3.1.1 to 3.1.2 This closes #9206 Signed-off-by: David Handermann --- nifi-code-coverage/pom.xml | 2 +- nifi-commons/nifi-hashicorp-vault/pom.xml | 2 +- nifi-commons/nifi-metrics/pom.xml | 4 ++-- .../nifi-azure-bundle/nifi-azure-processors/pom.xml| 4 ++-- .../nifi-compress-processors/pom.xml | 2 +- .../nifi-email-bundle/nifi-email-processors/pom.xml| 2 +- nifi-extension-bundles/nifi-github-bundle/pom.xml | 2 +- nifi-extension-bundles/nifi-iceberg-bundle/pom.xml | 2 +- .../nifi-slack-bundle/nifi-slack-processors/pom.xml| 2 +- .../nifi-standard-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-standard-bundle/pom.xml| 2 +- .../nifi-questdb-bundle/nifi-questdb/pom.xml | 2 +- nifi-framework-bundle/pom.xml | 2 +- .../nifi-registry-core/nifi-registry-test/pom.xml | 2 +- nifi-registry/pom.xml | 2 +- pom.xml| 18 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index a8cfbd925f..bb7d26d508 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -89,7 +89,7 @@ io.projectreactor.netty reactor-netty-http -1.1.21 +1.1.22 diff --git a/nifi-commons/nifi-hashicorp-vault/pom.xml b/nifi-commons/nifi-hashicorp-vault/pom.xml index fd4e6a2a8f..f7af44ae2e 100644 --- a/nifi-commons/nifi-hashicorp-vault/pom.xml +++ b/nifi-commons/nifi-hashicorp-vault/pom.xml @@ -21,7 +21,7 @@ nifi-hashicorp-vault -3.1.1 +3.1.2 diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml index 5743be5c70..9541e63c00 100644 --- a/nifi-commons/nifi-metrics/pom.xml +++ b/nifi-commons/nifi-metrics/pom.xml @@ -31,12 +31,12 @@ io.dropwizard.metrics metrics-jvm -4.2.26 +4.2.27 io.dropwizard.metrics metrics-core -4.2.26 +4.2.27 diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml index b69b63e7a3..276b60df0f 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml @@ -111,7 +111,7 @@ io.projectreactor reactor-core -3.6.8 +3.6.9 com.azure @@ -191,7 +191,7 @@ io.projectreactor reactor-test -3.6.8 +3.6.9 test diff --git a/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml b/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml index e789f57512..73a20a4f86 100644 --- a/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml +++ b/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml @@ -43,7 +43,7 @@ language governing permissions and limitations under the License
(nifi) branch main updated: NIFI-13681 Aligned Cluster Docker Environment Variables with Properties (#9199)
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 d9c5a19255 NIFI-13681 Aligned Cluster Docker Environment Variables
with Properties (#9199)
d9c5a19255 is described below
commit d9c5a19255ef4c55ad93fab666e214953383e34e
Author: Malthe Borch
AuthorDate: Tue Aug 27 18:21:17 2024 +0200
NIFI-13681 Aligned Cluster Docker Environment Variables with Properties
(#9199)
Signed-off-by: David Handermann
---
nifi-docker/dockerhub/sh/start.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-docker/dockerhub/sh/start.sh
b/nifi-docker/dockerhub/sh/start.sh
index 8a9b35e313..c439459cdf 100755
--- a/nifi-docker/dockerhub/sh/start.sh
+++ b/nifi-docker/dockerhub/sh/start.sh
@@ -71,8 +71,8 @@ prop_replace 'nifi.cluster.flow.election.max.candidates'
"${NIFI_ELECTION_MAX
prop_replace 'nifi.web.proxy.context.path'
"${NIFI_WEB_PROXY_CONTEXT_PATH:-}"
# Set leader election and state management properties
-prop_replace 'nifi.cluster.leader.election.implementation'
"${NIFI_LEADER_ELECTION_IMPLEMENTATION:-CuratorLeaderElectionManager}"
-prop_replace 'nifi.state.management.provider.cluster'
"${NIFI_STATE_MANAGEMENT_CLUSTER_PROVIDER:-zk-provider}"
+prop_replace 'nifi.cluster.leader.election.implementation'
"${NIFI_CLUSTER_LEADER_ELECTION_IMPLEMENTATION:-CuratorLeaderElectionManager}"
+prop_replace 'nifi.state.management.provider.cluster'
"${NIFI_STATE_MANAGEMENT_PROVIDER_CLUSTER:-zk-provider}"
# Set analytics properties
prop_replace 'nifi.analytics.predict.enabled'
"${NIFI_ANALYTICS_PREDICT_ENABLED:-false}"
(nifi) branch support/nifi-1.x updated: NIFI-13675 Fixed Tooltip for Parameter Description (#9195)
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 153c87a7da NIFI-13675 Fixed Tooltip for Parameter Description (#9195)
153c87a7da is described below
commit 153c87a7daaeebea9b119066285b840ea4056e09
Author: Pierre Villard
AuthorDate: Sun Aug 25 05:24:28 2024 +0200
NIFI-13675 Fixed Tooltip for Parameter Description (#9195)
Signed-off-by: David Handermann
---
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
index 5a491201fe..e1c1de0ee6 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
@@ -2194,7 +2194,7 @@
infoIcon.qtip($.extend({},
nfCommon.config.tooltipConfig,
{
-content: parameter.description
+content: nfCommon.escapeHtml(parameter.description)
}));
}
}
(nifi) branch main updated: NIFI-12991 Fixed Recursive Validation of Group Execution Engine (#9186)
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 da9c296820 NIFI-12991 Fixed Recursive Validation of Group Execution
Engine (#9186)
da9c296820 is described below
commit da9c296820efb9e574cd006628acf48abe4fa27f
Author: Mark Payne
AuthorDate: Tue Aug 20 16:26:44 2024 -0400
NIFI-12991 Fixed Recursive Validation of Group Execution Engine (#9186)
Fixed issue in which we recursively validate that we can change Execution
Engine of a group, but without changing the top level, inherited groups can't
actually be changed; instead, replaced logic to ensure that we can change the
top level, that we don't validate the constraint that a STATELESS group cannot
have a STATEFUL child, and then validate that all descendant groups can be
updated, but without checking the descendants' parent groups.
Signed-off-by: David Handermann
---
.../apache/nifi/groups/StandardProcessGroup.java| 21 -
.../java/org/apache/nifi/groups/ProcessGroup.java | 6 ++
.../controller/service/mock/MockProcessGroup.java | 4
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 952b2ec396..01da985f2b 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -4406,6 +4406,23 @@ public final class StandardProcessGroup implements
ProcessGroup {
}
}
+// Ensure that we are not changing a parent to Stateless when a child
is explicitly set to STANDARD.
+if (resolvedProposedEngine == ExecutionEngine.STATELESS) {
+for (final ProcessGroup descendant : findAllProcessGroups()) {
+final ExecutionEngine descendantEngine =
descendant.getExecutionEngine();
+if (descendantEngine == ExecutionEngine.STANDARD) {
+throw new IllegalStateException("A Process Group using the
Stateless Engine may not have a child Process Group using the Standard Engine.
Cannot set Execution Engine of " + this +
+" to Stateless because it has a child Process Group "
+ descendant + " using the Standard Engine");
+}
+}
+}
+
+verifyCanUpdateExecutionEngine();
+}
+
+@Override
+public void verifyCanUpdateExecutionEngine() {
+// Ensure that no components are running / services enabled.
for (final ProcessorNode processor : getProcessors()) {
if (processor.isRunning()) {
throw new IllegalStateException("Cannot change Execution
Engine for " + this + " while components are running. " + processor + " is
currently running.");
@@ -4432,6 +4449,7 @@ public final class StandardProcessGroup implements
ProcessGroup {
}
}
+// Ensure that there is no data queued.
for (final Connection connection : getConnections()) {
final boolean queueEmpty = connection.getFlowFileQueue().isEmpty();
if (!queueEmpty) {
@@ -4439,9 +4457,10 @@ public final class StandardProcessGroup implements
ProcessGroup {
}
}
+// Ensure that all descendants are in a good state for updating the
execution engine.
for (final ProcessGroup child : getProcessGroups()) {
if (child.getExecutionEngine() == ExecutionEngine.INHERITED) {
-child.verifyCanSetExecutionEngine(executionEngine);
+child.verifyCanUpdateExecutionEngine();
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
index a2822995bc..40f94f38ad 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java
@@ -1214,6 +1214,12 @@ public interface ProcessGroup extends
ComponentAuthorizable, Positionable, Versi
*/
void verifyCanSetExecutionEngine(ExecutionEngine executionEngine);
+/**
+ * Verifies that the Process Group is in a state in which
(nifi) branch main updated: NIFI-13630 Handle Map Avro Type in PutBigQuery
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 9fbe6aab74 NIFI-13630 Handle Map Avro Type in PutBigQuery
9fbe6aab74 is described below
commit 9fbe6aab74f133f367c6cd386b926643d7a88828
Author: Juldrixx
AuthorDate: Tue Aug 6 15:49:37 2024 +0200
NIFI-13630 Handle Map Avro Type in PutBigQuery
This closes #9151
Signed-off-by: David Handermann
---
.../processors/gcp/bigquery/proto/ProtoUtils.java | 16 -
.../processors/gcp/bigquery/PutBigQueryTest.java | 82 ++
2 files changed, 96 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/proto/ProtoUtils.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/proto/ProtoUtils.java
index 823e0e11d0..8dfda739e0 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/proto/ProtoUtils.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/proto/ProtoUtils.java
@@ -46,8 +46,20 @@ public class ProtoUtils {
switch (field.getType()) {
case MESSAGE:
if (field.isRepeated()) {
- Collection collection = value.getClass().isArray() ?
Arrays.asList((Object[]) value) : (Collection) value;
- collection.forEach(act -> builder.addRepeatedField(field,
createMessage(field.getMessageType(), (Map) act, tableSchema)));
+ final Collection> valueMaps;
+ if (value instanceof Object[] arrayValue) {
+ valueMaps = Arrays.stream(arrayValue)
+ .map(item -> (Map)
item).toList();
+ } else if (value instanceof Map mapValue) {
+ valueMaps = mapValue.entrySet().stream()
+ .map(entry -> Map.of(
+ "key", entry.getKey(),
+ "value", entry.getValue()
+ )).toList();
+ } else {
+ valueMaps = (Collection>) value;
+ }
+ valueMaps.forEach(act -> builder.addRepeatedField(field,
createMessage(field.getMessageType(), act, tableSchema)));
} else {
builder.setField(field,
createMessage(field.getMessageType(), (Map) value,
tableSchema));
}
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryTest.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryTest.java
index 3ff7edf68c..6e6c513801 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryTest.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryTest.java
@@ -44,6 +44,7 @@ import java.util.stream.Stream;
import org.apache.nifi.csv.CSVReader;
import org.apache.nifi.csv.CSVUtils;
import org.apache.nifi.gcp.credentials.service.GCPCredentialsService;
+import org.apache.nifi.json.JsonTreeReader;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Processor;
import
org.apache.nifi.processors.gcp.credentials.service.GCPCredentialsControllerService;
@@ -457,6 +458,26 @@ public class PutBigQueryTest {
runner.assertTransferCount(PutBigQuery.REL_SUCCESS, 1);
}
+@Test
+void testMapFieldSchema() throws Exception {
+
when(writeClient.createWriteStream(isA(CreateWriteStreamRequest.class))).thenReturn(writeStream);
+
+TableSchema myTableSchema = mockJsonTableSchema();
+
+when(writeStream.getTableSchema()).thenReturn(myTableSchema);
+
+when(streamWriter.append(isA(ProtoRows.class), isA(Long.class)))
+
.thenReturn(ApiFutures.immediateFuture(AppendRowsResponse.newBuilder().setAppendResult(mock(AppendRowsResponse.AppendResult.class)).build()));
+
+decorateWithJsonRecordReaderWithSchema(runner);
+runner.setProperty(PutBigQuery.RECORD_READER, "jsonReader");
+
+runner.enqueue(jsonContent());
+runner.run();
+
+runner.assertAllFlowFilesTransferred(PutBigQuery.REL_SUCCESS);
+}
+
private void decorateWithRecordReader(TestRunner runner) throws
InitializationException {
CSVReader csvReader = new CSVReader();
runner.addCont
(nifi) branch main updated: NIFI-13642 Added Delete Keys Property to PutDatabaseRecord
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 d4344a3140 NIFI-13642 Added Delete Keys Property to PutDatabaseRecord
d4344a3140 is described below
commit d4344a3140722cb69202f8b58f190127471d5d30
Author: Rajmund Takacs
AuthorDate: Tue Aug 6 16:48:12 2024 +0200
NIFI-13642 Added Delete Keys Property to PutDatabaseRecord
- Delete Keys property enables targeted deletes for databases that do not
support primary keys
This closes #9162
Signed-off-by: David Handermann
---
.../processors/standard/PutDatabaseRecord.java | 102 +
.../processors/standard/PutDatabaseRecordTest.java | 8 +-
2 files changed, 70 insertions(+), 40 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
index 541eca9613..a3cfd0c375 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
@@ -16,8 +16,43 @@
*/
package org.apache.nifi.processors.standard;
+import static java.lang.String.format;
+import static org.apache.nifi.expression.ExpressionLanguageScope.ENVIRONMENT;
+import static
org.apache.nifi.expression.ExpressionLanguageScope.FLOWFILE_ATTRIBUTES;
+import static org.apache.nifi.expression.ExpressionLanguageScope.NONE;
+
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.sql.BatchUpdateException;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.SQLDataException;
+import java.sql.SQLException;
+import java.sql.SQLIntegrityConstraintViolationException;
+import java.sql.SQLTransientException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -60,40 +95,6 @@ import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.util.DataTypeUtils;
import
org.apache.nifi.serialization.record.util.IllegalTypeConversionException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.sql.BatchUpdateException;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.SQLDataException;
-import java.sql.SQLException;
-import java.sql.SQLIntegrityConstraintViolationException;
-import java.sql.SQLTransientException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.HexFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-
-import static java.lang.String.format;
-import static org.apache.nifi.expression.ExpressionLanguageScope.ENVIRONMENT;
-import static
org.apache.nifi.expression.ExpressionLanguageScope.FLOWFILE_ATTRIBUTES;
-import static org.apache.nifi.expression.ExpressionLanguageScope.NONE;
-
@InputRequirement(Requirement.INPUT_REQUIRED)
@Tags({"sql", "record", "jdbc", "put", "database", "update", "insert",
"delete"})
@CapabilityDescription("The PutDatabaseRecord processor uses a specified
RecordReader to input (possibly multiple) records from an incoming flow file.
These records are translated t
(nifi) branch main updated (7348740ecc -> abe41ff649)
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 7348740ecc NIFI-13639 Replaced OkHttp with web-client-api in web-security This closes #9157 add abe41ff649 NIFI-12411 Update PublishAMQP with configurable Header Source Property No new revisions were added by this update. Summary of changes: .../apache/nifi/amqp/processors/AMQPPublisher.java | 4 +- .../amqp/processors/AbstractAMQPProcessor.java | 37 ++-- .../apache/nifi/amqp/processors/ConsumeAMQP.java | 160 ++--- .../apache/nifi/amqp/processors/PublishAMQP.java | 193 +++-- .../additionalDetails.html | 18 +- .../nifi/amqp/processors/ConsumeAMQPTest.java | 45 ++--- .../nifi/amqp/processors/PublishAMQPTest.java | 119 + 7 files changed, 387 insertions(+), 189 deletions(-)
(nifi) branch improve-prov-performance deleted (was 64132affb6)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch improve-prov-performance in repository https://gitbox.apache.org/repos/asf/nifi.git was 64132affb6 NIFI-524: - Adding a tab for process groups statistics in the Summary table. This change permanently discards the following revisions: discard 64132affb6 NIFI-524: - Adding a tab for process groups statistics in the Summary table. discard 4dafd65a2e NIFI-527: Added unit test to verify backpressure discard 2f7b2ef300 NIFI-527: Cleaned up log messages discard 9a9973af8d NIFI-527: More performance improvements, including reusing IndexSearchers and IndexWriters discard a1027aeae5 NIFI-527: Refactored the serialization format of the persistent prov repo to use compression blocks and index them
(nifi) branch prov-query-language deleted (was 6ea2c72b98)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch prov-query-language in repository https://gitbox.apache.org/repos/asf/nifi.git was 6ea2c72b98 NIFI-40: Added new fields to index/search on This change permanently discards the following revisions: discard 6ea2c72b98 NIFI-40: Added new fields to index/search on discard 6e0575cf12 NIFI-40: merged changes from NIFI-250 branch and develop discard 8783c114ac Merge branch 'develop' into prov-query-language discard d122a83633 NIFI-250: Fixed NPE discard 50f0c123bc NIFI-250: - Including active threads in the reporting task dto. - Verifying actions taken against component referencing controller services. - Rendering the run state for reporting tasks (including active thread counts). discard cd69a423dd Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250 discard 6b36aefef9 NIFI-250: - Adding active thread count on reporting tasks. - Merging clustered responses for controller service and reporting task endpoints. discard f556490fb7 NIFI-250: Added verify methods to controller service provider discard 79ddcb828e Merge branch 'develop' into NIFI-250 discard 79c6001638 NIFI-40: Merged in NIFI-250 and bug fixes discard d5a9a1a625 NIFI-250: - Updating button visibility to always show the enable/run buttons when the service/task is disabled/stopped. Previously the enable/run buttons were only visible the component did not have any validation errors. However, this caused the buttons to shift and the alignment to be off. discard 8cc58fe80b NIFI-250: - Adding a button to link to the usage of a controller service or reporting task. discard c9604a3fca NIFI-250: - Adding support for configuring the scheduling strategy and scheduling period for reporting tasks. discard df43c8b620 NIFI-40: initial implementation of prov query language discard ca7b652621 NIFI-250: - Trying to ensure accurate details when enabling/disabling controller service and minimize web requests. - Fixing issues with the enabled flag in the controller service and reporting task dialog. discard ae3c29aa56 Merge branch 'develop' into NIFI-250 discard 4f41202e9d NIFI-250: - Updating controller service auditing to ensure transitive referenced components are reported correctly. - Restoring reference to reporting task provider. discard fe09680dea Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250 discard 40035429f8 NIFI-250: Added missing methods to ReportingTaskProvider discard 85e38dc055 NIFI-250: - Setting the default name of the reporting task. discard 74d45aefbf NIFI-250: - Adding methods to obtain all reporting tasks. - Adding parameters to update the scheduled state of a reporting task. - Adding action buttons to the reporting task table. discard 2211741cad NIFI-250: - Fixing issues showing the progress when enabling/disabling a controller service. - Ensure state for the service and its referencing components at all time since the action could be cancelled at any time. discard fc76a61659 NIFI-250: Fixed import that was accidentally removed discard 0d8cc34ae1 Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250 discard baa0e74cc3 NIFI-250: Load controller services in correct order instead of arbitrary order discard 048c5d9aa7 NIFI-250: - Updating the progress label when enabling/disabling controller services and their referencing components. discard 51d70bff34 NIFI-250: - Showing the progress of enabling/disabling of a controller service so the user knows what the status of each step. This is especially important when the action fails someplace in the middle. discard 5cc6fda21b NIFI-250: - Updating the enable/disable dialog to show the current status while waiting for referencing components. discard 6d12f134ff NIFI-250: - Adding a close button after enabling/disabling a controller service. This gives the user an opportunity to review issues prior to closing the dialog. discard eb6c5b5e23 Merge branch 'develop' into NIFI-250 discard bde21cb8a6 NIFI-250: - Updating the layout of the enable/disable dialogs. - Showing referencing components validation errors where appropriate. discard 73459ccb5c Merge branch 'develop' into NIFI-250 discard 6f867585e1 NIFI-250: - Including validation errors in the controller service referencing components dto. discard b1dcab62a7 NIFI-250: - Fixing missing import. discard 91f69b0cf2 NIFI-250: - Adding a factory bean for obtaining the appropriate ReportingTaskProvider given the configured operating mode (cluster/node). - Fixing copy/paste error with the ControllerServiceProvicer factory bean. discard ed22742c0f NIFI-250: - JS global hint. discard bc508cd905 NIFI-250: - Reseting the table size when opening the new controller service
(nifi) branch journaling-prov-repo deleted (was a2219eb753)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch journaling-prov-repo in repository https://gitbox.apache.org/repos/asf/nifi.git was a2219eb753 NIFI-388: added getAttribute(String) method to ProvenanceEventRecord The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(nifi) branch support/nifi-1.x updated (42d3e6a96a -> a044af8d6c)
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 42d3e6a96a NIFI-13655 Upgrade 1.x Shared Dependencies including JacksonXML and others add a044af8d6c NIFI-13430 Added CopyS3Object and GetS3ObjectMetadata No new revisions were added by this update. Summary of changes: .../nifi/processors/aws/s3/CopyS3Object.java | 148 ++ .../nifi/processors/aws/s3/DeleteS3Object.java | 2 +- .../nifi/processors/aws/s3/FetchS3Object.java | 2 +- .../processors/aws/s3/GetS3ObjectMetadata.java | 216 + .../org/apache/nifi/processors/aws/s3/ListS3.java | 2 +- .../apache/nifi/processors/aws/s3/PutS3Object.java | 2 +- .../apache/nifi/processors/aws/s3/TagS3Object.java | 2 +- .../services/org.apache.nifi.processor.Processor | 2 + .../apache/nifi/processors/aws/s3/AuthUtils.java | 41 .../nifi/processors/aws/s3/TestCopyS3Object.java | 105 ++ .../processors/aws/s3/TestGetS3ObjectMetadata.java | 203 +++ 11 files changed, 720 insertions(+), 5 deletions(-) create mode 100644 nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java create mode 100644 nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java create mode 100644 nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AuthUtils.java create mode 100644 nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestCopyS3Object.java create mode 100644 nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestGetS3ObjectMetadata.java
(nifi) branch main updated: NIFI-12709 Added New FlowFlow Attributes for Zip and Tar in UnpackContent
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 9d51c675cb NIFI-12709 Added New FlowFlow Attributes for Zip and Tar in UnpackContent 9d51c675cb is described below commit 9d51c675cbfd20e6ecbf2660afd2250ed8752f69 Author: dan-s1 AuthorDate: Fri Jul 26 17:10:22 2024 + NIFI-12709 Added New FlowFlow Attributes for Zip and Tar in UnpackContent This closes #9122 Signed-off-by: David Handermann --- .../nifi/processors/standard/UnpackContent.java| 138 - .../processors/standard/TestUnpackContent.java | 38 -- 2 files changed, 137 insertions(+), 39 deletions(-) diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java index 492c488114..b831751b6e 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java @@ -67,9 +67,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.Charset; import java.nio.file.Path; +import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -99,12 +102,17 @@ import java.util.regex.Pattern; @WritesAttribute(attribute = "fragment.count", description = "The number of unpacked FlowFiles generated from the parent FlowFile"), @WritesAttribute(attribute = "segment.original.filename ", description = "The filename of the parent FlowFile. Extensions of .tar, .zip or .pkg are removed because " + "the MergeContent processor automatically adds those extensions if it is used to rebuild the original FlowFile"), -@WritesAttribute(attribute = "file.lastModifiedTime", description = "The date and time that the unpacked file was last modified (tar only)."), -@WritesAttribute(attribute = "file.creationTime", description = "The date and time that the file was created. This attribute holds always the same value as file.lastModifiedTime (tar only)."), -@WritesAttribute(attribute = "file.owner", description = "The owner of the unpacked file (tar only)"), -@WritesAttribute(attribute = "file.group", description = "The group owner of the unpacked file (tar only)"), -@WritesAttribute(attribute = "file.permissions", description = "The read/write/execute permissions of the unpacked file (tar only)"), -@WritesAttribute(attribute = "file.encryptionMethod", description = "The encryption method for entries in Zip archives")}) +@WritesAttribute(attribute = UnpackContent.FILE_LAST_MODIFIED_TIME_ATTRIBUTE, description = "The date and time that the unpacked file was last modified (tar and zip only)."), +@WritesAttribute(attribute = UnpackContent.FILE_CREATION_TIME_ATTRIBUTE, description = "The date and time that the file was created. For encrypted zip files this attribute" + +" always holds the same value as " + UnpackContent.FILE_LAST_MODIFIED_TIME_ATTRIBUTE + ". For tar and unencrypted zip files if available it will be returned otherwise" + +" this will be the same value as" + UnpackContent.FILE_LAST_MODIFIED_TIME_ATTRIBUTE + "."), +@WritesAttribute(attribute = UnpackContent.FILE_LAST_METADATA_CHANGE_ATTRIBUTE, description = "The date and time the file's metadata changed (tar only)."), +@WritesAttribute(attribute = UnpackContent.FILE_LAST_ACCESS_TIME_ATTRIBUTE, description = "The date and time the file was last accessed (tar and unencrypted zip files only)"), +@WritesAttribute(attribute = UnpackContent.FILE_OWNER_ATTRIBUTE, description = "The owner of the unpacked file (tar only)"), +@WritesAttribute(attribute = UnpackContent.FILE_GROUP_ATTRIBUTE, description = "The group owner of the unpacked file (tar only)"), +@WritesAttribute(attribute = UnpackContent.FILE_SIZE_ATTRIBUTE, description = "The uncompressed size of the unpacked file (tar and zip only)"), +@WritesAttribute(attribute = UnpackContent.FILE_PERMISSIONS_ATTRIBUTE, description = "The read/write/ex
(nifi) branch main updated: NIFI-13657 Fixed Reducer for Processor Load Average in Node Status
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 e46c7db1ec NIFI-13657 Fixed Reducer for Processor Load Average in Node
Status
e46c7db1ec is described below
commit e46c7db1ecb32ec0bd4910f3d15a7f407f60063d
Author: Bryan Bende
AuthorDate: Wed Aug 14 15:14:40 2024 -0400
NIFI-13657 Fixed Reducer for Processor Load Average in Node Status
This closes #9177
Signed-off-by: David Handermann
---
.../org/apache/nifi/controller/status/history/NodeStatusDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-status-history-shared/src/main/java/org/apache/nifi/controller/status/history/NodeStatusDescriptor.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-status-history-shared/src/main/java/org/apache/nifi/controller/status/history/NodeStatusDescriptor.java
index b6bd14be88..dd43870e17 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-status-history-shared/src/main/java/org/apache/nifi/controller/status/history/NodeStatusDescriptor.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-status-history-shared/src/main/java/org/apache/nifi/controller/status/history/NodeStatusDescriptor.java
@@ -79,7 +79,7 @@ public enum NodeStatusDescriptor {
@Override
public Long reduce(final List values) {
return (long) values.stream()
-.map(snapshot ->
snapshot.getStatusMetric(HEAP_UTILIZATION.getDescriptor()))
+.map(snapshot ->
snapshot.getStatusMetric(PROCESSOR_LOAD_AVERAGE.getDescriptor()))
.filter(Objects::nonNull)
.mapToLong(value -> value)
.average()
(nifi) branch main updated: NIFI-13430 Added CopyS3Object and GetS3ObjectMetadata
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 99f3717f13 NIFI-13430 Added CopyS3Object and GetS3ObjectMetadata
99f3717f13 is described below
commit 99f3717f13169ed9504c3c05650938940ee169d4
Author: Mike Thomsen
AuthorDate: Thu Jun 20 09:32:29 2024 -0400
NIFI-13430 Added CopyS3Object and GetS3ObjectMetadata
This closes #8992
Co-authored-by: David Handermann
Signed-off-by: David Handermann
---
.../nifi/processors/aws/s3/CopyS3Object.java | 149 ++
.../nifi/processors/aws/s3/DeleteS3Object.java | 2 +-
.../nifi/processors/aws/s3/FetchS3Object.java | 2 +-
.../processors/aws/s3/GetS3ObjectMetadata.java | 216 +
.../org/apache/nifi/processors/aws/s3/ListS3.java | 2 +-
.../apache/nifi/processors/aws/s3/PutS3Object.java | 2 +-
.../apache/nifi/processors/aws/s3/TagS3Object.java | 2 +-
.../services/org.apache.nifi.processor.Processor | 2 +
.../nifi/processors/aws/s3/TestCopyS3Object.java | 108 +++
.../processors/aws/s3/TestGetS3ObjectMetadata.java | 202 +++
10 files changed, 682 insertions(+), 5 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
new file mode 100644
index 00..9f886bda50
--- /dev/null
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.aws.s3;
+
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.AccessControlList;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.CopyObjectRequest;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.SeeAlso;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.exception.ProcessException;
+
+import java.util.List;
+
+import static org.apache.nifi.processors.aws.util.RegionUtilV1.S3_REGION;
+
+@Tags({"Amazon", "S3", "AWS", "Archive", "Copy"})
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@CapabilityDescription("Copies a file from one bucket and key to another in
AWS S3")
+@SeeAlso({PutS3Object.class, DeleteS3Object.class, ListS3.class,
TagS3Object.class, DeleteS3Object.class, FetchS3Object.class})
+public class CopyS3Object extends AbstractS3Processor {
+
+static final PropertyDescriptor SOURCE_BUCKET = new
PropertyDescriptor.Builder()
+.fromPropertyDescriptor(BUCKET_WITH_DEFAULT_VALUE)
+.name("Source Bucket")
+.displayName("Source Bucket")
+.description("The bucket that contains the file to be copied.")
+.build();
+
+static final PropertyDescriptor SOURCE_KEY = new
PropertyDescriptor.Builder()
+.fromPropertyDescriptor(KEY)
+.name("Source Key")
+.displayName("Source Key")
+.description("The source key in the source bucket")
+.build();
+
+static final PropertyDescriptor DESTINATION_BUCKET = new
PropertyDescriptor.Builder()
+.fromPropertyDescriptor(BUCKET_WITHOUT_DEFAULT_VALUE)
+.name("Destination Bucket")
+.displayName("Destination
(nifi) branch main updated: NIFI-11977 Set UTF-8 Character Set in Subject for PutEmail (#9170)
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 39a1ccc191 NIFI-11977 Set UTF-8 Character Set in Subject for PutEmail
(#9170)
39a1ccc191 is described below
commit 39a1ccc191e51fbb65e832548f655335215f0fb8
Author: Michael Akinyemi <43253796+makiny...@users.noreply.github.com>
AuthorDate: Tue Aug 13 12:03:41 2024 -0400
NIFI-11977 Set UTF-8 Character Set in Subject for PutEmail (#9170)
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/processors/standard/PutEmail.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
index 42da4020a7..2772dec176 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
@@ -415,7 +415,7 @@ public class PutEmail extends AbstractProcessor {
final Properties properties =
this.getMailPropertiesFromFlowFile(context, flowFile);
final Session mailSession = this.createMailSession(properties);
-final Message message = new MimeMessage(mailSession);
+final MimeMessage message = new MimeMessage(mailSession);
try {
message.addFrom(toInetAddresses(context, flowFile, FROM));
@@ -431,7 +431,8 @@ public class PutEmail extends AbstractProcessor {
}
}
this.setMessageHeader("X-Mailer",
context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions(flowFile).getValue(),
message);
-
message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions(flowFile).getValue());
+
+
message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions(flowFile).getValue(),
StandardCharsets.UTF_8.name());
final String messageText = getMessage(flowFile, context, session);
(nifi) branch main updated (b4266a559c -> e349b7e7b4)
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 b4266a559c [NIFI-13637] add padding to Jolt UI expansion panels (#9154) add e349b7e7b4 NIFI-13649 Check Cluster Node Address Status before marking CONNECTED (#9168) No new revisions were added by this update. Summary of changes: .../cluster/coordination/ClusterCoordinator.java | 8 + .../heartbeat/AbstractHeartbeatMonitor.java| 5 +++ .../coordination/node/NodeClusterCoordinator.java | 19 +++ .../heartbeat/TestAbstractHeartbeatMonitor.java| 38 ++ .../java/org/apache/nifi/BootstrapListener.java| 1 + .../apache/nifi/web/api/ApplicationResource.java | 16 +++-- 6 files changed, 85 insertions(+), 2 deletions(-)
(nifi) branch main updated: NIFI-13648 Upgraded Jetty to 12.0.12 along with other common dependencies
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 3096c983f5 NIFI-13648 Upgraded Jetty to 12.0.12 along with other common dependencies 3096c983f5 is described below commit 3096c983f51662e76551f91cda5dcbbc981bb1c0 Author: Joseph Witt AuthorDate: Fri Aug 9 11:14:01 2024 -0700 NIFI-13648 Upgraded Jetty to 12.0.12 along with other common dependencies - Upgraded AWS SDK from 1.12.762 to 1.12.767 - Upgraded AWSK SDK from 2.26.21 to 2.27.1 - Upgraded zstd-jni from 1.5.6-3 to 1.5.6-4 - Upgraded excel-streaming-reader from 4.4.0 to 5.0.2 - Upgraded azure-sdk-bom from 1.2.25 to 1.2.26 - Upgraded json-schema-validator from 1.5.0 to 1.5.1 - Upgraded oauth2-oidc-sdk from 11.13 to 11.14 - Upgraded Fabric8 Kubernetes Client from 6.13.1 to 6.13.2 - Upgraded commons-compress from 1.26.2 to 1.27.0 - Upgraded commons-lang3 from 3.15.0 to 3.16.0 - Upgraded Apache SSHD from 2.13.1 to 2.13.2 - Upgraded Jetty from 12.0.11 to 12.0.12 - Upgraded Elasticsearch Client from 8.14.3 to 8.15.0 - Upgraded Jersey from 3.1.7 to 3.1.8 - Upgraded SLF4J from 2.0.13 to 2.0.15 - Upgraded Testcontainers from 1.20.0 to 1.20.1 - Upgraded org.tukaani xz from 1.9 to 1.10 - Upgraded snappy-java from 1.1.10.5 to 1.1.10.6 - Upgraded google-api-services-drive from v3-rev20240628-2.0.0 to v3-rev20240730-2.0.0 - Upgraded Hazelcast from 5.4.0 to 5.5.0 - Upgraded Azure Kusto from 5.1.0 to 5.1.1 - Upgraded ActiveMQ from 6.1.2 to 6.1.3 - Upgraded Clojure from 1.11.3 to 1.11.4 - Upgraded FlywayDB from 10.16.0 to 10.17.0 - Upgraded MongoDB from 4.11.2 to 4.11.3 - Upgraded Neo4j from 5.22.0 to 5.23.0 This closes #9167 Signed-off-by: David Handermann --- nifi-code-coverage/pom.xml | 2 +- .../nifi-azure-processors/pom.xml | 4 ++-- nifi-extension-bundles/nifi-azure-bundle/pom.xml | 2 +- .../nifi-compress-processors/pom.xml | 2 +- .../nifi-elasticsearch-bundle/pom.xml | 4 ++-- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml| 2 +- .../nifi-neo4j-cypher-service/pom.xml | 2 +- .../nifi-hazelcast-services/pom.xml| 2 +- .../nifi-jms-bundle/nifi-jms-processors/pom.xml| 2 +- nifi-extension-bundles/nifi-mongodb-bundle/pom.xml | 2 +- nifi-extension-bundles/nifi-poi-bundle/pom.xml | 2 +- .../nifi-registry-service/pom.xml | 2 +- .../nifi-scripting-processors/pom.xml | 2 +- .../nifi-standard-processors/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml | 6 +++--- .../nifi-record-serialization-services/pom.xml | 2 +- nifi-framework-bundle/pom.xml | 2 +- nifi-registry/nifi-registry-core/pom.xml | 2 +- nifi-registry/pom.xml | 4 ++-- pom.xml| 22 +++--- 20 files changed, 35 insertions(+), 35 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index 6f6ac3307a..a8cfbd925f 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -28,7 +28,7 @@ 1.10.14 -2.13.1 +2.13.2 0.8.11 diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml index 83c08e9146..b69b63e7a3 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml @@ -128,12 +128,12 @@ com.microsoft.azure.kusto kusto-data -5.1.0 +5.1.1 com.microsoft.azure.kusto kusto-ingest -5.1.0 +5.1.1 com.fasterxml.jackson.core diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/pom.xml index 2a9d4a84a7..10379202dd 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml @@ -28,7 +28,7 @@ -1.2.25 +1.2.26 1.16.1 0.34.1 diff --git a/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml b/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml index 2f5e9a26f7..e789f57512 100644 --- a/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml +++ b/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/pom.xml @@ -48,7 +48,7 @@ language governing permissions and limitations under
(nifi) branch main updated: NIFI-13646 Corrected Current User Replicated Response Handling (#9164)
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 9cd319e3e5 NIFI-13646 Corrected Current User Replicated Response
Handling (#9164)
9cd319e3e5 is described below
commit 9cd319e3e5ca19cbdf92bad60e761ef680f2297c
Author: David Handermann
AuthorDate: Wed Aug 7 16:22:39 2024 -0500
NIFI-13646 Corrected Current User Replicated Response Handling (#9164)
Signed-off-by: David Handermann
---
.../java/org/apache/nifi/web/api/FlowResource.java | 27 +-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
index dfe6399d11..722c49c449 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.prometheus.client.CollectorRegistry;
import io.prometheus.client.exporter.common.TextFormat;
import io.swagger.v3.oas.annotations.Operation;
@@ -152,6 +153,9 @@ import org.apache.nifi.web.util.PaginationHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
import java.text.Collator;
import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter;
@@ -188,6 +192,8 @@ public class FlowResource extends ApplicationResource {
private static final String
VERSIONED_REPORTING_TASK_SNAPSHOT_FILENAME_PATTERN =
"VersionedReportingTaskSnapshot-%s.json";
private static final String VERSIONED_REPORTING_TASK_SNAPSHOT_DATE_FORMAT
= "MMddHHmmss";
+private static final ObjectMapper objectMapper = new ObjectMapper();
+
private NiFiServiceFacade serviceFacade;
private Authorizer authorizer;
@@ -343,7 +349,7 @@ public class FlowResource extends ApplicationResource {
final CurrentUserEntity entity;
if (isReplicateRequest()) {
try (Response replicatedResponse = replicate(HttpMethod.GET)) {
-final CurrentUserEntity replicatedCurrentUserEntity =
(CurrentUserEntity) replicatedResponse.getEntity();
+final CurrentUserEntity replicatedCurrentUserEntity =
readReplicatedCurrentUserEntity(replicatedResponse);
final CurrentUserEntity currentUserEntity =
serviceFacade.getCurrentUser();
// Set Logout Supported based on local client information
instead of replicated and merged responses
replicatedCurrentUserEntity.setLogoutSupported(currentUserEntity.isLogoutSupported());
@@ -356,6 +362,25 @@ public class FlowResource extends ApplicationResource {
return generateOkResponse(entity).build();
}
+private CurrentUserEntity readReplicatedCurrentUserEntity(final Response
replicatedResponse) {
+final Object entity = replicatedResponse.getEntity();
+if (entity instanceof CurrentUserEntity replicatedCurrentUserEntity) {
+return replicatedCurrentUserEntity;
+} else if (entity instanceof StreamingOutput streamingOutput) {
+final ByteArrayOutputStream outputStream = new
ByteArrayOutputStream();
+try {
+streamingOutput.write(outputStream);
+
+final byte[] bytes = outputStream.toByteArray();
+return objectMapper.readValue(bytes, CurrentUserEntity.class);
+} catch (final IOException e) {
+throw new UncheckedIOException("Read Current User Entity
failed", e);
+}
+} else {
+throw new IllegalStateException("Current User Entity not expected
[%s]".formatted(entity));
+}
+}
+
/**
* Retrieves the contents of the specified group.
*
(nifi) branch main updated: NIFI-13555 Added Verification to HikariDBCPConnectionPool (#9085)
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 fd8acd57b8 NIFI-13555 Added Verification to HikariDBCPConnectionPool
(#9085)
fd8acd57b8 is described below
commit fd8acd57b8172417e382fd004a7a7480792d2da7
Author: Matt Burgess
AuthorDate: Tue Aug 6 14:26:19 2024 -0400
NIFI-13555 Added Verification to HikariDBCPConnectionPool (#9085)
Signed-off-by: David Handermann
---
.../apache/nifi/dbcp/HikariCPConnectionPool.java | 201 +
.../nifi/dbcp/HikariCPConnectionPoolTest.java | 51 +-
.../nifi/util/MockControllerServiceLookup.java | 2 +-
3 files changed, 211 insertions(+), 43 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
index 230df5a6f3..59413b71e4 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java
@@ -27,6 +27,7 @@ import
org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnDisabled;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
+import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.components.RequiredPermission;
@@ -34,12 +35,15 @@ import
org.apache.nifi.components.resource.ResourceCardinality;
import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
+import org.apache.nifi.controller.VerifiableControllerService;
import org.apache.nifi.expression.AttributeExpression;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.kerberos.KerberosUserService;
+import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.security.krb.KerberosAction;
+import org.apache.nifi.security.krb.KerberosLoginException;
import org.apache.nifi.security.krb.KerberosUser;
import javax.security.auth.login.LoginException;
@@ -48,10 +52,14 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import static
org.apache.nifi.components.ConfigVerificationResult.Outcome.FAILED;
+import static
org.apache.nifi.components.ConfigVerificationResult.Outcome.SUCCESSFUL;
+
/**
* Implementation of Database Connection Pooling Service. HikariCP is used for
connection pooling functionality.
*/
@@ -71,7 +79,7 @@ import java.util.stream.Collectors;
)
}
)
-public class HikariCPConnectionPool extends AbstractControllerService
implements DBCPService {
+public class HikariCPConnectionPool extends AbstractControllerService
implements DBCPService, VerifiableControllerService {
/**
* Property Name Prefix for Sensitive Dynamic Properties
*/
@@ -81,6 +89,8 @@ public class HikariCPConnectionPool extends
AbstractControllerService implements
private static final String DEFAULT_TOTAL_CONNECTIONS = "10";
private static final String DEFAULT_MAX_CONN_LIFETIME = "-1";
+private static final int DEFAULT_MIN_VALIDATION_TIMEOUT = 250;
+
public static final PropertyDescriptor DATABASE_URL = new
PropertyDescriptor.Builder()
.name("hikaricp-connection-url")
.displayName("Database Connection URL")
@@ -254,7 +264,132 @@ public class HikariCPConnectionPool extends
AbstractControllerService implements
*/
@OnEnabled
public void onConfigured(final ConfigurationContext context) {
+dataSource = new HikariDataSource();
+configureDataSource(context, dataSource);
+}
+
+private long extractMillisWithInfinite(PropertyValue prop) {
+return "-1".equals(prop.getValue()) ? INFINITE_MILLISECONDS :
prop.asTimePeriod(TimeUnit.MILLISECONDS);
+}
+
+/**
+ * Shutdown pool, close all open connections.
+ * If a principal is
(nifi-python-extensions) branch main updated: NIFI-13628 Set NumPy 1.26.4 for Chroma Processors (#5)
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-python-extensions.git The following commit(s) were added to refs/heads/main by this push: new afe8b3c NIFI-13628 Set NumPy 1.26.4 for Chroma Processors (#5) afe8b3c is described below commit afe8b3cb860868bb48acaecc2b018e474e7d1808 Author: krisztina-zsihovszki <76993418+krisztina-zsihovs...@users.noreply.github.com> AuthorDate: Tue Aug 6 19:46:23 2024 +0200 NIFI-13628 Set NumPy 1.26.4 for Chroma Processors (#5) Signed-off-by: David Handermann --- src/extensions/vectorstores/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/extensions/vectorstores/requirements.txt b/src/extensions/vectorstores/requirements.txt index 31e215a..c2131d4 100644 --- a/src/extensions/vectorstores/requirements.txt +++ b/src/extensions/vectorstores/requirements.txt @@ -7,6 +7,7 @@ langchain==0.1.11 # Chroma requirements chromadb==0.4.22 +numpy==1.26.4 onnxruntime tokenizers tqdm
(nifi) branch main updated: NIFI-13625 Removed or Replaced System.out.println in Tests (#9150)
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 f64e68b23c NIFI-13625 Removed or Replaced System.out.println in Tests
(#9150)
f64e68b23c is described below
commit f64e68b23c9ab340cee6b046131b2804c088a83e
Author: dan-s1
AuthorDate: Mon Aug 5 21:35:40 2024 -0400
NIFI-13625 Removed or Replaced System.out.println in Tests (#9150)
Signed-off-by: David Handermann
---
.../ingestors/RestChangeIngestorCommonTest.java| 16 --
.../bootstrap/util/OrderedPropertiesTest.java | 2 --
.../language/TestStandardPreparedQuery.java| 9 +---
.../org/apache/nifi/hl7/query/TestHL7Query.java| 4
.../apache/nifi/security/krb/KerberosUserIT.java | 10 ++---
.../nifi/stream/io/TestLeakyBucketThrottler.java | 6 +-
.../nifi/stream/io/util/TestLineDemarcator.java| 6 +-
.../wali/TestSequentialAccessWriteAheadLog.java| 13 +++
.../processors/aws/dynamodb/PutDynamoDBTest.java | 6 --
.../nifi/processors/aws/s3/ITFetchS3Object.java| 6 +-
.../nifi/processors/aws/s3/ITPutS3Object.java | 10 +
.../azure/loganalytics/TestMetricsFactory.java | 2 --
.../processors/compress/TestModifyCompression.java | 1 -
.../apache/nifi/util/db/TestJdbcClobReadable.java | 2 --
.../org/apache/nifi/util/db/TestJdbcCommon.java| 16 --
.../apache/nifi/util/db/TestJdbcHugeStream.java| 5 -
.../org/apache/nifi/util/db/TestJdbcTypesH2.java | 25 +-
.../org/apache/nifi/avro/TestAvroTypeUtil.java | 5 -
.../validation/TestStandardSchemaValidator.java| 1 -
.../processors/gcp/storage/FetchGCSObjectIT.java | 5 -
.../processors/gcp/storage/PutGCSObjectIT.java | 7 --
.../provenance/AbstractTestRecordReaderWriter.java | 3 ---
.../TestEventIdFirstSchemaRecordReaderWriter.java | 5 -
.../provenance/TestSchemaRecordReaderWriter.java | 9 +---
.../store/TestPartitionedWriteAheadEventStore.java | 5 -
.../TestSelectiveRecordReaderEventIterator.java| 5 -
.../TestVolatileProvenanceRepository.java | 3 ---
.../processors/standard/TestCompressContent.java | 1 -
.../processors/standard/TestDistributeLoad.java| 1 -
.../processors/standard/TestExecuteProcess.java| 7 --
.../nifi/processors/standard/TestLookupRecord.java | 1 -
.../nifi/processors/standard/TestModifyBytes.java | 13 ---
.../nifi/processors/standard/TestQueryRecord.java | 8 +--
.../nifi/processors/standard/TestReplaceText.java | 5 -
.../nifi/processors/standard/TestTailFile.java | 14
.../nifi/controller/TestMonitorDiskUsage.java | 2 --
.../avro/TestWriteAvroResultWithoutSchema.java | 5 -
.../json/TestInferJsonSchemaAccessStrategy.java| 7 --
.../nifi/json/TestJsonTreeRowRecordReader.java | 7 --
.../apache/nifi/syslog/TestSyslogRecordReader.java | 7 --
.../analysis/AttributeRollingWindowIT.java | 7 --
.../repository/TestRingBufferEventRepository.java | 9
.../clustered/TestSwappablePriorityQueue.java | 7 --
.../repository/StandardProcessSessionIT.java | 7 --
.../repository/TestFileSystemRepository.java | 7 --
.../TestWriteAheadFlowFileRepository.java | 10 ++---
.../swap/TestSchemaSwapSerializerDeserializer.java | 6 +-
.../TestJAXBVersionedProcessGroupSerializer.java | 4
.../performance/StatelessPerformanceIT.java| 6 +-
.../nifi/tests/system/nar/NarUploadPythonIT.java | 2 +-
.../toolkit/cli/impl/result/TestBucketsResult.java | 1 -
51 files changed, 133 insertions(+), 198 deletions(-)
diff --git
a/minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestorCommonTest.java
b/minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestorCommonTest.java
index e10226a877..e7d31e25e7 100644
---
a/minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestorCommonTest.java
+++
b/minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/RestChangeIngestorCommonTest.java
@@ -20,7 +20,6 @@ package
org.apache.nifi.minifi.bootstrap.configuration.ingestors;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
-import okhttp3.Headers;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -68,11 +67,6 @@ public abstract class RestChangeIngestorCommonTest {
throw new IOException("Unexpected code " + response);
}
-Headers responseHeaders = respon
(nifi) branch main updated: NIFI-12224 Added Support for updateMany Method in PutMongo
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 c5ed5c51e9 NIFI-12224 Added Support for updateMany Method in PutMongo
c5ed5c51e9 is described below
commit c5ed5c51e93f5b1f9311b5a478e64b2f1320a9d4
Author: Umar Hussain
AuthorDate: Sun Apr 7 02:47:03 2024 +0500
NIFI-12224 Added Support for updateMany Method in PutMongo
This closes #8610
Signed-off-by: David Handermann
---
.../processors/mongodb/AbstractMongoProcessor.java | 62 +++-
.../apache/nifi/processors/mongodb/PutMongo.java | 93 --
.../nifi/processors/mongodb/PutMongoRecord.java| 42 +--
.../apache/nifi/processors/mongodb/PutMongoIT.java | 337 -
.../nifi/processors/mongodb/PutMongoRecordIT.java | 9 +-
5 files changed, 387 insertions(+), 156 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
index 9a5c8eb724..5d7b4d6843 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.DescribedValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -46,13 +47,13 @@ import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
public abstract class AbstractMongoProcessor extends AbstractProcessor {
+public static final String ATTRIBUTE_MONGODB_UPDATE_MODE =
"mongodb.update.mode";
+
protected static final String JSON_TYPE_EXTENDED = "Extended";
protected static final String JSON_TYPE_STANDARD = "Standard";
protected static final AllowableValue JSON_EXTENDED = new
AllowableValue(JSON_TYPE_EXTENDED, "Extended JSON",
@@ -156,14 +157,41 @@ public abstract class AbstractMongoProcessor extends
AbstractProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.build();
-static final List descriptors;
+static final List descriptors = List.of(
+CLIENT_SERVICE,
+DATABASE_NAME,
+COLLECTION_NAME
+);
+
+public enum UpdateMethod implements DescribedValue {
+UPDATE_ONE("one", "Update One", "Updates only the first document that
matches the query."),
+UPDATE_MANY("many", "Update Many", "Updates every document that
matches the query."),
+UPDATE_FF_ATTRIBUTE("flowfile-attribute", "Use '" +
ATTRIBUTE_MONGODB_UPDATE_MODE + "' FlowFile attribute.",
+"Use the value of the '" + ATTRIBUTE_MONGODB_UPDATE_MODE + "'
attribute of the incoming FlowFile. Acceptable values are 'one' and 'many'.");
+private final String value;
+private final String displayName;
+private final String description;
+
+UpdateMethod(final String value, final String displayName, final
String description) {
+this.value = value;
+this.displayName = displayName;
+this.description = description;
+}
-static {
-List _temp = new ArrayList<>();
-_temp.add(CLIENT_SERVICE);
-_temp.add(DATABASE_NAME);
-_temp.add(COLLECTION_NAME);
-descriptors = Collections.unmodifiableList(_temp);
+@Override
+public String getValue() {
+return value;
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
+
+@Override
+public String getDescription() {
+return description;
+}
}
protected ObjectMapper objectMapper;
@@ -235,4 +263,20 @@ public abstract class AbstractMongoProcessor extends
AbstractProcessor {
objectMapper.setDateFormat(df);
(nifi) branch support/nifi-1.x updated: NIFI-13621 Upgraded JGit to 5.13.3.202401111512 for CVE-2023-4759
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 57b4d92a3a NIFI-13621 Upgraded JGit to 5.13.3.20240512 for CVE-2023-4759 57b4d92a3a is described below commit 57b4d92a3ae4b9ddccd13815b21f90222cb8d297 Author: Krisztina Zsihovszki AuthorDate: Fri Aug 2 15:15:56 2024 +0200 NIFI-13621 Upgraded JGit to 5.13.3.20240512 for CVE-2023-4759 This closes #9141 Signed-off-by: David Handermann --- nifi-dependency-check-maven/suppressions.xml | 2 +- nifi-registry/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-dependency-check-maven/suppressions.xml b/nifi-dependency-check-maven/suppressions.xml index 091eccfcaa..c9fa8c0272 100644 --- a/nifi-dependency-check-maven/suppressions.xml +++ b/nifi-dependency-check-maven/suppressions.xml @@ -285,7 +285,7 @@ cpe:/a:avro_project:avro -CVE-2023-4759 is resolved in 6.7.0 which is already upgraded in nifi-registry +CVE-2023-4759 is resolved in v5.13.3.20240512 which is already upgraded in nifi-registry ^pkg:maven/org\.eclipse\.jgit/.*$ CVE-2023-4759 diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 83aba33759..6de3b03399 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -42,7 +42,7 @@ 3.12.0 3.7.0 2.3.2 -5.13.2.202306221912-r +5.13.3.20240512-r 2.9.3
(nifi) branch support/nifi-1.x updated: NIFI-13574 Upgraded Azure SDK BOM from 1.2.23 to 1.2.25
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 b649e4ecba NIFI-13574 Upgraded Azure SDK BOM from 1.2.23 to 1.2.25 b649e4ecba is described below commit b649e4ecbaffe91750aaebeb1639e4a868dc92f7 Author: Rajmund Takacs AuthorDate: Tue Jul 23 18:11:04 2024 +0200 NIFI-13574 Upgraded Azure SDK BOM from 1.2.23 to 1.2.25 - Upgraded msal4j from 1.15.0 to 1.16.1 This closes #9104 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index edad7348b7..a146545534 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -28,8 +28,8 @@ 8.6.6 -1.2.23 -1.15.0 +1.2.25 +1.16.1 0.34.1
(nifi) branch support/nifi-1.x updated (c073527b1b -> f4259c445b)
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 c073527b1b Revert "NIFI-13439 Add performance tracking to ProcessGroupStatus" add f4259c445b NIFI-13439 Add performance tracking to ProcessGroupStatus No new revisions were added by this update. Summary of changes: .../nifi/controller/status/ProcessGroupStatus.java | 28 ++ .../status/ProcessingPerformanceStatus.java| 107 + .../nifi/controller/status/ProcessorStatus.java| 12 +++ .../dto/status/ProcessGroupStatusSnapshotDTO.java | 13 +++ .../dto/status/ProcessingPerformanceStatusDTO.java | 100 +++ .../api/dto/status/ProcessorStatusSnapshotDTO.java | 13 +++ .../manager/ProcessingPerformanceStatusMerger.java | 34 +++ .../apache/nifi/cluster/manager/StatusMerger.java | 7 ++ .../apache/nifi/reporting/AbstractEventAccess.java | 29 ++ .../nifi/reporting/PerformanceMetricsUtil.java | 37 +++ .../org/apache/nifi/web/api/dto/DtoFactory.java| 26 + .../ProcessGroupStatusEnumerator.java | 7 +- .../ProcessGroupStatusTable.java | 12 ++- .../processorstatus/ProcessorStatusEnumerator.java | 7 +- .../sql/processorstatus/ProcessorStatusTable.java | 14 ++- .../reporting/sql/TestQueryNiFiReportingTask.java | 2 +- 16 files changed, 442 insertions(+), 6 deletions(-) create mode 100644 nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessingPerformanceStatus.java create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessingPerformanceStatusDTO.java create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ProcessingPerformanceStatusMerger.java create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/reporting/PerformanceMetricsUtil.java
(nifi) branch main updated: NIFI-13553 Upgraded msal4j from 1.15.1 to 1.16.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 febde9d281 NIFI-13553 Upgraded msal4j from 1.15.1 to 1.16.1 febde9d281 is described below commit febde9d281cfb1acc9afd37c674fba0c7192a820 Author: Paul Grey AuthorDate: Tue Jul 23 13:52:25 2024 -0400 NIFI-13553 Upgraded msal4j from 1.15.1 to 1.16.1 This closes #9106 Signed-off-by: David Handermann --- nifi-extension-bundles/nifi-azure-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-extension-bundles/nifi-azure-bundle/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/pom.xml index 4b4b10eae5..2a9d4a84a7 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-azure-bundle/pom.xml @@ -29,7 +29,7 @@ 1.2.25 -1.15.1 +1.16.1 0.34.1
(nifi) branch main updated: NIFI-13606 Corrected Custom UI loading in reverse proxy deployments
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 6c930626dc NIFI-13606 Corrected Custom UI loading in reverse proxy
deployments
6c930626dc is described below
commit 6c930626dc14e54d3af1e6e8ca1844962e654fde
Author: Matt Gilman
AuthorDate: Wed Jul 31 10:10:04 2024 -0400
NIFI-13606 Corrected Custom UI loading in reverse proxy deployments
This closes #9130
Signed-off-by: David Handermann
---
.../apache/nifi/web/api/ApplicationResource.java | 15 +++
.../nifi/web/api/ControllerServiceResource.java| 2 +-
.../nifi/web/api/ParameterProviderResource.java| 2 +-
.../org/apache/nifi/web/api/ProcessorResource.java | 24 +++--
.../apache/nifi/web/api/ReportingTaskResource.java | 2 +-
.../nifi/web/api/TestApplicationResource.java | 30 +++---
6 files changed, 53 insertions(+), 22 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
index 13e7ca7818..6f22cd7454 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
@@ -154,6 +154,21 @@ public abstract class ApplicationResource {
return buildResourceUri(uriBuilder.replacePath(ROOT_PATH).build());
}
+/**
+ * Generate a URI to an external UI.
+ *
+ * @param pathSegments path segments for the external UI
+ * @return the full external UI
+ */
+protected String generateExternalUiUri(final String... pathSegments) {
+final RequestUriBuilder builder =
RequestUriBuilder.fromHttpServletRequest(httpServletRequest,
properties.getAllowedContextPathsAsList());
+
+final String path = String.join("/", pathSegments);
+builder.path(path);
+
+return builder.build().toString();
+}
+
private URI buildResourceUri(final String... path) {
final UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
return buildResourceUri(uriBuilder.segment(path).build());
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
index 7af1482d4d..79ac0548e9 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
@@ -156,7 +156,7 @@ public class ControllerServiceResource extends
ApplicationResource {
final List uiExtensions =
uiExtensionMapping.getUiExtension(controllerService.getType(),
bundle.getGroup(), bundle.getArtifact(), bundle.getVersion());
for (final UiExtension uiExtension : uiExtensions) {
if
(UiExtensionType.ControllerServiceConfiguration.equals(uiExtension.getExtensionType()))
{
-
controllerService.setCustomUiUrl(uiExtension.getContextPath() + "/configure");
+
controllerService.setCustomUiUrl(generateExternalUiUri(uiExtension.getContextPath(),
"configure"));
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
index 17bd5a47af..37892bfb90 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ParameterProviderResource.java
@@ -217,7 +217,7 @@ public class ParameterProviderResource extends
AbstractParameterResource {
final List uiExtensions =
uiExtensionMapping.getUiExtension(parameterProvider.getType(),
bundle.getGroup(), bundle.getArtifact(), bundle.getVersion());
for (final UiExtension uiExtension : uiExtensions) {
if
(UiExtensionType.ParameterProviderConfiguration.equals(uiExtension.getExtensionType()))
{
-
parameterProvider.setCustomUiUrl(uiExtension.getContextPath() + "/configure");
+
(nifi) branch main updated: NIFI-13439 Added Performance Status to Group Status responses
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 f262e74170 NIFI-13439 Added Performance Status to Group Status
responses
f262e74170 is described below
commit f262e741704d1ab8bd314772445f5cbac609d533
Author: Timea Barna
AuthorDate: Thu Jun 27 07:41:59 2024 +0200
NIFI-13439 Added Performance Status to Group Status responses
- Added ProcessingPerformanceStatus to nifi-api
- Added Performance Status to Process Group and Processor Sources for Query
NiFi Reporting Task
This closes #9014
Signed-off-by: David Handermann
---
.../nifi/controller/status/ProcessGroupStatus.java | 28 ++
.../status/ProcessingPerformanceStatus.java| 107 +
.../nifi/controller/status/ProcessorStatus.java| 12 +++
.../datasources/ProcessGroupStatusDataSource.java | 14 ++-
.../sql/datasources/ProcessorStatusDataSource.java | 14 ++-
.../reporting/sql/TestQueryNiFiReportingTask.java | 2 +-
.../dto/status/ProcessGroupStatusSnapshotDTO.java | 14 +++
.../dto/status/ProcessingPerformanceStatusDTO.java | 100 +++
.../api/dto/status/ProcessorStatusSnapshotDTO.java | 13 +++
.../manager/ProcessingPerformanceStatusMerger.java | 34 +++
.../apache/nifi/cluster/manager/StatusMerger.java | 6 ++
.../apache/nifi/reporting/AbstractEventAccess.java | 27 ++
.../nifi/reporting/PerformanceMetricsUtil.java | 37 +++
.../org/apache/nifi/web/api/dto/DtoFactory.java| 26 +
14 files changed, 429 insertions(+), 5 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
b/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
index 8709055305..670af28449 100644
---
a/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
+++
b/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
@@ -57,6 +57,8 @@ public class ProcessGroupStatus implements Cloneable {
private Collection inputPortStatus = new ArrayList<>();
private Collection outputPortStatus = new ArrayList<>();
+private ProcessingPerformanceStatus processingPerformanceStatus;
+
public String getId() {
return id;
}
@@ -273,6 +275,14 @@ public class ProcessGroupStatus implements Cloneable {
this.processingNanos = processingNanos;
}
+public ProcessingPerformanceStatus getProcessingPerformanceStatus() {
+return processingPerformanceStatus;
+}
+
+public void setProcessingPerformanceStatus(ProcessingPerformanceStatus
processingPerformanceStatus) {
+this.processingPerformanceStatus = processingPerformanceStatus;
+}
+
@Override
public ProcessGroupStatus clone() {
final ProcessGroupStatus clonedObj = new ProcessGroupStatus();
@@ -296,6 +306,7 @@ public class ProcessGroupStatus implements Cloneable {
clonedObj.flowFilesTransferred = flowFilesTransferred;
clonedObj.bytesTransferred = bytesTransferred;
clonedObj.processingNanos = processingNanos;
+clonedObj.processingPerformanceStatus = processingPerformanceStatus;
if (connectionStatus != null) {
final Collection statusList = new ArrayList<>();
@@ -418,6 +429,9 @@ public class ProcessGroupStatus implements Cloneable {
builder.append(status);
}
+builder.append(", processingPerformanceStatus=");
+builder.append(processingPerformanceStatus);
+
builder.append("]");
return builder.toString();
}
@@ -620,6 +634,20 @@ public class ProcessGroupStatus implements Cloneable {
}
target.setRemoteProcessGroupStatus(mergedRemoteGroupMap.values());
+
+final ProcessingPerformanceStatus targetPerformanceStatus =
target.getProcessingPerformanceStatus();
+final ProcessingPerformanceStatus toMergePerformanceStatus =
toMerge.getProcessingPerformanceStatus();
+
+if (targetPerformanceStatus != null && toMergePerformanceStatus !=
null) {
+
targetPerformanceStatus.setIdentifier(toMergePerformanceStatus.getIdentifier());
+
targetPerformanceStatus.setCpuDuration(targetPerformanceStatus.getCpuDuration()
+ toMergePerformanceStatus.getCpuDuration());
+
targetPerformanceStatus.setContentReadDuration(targetPerformanceStatus.getContentReadDuration()
+ toMergePerformanceStatus.getContentReadDuration());
+
targetPerformanceStatus.setContentWriteDuration(targetPerformanceStatus.getContentWriteDuration()
+ toMergePerformanceStatus.getContentWriteDuration());
+
targetPerformanceStatus.setSessionCommitDuration(targetPerformanceStatus.getSessionCommitDuration()
+ toM
(nifi) branch main updated: NIFI-13595 Replaced test method random string with repeated string (#9124)
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 b0d402d146 NIFI-13595 Replaced test method random string with repeated
string (#9124)
b0d402d146 is described below
commit b0d402d1468065deb3838df15964de4c7090e4f8
Author: dan-s1
AuthorDate: Tue Jul 30 09:12:02 2024 -0400
NIFI-13595 Replaced test method random string with repeated string (#9124)
Signed-off-by: David Handermann
---
.../apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
index 006043eb61..30cdd6aafd 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJsonTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.elasticsearch;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.nifi.elasticsearch.IndexOperationRequest;
import org.apache.nifi.elasticsearch.IndexOperationResponse;
import org.apache.nifi.processor.exception.ProcessException;
@@ -468,7 +467,7 @@ public class PutElasticsearchJsonTest extends
AbstractPutElasticsearchTest {
runner.setProperty(ElasticsearchRestProcessor.MAX_JSON_FIELD_STRING_LENGTH,
"1KB");
runner.assertValid();
-final String val = String.format("{\"large\": \"%s\"}",
RandomStringUtils.randomAlphanumeric(1));
+final String val = String.format("{\"large\": \"%s\"}",
"a".repeat(1));
runner.enqueue(val);
runner.run();
(nifi) branch main updated: NIFI-13562 Removed carriage return characters from TestProcessorAuditor
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 60a03b90cb NIFI-13562 Removed carriage return characters from TestProcessorAuditor 60a03b90cb is described below commit 60a03b90cbd0590fb4ed44ac4d5974ee1835dbfc Author: exceptionfactory AuthorDate: Mon Jul 29 12:30:08 2024 -0500 NIFI-13562 Removed carriage return characters from TestProcessorAuditor Signed-off-by: David Handermann --- .../apache/nifi/audit/TestProcessorAuditor.java| 788 ++--- 1 file changed, 394 insertions(+), 394 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/audit/TestProcessorAuditor.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/audit/TestProcessorAuditor.java index b5bb381e6c..f2a2969bf6 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/audit/TestProcessorAuditor.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/audit/TestProcessorAuditor.java @@ -1,394 +1,394 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.audit; - -import org.apache.nifi.action.Action; -import org.apache.nifi.action.Component; -import org.apache.nifi.action.Operation; -import org.apache.nifi.action.details.ActionDetails; -import org.apache.nifi.action.details.FlowChangeConfigureDetails; -import org.apache.nifi.admin.service.AuditService; -import org.apache.nifi.authorization.user.NiFiUser; -import org.apache.nifi.authorization.user.NiFiUserDetails; -import org.apache.nifi.authorization.user.StandardNiFiUser; -import org.apache.nifi.bundle.Bundle; -import org.apache.nifi.bundle.BundleCoordinate; -import org.apache.nifi.bundle.BundleDetails; -import org.apache.nifi.components.PropertyDescriptor; -import org.apache.nifi.components.state.StateManager; -import org.apache.nifi.components.state.StateManagerProvider; -import org.apache.nifi.controller.FlowController; -import org.apache.nifi.controller.ProcessorNode; -import org.apache.nifi.controller.flow.FlowManager; -import org.apache.nifi.controller.service.ControllerServiceProvider; -import org.apache.nifi.groups.ProcessGroup; -import org.apache.nifi.nar.ExtensionManager; -import org.apache.nifi.processor.Processor; -import org.apache.nifi.web.api.dto.BundleDTO; -import org.apache.nifi.web.api.dto.ProcessorConfigDTO; -import org.apache.nifi.web.api.dto.ProcessorDTO; -import org.apache.nifi.web.dao.ComponentStateDAO; -import org.apache.nifi.web.dao.ProcessGroupDAO; -import org.apache.nifi.web.dao.impl.StandardComponentStateDAO; -import org.apache.nifi.web.dao.impl.StandardProcessGroupDAO; -import org.apache.nifi.web.dao.impl.StandardProcessorDAO; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -import java.io.File; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assert
(nifi) branch main updated: NIFI-13588 bumped maven-dependency-check to 10.0.3 (#9118)
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 beefa2a300 NIFI-13588 bumped maven-dependency-check to 10.0.3 (#9118) beefa2a300 is described below commit beefa2a3001d066c005743f5e270ce09274eda6d Author: Joe Witt AuthorDate: Sat Jul 27 06:47:33 2024 -0700 NIFI-13588 bumped maven-dependency-check to 10.0.3 (#9118) Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db22b4db48..dd18e7a957 100644 --- a/pom.xml +++ b/pom.xml @@ -1082,7 +1082,7 @@ org.owasp dependency-check-maven -10.0.1 +10.0.3 false
(nifi) branch main updated: NIFI-13581 Remove Parameter Contexts and Providers in destroyFlow of NiFiSystemIT (#9110)
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 94f8688545 NIFI-13581 Remove Parameter Contexts and Providers in
destroyFlow of NiFiSystemIT (#9110)
94f8688545 is described below
commit 94f8688545873fd05b8dd8cf7d962fbc902b184d
Author: Bryan Bende
AuthorDate: Wed Jul 24 19:51:49 2024 -0400
NIFI-13581 Remove Parameter Contexts and Providers in destroyFlow of
NiFiSystemIT (#9110)
Signed-off-by: David Handermann
---
.github/workflows/system-tests.yml | 4 +--
.../apache/nifi/tests/system/NiFiClientUtil.java | 36 ++
.../org/apache/nifi/tests/system/NiFiSystemIT.java | 2 ++
.../cli/impl/client/nifi/ParamContextClient.java | 2 ++
.../cli/impl/client/nifi/ParamProviderClient.java | 2 ++
.../client/nifi/impl/JerseyParamContextClient.java | 12 +++-
.../nifi/impl/JerseyParamProviderClient.java | 12 +++-
7 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/system-tests.yml
b/.github/workflows/system-tests.yml
index 9e083e7c54..db2c337628 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -26,7 +26,7 @@ on:
- 'nifi-system-tests/**'
- 'nifi-api/**'
- 'nifi-framework-api/**'
- - 'nifi-nifi-framework-bundle/**'
+ - 'nifi-framework-bundle/**'
- 'nifi-extension-bundles/nifi-py4j-bundle/**'
- 'nifi-stateless/**'
pull_request:
@@ -36,7 +36,7 @@ on:
- 'nifi-system-tests/**'
- 'nifi-api/**'
- 'nifi-framework-api/**'
- - 'nifi-nifi-framework-bundle/**'
+ - 'nifi-framework-bundle/**'
- 'nifi-extension-bundles/nifi-py4j-bundle/**'
- 'nifi-stateless/**'
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
index 8e62196f6e..f9aa09a396 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
@@ -89,6 +89,7 @@ import org.apache.nifi.web.api.entity.NodeEntity;
import org.apache.nifi.web.api.entity.ParameterContextEntity;
import org.apache.nifi.web.api.entity.ParameterContextReferenceEntity;
import org.apache.nifi.web.api.entity.ParameterContextUpdateRequestEntity;
+import org.apache.nifi.web.api.entity.ParameterContextsEntity;
import org.apache.nifi.web.api.entity.ParameterEntity;
import org.apache.nifi.web.api.entity.ParameterGroupConfigurationEntity;
import
org.apache.nifi.web.api.entity.ParameterProviderApplyParametersRequestEntity;
@@ -96,6 +97,7 @@ import
org.apache.nifi.web.api.entity.ParameterProviderConfigurationEntity;
import org.apache.nifi.web.api.entity.ParameterProviderEntity;
import
org.apache.nifi.web.api.entity.ParameterProviderParameterApplicationEntity;
import org.apache.nifi.web.api.entity.ParameterProviderParameterFetchEntity;
+import org.apache.nifi.web.api.entity.ParameterProvidersEntity;
import org.apache.nifi.web.api.entity.PortEntity;
import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessGroupFlowEntity;
@@ -126,11 +128,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
public class NiFiClientUtil {
@@ -472,6 +476,38 @@ public class NiFiClientUtil {
}
}
+public void deleteParameterContexts() throws NiFiClientException,
IOException {
+final ParameterContextsEntity parameterContextsEntity =
nifiClient.getParamContextClient().getParamContexts();
+final Map parameterContextMap =
parameterContextsEntity.getParameterContexts().stream()
+.collect(Collectors.toMap(ParameterContextEntity::getId,
Function.identity()));
+
+// If parameter context have inherited contexts then they needed to be
deleted from the bottom up, so we just keep iterating
+// over the set of ids and retrying deletes until all have been
deleted, knowing that some delete calls will fail the first time
+final Set parameterContextIds = new
HashSet<>(parameterContextMap.keySet());
+while (!parameterContextIds.isEmpty()) {
+final Iterator param
(nifi) branch main updated: NIFI-13569 Converted TestRegexDateTimeMatcher to Parameterized Test (#9099)
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 7c4c5ae693 NIFI-13569 Converted TestRegexDateTimeMatcher to
Parameterized Test (#9099)
7c4c5ae693 is described below
commit 7c4c5ae693daf9f0e12a93400774a9091097ae3e
Author: dan-s1
AuthorDate: Tue Jul 23 09:10:42 2024 -0400
NIFI-13569 Converted TestRegexDateTimeMatcher to Parameterized Test (#9099)
Signed-off-by: David Handermann
---
.../nifi/util/text/TestRegexDateTimeMatcher.java | 83 +++---
1 file changed, 41 insertions(+), 42 deletions(-)
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
index cfb006d0db..25377d97b6 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
@@ -16,54 +16,53 @@
*/
package org.apache.nifi.util.text;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestRegexDateTimeMatcher {
-@Test
-public void testCommonFormatsExpectedToPass() {
-final Map exampleToPattern = new LinkedHashMap<>();
-
-// Following examples are intended to test specific functions in the
regex generation.
-exampleToPattern.put("2018-12-12", "-MM-dd");
-exampleToPattern.put("2018/12/12", "/MM/dd");
-exampleToPattern.put("12/12/2018", "MM/dd/");
-exampleToPattern.put("12/12/18", "MM/dd/yy");
-exampleToPattern.put("1/1/18", "M/d/yy");
-exampleToPattern.put("1/10/18", "M/d/yy");
-exampleToPattern.put("1:40:55", "HH:mm:ss");
-exampleToPattern.put("01:0:5", "HH:mm:ss");
-exampleToPattern.put("12/12/2018 13:04:08 GMT-05:00", "MM/dd/
HH:mm:ss z");
-exampleToPattern.put("12/12/2018 13:04:08 -0500", "MM/dd/ HH:mm:ss
Z");
-exampleToPattern.put("12/12/2018 13:04:08 EST", "MM/dd/ HH:mm:ss
");
-exampleToPattern.put("12/12/2018 13:04:08 -05", "MM/dd/ HH:mm:ss
X");
-exampleToPattern.put("0:08 PM", "K:mm a");
-exampleToPattern.put("Dec 12, 2018", "MMM dd, ");
-exampleToPattern.put("12 Dec 2018", "dd MMM ");
-exampleToPattern.put("12 December 2018", "dd MMM ");
-
-exampleToPattern.put("2001.07.04 AD at 12:08:56 PDT", ".MM.dd G
'at' HH:mm:ss z");
-exampleToPattern.put("Wed, Jul 4, '01", "EEE, MMM d, ''yy");
-exampleToPattern.put("12:08 PM", "h:mm a");
-exampleToPattern.put("12 o'clock PM, Pacific Daylight Time", "hh
'o''clock' a, ");
-exampleToPattern.put("0:08 PM, PDT", "K:mm a, z");
-exampleToPattern.put("02001.July.04 AD 12:08 PM", "y.M.dd GGG
hh:mm aaa");
-exampleToPattern.put("Wed, 4 Jul 2001 12:08:56 -0700", "EEE, d MMM
HH:mm:ss Z");
-exampleToPattern.put("010704120856-0700", "yyMMddHHmmssZ");
-exampleToPattern.put("2001-07-04T12:08:56.235-0700",
"-MM-dd'T'HH:mm:ss.SSSZ");
-exampleToPattern.put("2001-07-04T12:08:56.235-07:00",
"-MM-dd'T'HH:mm:ss.SSSXXX");
-exampleToPattern.put("2001-W27-3", "-'W'ww-u");
-
-for (final Map.Entry entry :
exampleToPattern.entrySet()) {
-final RegexDateTimeMatcher matcher = new
RegexDateTimeMatcher.Compiler().compile(entry.getValue());
-final boolean matches = matcher.matches(entry.getKey());
+@ParameterizedTest
+@MethodSource("exampleToPattern")
+public void testCommonFormatsExpectedToPass(String example, String
pattern) {
+final RegexDateTimeMatcher matcher = new
RegexDateTimeMatcher.Compiler().compile(pattern);
+assertTrue(matcher.matches(example), String.format("
(nifi) branch support/nifi-1.x updated: NIFI-13557 Fixed TestExcelSchemaInference for Single Digit Month
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 0fffb0c3e8 NIFI-13557 Fixed TestExcelSchemaInference for Single Digit
Month
0fffb0c3e8 is described below
commit 0fffb0c3e8a4e697d80bd6f97d8f1d6bddfe0b61
Author: exceptionfactory
AuthorDate: Mon Jul 22 15:10:03 2024 -0500
NIFI-13557 Fixed TestExcelSchemaInference for Single Digit Month
Signed-off-by: David Handermann
---
.../java/org/apache/nifi/excel/TestExcelSchemaInference.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
index 4619f205e3..f2f7d45866 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
@@ -109,7 +109,11 @@ public class TestExcelSchemaInference {
EXPECTED_THIRD_FIELD_NAME, EXPECTED_FOURTH_FIELD_NAME),
fieldNames);
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.INT.getDataType(),
RecordFieldType.STRING.getDataType()),
schema.getDataType(EXPECTED_FIRST_FIELD_NAME).get());
-
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.TIMESTAMP.getDataType("/MM/dd/
HH:mm"), RecordFieldType.STRING.getDataType()),
+assertEquals(RecordFieldType.CHOICE.getChoiceDataType(
+RecordFieldType.TIMESTAMP.getDataType("/MM/dd/
HH:mm"),
+RecordFieldType.DATE.getDataType("MM/dd/"),
+RecordFieldType.STRING.getDataType()
+),
schema.getDataType(EXPECTED_SECOND_FIELD_NAME).get());
assertEquals(RecordFieldType.STRING,
schema.getDataType(EXPECTED_THIRD_FIELD_NAME).get().getFieldType());
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.BOOLEAN.getDataType(),
@@ -139,7 +143,11 @@ public class TestExcelSchemaInference {
assertEquals(Arrays.asList(EXPECTED_FIRST_FIELD_NAME,
EXPECTED_SECOND_FIELD_NAME,
EXPECTED_THIRD_FIELD_NAME, EXPECTED_FOURTH_FIELD_NAME),
fieldNames);
assertEquals(RecordFieldType.INT.getDataType(),
schema.getDataType(EXPECTED_FIRST_FIELD_NAME).get());
-
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.TIMESTAMP.getDataType("/MM/dd/
HH:mm"), RecordFieldType.STRING.getDataType()),
+assertEquals(RecordFieldType.CHOICE.getChoiceDataType(
+RecordFieldType.TIMESTAMP.getDataType("/MM/dd/
HH:mm"),
+RecordFieldType.DATE.getDataType("MM/dd/"),
+RecordFieldType.STRING.getDataType()
+),
schema.getDataType(EXPECTED_SECOND_FIELD_NAME).get());
assertEquals(RecordFieldType.STRING,
schema.getDataType(EXPECTED_THIRD_FIELD_NAME).get().getFieldType());
assertEquals(RecordFieldType.BOOLEAN.getDataType(),
schema.getDataType(EXPECTED_FOURTH_FIELD_NAME).get());
(nifi) branch support/nifi-1.x updated: NIFI-13557 Fixed TestSchemaInferenceUtil for Single Digit Month
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 c58c88d404 NIFI-13557 Fixed TestSchemaInferenceUtil for Single Digit
Month
c58c88d404 is described below
commit c58c88d404b61e5129fbecf5f3006fb8e5a5b6a1
Author: dan-s1
AuthorDate: Wed Jul 3 11:21:15 2024 -0500
NIFI-13557 Fixed TestSchemaInferenceUtil for Single Digit Month
Signed-off-by: David Handermann
---
.../src/test/java/org/apache/nifi/util/TestSchemaInferenceUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/util/TestSchemaInferenceUtil.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/util/TestSchemaInferenceUtil.java
index bacb21a868..b73a537d83 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/util/TestSchemaInferenceUtil.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/util/TestSchemaInferenceUtil.java
@@ -73,7 +73,7 @@ class TestSchemaInferenceUtil {
private static Stream dataForTimeInference() {
return Stream.of(
Arguments.of("2017-03-19",
RecordFieldType.DATE.getDataType(DATE_FORMAT)),
-Arguments.of("2017-3-19", RecordFieldType.STRING.getDataType()),
+Arguments.of("2017-3-19",
RecordFieldType.DATE.getDataType(DATE_FORMAT)),
Arguments.of("2017-44-55", RecordFieldType.STRING.getDataType()),
Arguments.of("2017.03.19", RecordFieldType.STRING.getDataType()),
(nifi-site) branch main updated: NIFI-13571 Adjusted MiNiFi redirect path matching to include old pages
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-site.git
The following commit(s) were added to refs/heads/main by this push:
new 514cb76c NIFI-13571 Adjusted MiNiFi redirect path matching to include
old pages
514cb76c is described below
commit 514cb76c8d81146616f4b28d603b54506668b1ea
Author: exceptionfactory
AuthorDate: Mon Jul 22 14:00:49 2024 -0500
NIFI-13571 Adjusted MiNiFi redirect path matching to include old pages
---
static/.htaccess | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/static/.htaccess b/static/.htaccess
index 0d722809..4d05499d 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -8,7 +8,7 @@ RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI}
[L,R]
RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.27.0/$2 [L]
# Rewrite historical links
-RewriteRule ^minifi/$ /projects/minifi/ [L,R]
+RewriteRule ^minifi/.*$ /projects/minifi/ [L,R]
RewriteRule ^quickstart\.html$ /documentation/v2/ [L,R]
RewriteRule ^developer-guide\.html$ /documentation/guides/ [L,R]
RewriteRule ^release-guide\.html$ /documentation/guides/releases/ [L,R]
(nifi) branch support/nifi-1.x updated: NIFI-13557 Corrected Date Time Matcher to support single digit months
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 b9b89ed212 NIFI-13557 Corrected Date Time Matcher to support single
digit months
b9b89ed212 is described below
commit b9b89ed212716d36f72fb82da9f13c67089f9af2
Author: dan-s1
AuthorDate: Fri Jul 19 13:34:26 2024 +
NIFI-13557 Corrected Date Time Matcher to support single digit months
This closes #9094
(cherry picked from commit 059a3b774521bb4f714748784c694c898018ae97)
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java | 2 +-
.../test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
index 48f0774493..b912c888e9 100644
---
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
+++
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
@@ -384,7 +384,7 @@ public class RegexDateTimeMatcher implements
DateTimeMatcher {
}
private void addShortMonth() {
-patterns.add("(?:0[1-9]|1[0-2])");
+patterns.add("(?:0?[1-9]|1[0-2])");
range = range.plus(1, 2);
}
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
index aadc98b07c..f6d84d7e2b 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
@@ -34,6 +34,8 @@ public class TestRegexDateTimeMatcher {
exampleToPattern.put("2018/12/12", "/MM/dd");
exampleToPattern.put("12/12/2018", "MM/dd/");
exampleToPattern.put("12/12/18", "MM/dd/yy");
+exampleToPattern.put("1/1/18", "M/d/yy");
+exampleToPattern.put("1/10/18", "M/d/yy");
exampleToPattern.put("1:40:55", "HH:mm:ss");
exampleToPattern.put("01:0:5", "HH:mm:ss");
exampleToPattern.put("12/12/2018 13:04:08 GMT-05:00", "MM/dd/
HH:mm:ss z");
(nifi) branch main updated (36b9edd862 -> f50fce5344)
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 36b9edd862 NIFI-13561 Enabled Jira Automatic Linking in GitHub (#9092) new 059a3b7745 NIFI-13557 Corrected Date Time Matcher to support single digit months new f50fce5344 NIFI-13565 Updated Record Date Time Properties to mention DateTimeFormatter The 2 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: .../main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java | 2 +- .../java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java| 2 ++ .../src/main/java/org/apache/nifi/serialization/DateTimeUtils.java | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-)
(nifi) 02/02: NIFI-13565 Updated Record Date Time Properties to mention DateTimeFormatter
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 f50fce5344d53d75eb4d0711c6305ca16a999f49
Author: dan-s1
AuthorDate: Fri Jul 19 19:13:38 2024 +
NIFI-13565 Updated Record Date Time Properties to mention DateTimeFormatter
This closes #9096
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/serialization/DateTimeUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/serialization/DateTimeUtils.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/serialization/DateTimeUtils.java
index 03b768a797..98fc42c237 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/serialization/DateTimeUtils.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/serialization/DateTimeUtils.java
@@ -25,7 +25,7 @@ public class DateTimeUtils {
.name("Date Format")
.description("Specifies the format to use when reading/writing Date
fields. "
+ "If not specified, Date fields will be assumed to be number of
milliseconds since epoch (Midnight, Jan 1, 1970 GMT). "
-+ "If specified, the value must match the Java Simple Date Format
(for example, MM/dd/ for a two-digit month, followed by "
++ "If specified, the value must match the Java
java.time.format.DateTimeFormatter format (for example, MM/dd/ for a
two-digit month, followed by "
+ "a two-digit day, followed by a four-digit year, all separated
by '/' characters, as in 01/01/2017).")
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
.addValidator(new DateTimeFormatValidator())
@@ -36,7 +36,7 @@ public class DateTimeUtils {
.name("Time Format")
.description("Specifies the format to use when reading/writing Time
fields. "
+ "If not specified, Time fields will be assumed to be number of
milliseconds since epoch (Midnight, Jan 1, 1970 GMT). "
-+ "If specified, the value must match the Java Simple Date Format
(for example, HH:mm:ss for a two-digit hour in 24-hour format, followed by "
++ "If specified, the value must match the Java
java.time.format.DateTimeFormatter format (for example, HH:mm:ss for a
two-digit hour in 24-hour format, followed by "
+ "a two-digit minute, followed by a two-digit second, all
separated by ':' characters, as in 18:04:15).")
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
.addValidator(new DateTimeFormatValidator())
@@ -47,7 +47,7 @@ public class DateTimeUtils {
.name("Timestamp Format")
.description("Specifies the format to use when reading/writing
Timestamp fields. "
+ "If not specified, Timestamp fields will be assumed to be number
of milliseconds since epoch (Midnight, Jan 1, 1970 GMT). "
-+ "If specified, the value must match the Java Simple Date Format
(for example, MM/dd/ HH:mm:ss for a two-digit month, followed by "
++ "If specified, the value must match the Java
java.time.format.DateTimeFormatter format (for example, MM/dd/ HH:mm:ss for
a two-digit month, followed by "
+ "a two-digit day, followed by a four-digit year, all separated
by '/' characters; and then followed by a two-digit hour in 24-hour format,
followed by "
+ "a two-digit minute, followed by a two-digit second, all
separated by ':' characters, as in 01/01/2017 18:04:15).")
.expressionLanguageSupported(ExpressionLanguageScope.NONE)
(nifi) 01/02: NIFI-13557 Corrected Date Time Matcher to support single digit months
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 059a3b774521bb4f714748784c694c898018ae97
Author: dan-s1
AuthorDate: Fri Jul 19 13:34:26 2024 +
NIFI-13557 Corrected Date Time Matcher to support single digit months
This closes #9094
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java | 2 +-
.../test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
index 94424e97a5..937ea131f9 100644
---
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
+++
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/text/RegexDateTimeMatcher.java
@@ -384,7 +384,7 @@ public class RegexDateTimeMatcher implements
DateTimeMatcher {
}
private void addShortMonth() {
-patterns.add("(?:0[1-9]|1[0-2])");
+patterns.add("(?:0?[1-9]|1[0-2])");
range = range.plus(1, 2);
}
diff --git
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
index 28e7e5e1a8..cfb006d0db 100644
---
a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
+++
b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/text/TestRegexDateTimeMatcher.java
@@ -34,6 +34,8 @@ public class TestRegexDateTimeMatcher {
exampleToPattern.put("2018/12/12", "/MM/dd");
exampleToPattern.put("12/12/2018", "MM/dd/");
exampleToPattern.put("12/12/18", "MM/dd/yy");
+exampleToPattern.put("1/1/18", "M/d/yy");
+exampleToPattern.put("1/10/18", "M/d/yy");
exampleToPattern.put("1:40:55", "HH:mm:ss");
exampleToPattern.put("01:0:5", "HH:mm:ss");
exampleToPattern.put("12/12/2018 13:04:08 GMT-05:00", "MM/dd/
HH:mm:ss z");
(nifi) branch main updated: NIFI-13551 Fixed framework SSLContext loading for Headless Server
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 ee7a905c40 NIFI-13551 Fixed framework SSLContext loading for Headless
Server
ee7a905c40 is described below
commit ee7a905c4095e1aa1c449d2a7b53d30cbdff905a
Author: Ferenc Erdei
AuthorDate: Tue Jul 16 09:52:06 2024 +0200
NIFI-13551 Fixed framework SSLContext loading for Headless Server
- Changed conditional from evaluating HTTPS port to evaluating store path
and password properties
This closes #9083
Signed-off-by: David Handermann
---
.../apache/nifi/framework/ssl/FrameworkSslContextProvider.java | 9 +++--
.../main/java/org/apache/nifi/headless/HeadlessNiFiServer.java | 7 +++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
index 9374ea8550..7a651e2b97 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
@@ -82,7 +82,7 @@ public class FrameworkSslContextProvider {
private KeyManagerBuilder getKeyManagerBuilder() {
final KeyManagerBuilder keyManagerBuilder;
-if (properties.isHTTPSConfigured()) {
+if (isPropertyConfigured(SECURITY_KEYSTORE) &&
isPropertyConfigured(SECURITY_KEYSTORE_PASSWD)) {
final Path keyStorePath = getKeyStorePath();
final String keyStorePassword =
properties.getProperty(SECURITY_KEYSTORE_PASSWD, EMPTY);
final char[] keyPassword =
properties.getProperty(SECURITY_KEY_PASSWD, keyStorePassword).toCharArray();
@@ -102,7 +102,7 @@ public class FrameworkSslContextProvider {
private TrustManagerBuilder getTrustManagerBuilder() {
final TrustManagerBuilder trustManagerBuilder;
-if (properties.isHTTPSConfigured()) {
+if (isPropertyConfigured(SECURITY_TRUSTSTORE) &&
isPropertyConfigured(SECURITY_TRUSTSTORE_PASSWD)) {
final Path trustStorePath = getTrustStorePath();
final String trustStorePassword =
properties.getProperty(SECURITY_TRUSTSTORE_PASSWD, EMPTY);
final String trustStoreType =
properties.getProperty(SECURITY_TRUSTSTORE_TYPE);
@@ -134,4 +134,9 @@ public class FrameworkSslContextProvider {
return Paths.get(trustStoreProperty);
}
+
+private boolean isPropertyConfigured(final String propertyName) {
+final String value = properties.getProperty(propertyName);
+return value != null && !value.isBlank();
+}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-headless-server/src/main/java/org/apache/nifi/headless/HeadlessNiFiServer.java
b/nifi-framework-bundle/nifi-framework/nifi-headless-server/src/main/java/org/apache/nifi/headless/HeadlessNiFiServer.java
index b4e93ed218..f64a738358 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-headless-server/src/main/java/org/apache/nifi/headless/HeadlessNiFiServer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-headless-server/src/main/java/org/apache/nifi/headless/HeadlessNiFiServer.java
@@ -47,7 +47,7 @@ import
org.apache.nifi.diagnostics.bootstrap.BootstrapDiagnosticsFactory;
import org.apache.nifi.encrypt.PropertyEncryptor;
import org.apache.nifi.encrypt.PropertyEncryptorBuilder;
import org.apache.nifi.events.VolatileBulletinRepository;
-import org.apache.nifi.framework.configuration.SslContextConfiguration;
+import org.apache.nifi.framework.ssl.FrameworkSslContextProvider;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.ExtensionManagerHolder;
import org.apache.nifi.nar.ExtensionMapping;
@@ -136,9 +136,8 @@ public class HeadlessNiFiServer implements NiFiServer {
final BulletinRepository bulletinRepository = new
VolatileBulletinRepository();
final StatusHistoryRepository statusHistoryRepository =
getStatusHistoryRepository(extensionManager);
-final SslContextConfiguration sslContextConfiguration = new
SslContextConfiguration();
-sslContextConfiguration.setProperties(props);
-final SSLContext sslContext = sslContextConfiguration.sslContext();
+final FrameworkSslContextProvider sslContextProvider = new
FrameworkSslContextProvider(props);
+final SSLContext sslContext =
sslContextProvider.loadSslContext().orElse(null);
final StateManagerProvider stateManagerProvider =
StandardSta
(nifi) branch main updated (e205f27f89 -> 16c9ea4f7c)
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 e205f27f89 [NIFI-13539] upgrade to angular 18.0.7 (#9072) add 16c9ea4f7c NIFI-13536 Added branch parameter to REST methods for listing buckets and flows No new revisions were added by this update. Summary of changes: .../org/apache/nifi/web/NiFiServiceFacade.java | 9 --- .../apache/nifi/web/StandardNiFiServiceFacade.java | 15 +-- .../java/org/apache/nifi/web/api/FlowResource.java | 29 -- 3 files changed, 34 insertions(+), 19 deletions(-)
(nifi) branch main updated: NIFI-13556 Fixed logic for identifying components from uploaded NAR
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 8e5cf99cd7 NIFI-13556 Fixed logic for identifying components from
uploaded NAR
8e5cf99cd7 is described below
commit 8e5cf99cd71faf6b4954c6f591f49ff3e7423b2d
Author: Bryan Bende
AuthorDate: Wed Jul 17 12:15:15 2024 -0400
NIFI-13556 Fixed logic for identifying components from uploaded NAR
- Return copied set of Extensions from ExtensionManager to avoid concurrent
modification
This closes #9089
Signed-off-by: David Handermann
---
.../nifi/nar/ComponentNodeDefinitionPredicate.java | 11 +++
.../nar/ComponentNodeDefinitionPredicateTest.java | 13
.../nar/StandardExtensionDiscoveringManager.java | 2 +-
.../tests/system/nar/NarUploadStandaloneIT.java| 35 ++
4 files changed, 49 insertions(+), 12 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicate.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicate.java
index fc5515c0e1..8f2ed91ef1 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicate.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicate.java
@@ -42,21 +42,22 @@ class ComponentNodeDefinitionPredicate implements
Predicate {
}
private boolean isComponentFromType(final T
componentNode, final ExtensionDefinition extensionDefinition) {
-final String componentType = componentNode.getComponentType();
+final String componentClassName =
componentNode.getCanonicalClassName();
final BundleCoordinate componentCoordinate =
componentNode.getBundleCoordinate();
-final String extensionDefinitionType =
extensionDefinition.getImplementationClassName();
+final String extensionDefinitionClassName =
extensionDefinition.getImplementationClassName();
final BundleCoordinate extensionDefinitionCoordinate =
extensionDefinition.getBundle().getBundleDetails().getCoordinate();
if (PythonBundle.isPythonCoordinate(componentCoordinate)) {
+final String componentType = componentNode.getComponentType();
final String pythonComponentType = "python." + componentType;
-return pythonComponentType.equals(extensionDefinitionType) &&
componentCoordinate.equals(extensionDefinitionCoordinate);
+return pythonComponentType.equals(extensionDefinitionClassName) &&
componentCoordinate.equals(extensionDefinitionCoordinate);
} else if (componentNode.isExtensionMissing()) {
-return componentType.equals(extensionDefinitionType)
+return componentClassName.equals(extensionDefinitionClassName)
&&
componentCoordinate.getGroup().equals(extensionDefinitionCoordinate.getGroup())
&&
componentCoordinate.getId().equals(extensionDefinitionCoordinate.getId());
} else {
-return componentType.equals(extensionDefinitionType) &&
componentCoordinate.equals(extensionDefinitionCoordinate);
+return componentClassName.equals(extensionDefinitionClassName) &&
componentCoordinate.equals(extensionDefinitionCoordinate);
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicateTest.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicateTest.java
index 0ebbd51c27..8c185b8c4a 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicateTest.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/nar/ComponentNodeDefinitionPredicateTest.java
@@ -34,7 +34,8 @@ import static org.mockito.Mockito.when;
public class ComponentNodeDefinitionPredicateTest {
-private static final String STANDARD_PROCESSOR_TYPE =
"org.apache.nifi.MyProcessor";
+private static final String STANDARD_PROCESSOR_COMPONENT_TYPE =
"MyProcessor";
+private static final String STANDARD_PROCESSOR_CLASS_NAME =
"org.apache.nifi." + STANDARD_PROCESSOR_COMPONENT_TYPE;
private static final BundleCoordinate STANDARD_BUNDLE_COORDINATE_V1 = new
BundleCoordinate("org.apache.nifi", "my-processors-nar", "1.0.0");
private static final BundleCoordinate STANDARD_BUNDLE_CO
(nifi) branch support/nifi-1.x updated: NIFI-13550 Added documentation about the ExcelReader Starting Row Strategy
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 6c99f1ed83 NIFI-13550 Added documentation about the ExcelReader Starting Row Strategy 6c99f1ed83 is described below commit 6c99f1ed837c6e0b756b08ac646a846d9842d770 Author: dan-s1 AuthorDate: Mon Jul 15 19:27:11 2024 + NIFI-13550 Added documentation about the ExcelReader Starting Row Strategy (cherry picked from commit 1ff5ebd6fcd7fe4b312ed8dc8ddb5366535ecddf) Signed-off-by: David Handermann --- .../additionalDetails.html | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html index 561d43afec..4cda682e0c 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html +++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html @@ -25,6 +25,9 @@ The ExcelReader allows for interpreting input data as delimited Records. Each row in an Excel spreadsheet is a record and each cell is considered a field. The reader allows for choosing which row to start from and which sheets in a spreadsheet to ingest. + When using the "Use Starting Row" strategy, the field names will be assumed to be the column names from the configured + starting row. If there are any column(s) from the starting row which are blank, they are automatically assigned a field name + using the cell number prefixed with "column_". When using the "Infer Schema" strategy, the field names will be assumed to be the cell numbers of each column prefixed with "column_". Otherwise, the names of fields can be supplied when specifying the schema by using the Schema Text or looking up the schema in a Schema Registry. @@ -70,13 +73,16 @@ will be thrown. - -Schema Inference +Use Starting Row and Schema Inference While NiFi's Record API does require that each Record have a schema, it is often convenient to infer the schema based on the values in the data, -rather than having to manually create a schema. This is accomplished by selecting a value of "Infer Schema" for the "Schema Access Strategy" property. -When using this strategy, the Reader will determine the schema by first parsing all data in the FlowFile, keeping track of all fields that it has encountered +rather than having to manually create a schema. This is accomplished by selecting either value of "Use Starting Row" or "Infer Schema" for the + "Schema Access Strategy" property. When using the "Use Starting Row" strategy, the Reader will determine the schema by parsing the first ten rows + after the configured starting row of the data in the FlowFile all the while keeping track of all fields that it has encountered + and the type of each field. A schema is then formed that encompasses all encountered fields. A schema can even be inferred if there are blank lines + within those ten rows, but if they are all blank, then this strategy will fail to create a schema. +When using the "Infer Schema" strategy, the Reader will determine the schema by first parsing all data in the FlowFile, keeping track of all fields that it has encountered and the type of each field. Once all data has been parsed, a schema is formed that encompasses all fields that have been encountered.
(nifi) branch main updated (36fb6f109f -> 0e7e511aec)
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 36fb6f109f NIFI-13528: fixed Python processor's customValidate function add 0e7e511aec NIFI-13546 Fixed Content Repository recovery when archive directories are missing No new revisions were added by this update. Summary of changes: .../repository/FileSystemRepository.java | 145 + .../repository/TestFileSystemRepository.java | 37 +++--- 2 files changed, 81 insertions(+), 101 deletions(-)
(nifi) branch support/nifi-1.x updated: NIFI-13542 Added missing Max String Length property for JSON Readers (#9084)
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 b9b5c03b2e NIFI-13542 Added missing Max String Length property for
JSON Readers (#9084)
b9b5c03b2e is described below
commit b9b5c03b2ecb44291c53362841f933dbcbf66297
Author: Mark Bathori <57758037+mark-bath...@users.noreply.github.com>
AuthorDate: Tue Jul 16 18:35:56 2024 +0200
NIFI-13542 Added missing Max String Length property for JSON Readers (#9084)
Signed-off-by: David Handermann
---
.../apache/nifi/json/AbstractJsonRowRecordReader.java| 2 +-
.../org/apache/nifi/json/JsonPathRowRecordReader.java| 13 ++---
.../main/java/org/apache/nifi/json/JsonRecordSource.java | 15 ++-
.../java/org/apache/nifi/yaml/YamlParserFactory.java | 10 --
.../main/java/org/apache/nifi/yaml/YamlRecordSource.java | 5 +++--
.../main/java/org/apache/nifi/json/JsonPathReader.java | 2 +-
.../main/java/org/apache/nifi/json/JsonTreeReader.java | 4 ++--
.../main/java/org/apache/nifi/yaml/YamlTreeReader.java | 16 ++--
.../nifi/json/TestInferJsonSchemaAccessStrategy.java | 3 ++-
.../apache/nifi/json/TestJsonTreeRowRecordReader.java| 2 +-
.../apache/nifi/yaml/TestYamlTreeRowRecordReader.java| 3 ++-
11 files changed, 42 insertions(+), 33 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
index 4d993b6029..0fef6d50c1 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
@@ -76,7 +76,7 @@ public abstract class AbstractJsonRowRecordReader implements
RecordReader {
.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
.build();
-private static final StreamReadConstraints DEFAULT_STREAM_READ_CONSTRAINTS
= StreamReadConstraints.builder()
+static final StreamReadConstraints DEFAULT_STREAM_READ_CONSTRAINTS =
StreamReadConstraints.builder()
.maxStringLength(DataUnit.parseDataSize(DEFAULT_MAX_STRING_LENGTH,
DataUnit.B).intValue())
.build();
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
index 280d64b454..c02552f4c2 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
@@ -19,11 +19,13 @@ package org.apache.nifi.json;
import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
+import com.jayway.jsonpath.spi.json.JsonProvider;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.serialization.MalformedRecordException;
import org.apache.nifi.serialization.SimpleRecordSchema;
@@ -48,17 +50,17 @@ import java.util.Map;
import java.util.Optional;
public class JsonPathRowRecordReader extends AbstractJsonRowRecordReader {
-private static final Configuration STRICT_PROVIDER_CONFIGURATION =
Configuration.builder().jsonProvider(new JacksonJsonProvider()).build();
private final ComponentLog logger;
private final LinkedHashMap jsonPaths;
private final InputStream in;
private final RecordSchema schema;
+private final Configuration providerConfiguration;
public JsonPathRowRecordReader(final LinkedHashMap
jsonPaths, final RecordSchema schema, final InputStream in, final ComponentLog
logger,
final String dateFormat, final String
timeFormat, final String timestampFormat)
throws MalformedRecordException, IOException {
-this(jsonPaths, schema, in, logger, dateFormat, timeFormat,
timestampFormat, false, null);
+this(jsonPaths, sche
(nifi) branch support/nifi-1.x updated: NIFI-12491 Added Starting Row Schema Strategy to ExcelReader (#9081)
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 21959560c5 NIFI-12491 Added Starting Row Schema Strategy to
ExcelReader (#9081)
21959560c5 is described below
commit 21959560c59cfc7ce909d035fb4ed400e943
Author: dan-s1
AuthorDate: Tue Jul 16 10:20:40 2024 -0400
NIFI-12491 Added Starting Row Schema Strategy to ExcelReader (#9081)
Signed-off-by: David Handermann
---
.../nifi/excel/ExcelHeaderSchemaStrategy.java | 162 +++
.../java/org/apache/nifi/excel/ExcelReader.java| 18 ++-
.../apache/nifi/excel/ExcelSchemaInference.java| 3 +-
.../java/org/apache/nifi/excel/ExcelUtils.java | 2 +
.../nifi/excel/TestExcelHeaderSchemaStrategy.java | 180 +
.../nifi/excel/TestExcelSchemaInference.java | 8 +-
6 files changed, 363 insertions(+), 10 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelHeaderSchemaStrategy.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelHeaderSchemaStrategy.java
new file mode 100644
index 00..b685da3824
--- /dev/null
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelHeaderSchemaStrategy.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.excel;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.context.PropertyContext;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.schema.access.SchemaAccessStrategy;
+import org.apache.nifi.schema.access.SchemaField;
+import org.apache.nifi.schema.access.SchemaNotFoundException;
+import org.apache.nifi.schema.inference.FieldTypeInference;
+import org.apache.nifi.schema.inference.TimeValueInference;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordField;
+import org.apache.nifi.serialization.record.RecordSchema;
+import org.apache.nifi.util.SchemaInferenceUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class ExcelHeaderSchemaStrategy implements SchemaAccessStrategy {
+private static final Set schemaFields =
EnumSet.noneOf(SchemaField.class);
+static final int NUM_ROWS_TO_DETERMINE_TYPES = 10; // NOTE: This number is
arbitrary.
+static final AllowableValue USE_STARTING_ROW = new AllowableValue("Use
Starting Row", "Use Starting Row",
+"The configured first row of the Excel file is a header line that
contains the names of the columns. The schema will be derived by using the "
++ "column names in the header and the following " +
NUM_ROWS_TO_DETERMINE_TYPES + " rows to determine the type(s) of each column");
+
+private final PropertyContext context;
+private final ComponentLog logger;
+private final TimeValueInference timeValueInference;
+private final DataFormatter dataFormatter;
+
+public ExcelHeaderSchemaStrategy(PropertyContext context, ComponentLog
logger, TimeValueInference timeValueInference, Locale locale) {
+this.context = context;
+this.logger = logger;
+this.timeValueInference = timeValueInference;
+this.dataFormatter = locale == null ? new DataFormatter() : new
DataFormatter(locale);
+}
+
+@Override
+public RecordSchema getSchema(Map variables, InputStream
(nifi) branch main updated: NIFI-13550 Added documentation about the ExcelReader Starting Row Strategy
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 1ff5ebd6fc NIFI-13550 Added documentation about the ExcelReader Starting Row Strategy 1ff5ebd6fc is described below commit 1ff5ebd6fcd7fe4b312ed8dc8ddb5366535ecddf Author: dan-s1 AuthorDate: Mon Jul 15 19:27:11 2024 + NIFI-13550 Added documentation about the ExcelReader Starting Row Strategy This closes #9082 Signed-off-by: David Handermann --- .../additionalDetails.html | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html index c6a3c8af18..6fe3d7366e 100644 --- a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html +++ b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/resources/docs/org.apache.nifi.excel.ExcelReader/additionalDetails.html @@ -25,6 +25,9 @@ The ExcelReader allows for interpreting input data as delimited Records. Each row in an Excel spreadsheet is a record and each cell is considered a field. The reader allows for choosing which row to start from and which sheets in a spreadsheet to ingest. + When using the "Use Starting Row" strategy, the field names will be assumed to be the column names from the configured + starting row. If there are any column(s) from the starting row which are blank, they are automatically assigned a field name + using the cell number prefixed with "column_". When using the "Infer Schema" strategy, the field names will be assumed to be the cell numbers of each column prefixed with "column_". Otherwise, the names of fields can be supplied when specifying the schema by using the Schema Text or looking up the schema in a Schema Registry. @@ -70,13 +73,16 @@ will be thrown. - -Schema Inference +Use Starting Row and Schema Inference While NiFi's Record API does require that each Record have a schema, it is often convenient to infer the schema based on the values in the data, -rather than having to manually create a schema. This is accomplished by selecting a value of "Infer Schema" for the "Schema Access Strategy" property. -When using this strategy, the Reader will determine the schema by first parsing all data in the FlowFile, keeping track of all fields that it has encountered +rather than having to manually create a schema. This is accomplished by selecting either value of "Use Starting Row" or "Infer Schema" for the + "Schema Access Strategy" property. When using the "Use Starting Row" strategy, the Reader will determine the schema by parsing the first ten rows + after the configured starting row of the data in the FlowFile all the while keeping track of all fields that it has encountered + and the type of each field. A schema is then formed that encompasses all encountered fields. A schema can even be inferred if there are blank lines + within those ten rows, but if they are all blank, then this strategy will fail to create a schema. +When using the "Infer Schema" strategy, the Reader will determine the schema by first parsing all data in the FlowFile, keeping track of all fields that it has encountered and the type of each field. Once all data has been parsed, a schema is formed that encompasses all fields that have been encountered.
(nifi) branch main updated: NIFI-13542 Added missing Max String Length property for JSON Readers
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 730b9c693e NIFI-13542 Added missing Max String Length property for
JSON Readers
730b9c693e is described below
commit 730b9c693eeef2ab44d1667e36eaad5dcd662b86
Author: Mark Bathori
AuthorDate: Thu Jul 11 16:18:19 2024 +0200
NIFI-13542 Added missing Max String Length property for JSON Readers
This closes #9074
Signed-off-by: David Handermann
---
.../apache/nifi/json/AbstractJsonRowRecordReader.java| 2 +-
.../org/apache/nifi/json/JsonPathRowRecordReader.java| 13 ++---
.../main/java/org/apache/nifi/json/JsonRecordSource.java | 15 ++-
.../java/org/apache/nifi/yaml/YamlParserFactory.java | 10 --
.../main/java/org/apache/nifi/yaml/YamlRecordSource.java | 5 +++--
.../main/java/org/apache/nifi/json/JsonPathReader.java | 2 +-
.../main/java/org/apache/nifi/json/JsonTreeReader.java | 4 ++--
.../main/java/org/apache/nifi/yaml/YamlTreeReader.java | 16 ++--
.../nifi/json/TestInferJsonSchemaAccessStrategy.java | 3 ++-
.../apache/nifi/json/TestJsonTreeRowRecordReader.java| 2 +-
.../apache/nifi/yaml/TestYamlTreeRowRecordReader.java| 3 ++-
11 files changed, 42 insertions(+), 33 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
index b35d1ca301..de0b7dde17 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
@@ -75,7 +75,7 @@ public abstract class AbstractJsonRowRecordReader implements
RecordReader {
.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
.build();
-private static final StreamReadConstraints DEFAULT_STREAM_READ_CONSTRAINTS
= StreamReadConstraints.builder()
+static final StreamReadConstraints DEFAULT_STREAM_READ_CONSTRAINTS =
StreamReadConstraints.builder()
.maxStringLength(DataUnit.parseDataSize(DEFAULT_MAX_STRING_LENGTH,
DataUnit.B).intValue())
.build();
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
index 1d97831677..db6e606e0e 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/JsonPathRowRecordReader.java
@@ -19,11 +19,13 @@ package org.apache.nifi.json;
import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
+import com.jayway.jsonpath.spi.json.JsonProvider;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.serialization.MalformedRecordException;
import org.apache.nifi.serialization.SimpleRecordSchema;
@@ -48,17 +50,17 @@ import java.util.Map;
import java.util.Optional;
public class JsonPathRowRecordReader extends AbstractJsonRowRecordReader {
-private static final Configuration STRICT_PROVIDER_CONFIGURATION =
Configuration.builder().jsonProvider(new JacksonJsonProvider()).build();
private final ComponentLog logger;
private final LinkedHashMap jsonPaths;
private final InputStream in;
private final RecordSchema schema;
+private final Configuration providerConfiguration;
public JsonPathRowRecordReader(final LinkedHashMap
jsonPaths, final RecordSchema schema, final InputStream in, final ComponentLog
logger,
final String dateFormat, final String
timeFormat, final String timestampFormat)
throws MalformedRecordException, IOException {
-this(jsonPaths, schema, in, logger, dateFormat, timeFormat,
timestampFormat, false, null);
+this(jsonPaths, schema, in, logger, dateFormat
(nifi) branch main updated: NIFI-12491 Added Starting Row Schema Strategy to ExcelReader
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 a424c0eac3 NIFI-12491 Added Starting Row Schema Strategy to ExcelReader
a424c0eac3 is described below
commit a424c0eac360c1eff4edb14d1e8bbe3b282e5895
Author: dan-s1
AuthorDate: Mon Jun 24 19:41:53 2024 +
NIFI-12491 Added Starting Row Schema Strategy to ExcelReader
This closes #9064
Signed-off-by: David Handermann
---
.../nifi/excel/ExcelHeaderSchemaStrategy.java | 162 +++
.../java/org/apache/nifi/excel/ExcelReader.java| 16 +-
.../apache/nifi/excel/ExcelSchemaInference.java| 3 +-
.../java/org/apache/nifi/excel/ExcelUtils.java | 2 +
.../nifi/excel/TestExcelHeaderSchemaStrategy.java | 180 +
.../nifi/excel/TestExcelSchemaInference.java | 8 +-
6 files changed, 362 insertions(+), 9 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelHeaderSchemaStrategy.java
b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelHeaderSchemaStrategy.java
new file mode 100644
index 00..b685da3824
--- /dev/null
+++
b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelHeaderSchemaStrategy.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.excel;
+
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.context.PropertyContext;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.schema.access.SchemaAccessStrategy;
+import org.apache.nifi.schema.access.SchemaField;
+import org.apache.nifi.schema.access.SchemaNotFoundException;
+import org.apache.nifi.schema.inference.FieldTypeInference;
+import org.apache.nifi.schema.inference.TimeValueInference;
+import org.apache.nifi.serialization.SimpleRecordSchema;
+import org.apache.nifi.serialization.record.DataType;
+import org.apache.nifi.serialization.record.RecordField;
+import org.apache.nifi.serialization.record.RecordSchema;
+import org.apache.nifi.util.SchemaInferenceUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class ExcelHeaderSchemaStrategy implements SchemaAccessStrategy {
+private static final Set schemaFields =
EnumSet.noneOf(SchemaField.class);
+static final int NUM_ROWS_TO_DETERMINE_TYPES = 10; // NOTE: This number is
arbitrary.
+static final AllowableValue USE_STARTING_ROW = new AllowableValue("Use
Starting Row", "Use Starting Row",
+"The configured first row of the Excel file is a header line that
contains the names of the columns. The schema will be derived by using the "
++ "column names in the header and the following " +
NUM_ROWS_TO_DETERMINE_TYPES + " rows to determine the type(s) of each column");
+
+private final PropertyContext context;
+private final ComponentLog logger;
+private final TimeValueInference timeValueInference;
+private final DataFormatter dataFormatter;
+
+public ExcelHeaderSchemaStrategy(PropertyContext context, ComponentLog
logger, TimeValueInference timeValueInference, Locale locale) {
+this.context = context;
+this.logger = logger;
+this.timeValueInference = timeValueInference;
+this.dataFormatter = locale == null ? new DataFormatter() : new
DataFormatter(locale);
+}
+
+@Override
+public RecordSchema getSchema(Map variables, InputStream
(nifi) branch main updated (b5b61d960c -> 3c7b262619)
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 b5b61d960c NIFI-13344 Implemented backend for uploading and managing custom NARs add 3c7b262619 NIFI-13159 Moved Remote Delete after Put for PutFTP/PutSFTP REPLACE Strategy No new revisions were added by this update. Summary of changes: .../util/file/transfer/PutFileTransfer.java | 1 - .../nifi/processors/standard/util/FTPTransfer.java | 7 +++ .../nifi/processors/standard/util/SFTPTransfer.java | 7 +++ .../standard/util/TestServerSFTPTransfer.java | 21 - 4 files changed, 14 insertions(+), 22 deletions(-)
(nifi) branch main updated (1437a2dcef -> b5b61d960c)
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 1437a2dcef NIFI-13480: (#9077) add b5b61d960c NIFI-13344 Implemented backend for uploading and managing custom NARs No new revisions were added by this update. Summary of changes: .../src/main/resources/conf/bootstrap.conf | 3 + .../java/org/apache/nifi/util/NiFiProperties.java | 10 + .../nifi/stream/io/MaxLengthInputStream.java | 129 ++ .../nifi/util/security/MessageDigestUtils.java | 2 +- .../nifi/stream/io/MaxLengthInputStreamTest.java | 132 ++ .../nifi/web/client/api/HttpResponseStatus.java| 3 + nifi-docs/src/main/asciidoc/toolkit-guide.adoc | 5 + .../java/org/apache/nifi/py4j/PythonProcess.java | 19 +- .../org/apache/nifi/py4j/StandardPythonBridge.java | 37 +- .../PythonControllerInteractionIT.java | 6 + .../apache/nifi/python/DisabledPythonBridge.java | 9 + .../java/org/apache/nifi/python/PythonBridge.java | 18 +- .../python/PythonBridgeInitializationContext.java | 5 + .../apache/nifi/python/PythonBundleCoordinate.java | 37 ++ .../org/apache/nifi/python/PythonController.java | 8 + .../apache/nifi/python/PythonProcessConfig.java| 14 - .../apache/nifi/python/PythonProcessorDetails.java | 5 + .../src/main/python/framework/BundleCoordinate.py | 44 ++ .../src/main/python/framework/Controller.py| 3 + .../src/main/python/framework/ExtensionDetails.py | 8 +- .../src/main/python/framework/ExtensionManager.py | 8 + .../main/python/framework/ProcessorInspection.py | 31 +- nifi-framework-api/pom.xml | 15 + .../main/java/org/apache/nifi/nar/NarManifest.java | 280 .../java/org/apache/nifi/nar/NarManifestEntry.java | 48 ++ .../org/apache/nifi/nar/NarPersistenceContext.java | 89 .../org/apache/nifi/nar/NarPersistenceInfo.java| 60 +++ .../apache/nifi/nar/NarPersistenceProvider.java| 109 + ...arPersistenceProviderInitializationContext.java | 32 ++ .../java/org/apache/nifi/nar/NarProperties.java| 229 ++ .../main/java/org/apache/nifi/nar/NarProperty.java | 44 ++ .../main/java/org/apache/nifi/nar/NarSource.java | 35 ++ .../java/org/apache/nifi/nar/NarManifestTest.java | 117 + .../org/apache/nifi/nar/NarPropertiesTest.java | 157 +++ .../src/test/resources/nar/MANIFEST-FULL.MF| 13 + .../src/test/resources/nar/MANIFEST-MINIMAL.MF | 6 + .../apache/nifi/web/api/dto/NarCoordinateDTO.java | 84 .../org/apache/nifi/web/api/dto/NarSummaryDTO.java | 174 +++ .../nifi/web/api/entity/NarDetailsEntity.java | 111 + .../nifi/web/api/entity/NarSummariesEntity.java| 57 +++ .../nifi/web/api/entity/NarSummaryEntity.java | 63 +++ .../nifi-framework/nifi-documentation/pom.xml | 9 +- .../apache/nifi/documentation/DocGenerator.java| 19 +- .../authorization/FileAccessPolicyProvider.java| 2 + .../nifi-framework/nifi-framework-cluster/pom.xml | 5 + .../http/StandardHttpResponseMapper.java | 8 +- .../http/endpoints/NarDetailsEndpointMerger.java | 65 +++ .../http/endpoints/NarSummariesEndpointMerger.java | 56 +++ .../http/endpoints/NarSummaryEndpointMerger.java | 62 +++ .../StandardUploadRequestReplicator.java | 180 .../http/replication/UploadRequest.java| 144 ++ .../UploadRequestReplicationException.java | 35 ++ .../http/replication/UploadRequestReplicator.java | 38 ++ .../nifi/cluster/manager/NarSummariesMerger.java | 47 ++ .../nifi/cluster/manager/NarSummaryDtoMerger.java | 35 ++ .../FrameworkClusterConfiguration.java | 19 + .../cluster/manager/NarSummariesMergerTest.java| 79 .../cluster/manager/NarSummaryDtoMergerTest.java | 70 +++ .../org/apache/nifi/nar/NarComponentManager.java | 55 +++ .../org/apache/nifi/nar/NarInstallRequest.java | 78 .../main/java/org/apache/nifi/nar/NarManager.java | 103 + .../src/main/java/org/apache/nifi/nar/NarNode.java | 161 +++ .../org/apache/nifi/nar/NarNotFoundException.java | 37 ++ .../main/java/org/apache/nifi/nar/NarState.java| 39 ++ .../org/apache/nifi/nar/StoppedComponents.java | 40 ++ .../nifi-framework/nifi-framework-core/pom.xml | 10 + .../components/ClassLoaderAwarePythonBridge.java | 15 + .../apache/nifi/controller/ExtensionBuilder.java | 28 +- .../org/apache/nifi/controller/FlowController.java | 18 +- .../nifi/controller/StandardFlowService.java | 13 +- .../configuration/FlowControllerConfiguration.java | 113 - .../nifi/nar/ComponentNodeDefinitionPredicate.java | 62 +++ .../java/org/apache/nifi/nar/NarInstallTask.java | 189 .../nar/NarPersistenceProviderFactoryBean.java | 160 +++ .../java/org/apache/nifi/nar
(nifi) branch main updated: NIFI-13485 Use readBlob when reading content in GitHubRepositoryClient
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 cbdabccd6b NIFI-13485 Use readBlob when reading content in
GitHubRepositoryClient
cbdabccd6b is described below
commit cbdabccd6bee5534e593327f273614279bd0e980
Author: Bryan Bende
AuthorDate: Wed Jul 10 14:05:37 2024 -0400
NIFI-13485 Use readBlob when reading content in GitHubRepositoryClient
- The readBlob method avoids issues with 1 MB limits on alternative
getContent requests
This closes #9067
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/github/GitHubRepositoryClient.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubRepositoryClient.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubRepositoryClient.java
index 3b4805d52f..17a4298512 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubRepositoryClient.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubRepositoryClient.java
@@ -212,7 +212,7 @@ public class GitHubRepositoryClient {
return execute(() -> {
try {
final GHContent ghContent =
repository.getFileContent(resolvedPath, branchRef);
-return ghContent.read();
+return repository.readBlob(ghContent.getSha());
} catch (final FileNotFoundException fnf) {
throwPathOrBranchNotFound(fnf, resolvedPath, branchRef);
return null;
@@ -238,7 +238,7 @@ public class GitHubRepositoryClient {
return execute(() -> {
try {
final GHContent ghContent =
repository.getFileContent(resolvedPath, commitSha);
-return ghContent.read();
+return repository.readBlob(ghContent.getSha());
} catch (final FileNotFoundException fnf) {
throw new FlowRegistryException("Path [" + resolvedPath + "]
or Commit [" + commitSha + "] not found", fnf);
}
(nifi) branch main updated: NIFI-13529 Set Calcite Connection timeZone to UTC for Records
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 f338215851 NIFI-13529 Set Calcite Connection timeZone to UTC for
Records
f338215851 is described below
commit f338215851bcaec40b673af4ef4600b478a5c9f3
Author: Mark Payne
AuthorDate: Tue Jul 9 11:01:41 2024 -0400
NIFI-13529 Set Calcite Connection timeZone to UTC for Records
Calcite adjusts Timestamp objects returned from a Result Set based on the
configured Time Zone Offset in an attempt to localize the results. Framework
use of Calcite for Record processing expects input Timestamp values to remain
unchanged, so setting the timeZone property to UTC with an offset of 0
effectively avoids this Calcite localization.
This closes #9066
Signed-off-by: David Handermann
---
.../java/org/apache/nifi/sql/CalciteDatabase.java | 4 +++
.../org/apache/nifi/sql/TestCalciteDatabase.java | 40 ++
2 files changed, 44 insertions(+)
diff --git
a/nifi-commons/nifi-calcite-utils/src/main/java/org/apache/nifi/sql/CalciteDatabase.java
b/nifi-commons/nifi-calcite-utils/src/main/java/org/apache/nifi/sql/CalciteDatabase.java
index f5d9574400..537f9956f3 100644
---
a/nifi-commons/nifi-calcite-utils/src/main/java/org/apache/nifi/sql/CalciteDatabase.java
+++
b/nifi-commons/nifi-calcite-utils/src/main/java/org/apache/nifi/sql/CalciteDatabase.java
@@ -193,6 +193,10 @@ public class CalciteDatabase implements Closeable {
calciteProperties = properties;
}
+// If not explicitly set, default timezone to UTC. We ensure that when
we provide timestamps, we convert them to UTC. We don't want
+// Calcite trying to convert them again.
+calciteProperties.putIfAbsent("timeZone", "UTC");
+
final Connection sqlConnection =
DriverManager.getConnection("jdbc:calcite:", calciteProperties);
final CalciteConnection connection =
sqlConnection.unwrap(CalciteConnection.class);
connection.getRootSchema().setCacheEnabled(false);
diff --git
a/nifi-commons/nifi-calcite-utils/src/test/java/org/apache/nifi/sql/TestCalciteDatabase.java
b/nifi-commons/nifi-calcite-utils/src/test/java/org/apache/nifi/sql/TestCalciteDatabase.java
index 9d06bd6e84..b8604bc28a 100644
---
a/nifi-commons/nifi-calcite-utils/src/test/java/org/apache/nifi/sql/TestCalciteDatabase.java
+++
b/nifi-commons/nifi-calcite-utils/src/test/java/org/apache/nifi/sql/TestCalciteDatabase.java
@@ -24,6 +24,8 @@ import java.io.IOException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -85,6 +87,25 @@ public class TestCalciteDatabase {
}
}
+@Test
+public void testWithTimestamp() throws SQLException, IOException {
+final String query = "SELECT * FROM CANNED_DATA";
+
+try (final CalciteDatabase database = createNameTimestampDatabase();
+ final PreparedStatement stmt =
database.getConnection().prepareStatement(query);
+ final ResultSet resultSet = stmt.executeQuery()) {
+
+assertTrue(resultSet.next());
+
+// We should get the same result whether we call getTimestamp() or
getObject(). We should also get back the same original Long value.
+final Timestamp timestamp = resultSet.getTimestamp(2);
+assertEquals(timestamp, resultSet.getObject(2));
+assertEquals(170405640L, timestamp.getTime());
+
+assertFalse(resultSet.next());
+}
+}
+
public static class ToUpperCase {
public String invoke(final String value) {
return value.toUpperCase();
@@ -113,6 +134,25 @@ public class TestCalciteDatabase {
return database;
}
+private CalciteDatabase createNameTimestampDatabase() throws SQLException {
+final CalciteDatabase database = new CalciteDatabase();
+
+final NiFiTableSchema tableSchema = new NiFiTableSchema(List.of(
+new ColumnSchema("name", String.class, false),
+new ColumnSchema("dob", Timestamp.class, false)
+));
+
+final List rows = new ArrayList<>();
+rows.add(new Object[] {"Mark", new Timestamp(170405640L)});
+
+final ListDataSource arrayListDataSource = new
ListDataSource(tableSchema, rows);
+
+final NiFiTable table = new NiFiTable("CANNED_DATA",
arrayListDataSource, mock(ComponentLog.class));
+database.addTable(table);
+
+return database;
+}
+
private static class ListDataSource implements ResettableDataSource {
private final NiFiTableSchema schema;
(nifi-site) branch main updated: NIFI-13460 Removed incorrect download title attributes
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-site.git
The following commit(s) were added to refs/heads/main by this push:
new ae3095e8 NIFI-13460 Removed incorrect download title attributes
ae3095e8 is described below
commit ae3095e8e75f4bf5914fa6541999b0f1963c22de
Author: exceptionfactory
AuthorDate: Tue Jul 9 12:41:49 2024 -0500
NIFI-13460 Removed incorrect download title attributes
---
layouts/shortcodes/cpp-download-links.html | 3 +--
layouts/shortcodes/download-links.html | 3 +--
layouts/shortcodes/fds-download-links.html | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/layouts/shortcodes/cpp-download-links.html
b/layouts/shortcodes/cpp-download-links.html
index 9c2f8362..49ba2afe 100644
--- a/layouts/shortcodes/cpp-download-links.html
+++ b/layouts/shortcodes/cpp-download-links.html
@@ -14,8 +14,7 @@
{{- $downloadFilePath := (print "nifi-minifi-cpp/" $downloadVersion
"/nifi-minifi-cpp-" $downloadVersion "-" $extension) -}}
- {{ .Get "label"
}} {{ $downloadVersion }}
OpenPGP
diff --git a/layouts/shortcodes/download-links.html
b/layouts/shortcodes/download-links.html
index 5488db9d..f99222e4 100644
--- a/layouts/shortcodes/download-links.html
+++ b/layouts/shortcodes/download-links.html
@@ -26,8 +26,7 @@
{{- $downloadFilePath := (print $downloadVersion "/" $project "-" $qualifier
$downloadVersion $extension) -}}
- {{ .Get "label"
}} {{ $downloadVersion }}
OpenPGP
diff --git a/layouts/shortcodes/fds-download-links.html
b/layouts/shortcodes/fds-download-links.html
index 21e23d1a..01d746e6 100644
--- a/layouts/shortcodes/fds-download-links.html
+++ b/layouts/shortcodes/fds-download-links.html
@@ -14,8 +14,7 @@
{{- $downloadFilePath := (print "nifi-fds/nifi-fds-" $downloadVersion
"/nifi-fds-" $downloadVersion "-source-release.zip") -}}
- {{ .Get "label"
}} {{ $downloadVersion }}
OpenPGP
(nifi) branch support/nifi-1.x updated: NIFI-13418 Updated ExcelReader to handle spreadsheets with shared formulas
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 3bdf32dd14 NIFI-13418 Updated ExcelReader to handle spreadsheets with
shared formulas
3bdf32dd14 is described below
commit 3bdf32dd1405e68f5406582e338932a2db132368
Author: dan-s1
AuthorDate: Mon Jul 8 18:48:36 2024 +
NIFI-13418 Updated ExcelReader to handle spreadsheets with shared formulas
This closes #9063
Signed-off-by: David Handermann
(cherry picked from commit 90c58a88a702db2b418e2bf6ebe7eb422a3c3b51)
---
.../src/main/java/org/apache/nifi/excel/RowIterator.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
index 733697efd1..6d067a7c07 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
@@ -47,6 +47,7 @@ class RowIterator implements Iterator, Closeable {
.bufferSize(4096)
.password(configuration.getPassword())
.setAvoidTempFiles(configuration.isAvoidTempFiles())
+.setReadSharedFormulas(true) // NOTE: If not set to true, then
data with shared formulas fail.
.open(in);
final List requiredSheets = configuration.getRequiredSheets();
(nifi) branch support/nifi-1.x updated (7d72664854 -> 089fa476b3)
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 7d72664854 Merge branch 'support/nifi-1.x' of https://gitbox.apache.org/repos/asf/nifi into support/nifi-1.x add 089fa476b3 NIFI-13461 Added DeleteFile Processor No new revisions were added by this update. Summary of changes: .../nifi/processors/standard/DeleteFile.java | 183 + .../services/org.apache.nifi.processor.Processor | 1 + .../nifi/processors/standard/TestDeleteFile.java | 159 ++ 3 files changed, 343 insertions(+) create mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java create mode 100644 nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeleteFile.java
(nifi) branch main updated: NIFI-13418 Updated ExcelReader to handle spreadsheets with shared formulas
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 90c58a88a7 NIFI-13418 Updated ExcelReader to handle spreadsheets with
shared formulas
90c58a88a7 is described below
commit 90c58a88a702db2b418e2bf6ebe7eb422a3c3b51
Author: dan-s1
AuthorDate: Mon Jul 8 18:48:36 2024 +
NIFI-13418 Updated ExcelReader to handle spreadsheets with shared formulas
This closes #9063
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/excel/RowIterator.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
index 733697efd1..6d067a7c07 100644
---
a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
+++
b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/RowIterator.java
@@ -47,6 +47,7 @@ class RowIterator implements Iterator, Closeable {
.bufferSize(4096)
.password(configuration.getPassword())
.setAvoidTempFiles(configuration.isAvoidTempFiles())
+.setReadSharedFormulas(true) // NOTE: If not set to true, then
data with shared formulas fail.
.open(in);
final List requiredSheets = configuration.getRequiredSheets();
(nifi) 02/02: NIFI-13527 Corrected various grammar issues in comments and docs
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 3f6eb6ff636d5773e8cfb78da18f60920d85ca94 Author: Joseph Witt AuthorDate: Sat Jul 6 22:56:12 2024 -0700 NIFI-13527 Corrected various grammar issues in comments and docs This closes #9060 Signed-off-by: David Handermann --- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 12 ++-- .../additionalDetails.html | 5 - .../additionalDetails.html | 5 - .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../gcp/bigquery/AbstractBigQueryProcessor.java | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 8 .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 13 ++--- .../additionalDetails.html | 21 ++--- .../additionalDetails.html | 8 .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../additionalDetails.html | 2 +- .../additionalDetails.html | 6 +++--- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 ++-- .../nifi/controller/AbstractComponentNode.java | 4 ++-- .../src/main/resources/conf/authorizers.xml | 4 ++-- .../apache/nifi/web/api/ApplicationResource.java| 6 +++--- nifi
(nifi) branch main updated (58b2af9a6e -> 3f6eb6ff63)
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 58b2af9a6e NIFI-13523: (#9056) new f92d8f72a8 NIFI-13526 Removed unused variables and localized nifi-socket-utils new 3f6eb6ff63 NIFI-13527 Corrected various grammar issues in comments and docs The 2 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/schema/v2/ConfigSchemaV2.java | 1 - .../nifi/parameter/AbstractParameterGroup.java | 51 - .../apache/nifi/registry/EnvironmentVariables.java | 8 +- nifi-code-coverage/pom.xml | 5 - .../apache/nifi/provenance/lineage/EventNode.java | 1 - .../ExpressionLanguageAgnosticParameterParser.java | 4 - .../ExpressionLanguageAwareParameterParser.java| 4 - .../java/org/apache/nifi/util/NiFiProperties.java | 11 - nifi-commons/nifi-socket-utils/pom.xml | 49 - .../apache/nifi/io/nio/AbstractChannelReader.java | 162 --- .../java/org/apache/nifi/io/nio/BufferPool.java| 110 -- .../org/apache/nifi/io/nio/ChannelDispatcher.java | 158 --- .../org/apache/nifi/io/nio/ChannelListener.java| 225 - .../apache/nifi/io/nio/DatagramChannelReader.java | 59 -- .../apache/nifi/io/nio/SocketChannelReader.java| 51 - .../io/nio/consumer/AbstractStreamConsumer.java| 131 .../nifi/io/nio/consumer/StreamConsumer.java | 80 .../io/nio/consumer/StreamConsumerFactory.java | 26 --- nifi-commons/pom.xml | 1 - .../additionalDetails.html | 4 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 12 +- .../additionalDetails.html | 5 - .../additionalDetails.html | 5 - .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../nifi/processors/email/GenerateAttachment.java | 2 - .../org/apache/nifi/util/db/TestJdbcTypesH2.java | 5 - .../gcp/bigquery/AbstractBigQueryProcessor.java| 2 +- .../gcp/bigquery/BigQueryAttributes.java | 6 - .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../groovyx/ExecuteGroovyScriptTest.java | 4 - .../additionalDetails.html | 2 +- .../hadoop/TestCreateHadoopSequenceFile.java | 12 -- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../processors/image/ExtractImageMetadataTest.java | 2 +- .../additionalDetails.html | 4 +- .../additionalDetails.html | 2 +- .../network/parser/util/ConversionUtil.java| 37 +--- .../additionalDetails.html | 4 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 4 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../additionalDetails.html | 2 +- .../apache/nifi/processors/shopify/GetShopify.java | 1 - .../additionalDetails.html | 4 +- .../additionalDetails.html
(nifi-site) branch main updated: NIFI-13460 Published CVE-2024-37389
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-site.git
The following commit(s) were added to refs/heads/main by this push:
new a5a3e8b1 NIFI-13460 Published CVE-2024-37389
a5a3e8b1 is described below
commit a5a3e8b1428b2b6fe1447934e2a1772792261a32
Author: exceptionfactory
AuthorDate: Sun Jul 7 22:36:14 2024 -0500
NIFI-13460 Published CVE-2024-37389
---
content/documentation/security.md | 19 +++
1 file changed, 19 insertions(+)
diff --git a/content/documentation/security.md
b/content/documentation/security.md
index ba9e7ad6..b33a91fe 100644
--- a/content/documentation/security.md
+++ b/content/documentation/security.md
@@ -64,6 +64,25 @@ Severity ratings represent the determination of project
members based on an eval
The following announcements include published vulnerabilities that apply
directly to Apache NiFi components.
+{{< vulnerability
+id="CVE-2024-37389"
+title="Improper Neutralization of Input in Parameter Context Description"
+published="2024-07-08"
+severity="Medium"
+products="Apache NiFi"
+affectedVersions="1.10.0 to 1.26.0 and 2.0.0-M1 to 2.0.0-M3"
+fixedVersion="1.27.0 and 2.0.0-M4"
+jira="NIFI-13374"
+pullRequest="8938"
+reporter="Akbar Kustirama at abay.sh" >}}
+
+Apache NiFi 1.10.0 through 1.26.0 and 2.0.0-M1 through 2.0.0-M3 support a
description field in the Parameter Context
+configuration that is vulnerable to cross-site scripting. An authenticated
user, authorized to configure a Parameter
+Context, can enter arbitrary JavaScript code, which the client browser will
execute within the session context of the
+authenticated user. Upgrading to Apache NiFi 1.27.0 or 2.0.0-M4 is the
recommended mitigation.
+
+{{}}
+
{{< vulnerability
id="CVE-2023-49145"
title="Improper Neutralization of Input in Advanced User Interface for Jolt"
(nifi-site) branch main updated: NIFI-13460 Updated previous version to 1.27.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-site.git
The following commit(s) were added to refs/heads/main by this push:
new 2945101c NIFI-13460 Updated previous version to 1.27.0
2945101c is described below
commit 2945101cde1be072c862b4812a35cdeac3deeb54
Author: exceptionfactory
AuthorDate: Sun Jul 7 22:16:47 2024 -0500
NIFI-13460 Updated previous version to 1.27.0
---
config.toml | 4 ++--
static/.htaccess | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.toml b/config.toml
index 23098677..de1b78cf 100644
--- a/config.toml
+++ b/config.toml
@@ -38,8 +38,8 @@ mavenCentralDownloadPathUrl =
"https://repo1.maven.org/maven2/org/apache/nifi";
currentProjectVersion = "2.0.0-M4"
currentProjectVersionReleased = "2024-07-01"
-previousProjectVersion = "1.26.0"
-previousProjectVersionReleased = "2024-05-06"
+previousProjectVersion = "1.27.0"
+previousProjectVersionReleased = "2024-07-08"
minifiCppCurrentProjectVersion = "0.99.0"
minifiCppCurrentProjectVersionReleased = "2024-05-17"
diff --git a/static/.htaccess b/static/.htaccess
index f8c13620..0d722809 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -5,7 +5,7 @@ RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
# Redirect component documentation to specified version
-RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.26.0/$2 [L]
+RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.27.0/$2 [L]
# Rewrite historical links
RewriteRule ^minifi/$ /projects/minifi/ [L,R]
(nifi) 01/02: NIFI-13031 Changed PG StatusSnapshotDTO to use cloned copy for status
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 b82e3d20b65198b926d7a7b5a835591b3e2d8ca7
Author: Nissim Shiman
AuthorDate: Fri May 31 17:49:22 2024 +
NIFI-13031 Changed PG StatusSnapshotDTO to use cloned copy for status
This closes #9054
Signed-off-by: David Handermann
---
.../dto/status/ConnectionStatusSnapshotDTO.java| 1 +
.../dto/status/ProcessGroupStatusSnapshotDTO.java | 43 +-
.../entity/ConnectionStatisticsSnapshotEntity.java | 1 +
.../api/entity/ConnectionStatusSnapshotEntity.java | 1 +
.../web/api/entity/PortStatusSnapshotEntity.java | 1 +
.../entity/ProcessGroupStatusSnapshotEntity.java | 1 +
.../api/entity/ProcessorStatusSnapshotEntity.java | 1 +
.../RemoteProcessGroupStatusSnapshotEntity.java| 1 +
8 files changed, 41 insertions(+), 9 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java
index ba507ec935..59c7cd624a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java
@@ -321,6 +321,7 @@ public class ConnectionStatusSnapshotDTO implements
Cloneable {
other.setQueuedSize(getQueuedSize());
other.setPercentUseBytes(getPercentUseBytes());
other.setPercentUseCount(getPercentUseCount());
+other.setFlowFileAvailability(getFlowFileAvailability());
return other;
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java
index 94e063630a..9047697502 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java
@@ -549,11 +549,32 @@ public class ProcessGroupStatusSnapshotDTO implements
Cloneable {
other.setProcessingNanos(getProcessingNanos());
-
other.setConnectionStatusSnapshots(copy(getConnectionStatusSnapshots()));
-other.setProcessorStatusSnapshots(copy(getProcessorStatusSnapshots()));
-
other.setRemoteProcessGroupStatusSnapshots(copy(getRemoteProcessGroupStatusSnapshots()));
-other.setInputPortStatusSnapshots(copy(getInputPortStatusSnapshots()));
-
other.setOutputPortStatusSnapshots(copy(getOutputPortStatusSnapshots()));
+if (connectionStatusSnapshots != null) {
+final List
collectionStatusSnapshotEntities = new ArrayList<>();
+for (final ConnectionStatusSnapshotEntity
connectionStatusSnapshotEntity : connectionStatusSnapshots) {
+
collectionStatusSnapshotEntities.add(connectionStatusSnapshotEntity.clone());
+}
+
other.setConnectionStatusSnapshots(collectionStatusSnapshotEntities);
+}
+
+if (processorStatusSnapshots != null) {
+final List
processorStatusSnapshotEntities = new ArrayList<>();
+for (final ProcessorStatusSnapshotEntity
processorStatusSnapshotEntity : processorStatusSnapshots) {
+
processorStatusSnapshotEntities.add(processorStatusSnapshotEntity.clone());
+}
+other.setProcessorStatusSnapshots(processorStatusSnapshotEntities);
+}
+
+if (remoteProcessGroupStatusSnapshots != null) {
+final List
remoteProcessGroupStatusSnapshotEntities = new ArrayList<>();
+for (final RemoteProcessGroupStatusSnapshotEntity
remoteProcessGroupStatusSnapshotEntity : remoteProcessGroupStatusSnapshots) {
+
remoteProcessGroupStatusSnapshotEntities.add(remoteProcessGroupStatusSnapshotEntity.clone());
+}
+
other.setRemoteProcessGroupStatusSnapshots(remoteProcessGroupStatusSnapshotEntities);
+}
+
+
other.setInputPortStatusSnapshots(copyPortStatusSnapshots(inputPortStatusSnapshots));
+
other.setOutputPortStatusSnapshots(copyPortStatusSnapshots(outputPortStatusSnapshots));
if (processGroupStatusSnapshots != null) {
final List
(nifi) branch support/nifi-1.x updated (7dcea8baeb -> 34b5297c93)
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 7dcea8baeb NIFI-13498 Added deprecation notices new b82e3d20b6 NIFI-13031 Changed PG StatusSnapshotDTO to use cloned copy for status new 34b5297c93 NIFI-13420 Maintain consistent maxNonHeapBytes for clustered diagnostics The 2 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: .../dto/status/ConnectionStatusSnapshotDTO.java| 1 + .../dto/status/ProcessGroupStatusSnapshotDTO.java | 43 +- .../entity/ConnectionStatisticsSnapshotEntity.java | 1 + .../api/entity/ConnectionStatusSnapshotEntity.java | 1 + .../web/api/entity/PortStatusSnapshotEntity.java | 1 + .../entity/ProcessGroupStatusSnapshotEntity.java | 1 + .../api/entity/ProcessorStatusSnapshotEntity.java | 1 + .../RemoteProcessGroupStatusSnapshotEntity.java| 1 + .../apache/nifi/cluster/manager/StatusMerger.java | 6 ++- 9 files changed, 46 insertions(+), 10 deletions(-)
(nifi) 02/02: NIFI-13420 Maintain consistent maxNonHeapBytes for clustered diagnostics
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 34b5297c93543a085fcfe98f7f325e728986af48
Author: Nissim Shiman
AuthorDate: Wed Jun 19 19:29:55 2024 +
NIFI-13420 Maintain consistent maxNonHeapBytes for clustered diagnostics
- The merged value of maxNonHeapBytes should be -1 when at least one node
has that value
This closes #9055
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
index cfdd1ff597..d91c8f1ce4 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
@@ -685,7 +685,11 @@ public class StatusMerger {
target.setFreeHeapBytes(target.getFreeHeapBytes() +
toMerge.getFreeHeapBytes());
target.setFreeNonHeapBytes(target.getFreeNonHeapBytes() +
toMerge.getFreeNonHeapBytes());
target.setMaxHeapBytes(target.getMaxHeapBytes() +
toMerge.getMaxHeapBytes());
-target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() +
toMerge.getMaxNonHeapBytes());
+if (target.getMaxNonHeapBytes() != -1 && toMerge.getMaxNonHeapBytes()
!= -1) {
+target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() +
toMerge.getMaxNonHeapBytes());
+} else {
+target.setMaxNonHeapBytes(-1L);
+}
double systemLoad = target.getProcessorLoadAverage();
double toMergeSystemLoad = toMerge.getProcessorLoadAverage();
if (systemLoad >= 0 && toMergeSystemLoad >= 0) {
(nifi) branch support/nifi-1.x updated: NIFI-13498 Added deprecation notices
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 7dcea8baeb NIFI-13498 Added deprecation notices
7dcea8baeb is described below
commit 7dcea8baeb66751cad2b4c399034250ff4862f45
Author: Joseph Witt
AuthorDate: Thu Jul 4 20:55:12 2024 -0700
NIFI-13498 Added deprecation notices
ListenBeats
DecryptContent
DecryptContentCompatibility
ExtractTNEFAttachments
QueryDNS
QueryWhois
ConvertJsonToSql
ListenRELP
ListenTCPRecord
ParseCEF
ListenSMTP
PrometheusReportingTask
PrometheusRecordSink
StandardGangliaReporter
KuduLookupService
PutKudu
This closes #9050
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/processors/beats/ListenBeats.java| 2 ++
.../main/java/org/apache/nifi/processors/cipher/DecryptContent.java| 2 ++
.../org/apache/nifi/processors/cipher/DecryptContentCompatibility.java | 2 ++
.../java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java | 2 ++
.../src/main/java/org/apache/nifi/processors/email/ListenSMTP.java | 2 ++
.../src/main/java/org/apache/nifi/processors/enrich/QueryDNS.java | 3 ++-
.../src/main/java/org/apache/nifi/processors/enrich/QueryWhois.java| 3 ++-
.../main/java/org/apache/nifi/controller/kudu/KuduLookupService.java | 2 ++
.../src/main/java/org/apache/nifi/processors/kudu/PutKudu.java | 3 ++-
.../org/apache/nifi/reporting/prometheus/PrometheusRecordSink.java | 3 ++-
.../org/apache/nifi/reporting/prometheus/PrometheusReportingTask.java | 2 ++
.../java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java | 2 ++
.../src/main/java/org/apache/nifi/processors/standard/ListenRELP.java | 2 ++
.../main/java/org/apache/nifi/processors/standard/ListenTCPRecord.java | 2 ++
.../src/main/java/org/apache/nifi/processors/standard/ParseCEF.java| 3 ++-
.../org/apache/nifi/reporting/ganglia/StandardGangliaReporter.java | 2 ++
16 files changed, 32 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/ListenBeats.java
b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/ListenBeats.java
index a3b8dc4e64..92705d81b3 100644
---
a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/ListenBeats.java
+++
b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/src/main/java/org/apache/nifi/processors/beats/ListenBeats.java
@@ -47,6 +47,7 @@ import org.apache.nifi.remote.io.socket.NetworkUtils;
import org.apache.nifi.security.util.ClientAuth;
import org.apache.nifi.ssl.RestrictedSSLContextService;
import org.apache.nifi.ssl.SSLContextService;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import javax.net.ssl.SSLContext;
import java.io.IOException;
@@ -70,6 +71,7 @@ import java.util.concurrent.LinkedBlockingQueue;
@WritesAttribute(attribute = "beats.sequencenumber", description = "The
sequence number of the message included for batches containing single
messages"),
@WritesAttribute(attribute = "mime.type", description = "The mime.type of
the content which is application/json")
})
+@DeprecationNotice(reason = "This component is deprecated and will be removed
in NiFi 2.x.")
public class ListenBeats extends AbstractProcessor {
public static final PropertyDescriptor SSL_CONTEXT_SERVICE = new
PropertyDescriptor.Builder()
diff --git
a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContent.java
b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContent.java
index 23057f3719..6074ec8db5 100644
---
a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContent.java
+++
b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContent.java
@@ -41,6 +41,7 @@ import
org.apache.nifi.security.crypto.key.StandardDerivedKeySpec;
import
org.apache.nifi.security.crypto.key.detection.DetectedDerivedKeyParameterSpecReader;
import
org.apache.nifi.security.crypto.key.detection.DetectedDerivedKeyProvider;
import org.apache.nifi.security.crypto.key.io.ByteBufferSearch;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.bouncycastle.util.encoders.Hex;
import javax.crypto.Cipher;
@@ -70,6 +71,7 @@ import java.util.Set;
"The salt format indicates the Key Derivation Function that the
Processor uses to generate a secre
(nifi) branch main updated: NIFI-13466 Catch IllegalStateException in SplitExcel
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 b2840bd851 NIFI-13466 Catch IllegalStateException in SplitExcel
b2840bd851 is described below
commit b2840bd85190fd67583da3c02efe5b34795fe659
Author: dan-s1
AuthorDate: Wed Jul 3 16:21:15 2024 +
NIFI-13466 Catch IllegalStateException in SplitExcel
This closes #9033
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/processors/excel/SplitExcel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java
b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java
index 86812f2e4f..62ac79fd14 100644
---
a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java
+++
b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java
@@ -174,7 +174,7 @@ public class SplitExcel extends AbstractProcessor {
index++;
}
});
-} catch (ExcelRuntimeException | ProcessException e) {
+} catch (ExcelRuntimeException | IllegalStateException |
ProcessException e) {
getLogger().error("Failed to split {}", originalFlowFile, e);
session.remove(workbookSplits.stream()
.map(WorkbookSplit::content)
(nifi) branch main updated (7cb6684801 -> 15e5193099)
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 7cb6684801 NIFI-13494 Removed support for Repository Encryption This closes #9039 add b2f19aa0a8 NIFI-13501 Removed DecryptContent and DecryptContentCompatibility add 396c8450d0 NIFI-13505 Removed QueryDNS and QueryWhois add 4ff70dd233 NIFI-13507 Removed nifi-prometheus-bundle add f1fb106bf8 NIFI-13509 Removed ListenTCPRecord, ListenRELP and others add 6783420897 NIFI-13513 Removed ListenSMTP add 15e5193099 NIFI-13517 Upgraded Jetty from 12.0.10 to 12.0.11 and others No new revisions were added by this update. Summary of changes: .../main/markdown/minifi-java-agent-quick-start.md |5 - minifi/pom.xml |1 - nifi-assembly/pom.xml |6 - nifi-code-coverage/pom.xml | 15 - nifi-commons/nifi-security-socket-ssl/pom.xml | 72 -- .../remote/io/socket/ssl/SSLSocketChannel.java | 731 -- .../io/socket/ssl/SSLSocketChannelInputStream.java | 61 -- .../remote/io/socket/ssl/SSLSocketChannelTest.java | 383 nifi-commons/pom.xml |1 - nifi-docs/src/main/asciidoc/developer-guide.adoc |8 +- nifi-docs/src/main/asciidoc/getting-started.adoc |1 - nifi-docs/src/main/asciidoc/user-guide.adoc|2 +- .../nifi-azure-processors/pom.xml |4 +- nifi-extension-bundles/nifi-azure-bundle/pom.xml |4 +- .../nifi/processors/cipher/CipherAttributeKey.java | 29 - .../nifi/processors/cipher/CipherException.java| 32 - .../nifi/processors/cipher/DecryptContent.java | 355 --- .../cipher/DecryptContentCompatibility.java| 282 -- .../cipher/algorithm/CipherAlgorithmMode.java | 49 - .../cipher/algorithm/CipherAlgorithmPadding.java | 50 - .../cipher/algorithm/DigestAlgorithm.java | 51 - .../cipher/algorithm/SymmetricCipher.java | 54 -- .../CompatibilityModeEncryptionScheme.java | 213 - .../CompatibilityModeKeyDerivationStrategy.java| 95 -- .../cipher/encoded/EncodedDelimiter.java | 59 -- .../cipher/encoded/KeySpecificationFormat.java | 48 - .../cipher/io/DecryptStreamCallback.java | 137 --- .../services/org.apache.nifi.processor.Processor |2 - .../additionalDetails.html | 67 -- .../additionalDetails.html | 144 --- .../cipher/DecryptContentCompatibilityTest.java| 254 - .../nifi/processors/cipher/DecryptContentTest.java | 236 - .../nifi-elasticsearch-bundle/pom.xml |4 +- .../nifi-email-processors/pom.xml |5 - .../apache/nifi/processors/email/ListenSMTP.java | 232 - .../nifi/processors/email/smtp/SmtpConsumer.java | 163 .../services/org.apache.nifi.processor.Processor |1 - .../nifi/processors/email/TestListenSMTP.java | 205 .../nifi-enrich-processors/pom.xml |4 - .../processors/enrich/AbstractEnrichProcessor.java | 251 - .../apache/nifi/processors/enrich/QueryDNS.java| 275 -- .../apache/nifi/processors/enrich/QueryWhois.java | 345 --- .../services/org.apache.nifi.processor.Processor |2 - .../enrich/FakeDNSInitialDirContextFactory.java| 52 - .../nifi/processors/enrich/TestQueryDNS.java | 228 - .../nifi/processors/enrich/TestQueryWhois.java | 207 .../nifi-extension-utils/nifi-hadoop-utils/pom.xml |2 +- .../nifi-prometheus-utils/pom.xml | 55 -- .../nifi-standard-record-utils/pom.xml |6 - .../org/apache/nifi/record/listen/IOUtils.java | 36 - .../listen/SSLSocketChannelRecordReader.java | 98 -- .../record/listen/SocketChannelRecordReader.java | 58 -- .../SocketChannelRecordReaderDispatcher.java | 148 --- .../listen/StandardSocketChannelRecordReader.java | 84 -- .../nifi-extension-utils/pom.xml |1 - nifi-extension-bundles/nifi-github-bundle/pom.xml |2 +- .../nifi-hdfs-processors/pom.xml |2 +- .../nifi-hadoop-libraries-bundle/pom.xml |2 +- nifi-extension-bundles/nifi-iceberg-bundle/pom.xml |2 +- .../nifi-parquet-processors/pom.xml|2 +- .../nifi-prometheus-nar/pom.xml| 38 - .../src/main/resources/META-INF/LICENSE| 208 .../src/main/resources/META-INF/NOTICE | 76 -- .../nifi-prometheus-reporting-task/pom.xml | 77 -- .../reporting/prometheus/PrometheusRecordSink.java | 229 - .../prometheus/PrometheusReportingTask.java| 201 .../reporting/prometheus/PrometheusServer.java | 159
(nifi) branch main updated: NIFI-13516 Removed YandexTranslate and nifi-language-translation-nar
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 89741f6160 NIFI-13516 Removed YandexTranslate and nifi-language-translation-nar 89741f6160 is described below commit 89741f6160a0f7e8a8289b51bd71259c4f79d80d Author: Joseph Witt AuthorDate: Thu Jul 4 21:49:14 2024 -0500 NIFI-13516 Removed YandexTranslate and nifi-language-translation-nar This closes #9049 Signed-off-by: David Handermann --- nifi-assembly/pom.xml | 6 - nifi-code-coverage/pom.xml | 5 - .../nifi-language-translation-nar/pom.xml | 42 --- .../src/main/resources/META-INF/NOTICE | 67 - .../nifi-yandex-processors/pom.xml | 60 .../nifi/processors/yandex/YandexTranslate.java| 329 - .../nifi/processors/yandex/model/Translation.java | 53 .../nifi/processors/yandex/util/Languages.java | 86 -- .../services/org.apache.nifi.processor.Processor | 16 - .../processors/yandex/TestYandexTranslate.java | 215 -- .../nifi-language-translation-bundle/pom.xml | 31 -- nifi-extension-bundles/pom.xml | 1 - 12 files changed, 911 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 3fe6fb1f42..127b32c1e9 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -388,12 +388,6 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar - -org.apache.nifi -nifi-language-translation-nar -2.0.0-SNAPSHOT -nar - org.apache.nifi nifi-enrich-nar diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index 00bda5522f..41f90f8935 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -1117,11 +1117,6 @@ nifi-kerberos-iaa-providers 2.0.0-SNAPSHOT - -org.apache.nifi -nifi-yandex-processors -2.0.0-SNAPSHOT - org.apache.nifi nifi-ldap-iaa-providers diff --git a/nifi-extension-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml b/nifi-extension-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml deleted file mode 100644 index 4b7eb004f1..00 --- a/nifi-extension-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> -4.0.0 - - -org.apache.nifi -nifi-language-translation-bundle -2.0.0-SNAPSHOT - - -nifi-language-translation-nar -nar - - - - -org.apache.nifi -nifi-yandex-processors -2.0.0-SNAPSHOT - - -org.apache.nifi -nifi-standard-shared-nar -2.0.0-SNAPSHOT -nar - - - diff --git a/nifi-extension-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/src/main/resources/META-INF/NOTICE b/nifi-extension-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/src/main/resources/META-INF/NOTICE deleted file mode 100644 index b6afa054df..00 --- a/nifi-extension-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,67 +0,0 @@ -nifi-language-translation-nar -Copyright 2015-2020 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -** -Apache Software License v2 -** - -The following binary components are provided under the Apache Software License v2 - - (ASLv2) Apache Commons Lang -The following NOTICE information applies: - Apache Commons Lang - Copyright 2001-2015 The Apache Software Foundation - - This product includes software from the Spring Framework, - under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - - (ASLv2) Jackson JSON processor -The following NOTICE information applies: - # Jackson JSON processor - - Jackson is a high-performance, Free/Open Source JSON processing library. - It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has - been in development since 2007. - It is currently developed by a community of developers, as well as supported -
(nifi-python-extensions) branch main updated: NIFI-13495 Fixed PutChroma unexpected keyword argument error (#4)
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-python-extensions.git The following commit(s) were added to refs/heads/main by this push: new c4a8860 NIFI-13495 Fixed PutChroma unexpected keyword argument error (#4) c4a8860 is described below commit c4a8860f3fdfc9bc9b3e20d067be8b574c9f2696 Author: krisztina-zsihovszki <76993418+krisztina-zsihovs...@users.noreply.github.com> AuthorDate: Fri Jul 5 19:21:42 2024 +0200 NIFI-13495 Fixed PutChroma unexpected keyword argument error (#4) Signed-off-by: David Handermann --- src/extensions/vectorstores/PutChroma.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/vectorstores/PutChroma.py b/src/extensions/vectorstores/PutChroma.py index f9aad49..5554a82 100644 --- a/src/extensions/vectorstores/PutChroma.py +++ b/src/extensions/vectorstores/PutChroma.py @@ -57,7 +57,7 @@ class PutChroma(FlowFileTransform): client = None embedding_function = None -def __init__(self): +def __init__(self, **kwargs): # noqa: ARG002 self.property_descriptors = list(ChromaUtils.PROPERTIES) + [ prop for prop in EmbeddingUtils.PROPERTIES if prop != EmbeddingUtils.EMBEDDING_MODEL ]
(nifi) branch main updated (bd80506e89 -> 1d2b755edf)
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 bd80506e89 [NIFI-13472] update Alignment/spacing issues (#9022) new db6bac21bf NIFI-13499 Removed ListenBeats and nifi-beats-bundle new ad7375a3be NIFI-13503 Removed ExtractTNEFAttachments from nifi-email-processors new b1da7322e8 NIFI-13515 Removed PutKudu and nifi-kudu-bundle new 1d2b755edf NIFI-13511 Removed ShellUserGroupProvider from NiFi and Registry The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: nifi-assembly/pom.xml | 23 - nifi-code-coverage/pom.xml | 20 - nifi-dependency-check-maven/suppressions.xml | 5 - .../src/main/asciidoc/administration-guide.adoc| 24 +- nifi-docs/src/main/asciidoc/developer-guide.adoc | 1 - .../nifi-beats-bundle/nifi-beats-nar/pom.xml | 41 -- .../src/main/resources/META-INF/LICENSE| 233 --- .../src/main/resources/META-INF/NOTICE | 63 -- .../nifi-beats-processors/pom.xml | 65 -- .../apache/nifi/processors/beats/ListenBeats.java | 265 .../beats/handler/BatchChannelInboundHandler.java | 83 --- .../processors/beats/handler/BatchDecoder.java | 380 --- .../beats/handler/MessageAckEncoder.java | 65 -- .../nifi/processors/beats/protocol/Batch.java | 35 - .../processors/beats/protocol/BatchMessage.java| 36 - .../nifi/processors/beats/protocol/FrameType.java | 43 -- .../beats/protocol/FrameTypeDecoder.java | 38 -- .../nifi/processors/beats/protocol/MessageAck.java | 32 - .../processors/beats/protocol/ProtocolCode.java| 29 - .../beats/protocol/ProtocolCodeDecoder.java| 32 - .../beats/protocol/ProtocolException.java | 41 -- .../processors/beats/protocol/ProtocolVersion.java | 37 -- .../beats/protocol/ProtocolVersionDecoder.java | 38 -- .../beats/server/BeatsMessageServerFactory.java| 60 -- .../services/org.apache.nifi.processor.Processor | 15 - .../nifi/processors/beats/ListenBeatsTest.java | 236 --- nifi-extension-bundles/nifi-beats-bundle/pom.xml | 33 - .../nifi-email-processors/pom.xml | 22 - .../processors/email/ExtractTNEFAttachments.java | 155 - .../services/org.apache.nifi.processor.Processor | 1 - .../email/TestExtractTNEFAttachments.java | 102 --- .../src/test/resources/winmail-simple.dat | Bin 4915 -> 0 bytes .../src/test/resources/winmail-with-attachment.dat | Bin 22257 -> 0 bytes .../test/resources/winmail-with-attachments.dat| Bin 94272 -> 0 bytes .../nifi-kudu-controller-service/pom.xml | 134 .../nifi/controller/kudu/KuduLookupService.java| 336 -- .../org.apache.nifi.controller.ControllerService | 16 - .../nifi-kudu-bundle/nifi-kudu-nar/pom.xml | 47 -- .../src/main/resources/META-INF/NOTICE | 73 -- .../nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 147 - .../processors/kudu/AbstractKuduProcessor.java | 437 .../kudu/AutoFlushSyncPutKuduResult.java | 78 --- .../apache/nifi/processors/kudu/OperationType.java | 28 - .../org/apache/nifi/processors/kudu/PutKudu.java | 700 .../apache/nifi/processors/kudu/PutKuduResult.java | 144 .../processors/kudu/StandardPutKuduResult.java | 83 --- .../services/org.apache.nifi.processor.Processor | 16 - .../additionalDetails.html | 185 -- .../apache/nifi/processors/kudu/MockPutKudu.java | 126 .../apache/nifi/processors/kudu/TestPutKudu.java | 734 - nifi-extension-bundles/nifi-kudu-bundle/pom.xml| 75 --- nifi-extension-bundles/pom.xml | 2 - .../nifi-framework-nar-bom/pom.xml | 10 - nifi-framework-bundle/nifi-framework-nar/pom.xml | 5 - .../src/main/resources/conf/authorizers.xml| 25 - .../nifi-framework/nifi-shell-authorizer/pom.xml | 38 -- .../nifi/authorization/NssShellCommands.java | 56 -- .../nifi/authorization/OsxShellCommands.java | 56 -- .../nifi/authorization/RemoteShellCommands.java| 62 -- .../nifi/authorization/ShellCommandsProvider.java | 67 -- .../nifi/authorization/ShellUserGroupProvider.java | 672 --- .../nifi/authorization/util/ShellRunner.java | 123 ...org.apache.nifi.authorization.UserGroupProvider | 15 - nifi-framework-bundle/nifi-framework/pom.xml | 1 - .../authorization/shell/NssShellCommands.java | 55 -- .../authorization/shell/Osx
(nifi) 02/04: NIFI-13503 Removed ExtractTNEFAttachments from nifi-email-processors
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ad7375a3be046784dde3c75946f4d4bd85f568c6
Author: Joseph Witt
AuthorDate: Thu Jul 4 15:26:07 2024 -0700
NIFI-13503 Removed ExtractTNEFAttachments from nifi-email-processors
This closes #9042
Signed-off-by: David Handermann
---
.../nifi-email-processors/pom.xml | 22 ---
.../processors/email/ExtractTNEFAttachments.java | 155 -
.../services/org.apache.nifi.processor.Processor | 1 -
.../email/TestExtractTNEFAttachments.java | 102 --
.../src/test/resources/winmail-simple.dat | Bin 4915 -> 0 bytes
.../src/test/resources/winmail-with-attachment.dat | Bin 22257 -> 0 bytes
.../test/resources/winmail-with-attachments.dat| Bin 94272 -> 0 bytes
7 files changed, 280 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index f44d1f15cc..a8257aeb8d 100644
--- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -26,11 +26,9 @@
jar
6.3.1
-5.3.0
-
org.apache.nifi
nifi-utils
@@ -103,26 +101,6 @@
-
-
-org.apache.poi
-poi-scratchpad
-${poi.version}
-
-
-org.apache.commons
-commons-math3
-
-
-org.apache.commons
-commons-collections4
-
-
-com.zaxxer
-SparseBitSet
-
-
-
org.apache.nifi
nifi-security-utils
diff --git
a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java
b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java
deleted file mode 100644
index 3a24acf33d..00
---
a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractTNEFAttachments.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.processors.email;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.nifi.annotation.behavior.InputRequirement;
-import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
-import org.apache.nifi.annotation.behavior.SideEffectFree;
-import org.apache.nifi.annotation.behavior.SupportsBatching;
-import org.apache.nifi.annotation.behavior.WritesAttribute;
-import org.apache.nifi.annotation.behavior.WritesAttributes;
-import org.apache.nifi.annotation.documentation.CapabilityDescription;
-import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.flowfile.FlowFile;
-import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.exception.FlowFileHandlingException;
-import org.apache.poi.hmef.Attachment;
-import org.apache.poi.hmef.HMEFMessage;
-
-@SupportsBatching
-@SideEffectFree
-@Tags({"split", "email"})
-@InputRequirement(Requirement.INPUT_REQUIRED)
-@CapabilityDescription("Extract attachments from a mime formatted email file,
splitting them into individual flowfiles.")
-@WritesAttributes({
-@WritesAtt
(nifi) 04/04: NIFI-13511 Removed ShellUserGroupProvider from NiFi and Registry
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 1d2b755edf428d465d50c4025824f636bc9c7c50 Author: Joseph Witt AuthorDate: Thu Jul 4 19:37:16 2024 -0700 NIFI-13511 Removed ShellUserGroupProvider from NiFi and Registry This closes #9046 Signed-off-by: David Handermann --- nifi-code-coverage/pom.xml | 5 - .../src/main/asciidoc/administration-guide.adoc| 24 +- .../nifi-framework-nar-bom/pom.xml | 10 - nifi-framework-bundle/nifi-framework-nar/pom.xml | 5 - .../src/main/resources/conf/authorizers.xml| 25 - .../nifi-framework/nifi-shell-authorizer/pom.xml | 38 -- .../nifi/authorization/NssShellCommands.java | 56 -- .../nifi/authorization/OsxShellCommands.java | 56 -- .../nifi/authorization/RemoteShellCommands.java| 62 -- .../nifi/authorization/ShellCommandsProvider.java | 67 -- .../nifi/authorization/ShellUserGroupProvider.java | 672 - .../nifi/authorization/util/ShellRunner.java | 123 ...org.apache.nifi.authorization.UserGroupProvider | 15 - nifi-framework-bundle/nifi-framework/pom.xml | 1 - .../authorization/shell/NssShellCommands.java | 55 -- .../authorization/shell/OsxShellCommands.java | 55 -- .../authorization/shell/ShellCommandsProvider.java | 67 -- .../security/authorization/shell/ShellRunner.java | 123 .../shell/ShellUserGroupProvider.java | 645 ...gistry.security.authorization.UserGroupProvider | 3 +- .../src/main/resources/conf/authorizers.xml| 21 - 21 files changed, 2 insertions(+), 2126 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index ceaf8df8a3..00bda5522f 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -596,11 +596,6 @@ nifi-runtime 2.0.0-SNAPSHOT - -org.apache.nifi -nifi-shell-authorizer -2.0.0-SNAPSHOT - org.apache.nifi nifi-site-to-site diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index f8d1a8a469..0b2a0e5ebf 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -775,28 +775,6 @@ The LdapUserGroupProvider has the following properties: NOTE: Any identity mapping rules specified in _nifi.properties_ will also be applied to the user identities. Group names are not mapped. - ShellUserGroupProvider - -The ShellUserGroupProvider fetches user and group details from Unix-like systems using shell commands. - -This provider executes various shell pipelines with commands such as `getent` on Linux and `dscl` on macOS. - -Supported systems may be configured to retrieve users and groups from an external source, such as LDAP or NIS. In these cases the shell commands -will return those external users and groups. This provides administrators another mechanism to integrate user and group directory services. - -The ShellUserGroupProvider has the following properties: - -[options="header,footer"] -|== -| Property Name | Description -|`Initial Refresh Delay` | Duration of initial delay before first user and group refresh. (i.e. `10 secs`). Default is `5 mins`. -|`Refresh Delay` | Duration of delay between each user and group refresh. (i.e. `10 secs`). Default is `5 mins`. -|`Exclude Groups` | Regular expression used to exclude groups. Default is '', which means no groups are excluded. -|`Exclude Users` | Regular expression used to exclude users. Default is '', which means no users are excluded. -|== - -Like LdapUserGroupProvider, the ShellUserGroupProvider is commented out in the _authorizers.xml_ file. Refer to that comment for usage examples. - AzureGraphUserGroupProvider The AzureGraphUserGroupProvider fetches users and groups from Azure Active Directory (AAD) using the Microsoft Graph API. @@ -831,7 +809,7 @@ The AzureGraphUserGroupProvider has the following properties: |`Claim for Username` | The property of the user directory object mapped to the NiFi user name field. Default is 'upn'. 'email' is another option when `nifi.security.user.oidc.fallback.claims.identifying.user` is set to 'upn'. |
(nifi) 01/04: NIFI-13499 Removed ListenBeats and nifi-beats-bundle
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 db6bac21bf2de213638252fa5b0c4e58f11f720a Author: Joseph Witt AuthorDate: Thu Jul 4 15:11:44 2024 -0700 NIFI-13499 Removed ListenBeats and nifi-beats-bundle This closes #9040 Signed-off-by: David Handermann --- nifi-code-coverage/pom.xml | 5 - .../nifi-beats-bundle/nifi-beats-nar/pom.xml | 41 --- .../src/main/resources/META-INF/LICENSE| 233 - .../src/main/resources/META-INF/NOTICE | 63 .../nifi-beats-processors/pom.xml | 65 .../apache/nifi/processors/beats/ListenBeats.java | 265 -- .../beats/handler/BatchChannelInboundHandler.java | 83 - .../processors/beats/handler/BatchDecoder.java | 380 - .../beats/handler/MessageAckEncoder.java | 65 .../nifi/processors/beats/protocol/Batch.java | 35 -- .../processors/beats/protocol/BatchMessage.java| 36 -- .../nifi/processors/beats/protocol/FrameType.java | 43 --- .../beats/protocol/FrameTypeDecoder.java | 38 --- .../nifi/processors/beats/protocol/MessageAck.java | 32 -- .../processors/beats/protocol/ProtocolCode.java| 29 -- .../beats/protocol/ProtocolCodeDecoder.java| 32 -- .../beats/protocol/ProtocolException.java | 41 --- .../processors/beats/protocol/ProtocolVersion.java | 37 -- .../beats/protocol/ProtocolVersionDecoder.java | 38 --- .../beats/server/BeatsMessageServerFactory.java| 60 .../services/org.apache.nifi.processor.Processor | 15 - .../nifi/processors/beats/ListenBeatsTest.java | 236 - nifi-extension-bundles/nifi-beats-bundle/pom.xml | 33 -- nifi-extension-bundles/pom.xml | 1 - 24 files changed, 1906 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index ea84c4a4c6..b717d3b9d6 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -745,11 +745,6 @@ nifi-azure-services-api 2.0.0-SNAPSHOT - -org.apache.nifi -nifi-beats-processors -2.0.0-SNAPSHOT - org.apache.nifi nifi-box-processors diff --git a/nifi-extension-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml b/nifi-extension-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml deleted file mode 100644 index 5c9da1d8ab..00 --- a/nifi-extension-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd";> -4.0.0 - - -org.apache.nifi -nifi-beats-bundle -2.0.0-SNAPSHOT - - -nifi-beats-nar -nar - - - -org.apache.nifi -nifi-beats-processors -2.0.0-SNAPSHOT - - -org.apache.nifi -nifi-standard-services-api-nar -2.0.0-SNAPSHOT -nar - - - diff --git a/nifi-extension-bundles/nifi-beats-bundle/nifi-beats-nar/src/main/resources/META-INF/LICENSE b/nifi-extension-bundles/nifi-beats-bundle/nifi-beats-nar/src/main/resources/META-INF/LICENSE deleted file mode 100644 index e3d56a9e06..00 --- a/nifi-extension-bundles/nifi-beats-bundle/nifi-beats-nar/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,233 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "
(nifi) branch main updated: NIFI-13490 Upgraded AWS SDK to 2.26.14 and other dependencies (#9032)
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 5f2ae3db3d NIFI-13490 Upgraded AWS SDK to 2.26.14 and other dependencies (#9032) 5f2ae3db3d is described below commit 5f2ae3db3d8757d5c445940d8a0032aeffecd0f3 Author: Joseph Witt AuthorDate: Wed Jul 3 09:48:54 2024 -0700 NIFI-13490 Upgraded AWS SDK to 2.26.14 and other dependencies (#9032) - Upgraded AWS SDK 1 from 1.12.748 to 1.12.755 - Upgraded AWS SDK 2 from 2.26.8 to 2.26.14 - Upgraded Google Libraries BOM from 26.40.0 to 26.42.0 - Upgraded Fabric8 Kubernetes Client from 6.13.0 to 6.13.1 - Upgraded Groovy from 4.0.21 to 4.0.22 - Upgraded Lucene from 9.11.0 to 9.11.1 - Upgraded org.checkerframework from 3.44.0 to 3.45.0 - Upgraded org.junit.jupiter from 5.10.2 to 5.10.3 - Upgraded org.junit.platform from 1.10.2 to 1.10.3 - Upgraded org.junit.vintage from 5.10.2 to 5.10.3 - Upgraded Mockito from 5.11.0 to 5.12.0 - Upgraded com.slack.api from 1.40.0 to 1.40.2 - Upgraded org.apache.iotdb from 1.3.1 to 1.3.2 - Upgraded org.apache.kafka from 3.7.0 to 3.7.1 - Upgraded org.flywaydb from 10.15.0 to 1.15.2 - Upgraded org.neo4j.driver from 5.21.0 to 5.22.0 Signed-off-by: David Handermann --- nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +- .../nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml | 2 +- nifi-extension-bundles/nifi-iotdb-bundle/pom.xml | 2 +- .../nifi-kafka-bundle/nifi-kafka-3-service/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml| 2 +- .../nifi-slack-bundle/nifi-slack-processors/pom.xml | 2 +- .../nifi-standard-shared-bom/pom.xml | 2 +- nifi-registry/pom.xml| 2 +- pom.xml | 12 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml index 46c1805891..f2409b4ca6 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml @@ -25,7 +25,7 @@ pom -26.40.0 +26.42.0 diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml index e48a36690d..dbbcfc42d3 100644 --- a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml +++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml @@ -19,7 +19,7 @@ jar -5.21.0 +5.22.0 5.19 diff --git a/nifi-extension-bundles/nifi-iotdb-bundle/pom.xml b/nifi-extension-bundles/nifi-iotdb-bundle/pom.xml index ad181885b1..94130ded39 100644 --- a/nifi-extension-bundles/nifi-iotdb-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-iotdb-bundle/pom.xml @@ -30,7 +30,7 @@ -1.3.1 +1.3.2 diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml index 4ccb1f1d0a..b8f9102e2d 100644 --- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml +++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/pom.xml @@ -78,7 +78,7 @@ org.apache.kafka kafka-clients -3.7.0 +3.7.1 org.apache.nifi diff --git a/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml index 2d87e52179..285136d401 100644 --- a/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml @@ -27,7 +27,7 @@ nifi-provenance-repository-nar -9.11.0 +9.11.1 diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml index cee35376df..7183e1d1ac 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml @@ -30,7 +30,7 @@ com.slack.api bolt-socket-mode -1.40.0 +1.40.2 diff --git a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml index 880ec196a0..6334722371 100644 --- a/nifi-extension-bundles/nifi-standard
(nifi) branch support/nifi-1.x updated: NIFI-13464 Replaced nifi-deprecation-log with logger in Registry
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 3e1824264c NIFI-13464 Replaced nifi-deprecation-log with logger in
Registry
3e1824264c is described below
commit 3e1824264cc08c7bc996e4d6c178f3e0e5f5ff15
Author: Pierre Villard
AuthorDate: Sat Jun 29 20:52:53 2024 +0200
NIFI-13464 Replaced nifi-deprecation-log with logger in Registry
This closes #9019
Signed-off-by: David Handermann
---
.../nifi-registry-core/nifi-registry-properties-loader/pom.xml | 5 -
.../nifi/registry/properties/NiFiRegistryPropertiesLoader.java | 5 +
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
index d542e0830e..a7230b9b2f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
@@ -36,10 +36,5 @@
org.apache.nifi
nifi-property-protection-loader
-
-org.apache.nifi
-nifi-deprecation-log
-1.27.0-SNAPSHOT
-
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
index e9a06818e7..ada588979a 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.registry.properties;
-import org.apache.nifi.deprecation.log.DeprecationLogger;
-import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
import org.apache.nifi.properties.BootstrapProperties;
import org.apache.nifi.properties.SensitivePropertyProvider;
import org.apache.nifi.properties.SensitivePropertyProviderFactory;
@@ -35,7 +33,6 @@ import java.util.Properties;
public class NiFiRegistryPropertiesLoader {
-private static final DeprecationLogger deprecationLogger =
DeprecationLoggerFactory.getLogger(NiFiRegistryPropertiesLoader.class);
private static final Logger logger =
LoggerFactory.getLogger(NiFiRegistryPropertiesLoader.class);
private String keyHex;
@@ -128,7 +125,7 @@ public class NiFiRegistryPropertiesLoader {
public NiFiRegistryProperties load(final File file) {
final ProtectedNiFiRegistryProperties protectedNiFiProperties =
readProtectedPropertiesFromDisk(file);
if (protectedNiFiProperties.hasProtectedKeys()) {
-deprecationLogger.warn("Support for encrypted application
properties is deprecated for removal in NiFi 2.0.0");
+logger.warn("Support for encrypted application properties is
deprecated for removal in NiFi 2.0.0");
Security.addProvider(new BouncyCastleProvider());
getSensitivePropertyProviderFactory()
(nifi-site) branch main updated: NIFI-13462 Updated current version to 2.0.0-M4
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-site.git The following commit(s) were added to refs/heads/main by this push: new 7346b218 NIFI-13462 Updated current version to 2.0.0-M4 7346b218 is described below commit 7346b2188e4f07be839bcffd00ec1b5e5ac29b7b Author: exceptionfactory AuthorDate: Mon Jul 1 12:55:35 2024 -0500 NIFI-13462 Updated current version to 2.0.0-M4 --- config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 6b603f74..23098677 100644 --- a/config.toml +++ b/config.toml @@ -36,8 +36,8 @@ downloadPathUrl = "https://downloads.apache.org/nifi"; archiveDownloadPathUrl = "https://archive.apache.org/dist/nifi"; mavenCentralDownloadPathUrl = "https://repo1.maven.org/maven2/org/apache/nifi"; -currentProjectVersion = "2.0.0-M3" -currentProjectVersionReleased = "2024-05-16" +currentProjectVersion = "2.0.0-M4" +currentProjectVersionReleased = "2024-07-01" previousProjectVersion = "1.26.0" previousProjectVersionReleased = "2024-05-06"
(nifi) annotated tag rel/nifi-2.0.0-M4 created (now bb68c1ca90)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag rel/nifi-2.0.0-M4 in repository https://gitbox.apache.org/repos/asf/nifi.git at bb68c1ca90 (tag) tagging 19c5be01d463bc38ec0f5008549a2a42e589436d (commit) replaces rel/nifi-2.0.0-M2 by exceptionfactory on Mon Jul 1 10:54:36 2024 -0500 - Log - NIFI-13642 Signed release tag for NiFi 2.0.0-M4 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmaC0TwACgkQKbalLSqu jbrc6Q/+N/1jFB/Shc6PyxtqSAKZjTh7Acuc0G4bQieGSGp49Q0zGCNhH3wPkjsy qyvcObvO1g0LXaHfUKZH6QJYrM2D+aWH0+0TuOGk4/MRcaRXUgT3nN+UOcWnoJ3y 4c44qBn8DQclRVSRAEa+eoPEM4MgM+JwNU/gOHjtEaXby8cMm2OYEtiXHyMi1DHi tJJEZm1OQatwF6gSiB6M0Jesyl5Ihqm85C7PHaD808wMu73XyFDiyh5q89jSWzi2 MbFhCacfAMnGirBkMVvY47WgQpmfDBleQi0o9CqbxI7genedp2cArNhic7tJfFTJ GL+WMXl7hIi2i4tiKBNWbqJomdat2Jr8ay8EmXVrwV3S/ksvFnIVbNgMJewjfkg4 FPwHGFZHyOTrTlrmyyTd1VWG4BO/XkNNqvq1VfGEx44dVrSSfKAgKK9Jh6lU+5YG w7lBpJPxX6xkerLozsyhh6zjJ637gqnKrgFOgUQI71oKMpDqfI6VEqkrBlFea13y C6UaC1rwKrOIxsDjvT0vCwoLozDZ+aQS82fXJr4wVnxPNB1JI6k3NgGCeRkvq47V fyeAlEnHiLz+fkNxcHshQzldxSUFWhZ7P552/wFwO+lNYngLoS3BGDNwOwPTXqso VDkS/6OAeyY1FiaJRm53vfftI1rsizNwQepsJbShSG1h5ADKhOE= =dZyO -END PGP SIGNATURE- --- No new revisions were added by this update.
svn commit: r70081 - /dev/nifi/nifi-2.0.0-M4/ /release/nifi/2.0.0-M4/
Author: exceptionfactory Date: Mon Jul 1 15:42:14 2024 New Revision: 70081 Log: NIFI-13642 Added: release/nifi/2.0.0-M4/ - copied from r70080, dev/nifi/nifi-2.0.0-M4/ Removed: dev/nifi/nifi-2.0.0-M4/
(nifi) annotated tag nifi-2.0.0-M4-RC1 created (now 548e8f3dcc)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag nifi-2.0.0-M4-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 548e8f3dcc (tag) tagging 19c5be01d463bc38ec0f5008549a2a42e589436d (commit) replaces rel/nifi-2.0.0-M2 by exceptionfactory on Thu Jun 27 17:53:52 2024 -0500 - Log - NIFI-13642-RC1 copy for tag nifi-2.0.0-M4-RC1 --- No new revisions were added by this update.
(nifi) branch NIFI-13642-RC1 created (now 5994e7fe33)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch NIFI-13642-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 5994e7fe33 NIFI-13642-RC1 prepare for next development iteration This branch includes the following new commits: new 19c5be01d4 NIFI-13642-RC1 prepare release nifi-2.0.0-M4-RC1 new 5994e7fe33 NIFI-13642-RC1 prepare for next development iteration The 2 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.
svn commit: r70041 - /dev/nifi/nifi-2.0.0-M4/
Author: exceptionfactory Date: Fri Jun 28 12:54:56 2024 New Revision: 70041 Log: NIFI-13642 Uploaded RC1 artifacts for NiFi 2.0.0-M4 Added: dev/nifi/nifi-2.0.0-M4/ dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha512 dev/nifi/nifi-2.0.0-M4/minifi-toolkit-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/minifi-toolkit-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/minifi-toolkit-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/minifi-toolkit-2.0.0-M4-bin.zip.sha512 dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-bin.zip.sha512 dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-source-release.zip (with props) dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-source-release.zip.asc dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-source-release.zip.asc.1 dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-source-release.zip.sha256 dev/nifi/nifi-2.0.0-M4/nifi-2.0.0-M4-source-release.zip.sha512 dev/nifi/nifi-2.0.0-M4/nifi-registry-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/nifi-registry-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/nifi-registry-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/nifi-registry-2.0.0-M4-bin.zip.sha512 dev/nifi/nifi-2.0.0-M4/nifi-registry-toolkit-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/nifi-registry-toolkit-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/nifi-registry-toolkit-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/nifi-registry-toolkit-2.0.0-M4-bin.zip.sha512 dev/nifi/nifi-2.0.0-M4/nifi-stateless-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/nifi-stateless-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/nifi-stateless-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/nifi-stateless-2.0.0-M4-bin.zip.sha512 dev/nifi/nifi-2.0.0-M4/nifi-toolkit-2.0.0-M4-bin.zip (with props) dev/nifi/nifi-2.0.0-M4/nifi-toolkit-2.0.0-M4-bin.zip.asc dev/nifi/nifi-2.0.0-M4/nifi-toolkit-2.0.0-M4-bin.zip.sha256 dev/nifi/nifi-2.0.0-M4/nifi-toolkit-2.0.0-M4-bin.zip.sha512 Added: dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.asc == --- dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.asc (added) +++ dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.asc Fri Jun 28 12:54:56 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmZ+sNwACgkQKbalLSqu +jboHiBAAvz7UWw/jasyxrEc1pyujlGCUpcU1b8eUMUXfwQVhaWAsK+JULXDkiTOp +0ky0GfFB2tOJOohsZ9nRRZzpZPTnMsNpVnYbmYG0uJjTIjhnXbepQgQGDIak6BGX +83BiSPnp2il/MrKiq6OLvauEMFN3DT+ZLqR8ESCloluVYHXcEtLmjp397aS3CaDO +jjj6990FJ27MFGP4U27LLP8mSl6OvrrHzDy8paqh4RF7QiH3PUMx/9CvigRV747W +K0siu5P2NQINuV7j+uQ2prYzbpnoryfcaFe+z2D2hNQRw3EpX8CI4kk8Pk6NvvGj +KRJZ2O43+rVoNuRDPpNkaPUFv53vD+fBM8qbZYfySKNmk1Xov3sqeINRBwPgg0hR +DTrhFRX78BvYo3mf9voyWB91zTu6tI9V8EzvwJbgfJrlaztkU3+/LasRj129I33Q +xTYPLlJLonQ38fBtXqRLq9G741+8apR1tWtdtTvRqizIZ5avlw/Izsyfjiawa1Je +k3+R76+2vFnOy0vL0EjNVw6tqOxXg7NvxmKHzeAAWY4MtS7ZbG/omFyQSx0Omaea +8xRFeRfc+/Ov2aYtl2K/bjIt9Adk6zkdSsv1/gjQiNiuisjl+gzuTmPwUEchmibU ++jrBs+Y26nmjnzg8LobJa7gYEEXFbMyuhqfi7l2WZ0rpJWUHnrM= +=wQfy +-END PGP SIGNATURE- Added: dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha256 == --- dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha256 (added) +++ dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha256 Fri Jun 28 12:54:56 2024 @@ -0,0 +1 @@ +7e13d31ca83d44b6878aa26a9f2277c54e24ab6d0634a91a6ace4c0150996789 Added: dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha512 == --- dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha512 (added) +++ dev/nifi/nifi-2.0.0-M4/minifi-2.0.0-M4-bin.zip.sha512 Fri Jun 28 12:54:56 2024 @@ -0,0 +1 @@ +29a29e624cf6ea0113eb437274fca54b7516a6e4f8d71afcc0178de765ad15ecffbce721816abc2888b70a52bf20a5f1a628d17c71b89b4362980330b8e9e0e2 Added: dev/nifi/nifi-2.0.0-M4/minifi-toolkit-2.0.0-M4-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-2.0.0-M4/minifi-toolkit-2.0.0-M4-bin.zip -- svn:mime-type = application
