You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2017/11/14 21:32:33 UTC
[5/6] nifi-registry git commit: NIFIREG-53 Adding bucket name back to
BucketItem
NIFIREG-53 Adding bucket name back to BucketItem
Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/fc4050d7
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/fc4050d7
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/fc4050d7
Branch: refs/heads/master
Commit: fc4050d72cbfabb5dbfcd1c87e62d6753d343225
Parents: 0e4d55b
Author: Bryan Bende <bb...@apache.org>
Authored: Tue Nov 14 14:41:02 2017 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Tue Nov 14 14:41:02 2017 -0500
----------------------------------------------------------------------
.../org/apache/nifi/registry/bucket/BucketItem.java | 13 ++++++++++++-
.../apache/nifi/registry/service/DataModelMapper.java | 1 +
.../nifi/registry/service/TestRegistryService.java | 1 +
.../java/org/apache/nifi/registry/web/api/FlowsIT.java | 1 +
4 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/fc4050d7/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItem.java
----------------------------------------------------------------------
diff --git a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItem.java b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItem.java
index cb55664..9a96635 100644
--- a/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItem.java
+++ b/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItem.java
@@ -39,6 +39,9 @@ public abstract class BucketItem extends LinkableEntity {
@NotBlank
private String bucketIdentifier;
+ // read-only
+ private String bucketName;
+
@Min(1)
private long createdTimestamp;
@@ -80,7 +83,6 @@ public abstract class BucketItem extends LinkableEntity {
this.description = description;
}
-
@ApiModelProperty("The identifier of the bucket this items belongs to.")
public String getBucketIdentifier() {
return bucketIdentifier;
@@ -90,6 +92,15 @@ public abstract class BucketItem extends LinkableEntity {
this.bucketIdentifier = bucketIdentifier;
}
+ @ApiModelProperty(value = "The name of the bucket this items belongs to.", readOnly = true)
+ public String getBucketName() {
+ return bucketName;
+ }
+
+ public void setBucketName(String bucketName) {
+ this.bucketName = bucketName;
+ }
+
@ApiModelProperty("The timestamp of when the item was created.")
public long getCreatedTimestamp() {
return createdTimestamp;
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/fc4050d7/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/DataModelMapper.java
----------------------------------------------------------------------
diff --git a/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/DataModelMapper.java b/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/DataModelMapper.java
index c3a8c5e..a8ff424 100644
--- a/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/DataModelMapper.java
+++ b/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/DataModelMapper.java
@@ -71,6 +71,7 @@ public class DataModelMapper {
final VersionedFlow versionedFlow = new VersionedFlow();
versionedFlow.setIdentifier(flowEntity.getId());
versionedFlow.setBucketIdentifier(flowEntity.getBucket().getId());
+ versionedFlow.setBucketName(flowEntity.getBucket().getName());
versionedFlow.setName(flowEntity.getName());
versionedFlow.setDescription(flowEntity.getDescription());
versionedFlow.setCreatedTimestamp(flowEntity.getCreated().getTime());
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/fc4050d7/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
----------------------------------------------------------------------
diff --git a/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java b/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
index c77f95c..a0828af 100644
--- a/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
+++ b/nifi-registry-framework/src/test/java/org/apache/nifi/registry/service/TestRegistryService.java
@@ -383,6 +383,7 @@ public class TestRegistryService {
assertEquals(flowEntity.getName(), versionedFlow.getName());
assertEquals(flowEntity.getDescription(), versionedFlow.getDescription());
assertEquals(flowEntity.getBucket().getId(), versionedFlow.getBucketIdentifier());
+ assertEquals(flowEntity.getBucket().getName(), versionedFlow.getBucketName());
assertEquals(flowEntity.getCreated().getTime(), versionedFlow.getCreatedTimestamp());
assertEquals(flowEntity.getModified().getTime(), versionedFlow.getModifiedTimestamp());
}
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/fc4050d7/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
----------------------------------------------------------------------
diff --git a/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java b/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
index 5c2572d..58959b7 100644
--- a/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
+++ b/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/FlowsIT.java
@@ -122,6 +122,7 @@ public class FlowsIT extends UnsecuredITBase {
assertFlowsEqual(flow, createdFlow, false);
assertNotNull(createdFlow.getIdentifier());
+ assertNotNull(createdFlow.getBucketName());
assertEquals(0, createdFlow.getVersionCount());
assertEquals(createdFlow.getType(), BucketItemType.FLOW);
assertTrue(createdFlow.getCreatedTimestamp() - testStartTime > 0L); // both server and client in same JVM, so there shouldn't be skew