NIFIREG-265 Change bucket item type from Extension_Bundle to Bundle
diff --git a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/BucketItemDeserializer.java b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/BucketItemDeserializer.java
index efd7e61..01e1975 100644
--- a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/BucketItemDeserializer.java
+++ b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/impl/BucketItemDeserializer.java
@@ -66,7 +66,7 @@
final VersionedFlow versionedFlow = jsonParser.getCodec().treeToValue(node, VersionedFlow.class);
bucketItems.add(versionedFlow);
break;
- case Extension_Bundle:
+ case Bundle:
final Bundle bundle = jsonParser.getCodec().treeToValue(node, Bundle.class);
bucketItems.add(bundle);
break;
diff --git a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItemType.java b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItemType.java
index b746491..4b1ed69 100644
--- a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItemType.java
+++ b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/bucket/BucketItemType.java
@@ -26,5 +26,5 @@
Flow,
- Extension_Bundle;
+ Bundle;
}
diff --git a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/Bundle.java b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/Bundle.java
index 0a1cd4d..b9cf3eb 100644
--- a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/Bundle.java
+++ b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/Bundle.java
@@ -53,7 +53,7 @@
private long versionCount;
public Bundle() {
- super(BucketItemType.Extension_Bundle);
+ super(BucketItemType.Bundle);
}
@ApiModelProperty(value = "The type of the extension bundle")
diff --git a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
index 2ab945b..4a3d1a2 100644
--- a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
+++ b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
@@ -192,7 +192,7 @@
final FlowEntity flowEntity = (FlowEntity) item;
flowEntity.setSnapshotCount(snapshotCount);
}
- } else if (item.getType() == BucketItemEntityType.EXTENSION_BUNDLE) {
+ } else if (item.getType() == BucketItemEntityType.BUNDLE) {
final Long versionCount = extensionBundleVersionCounts.get(item.getId());
if (versionCount != null) {
final BundleEntity bundleEntity = (BundleEntity) item;
diff --git a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BucketItemEntityType.java b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BucketItemEntityType.java
index 2bbdd7c..cc883b9 100644
--- a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BucketItemEntityType.java
+++ b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BucketItemEntityType.java
@@ -23,7 +23,7 @@
FLOW(Values.FLOW),
- EXTENSION_BUNDLE(Values.EXTENSION_BUNDLE);
+ BUNDLE(Values.BUNDLE);
private final String value;
@@ -40,7 +40,7 @@
// need these constants to reference from @DiscriminatorValue
public static class Values {
public static final String FLOW = "FLOW";
- public static final String EXTENSION_BUNDLE = "EXTENSION_BUNDLE";
+ public static final String BUNDLE = "BUNDLE";
}
}
diff --git a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleEntity.java b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleEntity.java
index c9c4f69..1e3af7c 100644
--- a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleEntity.java
+++ b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleEntity.java
@@ -27,7 +27,7 @@
private long versionCount;
public BundleEntity() {
- setType(BucketItemEntityType.EXTENSION_BUNDLE);
+ setType(BucketItemEntityType.BUNDLE);
}
public BundleType getBundleType() {
@@ -64,8 +64,8 @@
@Override
public void setType(BucketItemEntityType type) {
- if (BucketItemEntityType.EXTENSION_BUNDLE != type) {
- throw new IllegalStateException("Must set type to " + BucketItemEntityType.Values.EXTENSION_BUNDLE);
+ if (BucketItemEntityType.BUNDLE != type) {
+ throw new IllegalStateException("Must set type to " + BucketItemEntityType.Values.BUNDLE);
}
super.setType(type);
}
diff --git a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BucketItemEntityRowMapper.java b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BucketItemEntityRowMapper.java
index eaecd3d..6db8e41 100644
--- a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BucketItemEntityRowMapper.java
+++ b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BucketItemEntityRowMapper.java
@@ -40,7 +40,7 @@
case FLOW:
item = new FlowEntity();
break;
- case EXTENSION_BUNDLE:
+ case BUNDLE:
final BundleEntity bundleEntity = new BundleEntity();
bundleEntity.setBundleType(BundleType.valueOf(rs.getString("BUNDLE_TYPE")));
bundleEntity.setGroupId(rs.getString("BUNDLE_GROUP_ID"));
diff --git a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BundleEntityRowMapper.java b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BundleEntityRowMapper.java
index e5469da..48de7a8 100644
--- a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BundleEntityRowMapper.java
+++ b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/mapper/BundleEntityRowMapper.java
@@ -38,7 +38,7 @@
entity.setModified(rs.getTimestamp("MODIFIED"));
entity.setBucketId(rs.getString("BUCKET_ID"));
entity.setBucketName(rs.getString("BUCKET_NAME"));
- entity.setType(BucketItemEntityType.EXTENSION_BUNDLE);
+ entity.setType(BucketItemEntityType.BUNDLE);
// BundleEntity fields
entity.setBundleType(BundleType.valueOf(rs.getString("BUNDLE_TYPE")));
diff --git a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/mapper/ExtensionMappings.java b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/mapper/ExtensionMappings.java
index 37dedd7..84031ec 100644
--- a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/mapper/ExtensionMappings.java
+++ b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/service/mapper/ExtensionMappings.java
@@ -61,7 +61,7 @@
entity.setDescription(bundle.getDescription());
entity.setCreated(new Date(bundle.getCreatedTimestamp()));
entity.setModified(new Date(bundle.getModifiedTimestamp()));
- entity.setType(BucketItemEntityType.EXTENSION_BUNDLE);
+ entity.setType(BucketItemEntityType.BUNDLE);
entity.setBucketId(bundle.getBucketIdentifier());
entity.setGroupId(bundle.getGroupId());
diff --git a/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/db/TestDatabaseMetadataService.java b/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/db/TestDatabaseMetadataService.java
index dc58e18..b150707 100644
--- a/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/db/TestDatabaseMetadataService.java
+++ b/nifi-registry-core/nifi-registry-framework/src/test/java/org/apache/nifi/registry/db/TestDatabaseMetadataService.java
@@ -415,7 +415,7 @@
assertEquals("Example processors bundle", entity.getDescription());
assertNotNull(entity.getCreated());
assertNotNull(entity.getModified());
- assertEquals(BucketItemEntityType.EXTENSION_BUNDLE, entity.getType());
+ assertEquals(BucketItemEntityType.BUNDLE, entity.getType());
assertEquals("3", entity.getBucketId());
assertEquals(BundleType.NIFI_NAR, entity.getBundleType());
diff --git a/nifi-registry-core/nifi-registry-framework/src/test/resources/db/migration/V999999.1__test-setup.sql b/nifi-registry-core/nifi-registry-framework/src/test/resources/db/migration/V999999.1__test-setup.sql
index a9a17d7..54b5dc0 100644
--- a/nifi-registry-core/nifi-registry-framework/src/test/resources/db/migration/V999999.1__test-setup.sql
+++ b/nifi-registry-core/nifi-registry-framework/src/test/resources/db/migration/V999999.1__test-setup.sql
@@ -86,7 +86,7 @@
'Example processors bundle',
parsedatetime('2018-11-02 12:56:00.000 UTC', 'yyyy-MM-dd hh:mm:ss.SSS z'),
parsedatetime('2018-11-02 12:56:00.000 UTC', 'yyyy-MM-dd hh:mm:ss.SSS z'),
- 'EXTENSION_BUNDLE',
+ 'BUNDLE',
'3'
);
@@ -155,7 +155,7 @@
'Example services bundle',
parsedatetime('2018-11-02 12:57:00.000 UTC', 'yyyy-MM-dd hh:mm:ss.SSS z'),
parsedatetime('2018-11-02 12:57:00.000 UTC', 'yyyy-MM-dd hh:mm:ss.SSS z'),
- 'EXTENSION_BUNDLE',
+ 'BUNDLE',
'3'
);
@@ -224,7 +224,7 @@
'Example service API bundle',
parsedatetime('2018-11-02 12:58:00.000 UTC', 'yyyy-MM-dd hh:mm:ss.SSS z'),
parsedatetime('2017-11-02 12:58:00.000 UTC', 'yyyy-MM-dd hh:mm:ss.SSS z'),
- 'EXTENSION_BUNDLE',
+ 'BUNDLE',
'3'
);
diff --git a/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/UnsecuredNiFiRegistryClientIT.java b/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/UnsecuredNiFiRegistryClientIT.java
index 077eab9..f0e15b4 100644
--- a/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/UnsecuredNiFiRegistryClientIT.java
+++ b/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/UnsecuredNiFiRegistryClientIT.java
@@ -752,7 +752,7 @@
// verify 3 bundle items
final List<BucketItem> extensionBundleItems = allItems.stream()
- .filter(i -> i.getType() == BucketItemType.Extension_Bundle)
+ .filter(i -> i.getType() == BucketItemType.Bundle)
.collect(Collectors.toList());
assertEquals(3, extensionBundleItems.size());
