(nifi) branch main updated: NIFI-12532: This closes #8179. Ensure that when CommunicateAction completes (exceptionally or otherwise) that it gets removed from the list of all CommunicationActions
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 c670161cb0 NIFI-12532: This closes #8179. Ensure that when
CommunicateAction completes (exceptionally or otherwise) that it gets removed
from the list of all CommunicationActions
c670161cb0 is described below
commit c670161cb09855b28e444a4d32d37427b31e8422
Author: Mark Payne
AuthorDate: Thu Dec 21 10:49:15 2023 -0500
NIFI-12532: This closes #8179. Ensure that when CommunicateAction completes
(exceptionally or otherwise) that it gets removed from the list of all
CommunicationActions
Signed-off-by: Joseph Witt
---
.../server/ConnectionLoadBalanceServer.java| 50 +-
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
index 20b955..f5c7c644ca 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/server/ConnectionLoadBalanceServer.java
@@ -17,6 +17,17 @@
package org.apache.nifi.controller.queue.clustered.server;
+import org.apache.commons.io.IOUtils;
+import org.apache.nifi.events.EventReporter;
+import org.apache.nifi.io.socket.SocketUtils;
+import org.apache.nifi.reporting.Severity;
+import org.apache.nifi.security.util.TlsPlatform;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLServerSocket;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -31,17 +42,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLServerSocket;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.nifi.events.EventReporter;
-import org.apache.nifi.io.socket.SocketUtils;
-import org.apache.nifi.reporting.Severity;
-import org.apache.nifi.security.util.TlsPlatform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ConnectionLoadBalanceServer {
private static final Logger logger =
LoggerFactory.getLogger(ConnectionLoadBalanceServer.class);
@@ -104,10 +104,12 @@ public class ConnectionLoadBalanceServer {
acceptConnection.stop();
}
-final Iterator itr =
communicationActions.iterator();
-while (itr.hasNext()) {
-itr.next().stop();
-itr.remove();
+synchronized (communicationActions) { // Must synchronize on
Synchronized List when using iterator
+final Iterator itr =
communicationActions.iterator();
+while (itr.hasNext()) {
+itr.next().stop();
+itr.remove();
+}
}
}
@@ -135,8 +137,7 @@ public class ConnectionLoadBalanceServer {
private volatile boolean stopped = false;
-// This should be final but it is not to allow override during
testing; no production code modifies the value
-private static int EXCEPTION_THRESHOLD_MILLIS = 10_000;
+private static final int EXCEPTION_THRESHOLD_MILLIS = 10_000;
private volatile long tlsErrorLastSeen = -1;
public CommunicateAction(final LoadBalanceProtocol
loadBalanceProtocol, final Socket socket, final EventReporter eventReporter)
throws IOException {
@@ -187,6 +188,8 @@ public class ConnectionLoadBalanceServer {
logger.error("Failed to communicate over Channel {}",
channelDescription, e);
eventReporter.reportEvent(Severity.ERROR, "Load
Balanced Connection", "Failed to receive FlowFiles for Load Balancing due to "
+ e);
}
+
+return;
}
}
}
@@ -265,11 +268,18 @@ public class ConnectionLoadBalanceServer {
socket.setSoTimeout(connectionTimeoutMillis);
final CommunicateAction communicateAction = new
CommunicateAction(loadBalanceProtocol, socket, eventReporter);
-final Thread commsThread = new Thread(communicateAction);
+communicationActions.add(communicateAction);
+
+
(nifi) branch support/nifi-1.x updated: NIFI-12535: Fixed documentation for 'PadRight Examples' table name in the Expression Language Guide as well as the last example in the table.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 29821f6e71 NIFI-12535: Fixed documentation for 'PadRight Examples'
table name in the Expression Language Guide as well as the last example in the
table.
29821f6e71 is described below
commit 29821f6e71a5d763863e191d223c8fb7fda519c0
Author: Alex Ethier
AuthorDate: Thu Dec 21 13:12:08 2023 -0500
NIFI-12535: Fixed documentation for 'PadRight Examples' table name in the
Expression Language Guide as well as the last example in the table.
Signed-off-by: Joseph Witt
---
nifi-docs/src/main/asciidoc/expression-language-guide.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index 321c334517..14620851f1 100644
--- a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -1085,13 +1085,13 @@ Expressions will provide the following results:
-.PadLeft Examples
+.PadRight Examples
|===
| Expression | Value
| `${greetings:padRight(10)}` | `hello\_`
| `${greetings:padRight(10, '@')}` | `hello@`
| `${greetings:padRight(10, 'xy')}` | `helloxyxyx`
-| `${greetings:padLeft(10, 'aVeryLongPaddingString')}` | `helloaVery`
+| `${greetings:padRight(10, 'aVeryLongPaddingString')}` | `helloaVery`
|===
(nifi) branch main updated: NIFI-12535: This closes #8181. Fixed documentation for 'PadRight Examples' table name in the Expression Language Guide as well as the last example in the table.
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 77093671e0 NIFI-12535: This closes #8181. Fixed documentation for
'PadRight Examples' table name in the Expression Language Guide as well as the
last example in the table.
77093671e0 is described below
commit 77093671e0ff90379ffc0fdf5be502cdf6988868
Author: Alex Ethier
AuthorDate: Thu Dec 21 13:12:08 2023 -0500
NIFI-12535: This closes #8181. Fixed documentation for 'PadRight Examples'
table name in the Expression Language Guide as well as the last example in the
table.
Signed-off-by: Joseph Witt
---
nifi-docs/src/main/asciidoc/expression-language-guide.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
index 2163d78e6b..e2c30cb6fb 100644
--- a/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/expression-language-guide.adoc
@@ -1078,13 +1078,13 @@ Expressions will provide the following results:
-.PadLeft Examples
+.PadRight Examples
|===
| Expression | Value
| `${greetings:padRight(10)}` | `hello\_`
| `${greetings:padRight(10, '@')}` | `hello@`
| `${greetings:padRight(10, 'xy')}` | `helloxyxyx`
-| `${greetings:padLeft(10, 'aVeryLongPaddingString')}` | `helloaVery`
+| `${greetings:padRight(10, 'aVeryLongPaddingString')}` | `helloaVery`
|===
(nifi) branch main updated: NIFI-12528: This closes #8180. Fixed bug that resulted in StackOverflowError when deleting loop containing only funnels
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 c41b273e82 NIFI-12528: This closes #8180. Fixed bug that resulted in
StackOverflowError when deleting loop containing only funnels
c41b273e82 is described below
commit c41b273e82c69466d4e518b814964883289edba7
Author: Mark Payne
AuthorDate: Thu Dec 21 11:07:39 2023 -0500
NIFI-12528: This closes #8180. Fixed bug that resulted in
StackOverflowError when deleting loop containing only funnels
Signed-off-by: Joseph Witt
---
.../org/apache/nifi/connectable/StandardConnection.java | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
index a2a6185b7b..9ef3b9fa39 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/connectable/StandardConnection.java
@@ -41,6 +41,7 @@ import org.apache.nifi.remote.RemoteGroupPort;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -500,6 +501,16 @@ public final class StandardConnection implements
Connection {
}
private void verifySourceStoppedOrFunnel(final Connection connection) {
+verifySourceStoppedOrFunnel(connection, new HashSet<>());
+}
+
+private void verifySourceStoppedOrFunnel(final Connection connection,
final Set connectionsSeen) {
+final boolean added = connectionsSeen.add(connection);
+if (!added) {
+// If we've already seen this Connection, no need to process it
again.
+return;
+}
+
final Connectable sourceComponent = connection.getSource();
if (!sourceComponent.isRunning()) {
return;
@@ -513,7 +524,7 @@ public final class StandardConnection implements Connection
{
// Source is a funnel and is running. We need to then check all of its
upstream components.
for (final Connection incoming :
sourceComponent.getIncomingConnections()) {
-verifySourceStoppedOrFunnel(incoming);
+verifySourceStoppedOrFunnel(incoming, connectionsSeen);
}
}
(nifi) branch support/nifi-1.x updated: NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled error (#8147)
This is an automated email from the ASF dual-hosted git repository.
rfellows 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 e8e547a00c NIFI-12481: Filtering out unauthorized registry clients to
avoid unhandled error (#8147)
e8e547a00c is described below
commit e8e547a00c2e000be345434ad90b855cf0e330d9
Author: Matt Gilman
AuthorDate: Thu Dec 21 11:34:57 2023 -0500
NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled
error (#8147)
* NIFI-12481:
- Filtering out unauthorized registry clients to avoid unhandled error.
* NIFI-12481:
- Using es5 syntax.
This closes #8147
---
.../src/main/webapp/js/nf/canvas/nf-flow-version.js | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
index 9588722569..07c8b0207c 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
@@ -198,12 +198,19 @@
}).done(function (registriesResponse) {
var registries = [];
-if (nfCommon.isDefinedAndNotNull(registriesResponse.registries) &&
registriesResponse.registries.length > 0) {
-registriesResponse.registries.sort(function (a, b) {
+var authorizedRegistries = [];
+if (nfCommon.isDefinedAndNotNull(registriesResponse.registries)) {
+authorizedRegistries =
registriesResponse.registries.filter(function(registry) {
+return registry.permissions.canRead;
+});
+}
+
+if (authorizedRegistries.length > 0) {
+authorizedRegistries.sort(function (a, b) {
return a.registry.name > b.registry.name;
});
-$.each(registriesResponse.registries, function (_,
registryEntity) {
+$.each(authorizedRegistries, function (_, registryEntity) {
var registry = registryEntity.registry;
registries.push({
text: registry.name,
(nifi) branch main updated: NIFI-12536: This closes #8178. Used proper method for converting byte array to String
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 2897618635 NIFI-12536: This closes #8178. Used proper method for
converting byte array to String
2897618635 is described below
commit 28976186351fca90178a3c6e4c125568a270cba2
Author: Mark Payne
AuthorDate: Thu Dec 21 10:41:14 2023 -0500
NIFI-12536: This closes #8178. Used proper method for converting byte array
to String
Signed-off-by: Joseph Witt
---
.../nifi-text-embeddings-module/src/main/python/ParseDocument.py| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 6b26f6aa49..a6582cc346 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
@@ -177,7 +177,7 @@ class ParseDocument(FlowFileTransform):
input_format =
context.getProperty(self.INPUT_FORMAT).evaluateAttributeExpressions(flowFile).getValue()
if input_format == PLAIN_TEXT:
-return [Document(page_content=str(flowFile.getContentsAsBytes()),
metadata=metadata)]
+return
[Document(page_content=flowFile.getContentsAsBytes().decode('utf-8'),
metadata=metadata)]
element_strategy =
context.getProperty(self.ELEMENT_STRATEGY).getValue()
if element_strategy == SINGLE_DOCUMENT:
(nifi) branch main updated: NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled error (#8147)
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 1f54d5d1fc NIFI-12481: Filtering out unauthorized registry clients to
avoid unhandled error (#8147)
1f54d5d1fc is described below
commit 1f54d5d1fc6a2c8c956b3426f6d5d12d2c547966
Author: Matt Gilman
AuthorDate: Thu Dec 21 11:34:57 2023 -0500
NIFI-12481: Filtering out unauthorized registry clients to avoid unhandled
error (#8147)
* NIFI-12481:
- Filtering out unauthorized registry clients to avoid unhandled error.
* NIFI-12481:
- Using es5 syntax.
This closes #8147
---
.../src/main/webapp/js/nf/canvas/nf-flow-version.js | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
index da98f70777..78812b5ea3 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
@@ -198,12 +198,19 @@
}).done(function (registriesResponse) {
var registries = [];
-if (nfCommon.isDefinedAndNotNull(registriesResponse.registries) &&
registriesResponse.registries.length > 0) {
-registriesResponse.registries.sort(function (a, b) {
+var authorizedRegistries = [];
+if (nfCommon.isDefinedAndNotNull(registriesResponse.registries)) {
+authorizedRegistries =
registriesResponse.registries.filter(function(registry) {
+return registry.permissions.canRead;
+});
+}
+
+if (authorizedRegistries.length > 0) {
+authorizedRegistries.sort(function (a, b) {
return a.component.name > b.component.name;
});
-$.each(registriesResponse.registries, function (_,
registryEntity) {
+$.each(authorizedRegistries, function (_, registryEntity) {
var registry = registryEntity.component;
registries.push({
text: registry.name,
(nifi) branch main updated (02d563eefc -> e6d09c3b3d)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 02d563eefc NIFI-12525: Added property migration for the removed
Consumer Hostname property in ConsumeAzureEventHub
add e6d09c3b3d NIFI-12485: Lineage Graph (#8173)
No new revisions were added by this update.
Summary of changes:
.../src/main/nifi/proxy.config.mjs | 50 +-
.../canvas-context-menu.service.ts}| 134 +--
.../pages/flow-designer/state/flow/flow.actions.ts | 4 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 42 +-
.../pages/flow-designer/state/flow/flow.reducer.ts | 4 +
.../flow-designer/state/flow/flow.selectors.ts | 2 +-
.../flow-designer/ui/canvas/canvas.component.html | 2 +-
.../ui/canvas/canvas.component.spec.ts | 2 +-
.../flow-designer/ui/canvas/canvas.component.ts| 7 +-
.../pages/flow-designer/ui/canvas/canvas.module.ts | 2 +-
.../feature/provenance-routing.module.ts | 3 -
.../pages/provenance/feature/provenance.module.ts | 3 +-
.../pages/provenance/service/provenance.service.ts | 15 +
.../nifi/src/app/pages/provenance/state/index.ts | 6 +-
.../app/pages/provenance/state/lineage/index.ts| 72 ++
.../provenance/state/lineage/lineage.actions.ts| 46 +
.../provenance/state/lineage/lineage.effects.ts| 178
.../provenance/state/lineage/lineage.reducer.ts| 54 ++
.../lineage/lineage.selectors.ts} | 24 +-
.../state/provenance-event-listing/index.ts| 12 +-
.../provenance-event-listing.actions.ts| 19 +-
.../provenance-event-listing.effects.ts| 36 +
.../provenance-event-listing.reducer.ts| 6 +-
.../provenance-event-listing.component.html| 21 +-
.../provenance-event-listing.component.ts | 46 +-
.../lineage/lineage.component.html}| 11 +-
.../lineage/lineage.component.scss | 77 ++
.../lineage/lineage.component.spec.ts} | 17 +-
.../lineage/lineage.component.ts | 997 +
.../provenance-event-table.component.html | 288 +++---
.../provenance-event-table.component.scss | 32 +
.../provenance-event-table.component.ts| 165 +++-
.../context-menu/context-menu.component.html | 5 +-
.../context-menu/context-menu.component.scss | 0
.../context-menu/context-menu.component.spec.ts| 2 +-
.../common/context-menu/context-menu.component.ts | 133 +++
.../controller-service-references.component.ts | 1 -
37 files changed, 2158 insertions(+), 360 deletions(-)
rename
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/{ui/canvas/context-menu/context-menu.component.ts
=> service/canvas-context-menu.service.ts} (90%)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/index.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.actions.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.reducer.ts
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/{ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.scss
=> state/lineage/lineage.selectors.ts} (56%)
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/{flow-designer/ui/canvas/canvas.component.html
=>
provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.html}
(68%)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.scss
copy
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/{flow-designer/ui/canvas/context-menu/context-menu.component.spec.ts
=>
provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.spec.ts}
(71%)
create mode 100644
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts
rename
(nifi-site) branch main updated: MINIFICPP-2273 Updated and Restructed MiNiFi Documentation
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 e35683a MINIFICPP-2273 Updated and Restructed MiNiFi Documentation
e35683a is described below
commit e35683afd80eea0e1f1ff4462965f7e8f87de608
Author: Martin Zink
AuthorDate: Tue Dec 12 23:26:07 2023 -0600
MINIFICPP-2273 Updated and Restructed MiNiFi Documentation
This closes #79
Signed-off-by: David Handermann
---
config.toml| 6 +
layouts/partials/minifi-topbar.html| 28 ++--
layouts/shortcodes/cpp-download-links.html | 11 +-
source/minifi/__index.md | 25 ++--
source/minifi/cpp-download.md | 33 +
source/minifi/faq.md | 11 --
source/minifi/getting-started.md | 124 --
source/minifi/{download.md => java-download.md}| 29 +
...va-agent-quick-start.md => java-quick-start.md} | 40 +++---
...m-admin-guide.md => java-system-admin-guide.md} | 14 +-
.../minifi/{minifi-toolkit.md => java-toolkit.md} | 34 +
source/people.md | 142 ++---
12 files changed, 168 insertions(+), 329 deletions(-)
diff --git a/config.toml b/config.toml
index 1adcf53..f43c3d8 100644
--- a/config.toml
+++ b/config.toml
@@ -51,3 +51,9 @@ currentProjectVersion = "2.0.0-M1"
currentProjectVersionReleased = "2023-11-25"
previousProjectVersion = "1.24.0"
previousProjectVersionReleased = "2023-11-27"
+
+minifiCppCurrentProjectVersion = "0.15.0"
+minifiCppCurrentProjectVersionReleased = "2023-09-01"
+
+minifiCppPreviousProjectVersion = "0.14.0"
+minifiCppPreviousProjectVersionReleased = "2023-04-17"
diff --git a/layouts/partials/minifi-topbar.html
b/layouts/partials/minifi-topbar.html
index bbfcdfe..639c9b8 100644
--- a/layouts/partials/minifi-topbar.html
+++ b/layouts/partials/minifi-topbar.html
@@ -16,30 +16,32 @@
-Documentation
+MiNiFi Java
-Getting Started
-MiNiFi Java Quick Start Guide
-Administrator's Guide
-Converter Toolkit
-FAQ
-https://cwiki.apache.org/confluence/display/MiNiFi;>Wiki
+Quick Start
+Converter Toolkit
+Administrator's Guide
+Download
-Downloads
+MiNiFi C++
-Download MiNiFi
Components
-https://cwiki.apache.org/confluence/display/MINIFI/Release+Notes;>MiNiFi Java Release Notes
-https://cwiki.apache.org/confluence/display/MINIFI/Release+Notes#ReleaseNotes-MiNiFi(C++)">MiNiFi C++ Release Notes
+https://github.com/apache/nifi-minifi-cpp?tab=readme-ov-file#installing-as-a-service;>Installation
+https://github.com/apache/nifi-minifi-cpp/blob/main/CONFIGURE.md;>Configuration
+https://github.com/apache/nifi-minifi-cpp/blob/main/PROCESSORS.md;>Processors
+https://github.com/apache/nifi-minifi-cpp/blob/main/examples/README.md;>Examples
+Download
+
Community
https://cwiki.apache.org/confluence/display/NIFI/Contributor+Guide;>Contributor Guide
Mailing Lists
Chat
People
+https://cwiki.apache.org/confluence/display/MiNiFi;>Wiki
@@ -48,9 +50,9 @@
Release
Guide
Licensing
Guide
https://gitbox.apache.org/repos/asf?p=nifi.git;>Source - Java Agent
-https://github.com/apache/nifi;>Source - GitHub - Java
Agent
+https://github.com/apache/nifi;>Source - GitHub - Java Agent
https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git;>Source - C++ Agent
-https://github.com/apache/nifi-minifi-cpp;>Source - GitHub - C++ Agent
+https://github.com/apache/nifi-minifi-cpp;>Source - GitHub - C++ Agent
https://issues.apache.org/jira/issues/?jql=project%20%3D%20NIFI%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22MiNiFi%22%20ORDER%20BY%20priority%20DESC%2C%20updated%20DESC;>MiNiFi
(nifi) branch main updated: NIFI-12525: Added property migration for the removed Consumer Hostname property in ConsumeAzureEventHub
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 02d563eefc NIFI-12525: Added property migration for the removed
Consumer Hostname property in ConsumeAzureEventHub
02d563eefc is described below
commit 02d563eefc0aaa23a15778a5cc15b5d549ed01c1
Author: Peter Turcsanyi
AuthorDate: Tue Dec 19 19:52:11 2023 +0100
NIFI-12525: Added property migration for the removed Consumer Hostname
property in ConsumeAzureEventHub
Signed-off-by: Pierre Villard
This closes #8171.
---
.../apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
index fe182e55db..4d99a53fae 100644
---
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
+++
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
@@ -51,6 +51,7 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -329,6 +330,11 @@ public class ConsumeAzureEventHub extends
AbstractSessionFactoryProcessor implem
return isRecordReaderSet && isRecordWriterSet ? RECORD_RELATIONSHIPS :
RELATIONSHIPS;
}
+@Override
+public void migrateProperties(final PropertyConfiguration config) {
+config.removeProperty("event-hub-consumer-hostname");
+}
+
@Override
protected Collection customValidate(ValidationContext
validationContext) {
final List results = new ArrayList<>();
(nifi) branch main updated: NIFI-12515 Removed deprecated Client Auth property from AMQP processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new ca4ee2407c NIFI-12515 Removed deprecated Client Auth property from
AMQP processors
ca4ee2407c is described below
commit ca4ee2407cb01e23fba9ad5ae72151aa1fd8d10a
Author: Peter Turcsanyi
AuthorDate: Thu Dec 14 22:02:11 2023 +0100
NIFI-12515 Removed deprecated Client Auth property from AMQP processors
Signed-off-by: Pierre Villard
This closes #8162.
---
.../nifi/amqp/processors/AbstractAMQPProcessor.java | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java
b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java
index 1ef85a2b46..7e9dbc7008 100644
---
a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java
+++
b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java
@@ -38,12 +38,12 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.security.util.ClientAuth;
import org.apache.nifi.ssl.SSLContextService;
@@ -125,14 +125,6 @@ abstract class AbstractAMQPProcessor
extends AbstractProce
.allowableValues("true", "false")
.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
.build();
-public static final PropertyDescriptor CLIENT_AUTH = new
PropertyDescriptor.Builder()
-.name("ssl-client-auth")
-.displayName("Client Auth")
-.description("The property has no effect and therefore
deprecated.")
-.required(false)
-.allowableValues(ClientAuth.values())
-.defaultValue("NONE")
-.build();
private static final List propertyDescriptors;
@@ -147,7 +139,6 @@ abstract class AbstractAMQPProcessor
extends AbstractProce
properties.add(AMQP_VERSION);
properties.add(SSL_CONTEXT_SERVICE);
properties.add(USE_CERT_AUTHENTICATION);
-properties.add(CLIENT_AUTH);
propertyDescriptors = Collections.unmodifiableList(properties);
}
@@ -157,6 +148,11 @@ abstract class AbstractAMQPProcessor
extends AbstractProce
private BlockingQueue> resourceQueue;
+@Override
+public void migrateProperties(final PropertyConfiguration config) {
+config.removeProperty("ssl-client-auth");
+}
+
@OnScheduled
public void onScheduled(ProcessContext context) {
resourceQueue = new
LinkedBlockingQueue<>(context.getMaxConcurrentTasks());
(nifi) branch main updated: NIFI-12527: Removed deprecated Session Cache Size property from JMS processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 4727d591d1 NIFI-12527: Removed deprecated Session Cache Size property
from JMS processors
4727d591d1 is described below
commit 4727d591d115cdca1975d91348ae75faba56e75a
Author: Peter Turcsanyi
AuthorDate: Tue Dec 19 22:55:26 2023 +0100
NIFI-12527: Removed deprecated Session Cache Size property from JMS
processors
Signed-off-by: Pierre Villard
This closes #8172.
---
.../apache/nifi/jms/processors/AbstractJMSProcessor.java | 14 ++
.../java/org/apache/nifi/jms/processors/ConsumeJMS.java| 1 -
.../java/org/apache/nifi/jms/processors/PublishJMS.java| 1 -
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
index 5c322a9ce2..4b89380532 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java
@@ -31,6 +31,7 @@ import org.apache.nifi.jms.cf.JMSConnectionFactoryProvider;
import org.apache.nifi.jms.cf.JMSConnectionFactoryProviderDefinition;
import org.apache.nifi.jms.cf.JndiJmsConnectionFactoryHandler;
import org.apache.nifi.jms.cf.JndiJmsConnectionFactoryProperties;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -109,14 +110,6 @@ public abstract class AbstractJMSProcessor extends Abstract
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
.build();
-static final PropertyDescriptor SESSION_CACHE_SIZE = new
PropertyDescriptor.Builder()
-.name("Session Cache size")
-.displayName("Session Cache Size")
-.description("This property is deprecated and no longer has any
effect on the Processor. It will be removed in a later version.")
-.required(false)
-.defaultValue("1")
-.addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
-.build();
static final PropertyDescriptor CHARSET = new PropertyDescriptor.Builder()
.name("character-set")
.displayName("Character Set")
@@ -187,6 +180,11 @@ public abstract class AbstractJMSProcessor extends Abstract
.build();
}
+@Override
+public void migrateProperties(final PropertyConfiguration config) {
+config.removeProperty("Session Cache size");
+}
+
@Override
protected Collection customValidate(ValidationContext
validationContext) {
return new
ConnectionFactoryConfigValidator(validationContext).validateConnectionFactoryConfig();
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
index 6b61fe4f73..d4f8e8a085 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/ConsumeJMS.java
@@ -239,7 +239,6 @@ public class ConsumeJMS extends
AbstractJMSProcessor {
_propertyDescriptors.add(USER);
_propertyDescriptors.add(PASSWORD);
_propertyDescriptors.add(CLIENT_ID);
-_propertyDescriptors.add(SESSION_CACHE_SIZE);
// change the validator on CHARSET property
PropertyDescriptor charsetWithELValidatorProperty = new
PropertyDescriptor.Builder()
diff --git
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
index 1e37f6aea1..4650ed3d9c 100644
---
a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
+++
b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java
@@ -178,7 +178,6 @@ public class PublishJMS extends
AbstractJMSProcessor {
_propertyDescriptors.add(USER);
_propertyDescriptors.add(PASSWORD);
