You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2018/09/18 13:35:26 UTC
nifi-registry git commit: NIFIREG-198 Add unit test that reproduces
bug
Repository: nifi-registry
Updated Branches:
refs/heads/master 3672f8b98 -> 1cff92488
NIFIREG-198 Add unit test that reproduces bug
NIFIREG-198 Fix VersionedRemoteProcesGroup targetUri
NIFIREG-198 Deprecate VersionedRemoteProcessGroup targetUri
This closes #139.
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/1cff9248
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/1cff9248
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/1cff9248
Branch: refs/heads/master
Commit: 1cff92488ad67498e24afdaede78a07221871cc3
Parents: 3672f8b
Author: Kevin Doran <kd...@apache.org>
Authored: Thu Sep 6 19:10:50 2018 -0400
Committer: Bryan Bende <bb...@apache.org>
Committed: Tue Sep 18 09:35:02 2018 -0400
----------------------------------------------------------------------
.../flow/VersionedRemoteProcessGroup.java | 55 +++++-----
.../flow/TestVersionedRemoteProcessGroup.java | 102 +++++++++++++++++++
2 files changed, 128 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/1cff9248/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteProcessGroup.java
----------------------------------------------------------------------
diff --git a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteProcessGroup.java b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteProcessGroup.java
index ba5cee6..834afac 100644
--- a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteProcessGroup.java
+++ b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedRemoteProcessGroup.java
@@ -17,9 +17,10 @@
package org.apache.nifi.registry.flow;
-import java.util.Set;
-
import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Set;
public class VersionedRemoteProcessGroup extends VersionedComponent {
private String targetUri;
@@ -37,46 +38,42 @@ public class VersionedRemoteProcessGroup extends VersionedComponent {
private Set<VersionedRemoteGroupPort> outputPorts;
- public void setTargetUri(final String targetUri) {
- this.targetUri = targetUri;
- }
-
-
- @ApiModelProperty("The target URI of the remote process group." +
- " If target uri is not set, but uris are set, then returns the first url in the urls." +
- " If neither target uri nor uris are set, then returns null.")
+ @Deprecated
+ @ApiModelProperty(
+ value = "[DEPRECATED] The target URI of the remote process group." +
+ " If target uri is not set, but uris are set, then returns the first uri in the uris." +
+ " If neither target uri nor uris are set, then returns null.",
+ notes = "This field is deprecated and will be removed in version 1.x of NiFi Registry." +
+ " Please migrate to using targetUris only.")
public String getTargetUri() {
- if (targetUri != null && targetUri.length() > 0) {
- return targetUri;
- }
- if (targetUris == null || targetUris.length() == 0) {
- return null;
- }
- if (targetUris.contains(",")) {
- return targetUris.substring(0, targetUris.indexOf(','));
+ if (!StringUtils.isEmpty(targetUri)) {
+ return targetUri;
}
+ return !StringUtils.isEmpty(targetUris) ? targetUris.split(",", 2)[0] : null;
- return this.targetUri;
}
- public void setTargetUris(String targetUris) {
- this.targetUris = targetUris;
+ public void setTargetUri(final String targetUri) {
+ this.targetUri = targetUri;
}
-
- @ApiModelProperty("The target URI of the remote process group." +
- " If target uris is not set but target uri is set," +
- " then returns the single target uri." +
- " If neither target uris nor target uri is set, then returns null.")
+ @ApiModelProperty(
+ value = "The target URIs of the remote process group." +
+ " If target uris is not set but target uri is set, then returns the single target uri." +
+ " If neither target uris nor target uri is set, then returns null.")
public String getTargetUris() {
- if (targetUris == null || targetUris.length() == 0) {
- return targetUri;
+
+ if (!StringUtils.isEmpty(targetUris)) {
+ return targetUris;
}
+ return !StringUtils.isEmpty(targetUri) ? targetUri : null;
- return this.targetUris;
}
+ public void setTargetUris(String targetUris) {
+ this.targetUris = targetUris;
+ }
@ApiModelProperty("The time period used for the timeout when communicating with the target.")
public String getCommunicationsTimeout() {
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/1cff9248/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java
----------------------------------------------------------------------
diff --git a/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java b/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java
new file mode 100644
index 0000000..bbe6724
--- /dev/null
+++ b/nifi-registry-data-model/src/test/java/org/apache/nifi/registry/flow/TestVersionedRemoteProcessGroup.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.registry.flow;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestVersionedRemoteProcessGroup {
+
+ @Test
+ public void testGetTargetUriAndGetTargetUris() {
+
+ VersionedRemoteProcessGroup vRPG = new VersionedRemoteProcessGroup();
+
+
+ /* targetUri is null, targetUris varies */
+
+ vRPG.setTargetUri(null);
+ vRPG.setTargetUris(null);
+ assertEquals(null, vRPG.getTargetUri());
+ assertEquals(null, vRPG.getTargetUris());
+
+ vRPG.setTargetUri(null);
+ vRPG.setTargetUris("");
+ assertEquals(null, vRPG.getTargetUri());
+ assertEquals(null, vRPG.getTargetUris());
+
+ vRPG.setTargetUri(null);
+ vRPG.setTargetUris("uri-2");
+ //assertEquals("uri-2", vRPG.getTargetUri());
+ assertEquals("uri-2", vRPG.getTargetUris());
+
+ vRPG.setTargetUri(null);
+ vRPG.setTargetUris("uri-2,uri-3");
+ assertEquals("uri-2", vRPG.getTargetUri());
+ assertEquals("uri-2,uri-3", vRPG.getTargetUris());
+
+
+ /* targetUri is empty, targetUris varies */
+
+ vRPG.setTargetUri("");
+ vRPG.setTargetUris(null);
+ assertEquals(null, vRPG.getTargetUri());
+ assertEquals(null, vRPG.getTargetUris());
+
+ vRPG.setTargetUri("");
+ vRPG.setTargetUris("");
+ assertEquals(null, vRPG.getTargetUri());
+ assertEquals(null, vRPG.getTargetUris());
+
+ vRPG.setTargetUri("");
+ vRPG.setTargetUris("uri-2");
+ assertEquals("uri-2", vRPG.getTargetUri());
+ assertEquals("uri-2", vRPG.getTargetUris());
+
+ vRPG.setTargetUri("");
+ vRPG.setTargetUris("uri-2,uri-3");
+ assertEquals("uri-2", vRPG.getTargetUri());
+ assertEquals("uri-2,uri-3", vRPG.getTargetUris());
+
+
+ /* targetUri is set, targetUris varies */
+
+ vRPG.setTargetUri("uri-1");
+ vRPG.setTargetUris(null);
+ assertEquals("uri-1", vRPG.getTargetUri());
+ assertEquals("uri-1", vRPG.getTargetUris());
+
+ vRPG.setTargetUri("uri-1");
+ vRPG.setTargetUris("");
+ assertEquals("uri-1", vRPG.getTargetUri());
+ assertEquals("uri-1", vRPG.getTargetUris());
+
+ vRPG.setTargetUri("uri-1");
+ vRPG.setTargetUris("uri-2");
+ assertEquals("uri-1", vRPG.getTargetUri());
+ assertEquals("uri-2", vRPG.getTargetUris());
+
+ vRPG.setTargetUri("uri-1");
+ vRPG.setTargetUris("uri-2,uri-3");
+ assertEquals("uri-1", vRPG.getTargetUri());
+ assertEquals("uri-2,uri-3", vRPG.getTargetUris());
+
+ }
+
+
+}