You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jg...@apache.org on 2022/03/01 11:06:57 UTC
[nifi] branch main updated: NIFI-9738 - VersionedComponent data members should derive from Object
This is an automated email from the ASF dual-hosted git repository.
jgresock 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 875f589 NIFI-9738 - VersionedComponent data members should derive from Object
875f589 is described below
commit 875f589548429b234faf408cbb5f019e11c422b8
Author: Paul Grey <gr...@yahoo.com>
AuthorDate: Mon Feb 28 20:32:44 2022 -0500
NIFI-9738 - VersionedComponent data members should derive from Object
Signed-off-by: Joe Gresock <jg...@gmail.com>
This closes #5816.
---
nifi-api/src/main/java/org/apache/nifi/flow/VersionedPort.java | 8 ++++----
.../apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java | 8 +-------
.../test/java/org/apache/nifi/util/TestFlowDifferenceFilters.java | 4 ++--
.../test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java | 4 ++--
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedPort.java b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedPort.java
index c8893f3..3b06e0e 100644
--- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedPort.java
+++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedPort.java
@@ -23,7 +23,7 @@ public class VersionedPort extends VersionedComponent {
private PortType type;
private Integer concurrentlySchedulableTaskCount;
private ScheduledState scheduledState;
- private boolean allowRemoteAccess;
+ private Boolean allowRemoteAccess;
@ApiModelProperty("The number of tasks that should be concurrently scheduled for the port.")
public Integer getConcurrentlySchedulableTaskCount() {
@@ -53,11 +53,11 @@ public class VersionedPort extends VersionedComponent {
}
@ApiModelProperty("Whether or not this port allows remote access for site-to-site")
- public boolean isAllowRemoteAccess() {
- return allowRemoteAccess;
+ public Boolean isAllowRemoteAccess() {
+ return ((allowRemoteAccess != null) && allowRemoteAccess);
}
- public void setAllowRemoteAccess(boolean allowRemoteAccess) {
+ public void setAllowRemoteAccess(Boolean allowRemoteAccess) {
this.allowRemoteAccess = allowRemoteAccess;
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
index c883272..cc3bf39 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
@@ -654,13 +654,7 @@ public class NiFiRegistryFlowMapper {
versionedPort.setPosition(mapPosition(port.getPosition()));
versionedPort.setType(PortType.valueOf(port.getConnectableType().name()));
versionedPort.setScheduledState(mapScheduledState(port.getScheduledState()));
-
- if (port instanceof PublicPort) {
- versionedPort.setAllowRemoteAccess(true);
- } else {
- versionedPort.setAllowRemoteAccess(false);
- }
-
+ versionedPort.setAllowRemoteAccess(port instanceof PublicPort);
versionedPort.setScheduledState(flowMappingOptions.getStateLookup().getState(port));
return versionedPort;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/TestFlowDifferenceFilters.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/TestFlowDifferenceFilters.java
index 2b865f6..9adebff 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/TestFlowDifferenceFilters.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/util/TestFlowDifferenceFilters.java
@@ -154,10 +154,10 @@ public class TestFlowDifferenceFilters {
@Test
public void testFilterPublicPortNameChangeWhenAllowRemoteAccess() {
final VersionedPort portA = new VersionedPort();
- portA.setAllowRemoteAccess(true);
+ portA.setAllowRemoteAccess(Boolean.TRUE);
final VersionedPort portB = new VersionedPort();
- portB.setAllowRemoteAccess(false);
+ portB.setAllowRemoteAccess(Boolean.FALSE);
final StandardFlowDifference flowDifference = new StandardFlowDifference(
DifferenceType.NAME_CHANGED,
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java
index a5054c6..597d301 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java
@@ -80,7 +80,7 @@ public class VersionedFlowBuilder {
public VersionedPort createOutputPort(final String portName, final VersionedProcessGroup group) {
final VersionedPort port = new VersionedPort();
- port.setAllowRemoteAccess(false);
+ port.setAllowRemoteAccess(Boolean.FALSE);
port.setComponentType(ComponentType.OUTPUT_PORT);
port.setConcurrentlySchedulableTaskCount(1);
port.setGroupIdentifier(group.getIdentifier());
@@ -100,7 +100,7 @@ public class VersionedFlowBuilder {
public VersionedPort createInputPort(final String portName, final VersionedProcessGroup group) {
final VersionedPort port = new VersionedPort();
- port.setAllowRemoteAccess(false);
+ port.setAllowRemoteAccess(Boolean.FALSE);
port.setComponentType(ComponentType.INPUT_PORT);
port.setConcurrentlySchedulableTaskCount(1);
port.setGroupIdentifier(group.getIdentifier());