(nifi) annotated tag nifi-2.0.0-M2-RC4 created (now 60ab087219)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag nifi-2.0.0-M2-RC4 in repository https://gitbox.apache.org/repos/asf/nifi.git at 60ab087219 (tag) tagging 640b7bdfbbb8842f057a9bf49dc2b9b5d092abda (commit) replaces rel/nifi-2.0.0-M1 by exceptionfactory on Thu Jan 25 18:11:29 2024 -0600 - Log - NIFI-12646-RC4 copy for tag nifi-2.0.0-M2-RC4 --- No new revisions were added by this update.
(nifi) 01/03: NIFI-12646 Set Python Processor version to 2.0.0-M2
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch NIFI-12646-RC4 in repository https://gitbox.apache.org/repos/asf/nifi.git commit 38fc0a4e8d966b6a185144e4ea6b34c948cdad1b Author: exceptionfactory AuthorDate: Fri Jan 19 19:12:04 2024 -0600 NIFI-12646 Set Python Processor version to 2.0.0-M2 Signed-off-by: David Handermann --- .../nifi-openai-module/src/main/python/PromptChatGPT.py | 2 +- .../nifi-text-embeddings-module/src/main/python/ChunkDocument.py | 2 +- .../nifi-text-embeddings-module/src/main/python/ParseDocument.py | 2 +- .../src/main/python/vectorstores/PutChroma.py| 2 +- .../src/main/python/vectorstores/PutPinecone.py | 2 +- .../src/main/python/vectorstores/QueryChroma.py | 2 +- .../src/main/python/vectorstores/QueryPinecone.py| 2 +- nifi-toolkit/nifi-toolkit-api/pom.xml| 5 + 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py b/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py index 5b8e3738fe..24bbd1f48e 100644 --- a/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py +++ b/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py @@ -30,7 +30,7 @@ class PromptChatGPT(FlowFileTransform): implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '2.0.0-M2' description = "Submits a prompt to ChatGPT, writing the results either to a FlowFile attribute or to the contents of the FlowFile" tags = ["text", "chatgpt", "gpt", "machine learning", "ML", "artificial intelligence", "ai", "document", "langchain"] dependencies = ['langchain==0.0.331', 'openai==0.28.1', 'jsonpath-ng'] diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py index 9b6f38e69f..a5fde8622d 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py @@ -104,7 +104,7 @@ class ChunkDocument(FlowFileTransform): class Java: implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '2.0.0-M2' description = """Chunks incoming documents that are formatted as JSON Lines into chunks that are appropriately sized for creating Text Embeddings. The input is expected to be in "json-lines" format, with each line having a 'text' and a 'metadata' element. Each line will then be split into one or more lines in the output.""" diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py index 777f80e402..de646781b6 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py @@ -45,7 +45,7 @@ class ParseDocument(FlowFileTransform): implements = ["org.apache.nifi.python.processor.FlowFileTransform"] class ProcessorDetails: -version = "2.0.0-SNAPSHOT" +version = "2.0.0-M2" description = """Parses incoming unstructured text documents and performs optical character recognition (OCR) in order to extract text from PDF and image files. The output is formatted as "json-lines" with two keys: 'text' and 'metadata'. Note that use of this Processor may require significant storage space and RAM utilization due to third-party dependencies necessary for processing PDF and image files. diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py index 4b792284f8..38208b52c1 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py @@ -26,7 +26,7 @@ class PutChroma(FlowFileTransform): implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '2.0.0-M2' description = """Publishes JSON data to a Chroma VectorDB. The Incoming data must be in single JSON per Line format, each with two keys: 'text' and 'metadata'. The text
(nifi) branch NIFI-12646-RC4 created (now 5ca7b0df81)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch NIFI-12646-RC4 in repository https://gitbox.apache.org/repos/asf/nifi.git at 5ca7b0df81 NIFI-12646-RC4 prepare for next development iteration This branch includes the following new commits: new 38fc0a4e8d NIFI-12646 Set Python Processor version to 2.0.0-M2 new 640b7bdfbb NIFI-12646-RC4 prepare release nifi-2.0.0-M2-RC4 new 5ca7b0df81 NIFI-12646-RC4 prepare for next development iteration The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
svn commit: r66807 - /dev/nifi/nifi-2.0.0-M2/
Author: exceptionfactory Date: Fri Jan 26 02:25:55 2024 New Revision: 66807 Log: NIFI-12646 Uploaded RC4 artifacts for NiFi 2.0.0-M2 Added: dev/nifi/nifi-2.0.0-M2/ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip.sha512 Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc == --- dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc (added) +++ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc Fri Jan 26 02:25:55 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmWzFhYACgkQKbalLSqu +jbrtYBAAimP1nFxHnzkZUZ0q1K3TNhDRj+LaVQfFseLwLiGgrEwBZ8iZRXh7aSv/ +B9DvJO1W4bjvk+xhBRilrCwIiuzXXofhj3/ZG4C5o0mUr4tCpzS+/nS50x9hZ7hL +JTlHKw0uvEnPxz/ZyxXmrUE5ken8c6/fwze3+jbHpSpfsSsIvYPApohmHospblVp +mB7hCPmtsB2AHLm9vt9qDaRgYOqLkF6fuUZI6dGz4a5Pv0SdkN9uQYt1iq29TKYd +r4MjH47KUb/Xw1Afio8DWw2QbJqegyIGNncY9dBft552weAxvvN2e9YIZPqzEMKl +ZJrOTpLpQE41EhzlwQgmxtNlBMk84sMp8Lj19lGgmlTk2ACmSH7PuHOj/A2L6SB5 +oaXg8b12En1+ovwhXg3HvksERruu2MrB+oNAzHSHCssElaKJ1ih7jz9qjDXHWS71 +q6OLbBYePHxiLT5WtQP7gPtGSeCuQsDllxnmfQA6Uy8/rs94OH2TciNY19l5175B +3rOKMN2Ftnuyz2eTn5sdlZvz/9q2BrOjilJJoCzscanQkJQzGiNGSZn9tfa+Ai+6 +kCCChWce5Uu9ju7tM2hykptR3R5vCUXHFrZFE6Wwxwk8Jhln+3ZCSUeqObrgN1hb +DKp+NPNkgBYAYiybK3lcyD6mLrJcz15EXjVgrPRbj963PxeAF8c= +=0Jf2 +-END PGP SIGNATURE- Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 == --- dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 (added) +++ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 Fri Jan 26 02:25:55 2024 @@ -0,0 +1 @@ +25dce65e4162b286bac58ef8adccdda3c71516a269e0e367eee8e9e4205a03b6 Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 == --- dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 (added) +++ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 Fri Jan 26 02:25:55 2024 @@ -0,0 +1 @@ +edc0d7c98706f9a0525074e6a426a162fd359beabd628ef25887e120030309880b2e70cc658bd1d913e9244452b576eaa54c524c718aeb83ffd5980411c8f5c5 Added: dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip
svn commit: r66806 - /dev/nifi/nifi-2.0.0-M2/
Author: exceptionfactory Date: Fri Jan 26 02:17:51 2024 New Revision: 66806 Log: NIFI-12646 Removed: dev/nifi/nifi-2.0.0-M2/
(nifi) branch main updated: NIFI-12668 Fix conflict in Registry Git provider with gpg.format=ssh
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 49702f1f51 NIFI-12668 Fix conflict in Registry Git provider with gpg.format=ssh 49702f1f51 is described below commit 49702f1f510cc33c9cb52bb5b9580009a1d8afe8 Author: Brian Ghigiarelli AuthorDate: Wed Jan 24 22:21:27 2024 -0500 NIFI-12668 Fix conflict in Registry Git provider with gpg.format=ssh NIFI-12667 Upgraded JGit from 6.7.0 to 6.8.0 This closes #8300 Signed-off-by: David Handermann --- .../apache/nifi/registry/provider/flow/git/GitFlowMetaData.java | 9 + nifi-registry/pom.xml| 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java index 5e99c392eb..5c7720921d 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java @@ -24,6 +24,8 @@ import org.eclipse.jgit.api.PushCommand; import org.eclipse.jgit.api.Status; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.NoHeadException; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.GpgConfig; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectStream; import org.eclipse.jgit.lib.Ref; @@ -475,9 +477,16 @@ class GitFlowMetaData { final String commitMessage = isEmpty(author) ? message : format("%s\n\nBy NiFi Registry user: %s", message, author); + +// Ensure that we are providing a valid GPG Format to jgit, even though +// it is not used for signing. This avoids an error if the system's +// git config for gpg.format is "ssh". +final Config unusedConfig = new Config(); +unusedConfig.setEnum("gpg", null, "format", GpgConfig.GpgFormat.OPENPGP); final RevCommit commit = git.commit() .setMessage(commitMessage) .setSign(false) +.setGpgConfig(new GpgConfig(unusedConfig)) .call(); if (flowPointer != null) { diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index b4356cbd43..2fd110ea25 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -40,7 +40,7 @@ 9.22.3 9.5.0 3.12.0 -6.7.0.202309050840-r +6.8.0.202311291450-r 2.12.0
(nifi) branch main updated: NIFI-12664 Removed deprecated DMC in GetHBase
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 68228921a4 NIFI-12664 Removed deprecated DMC in GetHBase 68228921a4 is described below commit 68228921a43c506e92a0476f550951e164dfb90e Author: Pierre Villard AuthorDate: Thu Jan 25 09:22:41 2024 +0400 NIFI-12664 Removed deprecated DMC in GetHBase This closes #8301 Signed-off-by: David Handermann --- .../main/java/org/apache/nifi/hbase/GetHBase.java | 125 ++-- .../java/org/apache/nifi/hbase/TestGetHBase.java | 128 + 2 files changed, 8 insertions(+), 245 deletions(-) diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/GetHBase.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/GetHBase.java index 5777a67861..8b2cf0d973 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/GetHBase.java +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/main/java/org/apache/nifi/hbase/GetHBase.java @@ -26,25 +26,20 @@ import org.apache.nifi.annotation.behavior.WritesAttributes; import org.apache.nifi.annotation.configuration.DefaultSchedule; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; -import org.apache.nifi.annotation.lifecycle.OnRemoved; import org.apache.nifi.annotation.lifecycle.OnScheduled; -import org.apache.nifi.annotation.notification.OnPrimaryNodeStateChange; -import org.apache.nifi.annotation.notification.PrimaryNodeState; import org.apache.nifi.components.AllowableValue; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.ValidationContext; import org.apache.nifi.components.ValidationResult; import org.apache.nifi.components.state.Scope; import org.apache.nifi.components.state.StateMap; -import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient; import org.apache.nifi.expression.ExpressionLanguageScope; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.hbase.io.JsonRowSerializer; import org.apache.nifi.hbase.io.RowSerializer; import org.apache.nifi.hbase.scan.Column; import org.apache.nifi.hbase.scan.ResultCell; -import org.apache.nifi.hbase.util.ObjectSerDe; -import org.apache.nifi.hbase.util.StringSerDe; +import org.apache.nifi.migration.PropertyConfiguration; import org.apache.nifi.processor.AbstractProcessor; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.ProcessSession; @@ -52,11 +47,7 @@ import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.util.StandardValidators; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -103,13 +94,6 @@ public class GetHBase extends AbstractProcessor implements VisibilityFetchSuppor .required(true) .identifiesControllerService(HBaseClientService.class) .build(); -static final PropertyDescriptor DISTRIBUTED_CACHE_SERVICE = new PropertyDescriptor.Builder() -.name("Distributed Cache Service") -.description("Specifies the Controller Service that should be used to maintain state about what has been pulled from HBase" + -" so that if a new node begins pulling data, it won't duplicate all of the work that has been done.") -.required(false) -.identifiesControllerService(DistributedMapCacheClient.class) -.build(); static final PropertyDescriptor CHARSET = new PropertyDescriptor.Builder() .name("Character Set") .description("Specifies which character set is used to encode the data in HBase") @@ -157,7 +141,6 @@ public class GetHBase extends AbstractProcessor implements VisibilityFetchSuppor private final AtomicReference lastResult = new AtomicReference<>(); private volatile List columns = new ArrayList<>(); -private volatile boolean justElectedPrimaryNode = false; private volatile String previousTable = null; @Override @@ -169,7 +152,6 @@ public class GetHBase extends AbstractProcessor implements VisibilityFetchSuppor protected List getSupportedPropertyDescriptors() { final List properties = new ArrayList<>(); properties.add(HBASE_CLIENT_SERVICE); -properties.add(DISTRIBUTED_CACHE_SERVICE); properties.add(TABLE_NAME); properties.add(COLUMNS);
(nifi) branch main updated: NIFI-12676 Fixed Servlet Registration in HandleHttpRequest This closes #8304.
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new 103e350943 NIFI-12676 Fixed Servlet Registration in HandleHttpRequest This closes #8304. 103e350943 is described below commit 103e350943233c6a780ab1086b2da9872df7c312 Author: exceptionfactory AuthorDate: Thu Jan 25 16:12:04 2024 -0600 NIFI-12676 Fixed Servlet Registration in HandleHttpRequest This closes #8304. Signed-off-by: Joseph Witt --- .../processors/standard/HandleHttpRequest.java | 8 +-- .../processors/standard/HandleHttpRequestTest.java | 61 +- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java index de7ff1ad7a..6cc07da11a 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java @@ -51,9 +51,8 @@ import org.apache.nifi.scheduling.ExecutionNode; import org.apache.nifi.ssl.RestrictedSSLContextService; import org.apache.nifi.ssl.SSLContextService; import org.apache.nifi.stream.io.StreamUtils; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; import org.eclipse.jetty.ee10.servlet.ServletContextRequest; -import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -485,8 +484,9 @@ public class HandleHttpRequest extends AbstractProcessor { } } }; -final ServletHandler servletHandler = new ServletHandler(); -servletHandler.addServlet(new ServletHolder(standardServlet)); +final ServletContextHandler handler = new ServletContextHandler(); +handler.addServlet(standardServlet, "/"); +server.setHandler(handler); this.server = server; server.start(); diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java index 0bc5ae8b3f..5ccc1ab2c7 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HandleHttpRequestTest.java @@ -27,6 +27,17 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @@ -36,14 +47,19 @@ class HandleHttpRequestTest { private static final String MINIMUM_THREADS = "8"; +private static final String URL_FORMAT = "http://127.0.0.1:%d;; + @Mock HttpContextMap httpContextMap; TestRunner runner; +HandleHttpRequest handleHttpRequest; + @BeforeEach void setRunner() throws InitializationException { -runner = TestRunners.newTestRunner(HandleHttpRequest.class); +handleHttpRequest = new HandleHttpRequest(); +runner = TestRunners.newTestRunner(handleHttpRequest); when(httpContextMap.getIdentifier()).thenReturn(CONTEXT_MAP_ID); runner.addControllerService(CONTEXT_MAP_ID, httpContextMap); @@ -72,4 +88,47 @@ class HandleHttpRequestTest { runner.assertTransferCount(HandleHttpRequest.REL_SUCCESS, 0); } + +@Test +void testRunMethodNotAllowed() throws InterruptedException { +runner.setProperty(HandleHttpRequest.HTTP_CONTEXT_MAP, CONTEXT_MAP_ID); +runner.setProperty(HandleHttpRequest.MAXIMUM_THREADS, MINIMUM_THREADS); +runner.setProperty(HandleHttpRequest.PORT, "0"); +runner.setProperty(HandleHttpRequest.ALLOW_GET, Boolean.FALSE.toString()); + +
(nifi) branch main updated: NIFI-12611: (#8296)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/main by this push: new ecb87149fe NIFI-12611: (#8296) ecb87149fe is described below commit ecb87149fe6baea4a6707d98d491482461bcb8eb Author: Matt Gilman AuthorDate: Thu Jan 25 14:53:17 2024 -0500 NIFI-12611: (#8296) - Component State. This closes #8296 --- .../src/main/nifi/src/app/app.module.ts| 4 +- .../service/canvas-context-menu.service.ts | 17 ++- .../flow-designer/service/canvas-utils.service.ts | 22 +++ .../controller-services.component.html | 1 + .../controller-services.component.spec.ts | 10 +- .../controller-services.component.ts | 13 ++ .../flow-analysis-rule-table.component.html| 6 +- .../flow-analysis-rule-table.component.ts | 6 + .../flow-analysis-rules.component.html | 1 + .../flow-analysis-rules.component.ts | 14 ++ .../management-controller-services.component.html | 1 + .../management-controller-services.component.ts| 13 ++ .../reporting-task-table.component.html| 6 +- .../reporting-task-table.component.ts | 5 + .../reporting-tasks/reporting-tasks.component.html | 1 + .../reporting-tasks/reporting-tasks.component.ts | 14 ++ .../src/app/service/component-state.service.ts | 51 +++ .../component-state/component-state.actions.ts | 49 ++ .../component-state/component-state.effects.ts | 139 + .../component-state.reducer.ts}| 53 +++ .../component-state/component-state.selectors.ts | 38 + .../nifi/src/app/state/component-state/index.ts| 65 .../src/main/nifi/src/app/state/index.ts | 6 +- .../state/status-history/status-history.reducer.ts | 1 - .../component-state/component-state.component.html | 86 +++ .../component-state/component-state.component.scss | 32 .../component-state.component.spec.ts} | 23 ++- .../component-state/component-state.component.ts | 169 + .../controller-service-table.component.html| 6 +- .../controller-service-table.component.ts | 6 + .../extension-creation.component.html | 1 - 31 files changed, 803 insertions(+), 56 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts index 4fde32890c..749a8dda7a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.module.ts @@ -41,6 +41,7 @@ import { MatDialogModule } from '@angular/material/dialog'; import { ControllerServiceStateEffects } from './state/contoller-service-state/controller-service-state.effects'; import { SystemDiagnosticsEffects } from './state/system-diagnostics/system-diagnostics.effects'; import { FlowConfigurationEffects } from './state/flow-configuration/flow-configuration.effects'; +import { ComponentStateEffects } from './state/component-state/component-state.effects'; @NgModule({ declarations: [AppComponent], @@ -65,7 +66,8 @@ import { FlowConfigurationEffects } from './state/flow-configuration/flow-config FlowConfigurationEffects, StatusHistoryEffects, ControllerServiceStateEffects, -SystemDiagnosticsEffects +SystemDiagnosticsEffects, +ComponentStateEffects ), StoreDevtoolsModule.instrument({ maxAge: 25, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts index 1210caef12..5e27e1cab8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts @@ -55,6 +55,7 @@ import { ContextMenuItemDefinition } from '../../../ui/common/context-menu/context-menu.component'; import { promptEmptyQueueRequest, promptEmptyQueuesRequest } from '../state/queue/queue.actions'; +import { getComponentStateAndOpenDialog } from
(nifi) annotated tag nifi-1.25.0-RC1 created (now 1993f4a9ce)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to annotated tag nifi-1.25.0-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 1993f4a9ce (tag) tagging 6ecc398d3f92425447e43242af4992757e25b3c5 (commit) replaces rel/nifi-1.24.0 by Pierre Villard on Thu Jan 25 16:18:00 2024 +0400 - Log - NIFI-12662-RC1 copy for tag nifi-1.25.0-RC1 --- No new revisions were added by this update.
(nifi) branch NIFI-12662-RC1 created (now 65c33d08aa)
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a change to branch NIFI-12662-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 65c33d08aa NIFI-12662-RC1 prepare for next development iteration This branch includes the following new commits: new 6ecc398d3f NIFI-12662-RC1 prepare release nifi-1.25.0-RC1 new 65c33d08aa NIFI-12662-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: r66802 - /dev/nifi/nifi-1.25.0/
Author: pvillard Date: Thu Jan 25 18:45:09 2024 New Revision: 66802 Log: NIFI-12662 Uploaded RC1 artifacts for NiFi 1.25.0 Added: dev/nifi/nifi-1.25.0/ dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/minifi-c2-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/minifi-c2-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/minifi-c2-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/minifi-c2-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/minifi-toolkit-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/minifi-toolkit-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/minifi-toolkit-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/minifi-toolkit-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/nifi-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/nifi-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/nifi-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/nifi-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/nifi-1.25.0-source-release.zip (with props) dev/nifi/nifi-1.25.0/nifi-1.25.0-source-release.zip.asc dev/nifi/nifi-1.25.0/nifi-1.25.0-source-release.zip.sha256 dev/nifi/nifi-1.25.0/nifi-1.25.0-source-release.zip.sha512 dev/nifi/nifi-1.25.0/nifi-kafka-connector-assembly-1.25.0.zip (with props) dev/nifi/nifi-1.25.0/nifi-kafka-connector-assembly-1.25.0.zip.asc dev/nifi/nifi-1.25.0/nifi-kafka-connector-assembly-1.25.0.zip.sha256 dev/nifi/nifi-1.25.0/nifi-kafka-connector-assembly-1.25.0.zip.sha512 dev/nifi/nifi-1.25.0/nifi-registry-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/nifi-registry-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/nifi-registry-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/nifi-registry-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/nifi-registry-toolkit-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/nifi-registry-toolkit-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/nifi-registry-toolkit-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/nifi-registry-toolkit-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/nifi-stateless-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/nifi-stateless-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/nifi-stateless-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/nifi-stateless-1.25.0-bin.zip.sha512 dev/nifi/nifi-1.25.0/nifi-toolkit-1.25.0-bin.zip (with props) dev/nifi/nifi-1.25.0/nifi-toolkit-1.25.0-bin.zip.asc dev/nifi/nifi-1.25.0/nifi-toolkit-1.25.0-bin.zip.sha256 dev/nifi/nifi-1.25.0/nifi-toolkit-1.25.0-bin.zip.sha512 Added: dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.asc == --- dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.asc (added) +++ dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.asc Thu Jan 25 18:45:09 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEP+klwr7XRAIeYWmi+SqTswwHxtUFAmWyoPAACgkQ+SqTswwH +xtW2/w/+NvyWBaVLbOD5syI4DhKrC8nESCoNbtrLTxa0SjIe7z0xcpzJ4X327qXZ +uCMwat9ButoGDqWN4/eoPBJr2R8sNJ/KZN0uIZFYEEdnzKQp1rSVkslPtcFu7ecj +L3pN3zLNgl3wagy2+yCkZiIIBJhdWcV4rEYo4mEYXQjIlfetNmwdQO9hc6gqBUWX +KCn2oC2B23gQxZ1zIvtXRmKHXZx29hTTXZ0m/bcEddotf5MdDdH3W6Mc402KKl6u +Tk7351k2mmKVxu+t8GTEvE8Qh+Rq5YlLNpyWRL19F+41PZ199DsPQoHUZFakT8dG +YZUafA+4DrU/IVwlhhHmdEVNrMMmNuejgVzn/KQr7mBM8NcCgHuJccq6cyRWwr4M +D+LTP5tBQ2p7pQlAMvb7uEctol3qDmMWTNEx4L/4JI6eRmVJwYeF5qjccKFjdrqz +HaEFocOtC9OA5oJ0o0TqZm59N5m9LabwFUcHZ9gfkYKFpAUaFz9ZjUjX1D1XpoNc +BK8jU/0vrsSyB5036f2eAyNI5ZleTN8NEhSIoO4vR12ZOPhogU6nnnOmaGdC0PZp +sunbAwHp324JTU72x9kZX8QIAvDXiFHXKfkviXjYNoYPmvZfc45rrSkOCw1a7OSb +w6BwF6l8wMkFiDMBdvS3p0lbzOlMHCxgrMXvD/XoFO1y26XHsCE= +=mFSw +-END PGP SIGNATURE- Added: dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha256 == --- dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha256 (added) +++ dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha256 Thu Jan 25 18:45:09 2024 @@ -0,0 +1 @@ +53e291ed8ad689eca70f43f214c2924366112ff51f6d8056d1bec92eae3403d3 Added: dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha512 == --- dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha512 (added) +++ dev/nifi/nifi-1.25.0/minifi-1.25.0-bin.zip.sha512 Thu Jan 25 18:45:09 2024 @@ -0,0 +1 @@ +efb9437491ce5b408fccc87583dbe9bd08e743152a4392df6bbac4dc22e4d9db09c89f7da7a4cfac0e155de999e2c9d8d75b67196507b5001af2cc32d2dab359 Added: dev/nifi/nifi-1.25.0/minifi-c2-1.25.0-bin.zip
(nifi-minifi-cpp) branch main updated: MINIFICPP-2291 Fix the site-to-site transfer or large files
This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git The following commit(s) were added to refs/heads/main by this push: new 1a8ae2f30 MINIFICPP-2291 Fix the site-to-site transfer or large files 1a8ae2f30 is described below commit 1a8ae2f30fd6465cfa5dce062b70fbc846ff8940 Author: Ferenc Gerlits AuthorDate: Thu Jan 25 16:37:52 2024 +0100 MINIFICPP-2291 Fix the site-to-site transfer or large files Previously, the site-to-site client treated the TRANSACTION_FINISHED_BUT_DESTINATION_FULL message from the server as a failure, and kept rolling back and retrying the flow file. Now, we treat it as success but add a yield so the server has time to clear the incoming connection, the same way as NiFi does. Closes #1720 Signed-off-by: Marton Szasz --- docker/test/integration/features/s2s.feature | 15 +++ .../flow_serialization/Nifi_flow_json_serializer.py | 4 ++-- extensions/standard-processors/processors/GetFile.cpp | 2 +- libminifi/include/sitetosite/SiteToSiteClient.h | 2 +- libminifi/src/core/FlowConfiguration.cpp | 2 +- libminifi/src/sitetosite/RawSocketProtocol.cpp| 2 +- libminifi/src/sitetosite/SiteToSiteClient.cpp | 15 ++- 7 files changed, 31 insertions(+), 11 deletions(-) diff --git a/docker/test/integration/features/s2s.feature b/docker/test/integration/features/s2s.feature index 6b5f2e6f0..c236f2ac7 100644 --- a/docker/test/integration/features/s2s.feature +++ b/docker/test/integration/features/s2s.feature @@ -34,6 +34,21 @@ Feature: Sending data from MiNiFi-C++ to NiFi using S2S protocol When both instances start up Then a flowfile with the content "test" is placed in the monitored directory in less than 90 seconds +And the Minifi logs do not contain the following message: "ProcessSession rollback" after 1 seconds + + Scenario: A MiNiFi instance produces and transfers a large data file to a NiFi instance via s2s +Given a GetFile processor with the "Input Directory" property set to "/tmp/input" +And a file with the content "this is a very long file we want to send by site-to-site" is present in "/tmp/input" +And a RemoteProcessGroup node opened on "http://nifi-${feature_id}:8080/nifi; +And the "success" relationship of the GetFile processor is connected to the input port on the RemoteProcessGroup + +And a NiFi flow receiving data from a RemoteProcessGroup "from-minifi" on port 8080 +And a PutFile processor with the "Directory" property set to "/tmp/output" in the "nifi" flow +And the "success" relationship of the from-minifi is connected to the PutFile + +When both instances start up +Then a flowfile with the content "this is a very long file we want to send by site-to-site" is placed in the monitored directory in less than 90 seconds +And the Minifi logs do not contain the following message: "ProcessSession rollback" after 1 seconds Scenario: Zero length files are transfered between via s2s if the "drop empty" connection property is false Given a MiNiFi CPP server with yaml config diff --git a/docker/test/integration/minifi/flow_serialization/Nifi_flow_json_serializer.py b/docker/test/integration/minifi/flow_serialization/Nifi_flow_json_serializer.py index 2c24f2d36..fa3f36ac6 100644 --- a/docker/test/integration/minifi/flow_serialization/Nifi_flow_json_serializer.py +++ b/docker/test/integration/minifi/flow_serialization/Nifi_flow_json_serializer.py @@ -210,8 +210,8 @@ class Nifi_flow_json_serializer: "labelIndex": 1, "zIndex": 0, "selectedRelationships": [conn_name] if not isinstance(connectable, InputPort) else [""], -"backPressureObjectThreshold": 1, -"backPressureDataSizeThreshold": "1 GB", +"backPressureObjectThreshold": 10, +"backPressureDataSizeThreshold": "50 B", "flowFileExpiration": "0 sec", "prioritizers": [], "bends": [], diff --git a/extensions/standard-processors/processors/GetFile.cpp b/extensions/standard-processors/processors/GetFile.cpp index b7c5e174b..318996730 100644 --- a/extensions/standard-processors/processors/GetFile.cpp +++ b/extensions/standard-processors/processors/GetFile.cpp @@ -78,7 +78,7 @@ void GetFile::onSchedule(core::ProcessContext& context, core::ProcessSessionFact if (auto directory_str = context.getProperty(Directory)) { if (!utils::file::is_directory(*directory_str)) { - throw Exception(PROCESS_SCHEDULE_EXCEPTION, "Input Directory \"" + value + "\" is not a directory"); + throw Exception(PROCESS_SCHEDULE_EXCEPTION, utils::string::join_pack("Input Directory \"",
(nifi) branch support/nifi-1.x updated: NIFI-12500: Add dynamic target for Get/Set/SendTrapSNMP
This is an automated email from the ASF dual-hosted git repository. tpalfy 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 c441f90cfc NIFI-12500: Add dynamic target for Get/Set/SendTrapSNMP c441f90cfc is described below commit c441f90cfcf332b367f32a57074dc975cf200e14 Author: lehelb AuthorDate: Thu Dec 14 19:07:00 2023 +0100 NIFI-12500: Add dynamic target for Get/Set/SendTrapSNMP This closes #8160. Signed-off-by: Tamas Palfy (cherry picked from commit 7fc27651a45c21f1e47f33efbba5649b06113da0) --- .../apache/nifi/snmp/factory/core/SNMPContext.java | 8 -- .../nifi/snmp/operations/GetSNMPHandler.java | 42 ++- .../nifi/snmp/operations/SNMPResourceHandler.java | 70 --- .../nifi/snmp/operations/SendTrapSNMPHandler.java | 37 +++--- .../nifi/snmp/operations/SetSNMPHandler.java | 13 +- .../snmp/processors/AbstractSNMPProcessor.java | 81 .../org/apache/nifi/snmp/processors/GetSNMP.java | 115 - .../apache/nifi/snmp/processors/SendTrapSNMP.java | 33 ++--- .../org/apache/nifi/snmp/processors/SetSNMP.java | 19 +-- .../java/org/apache/nifi/snmp/utils/SNMPUtils.java | 4 +- .../nifi/snmp/factory/core/SNMPContextTest.java| 47 --- .../snmp/factory/core/V1V2cSNMPFactoryTest.java| 13 -- .../nifi/snmp/factory/core/V3SNMPFactoryTest.java | 13 -- .../nifi/snmp/operations/GetSNMPHandlerTest.java | 99 +++ .../apache/nifi/snmp/operations/SNMPRequestIT.java | 140 ++--- .../snmp/operations/SendTrapSNMPHandlerTest.java | 21 +--- .../nifi/snmp/operations/SetSNMPHandlerTest.java | 11 +- .../snmp/processors/AbstractSNMPProcessorTest.java | 12 +- .../apache/nifi/snmp/processors/GetSNMPTest.java | 61 - 19 files changed, 328 insertions(+), 511 deletions(-) diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java index d3dd885613..081a23d6d9 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java @@ -17,20 +17,12 @@ package org.apache.nifi.snmp.factory.core; import org.apache.nifi.snmp.configuration.SNMPConfiguration; -import org.apache.nifi.snmp.operations.SNMPResourceHandler; import org.snmp4j.Snmp; import org.snmp4j.Target; import org.snmp4j.smi.UdpAddress; public interface SNMPContext { -default SNMPResourceHandler createSNMPResourceHandler(final SNMPConfiguration snmpConfiguration) { -return new SNMPResourceHandler( -createSnmpManagerInstance(snmpConfiguration), -createTargetInstance(snmpConfiguration) -); -} - default void setupTargetBasicProperties(final Target target, final SNMPConfiguration configuration) { final int snmpVersion = configuration.getVersion(); final String host = configuration.getTargetHost(); diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java index 3514dd776f..ccbc3c3a4d 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static org.apache.nifi.snmp.operations.SNMPResourceHandler.REQUEST_TIMEOUT_EXCEPTION_TEMPLATE; +import static org.apache.nifi.snmp.processors.AbstractSNMPProcessor.REQUEST_TIMEOUT_EXCEPTION_TEMPLATE; public class GetSNMPHandler { @@ -56,29 +56,15 @@ public class GetSNMPHandler { "associated with this %s OID does not contain child OIDs. Please check if the OID exists in the agent " + "MIB or specify a parent OID with at least one child element"; -private final SNMPResourceHandler snmpResourceHandler; +private Snmp snmpManager; private TreeUtils treeUtils; -public GetSNMPHandler(final SNMPResourceHandler snmpResourceHandler) { -this.snmpResourceHandler = snmpResourceHandler; -this.treeUtils = new TreeUtils(snmpResourceHandler.getSnmpManager(), getPduFactory); +public GetSNMPHandler(final Snmp snmpManager) { +this.snmpManager = snmpManager; +this.treeUtils = new
(nifi) branch main updated: NIFI-12500: Add dynamic target for Get/Set/SendTrapSNMP
This is an automated email from the ASF dual-hosted git repository. tpalfy 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 7fc27651a4 NIFI-12500: Add dynamic target for Get/Set/SendTrapSNMP 7fc27651a4 is described below commit 7fc27651a45c21f1e47f33efbba5649b06113da0 Author: lehelb AuthorDate: Thu Dec 14 19:07:00 2023 +0100 NIFI-12500: Add dynamic target for Get/Set/SendTrapSNMP This closes #8160. Signed-off-by: Tamas Palfy --- .../apache/nifi/snmp/factory/core/SNMPContext.java | 8 -- .../nifi/snmp/operations/GetSNMPHandler.java | 42 ++- .../nifi/snmp/operations/SNMPResourceHandler.java | 70 --- .../nifi/snmp/operations/SendTrapSNMPHandler.java | 37 +++--- .../nifi/snmp/operations/SetSNMPHandler.java | 13 +- .../snmp/processors/AbstractSNMPProcessor.java | 81 + .../org/apache/nifi/snmp/processors/GetSNMP.java | 115 +- .../apache/nifi/snmp/processors/SendTrapSNMP.java | 33 +++--- .../org/apache/nifi/snmp/processors/SetSNMP.java | 19 +-- .../java/org/apache/nifi/snmp/utils/SNMPUtils.java | 4 +- .../nifi/snmp/factory/core/SNMPContextTest.java| 47 .../snmp/factory/core/V1V2cSNMPFactoryTest.java| 13 -- .../nifi/snmp/factory/core/V3SNMPFactoryTest.java | 13 -- .../nifi/snmp/operations/GetSNMPHandlerTest.java | 99 +++- .../apache/nifi/snmp/operations/SNMPRequestIT.java | 131 + .../snmp/operations/SendTrapSNMPHandlerTest.java | 21 +--- .../nifi/snmp/operations/SetSNMPHandlerTest.java | 11 +- .../snmp/processors/AbstractSNMPProcessorTest.java | 12 +- .../apache/nifi/snmp/processors/GetSNMPTest.java | 61 -- 19 files changed, 319 insertions(+), 511 deletions(-) diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java index d3dd885613..081a23d6d9 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/factory/core/SNMPContext.java @@ -17,20 +17,12 @@ package org.apache.nifi.snmp.factory.core; import org.apache.nifi.snmp.configuration.SNMPConfiguration; -import org.apache.nifi.snmp.operations.SNMPResourceHandler; import org.snmp4j.Snmp; import org.snmp4j.Target; import org.snmp4j.smi.UdpAddress; public interface SNMPContext { -default SNMPResourceHandler createSNMPResourceHandler(final SNMPConfiguration snmpConfiguration) { -return new SNMPResourceHandler( -createSnmpManagerInstance(snmpConfiguration), -createTargetInstance(snmpConfiguration) -); -} - default void setupTargetBasicProperties(final Target target, final SNMPConfiguration configuration) { final int snmpVersion = configuration.getVersion(); final String host = configuration.getTargetHost(); diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java index 3514dd776f..ccbc3c3a4d 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/operations/GetSNMPHandler.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static org.apache.nifi.snmp.operations.SNMPResourceHandler.REQUEST_TIMEOUT_EXCEPTION_TEMPLATE; +import static org.apache.nifi.snmp.processors.AbstractSNMPProcessor.REQUEST_TIMEOUT_EXCEPTION_TEMPLATE; public class GetSNMPHandler { @@ -56,29 +56,15 @@ public class GetSNMPHandler { "associated with this %s OID does not contain child OIDs. Please check if the OID exists in the agent " + "MIB or specify a parent OID with at least one child element"; -private final SNMPResourceHandler snmpResourceHandler; +private Snmp snmpManager; private TreeUtils treeUtils; -public GetSNMPHandler(final SNMPResourceHandler snmpResourceHandler) { -this.snmpResourceHandler = snmpResourceHandler; -this.treeUtils = new TreeUtils(snmpResourceHandler.getSnmpManager(), getPduFactory); +public GetSNMPHandler(final Snmp snmpManager) { +this.snmpManager = snmpManager; +this.treeUtils = new TreeUtils(snmpManager, getPduFactory); } -public SNMPSingleResponse get(final String oid) throws
(nifi) annotated tag nifi-2.0.0-M2-RC3 created (now 0c4fedaae0)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag nifi-2.0.0-M2-RC3 in repository https://gitbox.apache.org/repos/asf/nifi.git at 0c4fedaae0 (tag) tagging 439ac5f596fe90d2591376caec1499ed86abfd6b (commit) replaces rel/nifi-2.0.0-M1 by exceptionfactory on Thu Jan 25 00:30:49 2024 -0600 - Log - NIFI-12646-RC3 copy for tag nifi-2.0.0-M2-RC3 --- No new revisions were added by this update.
(nifi) branch NIFI-12646-RC3 created (now c94ab4161d)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch NIFI-12646-RC3 in repository https://gitbox.apache.org/repos/asf/nifi.git at c94ab4161d NIFI-12646-RC3 prepare for next development iteration This branch includes the following new commits: new 28b254df9f NIFI-12646 Set Python Processor version to 2.0.0-M2 new 439ac5f596 NIFI-12646-RC3 prepare release nifi-2.0.0-M2-RC3 new c94ab4161d NIFI-12646-RC3 prepare for next development iteration The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(nifi) 01/03: NIFI-12646 Set Python Processor version to 2.0.0-M2
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch NIFI-12646-RC3 in repository https://gitbox.apache.org/repos/asf/nifi.git commit 28b254df9fd866b989b2b2cd15195c6ef168ce37 Author: exceptionfactory AuthorDate: Fri Jan 19 19:12:04 2024 -0600 NIFI-12646 Set Python Processor version to 2.0.0-M2 Signed-off-by: David Handermann --- .../nifi-openai-module/src/main/python/PromptChatGPT.py | 2 +- .../nifi-text-embeddings-module/src/main/python/ChunkDocument.py | 2 +- .../nifi-text-embeddings-module/src/main/python/ParseDocument.py | 2 +- .../src/main/python/vectorstores/PutChroma.py| 2 +- .../src/main/python/vectorstores/PutPinecone.py | 2 +- .../src/main/python/vectorstores/QueryChroma.py | 2 +- .../src/main/python/vectorstores/QueryPinecone.py| 2 +- nifi-toolkit/nifi-toolkit-api/pom.xml| 5 + 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py b/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py index 5b8e3738fe..24bbd1f48e 100644 --- a/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py +++ b/nifi-python-extensions/nifi-openai-module/src/main/python/PromptChatGPT.py @@ -30,7 +30,7 @@ class PromptChatGPT(FlowFileTransform): implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '2.0.0-M2' description = "Submits a prompt to ChatGPT, writing the results either to a FlowFile attribute or to the contents of the FlowFile" tags = ["text", "chatgpt", "gpt", "machine learning", "ML", "artificial intelligence", "ai", "document", "langchain"] dependencies = ['langchain==0.0.331', 'openai==0.28.1', 'jsonpath-ng'] diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py index 9b6f38e69f..a5fde8622d 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ChunkDocument.py @@ -104,7 +104,7 @@ class ChunkDocument(FlowFileTransform): class Java: implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '2.0.0-M2' description = """Chunks incoming documents that are formatted as JSON Lines into chunks that are appropriately sized for creating Text Embeddings. The input is expected to be in "json-lines" format, with each line having a 'text' and a 'metadata' element. Each line will then be split into one or more lines in the output.""" diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py index 777f80e402..de646781b6 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/ParseDocument.py @@ -45,7 +45,7 @@ class ParseDocument(FlowFileTransform): implements = ["org.apache.nifi.python.processor.FlowFileTransform"] class ProcessorDetails: -version = "2.0.0-SNAPSHOT" +version = "2.0.0-M2" description = """Parses incoming unstructured text documents and performs optical character recognition (OCR) in order to extract text from PDF and image files. The output is formatted as "json-lines" with two keys: 'text' and 'metadata'. Note that use of this Processor may require significant storage space and RAM utilization due to third-party dependencies necessary for processing PDF and image files. diff --git a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py index 4b792284f8..38208b52c1 100644 --- a/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py +++ b/nifi-python-extensions/nifi-text-embeddings-module/src/main/python/vectorstores/PutChroma.py @@ -26,7 +26,7 @@ class PutChroma(FlowFileTransform): implements = ['org.apache.nifi.python.processor.FlowFileTransform'] class ProcessorDetails: -version = '2.0.0-SNAPSHOT' +version = '2.0.0-M2' description = """Publishes JSON data to a Chroma VectorDB. The Incoming data must be in single JSON per Line format, each with two keys: 'text' and 'metadata'. The text
svn commit: r66793 - /dev/nifi/nifi-2.0.0-M2/
Author: exceptionfactory Date: Thu Jan 25 13:03:10 2024 New Revision: 66793 Log: NIFI-12646 Uploaded RC3 artifacts for NiFi 2.0.0-M2 Added: dev/nifi/nifi-2.0.0-M2/ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-2.0.0-M2-source-release.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-kafka-connector-assembly-2.0.0-M2.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-registry-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-registry-toolkit-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-stateless-2.0.0-M2-bin.zip.sha512 dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip (with props) dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip.asc dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip.sha256 dev/nifi/nifi-2.0.0-M2/nifi-toolkit-2.0.0-M2-bin.zip.sha512 Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc == --- dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc (added) +++ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.asc Thu Jan 25 13:03:10 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmWyWyQACgkQKbalLSqu +jbpnow//SzQmAdwozst0Oqj1RK7qLKjW/2JaKjD1fk+rdC5wiQZ+JjP7bxxO1b7D +54xLl3laWFBv5Xh77I3/1OTGeXOwUpCfdro8rbwRPPUgAy336snhoam5FuP7v2Hs +hGRR+lJq7McMWlKa/dEmegIi6hq3PDw7fwOWcvFljNw0shl6SmqfFSPfP7hufhob +D0lIdK1l+Law5gGXh2ewMJF2bW8uUzjV62tikJ5nRv6gtZ0+FmROVbgBwZhGrVNk +XrtezeSZ8p9hUZk7eTlZU3RMA9svgyi3rTMj65F086UGXtKSJ8tul9cugfe0yTmT ++sxy8NitBbTPDf92O+Iw4lpVnPmGj842b1OF5/lUKsjEgaC8wd0AgpJ3AjqmyrBE +POCRXx7ekhWrr0aYysIA9T8MUHvtdEdlW0CsT/geEqcIQp8xn2wrPJLCbw3OpYvz ++ijVV6iVeFyKjFsg0IA/6CEPCIIYPzPDjaDZ/kpChBpkLYSR7qkdLYuv8T0XLUMg +K/VMwZu4i8+Cn4xJh7+x0jGH10hvEG3eNSNklpvenHSLKoBsgz4ENpxP2QMcAw/E +1974zfX03pydtBH580LaFGVWzTEpzPuxnxhny/ou6MGWt6ASaHuTbdwZCTkxr6H7 +w5H2NgwfRPjonk22PIVaYOgW3xQj26KFDoRsEhXYoKh3RUqA/5w= +=ePEq +-END PGP SIGNATURE- Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 == --- dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 (added) +++ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha256 Thu Jan 25 13:03:10 2024 @@ -0,0 +1 @@ +05d236280d3bb9b3f275ce5ad99605d791b2c308cfb95f44f6c013c216935349 Added: dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 == --- dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 (added) +++ dev/nifi/nifi-2.0.0-M2/minifi-2.0.0-M2-bin.zip.sha512 Thu Jan 25 13:03:10 2024 @@ -0,0 +1 @@ +abfe98d06d566f5a313f34b5359069add81f08dbc14195ed69c2e07b984509336e5c2dda435ac80a44d3cd002e59a4e9adcbbf8a3415dbc9d56fb42abed66d76 Added: dev/nifi/nifi-2.0.0-M2/minifi-toolkit-2.0.0-M2-bin.zip
svn commit: r66792 - /dev/nifi/nifi-2.0.0-M2/
Author: exceptionfactory Date: Thu Jan 25 12:59:48 2024 New Revision: 66792 Log: NIFI-12646 Removed: dev/nifi/nifi-2.0.0-M2/