(nifi) branch support/nifi-1.x updated: NIFI-12726 Update commons-email to 1.6.0
This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new ebbbcf676b NIFI-12726 Update commons-email to 1.6.0 ebbbcf676b is described below commit ebbbcf676bfff681977a7a59ca131b070217334c Author: mr1716 AuthorDate: Thu Feb 1 13:55:11 2024 -0500 NIFI-12726 Update commons-email to 1.6.0 Signed-off-by: Pierre Villard This closes #8342. --- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 74614dcd7f..1fac89ad5f 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -52,7 +52,7 @@ org.apache.commons commons-email -1.5 +1.6.0 com.sun.mail
(nifi) branch main updated: NIFI-12726 Update commons-email to 1.6.0
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 12531ef206 NIFI-12726 Update commons-email to 1.6.0 12531ef206 is described below commit 12531ef206c53e1e9901ea1dcdd6d6b20f18caf6 Author: mr1716 AuthorDate: Thu Feb 1 13:55:11 2024 -0500 NIFI-12726 Update commons-email to 1.6.0 Signed-off-by: Pierre Villard This closes #8342. --- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 2a3e22f25c..86b0f7e4ae 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -57,7 +57,7 @@ org.apache.commons commons-email -1.5 +1.6.0 com.sun.mail
(nifi) branch main updated: NIFI-12731: Ensure state is updated in GetHBase whenever the session is committed
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 2f42b44efa NIFI-12731: Ensure state is updated in GetHBase whenever
the session is committed
2f42b44efa is described below
commit 2f42b44efa2f29a0380b5087e249d7975118a737
Author: Matt Burgess
AuthorDate: Thu Feb 1 19:04:26 2024 -0500
NIFI-12731: Ensure state is updated in GetHBase whenever the session is
committed
Signed-off-by: Pierre Villard
This closes #8346.
---
.../main/java/org/apache/nifi/hbase/GetHBase.java | 86 +++---
.../org/apache/nifi/hbase/scan/ResultHandler.java | 4 +-
2 files changed, 44 insertions(+), 46 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 8b2cf0d973..9e77167acc 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
@@ -140,7 +140,7 @@ public class GetHBase extends AbstractProcessor implements
VisibilityFetchSuppor
.build();
private final AtomicReference lastResult = new
AtomicReference<>();
-private volatile List columns = new ArrayList<>();
+private final List columns = new ArrayList<>();
private volatile String previousTable = null;
@Override
@@ -201,11 +201,11 @@ public class GetHBase extends AbstractProcessor
implements VisibilityFetchSuppor
for (final String column : columns) {
if (column.contains(":")) {
final String[] parts = column.split(":");
-final byte[] cf = parts[0].getBytes(Charset.forName("UTF-8"));
-final byte[] cq = parts[1].getBytes(Charset.forName("UTF-8"));
+final byte[] cf = parts[0].getBytes(StandardCharsets.UTF_8);
+final byte[] cq = parts[1].getBytes(StandardCharsets.UTF_8);
this.columns.add(new Column(cf, cq));
} else {
-final byte[] cf = column.getBytes(Charset.forName("UTF-8"));
+final byte[] cf = column.getBytes(StandardCharsets.UTF_8);
this.columns.add(new Column(cf, null));
}
}
@@ -307,11 +307,7 @@ public class GetHBase extends AbstractProcessor implements
VisibilityFetchSuppor
final byte[] cellValue =
Arrays.copyOfRange(cell.getValueArray(), cell.getValueOffset(),
cell.getValueLength() + cell.getValueOffset());
final String rowHash = new String(rowValue,
StandardCharsets.UTF_8);
-Set cellHashes =
cellsMatchingTimestamp.get(rowHash);
-if (cellHashes == null) {
-cellHashes = new HashSet<>();
-cellsMatchingTimestamp.put(rowHash,
cellHashes);
-}
+Set cellHashes =
cellsMatchingTimestamp.computeIfAbsent(rowHash, k -> new HashSet<>());
cellHashes.add(new String(cellValue,
StandardCharsets.UTF_8));
}
}
@@ -336,40 +332,11 @@ public class GetHBase extends AbstractProcessor
implements VisibilityFetchSuppor
rowsPulledHolder.set(++rowsPulled);
if (++rowsPulled % getBatchSize() == 0) {
-session.commitAsync();
+updateStateAndCommit(session, latestTimestampHolder.get(),
cellsMatchingTimestamp);
}
});
-final ScanResult scanResults = new
ScanResult(latestTimestampHolder.get(), cellsMatchingTimestamp);
-
-final ScanResult latestResult = lastResult.get();
-if (latestResult == null || scanResults.getTimestamp() >
latestResult.getTimestamp()) {
-session.setState(scanResults.toFlatMap(), Scope.CLUSTER);
-session.commitAsync(() ->
updateScanResultsIfNewer(scanResults));
-} else if (scanResults.getTimestamp() ==
latestResult.getTimestamp()) {
-final Map> combinedResults = new
HashMap<>(scanResults.getMatchingCells());
-
-// copy the results of result.getMatchingCells() to
combinedResults.
-// do a deep copy because the Set may be modified below.
-for (final Map.Entry> entry :
scanResults.getMatchingCells().entrySet()) {
-combinedResults.put(entry.getKey(), new
HashSet<>(entry.getValue()));
-}
-
-// combined the results from 'lastResult'
(nifi) branch support/nifi-1.x updated: NIFI-12731: Ensure state is updated in GetHBase whenever the session is committed
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new f4a1004d30 NIFI-12731: Ensure state is updated in GetHBase whenever
the session is committed
f4a1004d30 is described below
commit f4a1004d30b7be6edcf26781b5c39cdb395c0f81
Author: Matt Burgess
AuthorDate: Thu Feb 1 19:24:34 2024 -0500
NIFI-12731: Ensure state is updated in GetHBase whenever the session is
committed
Signed-off-by: Pierre Villard
This closes #8347.
---
.../main/java/org/apache/nifi/hbase/GetHBase.java | 93 +++---
.../org/apache/nifi/hbase/scan/ResultHandler.java | 4 +-
2 files changed, 48 insertions(+), 49 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 d11fcd5042..8aaf7849c2 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
@@ -53,13 +53,13 @@ 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;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -156,7 +156,7 @@ public class GetHBase extends AbstractProcessor implements
VisibilityFetchSuppor
.build();
private final AtomicReference lastResult = new
AtomicReference<>();
-private volatile List columns = new ArrayList<>();
+private final List columns = new ArrayList<>();
private volatile boolean justElectedPrimaryNode = false;
private volatile String previousTable = null;
@@ -226,11 +226,11 @@ public class GetHBase extends AbstractProcessor
implements VisibilityFetchSuppor
for (final String column : columns) {
if (column.contains(":")) {
final String[] parts = column.split(":");
-final byte[] cf = parts[0].getBytes(Charset.forName("UTF-8"));
-final byte[] cq = parts[1].getBytes(Charset.forName("UTF-8"));
+final byte[] cf = parts[0].getBytes(StandardCharsets.UTF_8);
+final byte[] cq = parts[1].getBytes(StandardCharsets.UTF_8);
this.columns.add(new Column(cf, cq));
} else {
-final byte[] cf = column.getBytes(Charset.forName("UTF-8"));
+final byte[] cf = column.getBytes(StandardCharsets.UTF_8);
this.columns.add(new Column(cf, null));
}
}
@@ -345,11 +345,7 @@ public class GetHBase extends AbstractProcessor implements
VisibilityFetchSuppor
final byte[] cellValue =
Arrays.copyOfRange(cell.getValueArray(), cell.getValueOffset(),
cell.getValueLength() + cell.getValueOffset());
final String rowHash = new String(rowValue,
StandardCharsets.UTF_8);
-Set cellHashes =
cellsMatchingTimestamp.get(rowHash);
-if (cellHashes == null) {
-cellHashes = new HashSet<>();
-cellsMatchingTimestamp.put(rowHash,
cellHashes);
-}
+Set cellHashes =
cellsMatchingTimestamp.computeIfAbsent(rowHash, k -> new HashSet<>());
cellHashes.add(new String(cellValue,
StandardCharsets.UTF_8));
}
}
@@ -374,40 +370,12 @@ public class GetHBase extends AbstractProcessor
implements VisibilityFetchSuppor
rowsPulledHolder.set(++rowsPulled);
if (++rowsPulled % getBatchSize() == 0) {
-session.commitAsync();
+updateStateAndCommit(session, latestTimestampHolder.get(),
cellsMatchingTimestamp);
}
});
-final ScanResult scanResults = new
ScanResult(latestTimestampHolder.get(), cellsMatchingTimestamp);
-
-final ScanResult latestResult = lastResult.get();
-if (latestResult == null || scanResults.getTimestamp() >
latestResult.getTimestamp()) {
-session.setState(scanResults.toFlatMap(), Scope.CLUSTER);
-session.commitAsync(() ->
updateScanResultsIfNewer(scanResults));
-} else if
(nifi) branch main updated: [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix (#8320)
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 c6f1d771e8 [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix (#8320) c6f1d771e8 is described below commit c6f1d771e8af96453382e6f7e1cbef0280f153ba Author: Scott Aslan AuthorDate: Thu Feb 1 16:59:43 2024 -0500 [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix (#8320) * [NIFI-12698] dark mode, [NIFI-12687] status history axis label fix * prettier * lint fix * update input form field styles to support dark mode * adjust colors of flow status icons, and PG status icons, and softened the warn palette. Fix background of status history charts in dark mode * fix provenance text color in dark mode * leave the toggle for dark mode always visible to encourage testing This closes #8320 --- .../src/main/nifi/.prettierignore | 1 + .../main/nifi/src/app/_app.component-theme.scss| 2 +- .../feature/_access-policies.component-theme.scss | 2 +- ...dd-tenant-to-policy-dialog.component-theme.scss | 2 +- ..._component-access-policies.component-theme.scss | 6 +- .../feature/_bulletins.component-theme.scss| 2 +- .../_bulletin-board-list.component-theme.scss | 2 +- .../feature/_counters.component-theme.scss | 2 +- .../ui/canvas/_canvas.component-theme.scss | 2 +- .../ui/canvas/footer/_footer.component-theme.scss | 2 +- .../_navigation-control.component-theme.scss | 2 +- .../birdseye/_birdseye.component-theme.scss| 2 +- .../_operation-control.component-theme.scss| 6 +- .../ui/canvas/header/_header.component-theme.scss | 2 +- .../flow-status/_flow-status.component-theme.scss | 2 +- .../_new-canvas-item.component-theme.scss | 2 +- .../header/search/_search.component-theme.scss | 8 +- .../ui/canvas/header/search/search.component.html | 3 +- .../ui/canvas/header/search/search.component.ts| 14 +- .../_prioritizers.component-theme.scss | 2 +- .../_create-process-group.component-theme.scss | 2 +- .../ui/common/banner/_banner.component-theme.scss | 2 +- .../_controller-services.component-theme.scss | 2 +- .../login/feature/_login.component-theme.scss | 2 +- .../ui/login-form/_login-form.component-theme.scss | 2 +- .../_parameter-contexts.component-theme.scss | 2 +- ...ameter-context-inheritance.component-theme.scss | 2 +- .../feature/_provenance.component-theme.scss | 2 +- .../_provenance-event-table.component-theme.scss | 2 +- .../lineage/_lineage.component-theme.scss | 8 +- .../_flowfile-dialog.component-theme.scss | 2 +- .../_flowfile-table.component-theme.scss | 2 +- .../feature/_settings.component-theme.scss | 2 +- .../summary/feature/_summary.component-theme.scss | 2 +- .../users/feature/_users.component-theme.scss | 2 +- .../_context-menu.component-theme.scss | 2 +- .../_extension-creation.component-theme.scss | 2 +- .../extension-creation.component.html | 14 +- .../extension-creation.component.ts| 8 +- .../navigation/_navigation.component-theme.scss| 5 +- .../ui/common/navigation/navigation.component.html | 1 + .../ui/common/navigation/navigation.component.ts | 29 +- .../nf-editor/_nf-editor.component-theme.scss | 7 +- .../_provenance-event-dialog.component-theme.scss | 2 +- .../resizable/_resizable.component-theme.scss | 2 +- .../_status-history.component-theme.scss | 17 +- .../status-history/status-history.component.scss | 6 +- ..._system-diagnostics-dialog.component-theme.scss | 2 +- .../_property-hint-tip.component-theme.scss| 2 +- .../src/assets/styles/_listing-table-theme.scss| 2 +- .../src/main/nifi/src/assets/themes/nifi.scss | 197 +- .../src/main/nifi/src/assets/themes/purple.scss| 194 +- .../src/main/nifi/src/styles.scss | 415 + 53 files changed, 767 insertions(+), 242 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore index 4e65d169f6..0ea8adf100 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore @@ -33,6 +33,7 @@ npm-debug.log # Theme src/assets/themes/* +src/styles.scss # System files .DS_Store diff
(nifi) branch support/nifi-1.x updated: NIFI-12715 Updated Snowflake SDKs
This is an automated email from the ASF dual-hosted git repository. turcsanyi 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 f211f3af28 NIFI-12715 Updated Snowflake SDKs f211f3af28 is described below commit f211f3af28a55e6a4d2ba44424d12abf232258a1 Author: mr1716 AuthorDate: Thu Feb 1 08:24:43 2024 -0500 NIFI-12715 Updated Snowflake SDKs This closes #8335. Signed-off-by: Peter Turcsanyi (cherry picked from commit d5ed02ec5969efb82efffa467a6be8c53ceeaccf) --- nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml index 507846e61a..a0662c0b26 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml @@ -36,13 +36,13 @@ net.snowflake snowflake-ingest-sdk -2.0.4 +2.0.5 net.snowflake snowflake-jdbc -3.14.4 +3.14.5
(nifi) branch main updated: NIFI-12715 Updated Snowflake SDKs
This is an automated email from the ASF dual-hosted git repository. turcsanyi 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 d5ed02ec59 NIFI-12715 Updated Snowflake SDKs d5ed02ec59 is described below commit d5ed02ec5969efb82efffa467a6be8c53ceeaccf Author: mr1716 AuthorDate: Thu Feb 1 08:24:43 2024 -0500 NIFI-12715 Updated Snowflake SDKs This closes #8335. Signed-off-by: Peter Turcsanyi --- nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml index 539e29a812..5b47436bbb 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml @@ -36,13 +36,13 @@ net.snowflake snowflake-ingest-sdk -2.0.4 +2.0.5 net.snowflake snowflake-jdbc -3.14.4 +3.14.5
(nifi) branch main updated: NIFI-12675 Fixed custom Relationships with Python Processors
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a587bad711 NIFI-12675 Fixed custom Relationships with Python Processors
a587bad711 is described below
commit a587bad71169fef91dbd2d1302a26f43e6efc182
Author: Mark Payne
AuthorDate: Tue Jan 30 11:36:08 2024 -0500
NIFI-12675 Fixed custom Relationships with Python Processors
Fixed bug that caused custom Relationships not to work on Python
Processors. Added unit test to verify. Also addressed issue in
PythonControllerInteractionIT where it did not wait for Processors to become
valid (originally this wasn't necessary but when we refactored Processors to
initialize in the background this was overlooked).
This closes #8316
Signed-off-by: David Handermann
---
.../nifi/util/StandardProcessorTestRunner.java | 5 ++
.../main/java/org/apache/nifi/util/TestRunner.java | 2 +
.../PythonControllerInteractionIT.java | 70 ++
.../src/main/python/src/nifiapi/relationship.py| 2 +-
.../python/framework/PythonProcessorAdapter.py | 17 +-
.../src/main/resources/extensions/RouteFlowFile.py | 40 +
6 files changed, 110 insertions(+), 26 deletions(-)
diff --git
a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index 8cdcd6bc0c..4bc2b65d0c 100644
---
a/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++
b/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -419,6 +419,11 @@ public class StandardProcessorTestRunner implements
TestRunner {
context.assertValid();
}
+@Override
+public boolean isValid() {
+return context.isValid();
+}
+
@Override
public void assertNotValid() {
Assertions.assertFalse(context.isValid(), "Processor appears to be
valid but expected it to be invalid");
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
index 84bb37140d..52b5f843a3 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
@@ -394,6 +394,8 @@ public interface TestRunner {
*/
void assertValid();
+boolean isValid();
+
/**
* Assert that the currently configured set of properties/annotation data
* are NOT valid
diff --git
a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
index 846adb64c4..2f03504119 100644
---
a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
+++
b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-integration-tests/src/test/java/org.apache.nifi.py4j/PythonControllerInteractionIT.java
@@ -19,15 +19,14 @@ package org.apache.nifi.py4j;
import org.apache.nifi.components.AsyncLoadedProcessor;
import org.apache.nifi.components.AsyncLoadedProcessor.LoadState;
-import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.json.JsonRecordSetWriter;
import org.apache.nifi.json.JsonTreeReader;
import org.apache.nifi.mock.MockProcessorInitializationContext;
-import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.ProcessorInitializationContext;
+import org.apache.nifi.processor.Relationship;
import org.apache.nifi.python.ControllerServiceTypeLookup;
import org.apache.nifi.python.PythonBridge;
import org.apache.nifi.python.PythonBridgeInitializationContext;
@@ -40,7 +39,6 @@ import org.apache.nifi.serialization.record.RecordField;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.util.MockFlowFile;
-import org.apache.nifi.util.MockPropertyValue;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
@@ -48,9 +46,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import java.io.File;
import java.io.FileOutputStream;
@@ -66,14 +61,13 @@ import java.util.HashMap;
import
(nifi) 03/04: NIFI-12718 Upgraded greenmail from 1.6.14 to 1.6.15
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit acde19f571a7d87664cd78ff6b706698d5043a2f Author: mr1716 AuthorDate: Thu Feb 1 08:33:11 2024 -0500 NIFI-12718 Upgraded greenmail from 1.6.14 to 1.6.15 This closes #8338 Signed-off-by: David Handermann (cherry picked from commit 41817d8088ac2b50e1af217d6b6d8ac05fa87273) --- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 5a9e84d6ba..74614dcd7f 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -145,7 +145,7 @@ com.icegreen greenmail -1.6.14 +1.6.15 test
(nifi) 02/04: NIFI-12717 Upgraded Gremlin from 3.7.0 to 3.7.1
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit 400d875f8b00a55bae9bb0d1de6d8c194327972d Author: mr1716 AuthorDate: Thu Feb 1 08:30:41 2024 -0500 NIFI-12717 Upgraded Gremlin from 3.7.0 to 3.7.1 This closes #8337 Signed-off-by: David Handermann (cherry picked from commit c71d9e531b48c30f4fe6808ed075d1ef2c4e7246) --- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml index 2ba609f9ab..c4ac9ca780 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml @@ -25,7 +25,7 @@ nifi-graph-test-clients jar -3.7.0 +3.7.1 0.6.3 32.1.2-jre 5.20.0 diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml index 1aa3a35620..b0566ddf5a 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml @@ -19,7 +19,7 @@ jar -3.7.0 +3.7.1
(nifi) branch support/nifi-1.x updated (cbfc47d460 -> a47009ab2c)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from cbfc47d460 NIFI-12695 Enabled PKCE Support for OIDC Integration new bce5e2ad8b NIFI-12713 Upgraded mysql-binlog-connector from 0.28.3 to 0.29.0 new 400d875f8b NIFI-12717 Upgraded Gremlin from 3.7.0 to 3.7.1 new acde19f571 NIFI-12718 Upgraded greenmail from 1.6.14 to 1.6.15 new a47009ab2c NIFI-12719 Upgraded metrics-core from 4.2.22 to 4.2.25 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml| 2 +- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml| 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
(nifi) 04/04: NIFI-12719 Upgraded metrics-core from 4.2.22 to 4.2.25
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit a47009ab2ceb21b16281c699669a1bbdf44378c6 Author: mr1716 AuthorDate: Thu Feb 1 08:40:17 2024 -0500 NIFI-12719 Upgraded metrics-core from 4.2.22 to 4.2.25 This closes #8339 Signed-off-by: David Handermann (cherry picked from commit 325a5a80431993e7e0d536e1d625e8cee00594fb) --- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 5d9f175a4e..04f6e5dfdb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -459,7 +459,7 @@ io.dropwizard.metrics metrics-core -4.2.22 +4.2.25 org.apache.curator
(nifi) 01/04: NIFI-12713 Upgraded mysql-binlog-connector from 0.28.3 to 0.29.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git commit bce5e2ad8b4bd64fad35fbc50ba78695d936deca Author: mr1716 AuthorDate: Thu Feb 1 08:19:46 2024 -0500 NIFI-12713 Upgraded mysql-binlog-connector from 0.28.3 to 0.29.0 This closes #8334 Signed-off-by: David Handermann (cherry picked from commit 691666c36ffe9dc9f4853a6b87aaa97b0922d3fe) --- .../nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml index 0af5e9eca8..d0847f866f 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml @@ -41,7 +41,7 @@ language governing permissions and limitations under the License. --> com.zendesk mysql-binlog-connector-java -0.28.3 +0.29.0 org.apache.nifi
(nifi) 02/06: NIFI-12713 Upgraded mysql-binlog-connector from 0.28.3 to 0.29.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 691666c36ffe9dc9f4853a6b87aaa97b0922d3fe Author: mr1716 AuthorDate: Thu Feb 1 08:19:46 2024 -0500 NIFI-12713 Upgraded mysql-binlog-connector from 0.28.3 to 0.29.0 This closes #8334 Signed-off-by: David Handermann --- .../nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml index de27787488..7903dc876b 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml @@ -39,7 +39,7 @@ language governing permissions and limitations under the License. --> com.zendesk mysql-binlog-connector-java -0.28.3 +0.29.0 org.apache.nifi
(nifi) 05/06: NIFI-12718 Upgraded greenmail from 1.6.14 to 1.6.15
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 41817d8088ac2b50e1af217d6b6d8ac05fa87273 Author: mr1716 AuthorDate: Thu Feb 1 08:33:11 2024 -0500 NIFI-12718 Upgraded greenmail from 1.6.14 to 1.6.15 This closes #8338 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 810852607f..2a3e22f25c 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -133,7 +133,7 @@ com.icegreen greenmail -1.6.14 +1.6.15 test
(nifi) 01/06: NIFI-12714 Upgraded Solr from 9.4.0 to 9.4.1
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit c93daaea3318a2695e9ddcd3774464bc78054664 Author: mr1716 AuthorDate: Thu Feb 1 08:21:43 2024 -0500 NIFI-12714 Upgraded Solr from 9.4.0 to 9.4.1 This closes #8333 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-solr-bundle/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/pom.xml index 52b70a929c..4a85ca8005 100644 --- a/nifi-nar-bundles/nifi-solr-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/pom.xml @@ -25,7 +25,7 @@ pom A bundle of processors that can store and retrieve data from Apache Solr -9.4.0 +9.4.1 10.0.18 2.41 2.1.6
(nifi) 06/06: NIFI-12719 Upgraded metrics-core from 4.2.22 to 4.2.25
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 325a5a80431993e7e0d536e1d625e8cee00594fb Author: mr1716 AuthorDate: Thu Feb 1 08:40:17 2024 -0500 NIFI-12719 Upgraded metrics-core from 4.2.22 to 4.2.25 This closes #8339 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 145eb94faf..6715bd242c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -464,7 +464,7 @@ io.dropwizard.metrics metrics-core -4.2.22 +4.2.25 org.apache.curator
(nifi) 03/06: NIFI-12716 Upgraded Groovy from 4.0.16 to 4.0.18
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit a49428ae696109eda638526263ea948434c7414c Author: mr1716 AuthorDate: Thu Feb 1 08:27:57 2024 -0500 NIFI-12716 Upgraded Groovy from 4.0.16 to 4.0.18 This closes #8336 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8a8b0f7f2..b70cef54a7 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ 4.0.1 3.1.0 2.5.0 -4.0.16 +4.0.18 3.1.2 3.3.6 1.2.1
(nifi) 04/06: NIFI-12717 Upgraded Gremlin from 3.7.0 to 3.7.1
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit c71d9e531b48c30f4fe6808ed075d1ef2c4e7246 Author: mr1716 AuthorDate: Thu Feb 1 08:30:41 2024 -0500 NIFI-12717 Upgraded Gremlin from 3.7.0 to 3.7.1 This closes #8337 Signed-off-by: David Handermann --- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml index dcad76b39c..46342bb02a 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml @@ -25,7 +25,7 @@ nifi-graph-test-clients jar -3.7.0 +3.7.1 0.6.3 32.1.2-jre 5.20.0 diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml index 4ec94094e9..224ef242de 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml @@ -19,7 +19,7 @@ jar -3.7.0 +3.7.1
(nifi) branch main updated (102daa15f8 -> 325a5a8043)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 102daa15f8 NIFI-12684: Handling error responses in the service listing on the canvas (#8321) new c93daaea33 NIFI-12714 Upgraded Solr from 9.4.0 to 9.4.1 new 691666c36f NIFI-12713 Upgraded mysql-binlog-connector from 0.28.3 to 0.29.0 new a49428ae69 NIFI-12716 Upgraded Groovy from 4.0.16 to 4.0.18 new c71d9e531b NIFI-12717 Upgraded Gremlin from 3.7.0 to 3.7.1 new 41817d8088 NIFI-12718 Upgraded greenmail from 1.6.14 to 1.6.15 new 325a5a8043 NIFI-12719 Upgraded metrics-core from 4.2.22 to 4.2.25 The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml| 2 +- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml| 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml| 2 +- nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
(nifi) branch main updated (7edf0d4e2a -> 102daa15f8)
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 7edf0d4e2a NIFI-12693: Moved notification of python process that a Processor was removed to a background (virtual) thread. Also noted in testing that in one instance a Python Processor never became valid because it had cached property descriptors before the processor was fully initialized, so updated code to ensure that we do not cache values before initialization is completed. add 102daa15f8 NIFI-12684: Handling error responses in the service listing on the canvas (#8321) No new revisions were added by this update. Summary of changes: .../service/controller-service.service.ts | 4 +- .../service/parameter-helper.service.ts| 162 + .../controller-services.actions.ts | 4 +- .../controller-services.effects.ts | 195 +++-- .../controller-services.reducer.ts | 12 +- .../controller-services.selectors.ts | 10 ++ .../state/controller-services/index.ts | 7 +- .../pages/flow-designer/state/flow/flow.effects.ts | 104 +-- .../pages/flow-designer/state/parameter/index.ts | 1 + .../state/parameter/parameter.effects.ts | 29 +-- .../state/parameter/parameter.reducer.ts | 14 +- .../controller-services.component.html | 4 +- .../controller-services.component.ts | 4 +- .../management-controller-services.effects.ts | 6 +- .../controller-service-state.actions.ts| 43 ++--- .../controller-service-state.effects.ts| 49 ++ .../controller-service-state.reducer.ts| 13 -- .../src/app/state/contoller-service-state/index.ts | 1 - 18 files changed, 330 insertions(+), 332 deletions(-) create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/parameter-helper.service.ts
(nifi) branch support/nifi-1.x updated: NIFI-12695 Enabled PKCE Support for OIDC Integration
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new cbfc47d460 NIFI-12695 Enabled PKCE Support for OIDC Integration
cbfc47d460 is described below
commit cbfc47d46021eb46c6d4c387096af8777bd0ea4a
Author: exceptionfactory
AuthorDate: Tue Jan 30 21:59:42 2024 -0600
NIFI-12695 Enabled PKCE Support for OIDC Integration
- Added Spring Security PKCE OAuth2 Request Customizer to standard Resolver
Signed-off-by: Pierre Villard
This closes #8324.
(cherry picked from commit 547f338147f4c48d9612ce4e7a6d52e0d8714f7f)
---
nifi-docs/src/main/asciidoc/administration-guide.adoc | 3 +++
.../web/StandardOAuth2AuthorizationRequestResolver.java| 9 +++--
.../StandardOAuth2AuthorizationRequestResolverTest.java| 14 ++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index c50eea6c03..dc9819aab1 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -497,6 +497,9 @@ The implementation supports the Authorization Code Grant
Type as described in
link:https://www.rfc-editor.org/rfc/rfc6749#section-4.1[RFC 6749 Section 4.1^]
and
link:https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowSteps[OpenID
Connect Core Section 3.1.1^].
+The Authorization Code Grant Type implementation supports
link:https://www.rfc-editor.org/rfc/rfc7636[RFC 7636] Proof
+Key for Code Exchange as part of the authentication process. PKCE support uses
the `S256` code challenge method.
+
After successful authentication with the Authorization Server, NiFi generates
an application Bearer Token with an
expiration based on the OAuth2 Access Token expiration. NiFi stores authorized
tokens using the local State
Provider and encrypts serialized information using the application Sensitive
Properties Key.
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/StandardOAuth2AuthorizationRequestResolver.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/StandardOAuth2AuthorizationRequestResolver.java
index dd8ca86ee3..3cdd3cc74e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/StandardOAuth2AuthorizationRequestResolver.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/oidc/client/web/StandardOAuth2AuthorizationRequestResolver.java
@@ -19,7 +19,7 @@ package org.apache.nifi.web.security.oidc.client.web;
import org.apache.nifi.web.util.RequestUriBuilder;
import
org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
import
org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizationRequestResolver;
-import
org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter;
+import
org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestCustomizers;
import
org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
import
org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
import org.springframework.web.util.UriComponentsBuilder;
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletRequest;
import java.net.URI;
import java.util.Objects;
+import static
org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI;
+
/**
* Authorization Request Resolver supports handling of headers from reverse
proxy servers
*/
@@ -41,7 +43,10 @@ public class StandardOAuth2AuthorizationRequestResolver
implements OAuth2Authori
*/
public StandardOAuth2AuthorizationRequestResolver(final
ClientRegistrationRepository clientRegistrationRepository) {
Objects.requireNonNull(clientRegistrationRepository, "Repository
required");
-resolver = new
DefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepository,
OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI);
+final DefaultOAuth2AuthorizationRequestResolver requestResolver = new
DefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepository,
DEFAULT_AUTHORIZATION_REQUEST_BASE_URI);
+// Enable RFC 7636 Proof Key for Code Exchange on Requests
+
(nifi) branch main updated: NIFI-12693: Moved notification of python process that a Processor was removed to a background (virtual) thread. Also noted in testing that in one instance a Python Processo
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 7edf0d4e2a NIFI-12693: Moved notification of python process that a
Processor was removed to a background (virtual) thread. Also noted in testing
that in one instance a Python Processor never became valid because it had
cached property descriptors before the processor was fully initialized, so
updated code to ensure that we do not cache values before initialization is
completed.
7edf0d4e2a is described below
commit 7edf0d4e2aee21949bc3ef755ca4b27fa324d20f
Author: Mark Payne
AuthorDate: Tue Jan 30 10:58:22 2024 -0500
NIFI-12693: Moved notification of python process that a Processor was
removed to a background (virtual) thread. Also noted in testing that in one
instance a Python Processor never became
valid because it had cached property descriptors before the processor was
fully initialized, so updated code to ensure that we do not cache values before
initialization is completed.
This closes #8315
Signed-off-by: David Handermann
---
.../apache/nifi/groups/StandardProcessGroup.java | 21 ++--
.../nifi/web/dao/impl/StandardProcessorDAO.java| 2 +-
.../org/apache/nifi/py4j/StandardPythonBridge.java | 37 ++
.../python/processor/PythonProcessorProxy.java | 8 ++---
4 files changed, 38 insertions(+), 30 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 78579458e3..e9db230087 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -1263,6 +1263,14 @@ public final class StandardProcessGroup implements
ProcessGroup {
}
}
+// Remove connections prior to removing the Processor. If there is
any failure in removing the Processor or the associated cleanup,
+// we can handle that. However, we could have many potential
issues if Connections exist whose source or destination does not exist.
+// must copy to avoid a concurrent modification
+final List copy = new
ArrayList<>(processor.getConnections());
+for (final Connection conn : copy) {
+removeConnection(conn);
+}
+
processors.remove(id);
onComponentModified();
@@ -1274,18 +1282,7 @@ public final class StandardProcessGroup implements
ProcessGroup {
logRepository.removeAllObservers();
}
-scheduler.submitFrameworkTask(new Runnable() {
-@Override
-public void run() {
-
stateManagerProvider.onComponentRemoved(processor.getIdentifier());
-}
-});
-
-// must copy to avoid a concurrent modification
-final Set copy = new
HashSet<>(processor.getConnections());
-for (final Connection conn : copy) {
-removeConnection(conn);
-}
+scheduler.submitFrameworkTask(() ->
stateManagerProvider.onComponentRemoved(processor.getIdentifier()));
removed = true;
LOG.info("{} removed from flow", processor);
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
index c4198fe282..552b82fdeb 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
@@ -589,7 +589,7 @@ public class StandardProcessorDAO extends ComponentDAO
implements ProcessorDAO {
try {
// attempt remove the processor
processor.getProcessGroup().removeProcessor(processor);
-} catch (ComponentLifeCycleException plce) {
+} catch (final ComponentLifeCycleException plce) {
throw new NiFiCoreException(plce.getMessage(), plce);
}
}
diff --git
(nifi) branch support/nifi-1.x updated: NIFI-12699 Set timeout to 10 seconds for TestStandardFlowFileQueue.testListFlowFilesResultsLimitedCollection
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new b73f553f2b NIFI-12699 Set timeout to 10 seconds for
TestStandardFlowFileQueue.testListFlowFilesResultsLimitedCollection
b73f553f2b is described below
commit b73f553f2b2a1e5113ae9fc0f4eacb8d61d5893c
Author: Mark Bean
AuthorDate: Tue Jan 30 20:09:11 2024 -0500
NIFI-12699 Set timeout to 10 seconds for
TestStandardFlowFileQueue.testListFlowFilesResultsLimitedCollection
This closes #8330
Signed-off-by: David Handermann
(cherry picked from commit e031e7e7a2f1e9f4d5dcae3eb6700c2b4babcd65)
---
.../test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
index 32fdd0b0f6..cce6dbaaf6 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
@@ -520,7 +520,7 @@ public class TestStandardFlowFileQueue {
}
@Test
-@Timeout(5)
+@Timeout(10)
public void testListFlowFilesResultsLimitedCollection() throws
InterruptedException {
Collection tff = new ArrayList<>();
//Swap Size is 1 records, so 3 is equal to 3 swap files.
(nifi) branch main updated: NIFI-12699 Set timeout to 10 seconds for TestStandardFlowFileQueue.testListFlowFilesResultsLimitedCollection
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 e031e7e7a2 NIFI-12699 Set timeout to 10 seconds for
TestStandardFlowFileQueue.testListFlowFilesResultsLimitedCollection
e031e7e7a2 is described below
commit e031e7e7a2f1e9f4d5dcae3eb6700c2b4babcd65
Author: Mark Bean
AuthorDate: Tue Jan 30 20:09:11 2024 -0500
NIFI-12699 Set timeout to 10 seconds for
TestStandardFlowFileQueue.testListFlowFilesResultsLimitedCollection
This closes #8330
Signed-off-by: David Handermann
---
.../test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
index 240629d539..6700bc02e1 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
@@ -519,7 +519,7 @@ public class TestStandardFlowFileQueue {
}
@Test
-@Timeout(5)
+@Timeout(10)
public void testListFlowFilesResultsLimitedCollection() throws
InterruptedException {
Collection tff = new ArrayList<>();
//Swap Size is 1 records, so 3 is equal to 3 swap files.
