Repository: nifi-registry
Updated Branches:
  refs/heads/master 7dd88eb44 -> 88cae4f15


http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/88cae4f1/nifi-registry-provider-impl/src/test/java/org/apache/nifi/registry/metadata/TestFileSystemMetadataProvider.java
----------------------------------------------------------------------
diff --git 
a/nifi-registry-provider-impl/src/test/java/org/apache/nifi/registry/metadata/TestFileSystemMetadataProvider.java
 
b/nifi-registry-provider-impl/src/test/java/org/apache/nifi/registry/metadata/TestFileSystemMetadataProvider.java
index a0d6eb5..753ca6e 100644
--- 
a/nifi-registry-provider-impl/src/test/java/org/apache/nifi/registry/metadata/TestFileSystemMetadataProvider.java
+++ 
b/nifi-registry-provider-impl/src/test/java/org/apache/nifi/registry/metadata/TestFileSystemMetadataProvider.java
@@ -16,9 +16,6 @@
  */
 package org.apache.nifi.registry.metadata;
 
-import org.apache.nifi.registry.bucket.Bucket;
-import org.apache.nifi.registry.flow.VersionedFlow;
-import org.apache.nifi.registry.flow.VersionedFlowSnapshot;
 import org.apache.nifi.registry.provider.ProviderConfigurationContext;
 import org.apache.nifi.registry.provider.ProviderCreationException;
 import org.apache.nifi.registry.util.FileUtils;
@@ -114,17 +111,17 @@ public class TestFileSystemMetadataProvider {
         assertEquals(2, metadataProvider.getBuckets().size());
         assertEquals(1, metadataProvider.getFlows().size());
 
-        final Bucket bucket1 = metadataProvider.getBucket("bucket1");
+        final BucketMetadata bucket1 = metadataProvider.getBucket("bucket1");
         assertNotNull(bucket1);
         assertEquals("bucket1", bucket1.getIdentifier());
 
-        final Bucket bucket2 = metadataProvider.getBucket("bucket2");
+        final BucketMetadata bucket2 = metadataProvider.getBucket("bucket2");
         assertNotNull(bucket2);
         assertEquals("bucket2", bucket2.getIdentifier());
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
-        assertNotNull(versionedFlow);
-        assertEquals("flow1", versionedFlow.getIdentifier());
+        final FlowMetadata flowMetadata = metadataProvider.getFlow("flow1");
+        assertNotNull(flowMetadata);
+        assertEquals("flow1", flowMetadata.getIdentifier());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -137,13 +134,14 @@ public class TestFileSystemMetadataProvider {
     public void testCreateBucket() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_NEW_FILE));
 
-        final Bucket bucket = new Bucket();
-        bucket.setIdentifier("bucket1");
-        bucket.setName("My Bucket");
-        bucket.setDescription("This is my bucket");
-        bucket.setCreatedTimestamp(System.currentTimeMillis());
+        final BucketMetadata bucket = new StandardBucketMetadata.Builder()
+                .identifier("bucket1")
+                .name("My Bucket")
+                .description("This is my bucket")
+                .created(System.currentTimeMillis())
+                .build();
 
-        final Bucket returnedBucket = metadataProvider.createBucket(bucket);
+        final BucketMetadata returnedBucket = 
metadataProvider.createBucket(bucket);
         assertNotNull(returnedBucket);
         assertEquals(bucket.getIdentifier(), returnedBucket.getIdentifier());
         assertEquals(bucket.getName(), returnedBucket.getName());
@@ -156,7 +154,7 @@ public class TestFileSystemMetadataProvider {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
         assertEquals(2, metadataProvider.getBuckets().size());
 
-        final Bucket bucket1 = metadataProvider.getBucket("bucket1");
+        final BucketMetadata bucket1 = metadataProvider.getBucket("bucket1");
         assertNotNull(bucket1);
         assertEquals("bucket1", bucket1.getIdentifier());
         assertEquals("Bryan's Bucket", bucket1.getName());
@@ -169,7 +167,7 @@ public class TestFileSystemMetadataProvider {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
         assertEquals(2, metadataProvider.getBuckets().size());
 
-        final Bucket bucket1 = 
metadataProvider.getBucket("bucket-does-not-exist");
+        final BucketMetadata bucket1 = 
metadataProvider.getBucket("bucket-does-not-exist");
         assertNull(bucket1);
     }
 
@@ -178,16 +176,18 @@ public class TestFileSystemMetadataProvider {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
         assertEquals(2, metadataProvider.getBuckets().size());
 
-        final Bucket bucket = metadataProvider.getBucket("bucket1");
+        final BucketMetadata bucket = metadataProvider.getBucket("bucket1");
         assertNotNull(bucket);
 
-        bucket.setName("New Name");
-        bucket.setDescription("New Description");
+        final BucketMetadata updatedBucket = new 
StandardBucketMetadata.Builder(bucket)
+                .name("New Name")
+                .description("New Description")
+                .build();
 
-        final Bucket updatedBucket = metadataProvider.updateBucket(bucket);
-        assertNotNull(updatedBucket);
-        assertEquals("New Name", updatedBucket.getName());
-        assertEquals("New Description", updatedBucket.getDescription());
+        final BucketMetadata returnedBucket = 
metadataProvider.updateBucket(updatedBucket);
+        assertNotNull(returnedBucket);
+        assertEquals("New Name", returnedBucket.getName());
+        assertEquals("New Description", returnedBucket.getDescription());
     }
 
     @Test
@@ -195,13 +195,14 @@ public class TestFileSystemMetadataProvider {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
         assertEquals(2, metadataProvider.getBuckets().size());
 
-        final Bucket bucket = new Bucket();
-        bucket.setIdentifier("does-not-exist");
-        bucket.setName("My Bucket");
-        bucket.setDescription("This is my bucket");
-        bucket.setCreatedTimestamp(System.currentTimeMillis());
+        final BucketMetadata bucket = new StandardBucketMetadata.Builder()
+                .identifier("does-not-exist")
+                .name("New Name")
+                .description("New Description")
+                .created(System.currentTimeMillis())
+                .build();
 
-        final Bucket updatedBucket = metadataProvider.updateBucket(bucket);
+        final BucketMetadata updatedBucket = 
metadataProvider.updateBucket(bucket);
         assertNull(updatedBucket);
     }
 
@@ -213,14 +214,14 @@ public class TestFileSystemMetadataProvider {
         final String bucketId = "bucket1";
         assertNotNull(metadataProvider.getBucket(bucketId));
 
-        final Set<VersionedFlow> bucketFlows = 
metadataProvider.getFlows(bucketId);
+        final Set<FlowMetadata> bucketFlows = 
metadataProvider.getFlows(bucketId);
         assertNotNull(bucketFlows);
         assertEquals(1, bucketFlows.size());
 
         metadataProvider.deleteBucket(bucketId);
         assertNull(metadataProvider.getBucket(bucketId));
 
-        final Set<VersionedFlow> bucketFlows2 = 
metadataProvider.getFlows(bucketId);
+        final Set<FlowMetadata> bucketFlows2 = 
metadataProvider.getFlows(bucketId);
         assertNotNull(bucketFlows2);
         assertEquals(0, bucketFlows2.size());
     }
@@ -242,24 +243,26 @@ public class TestFileSystemMetadataProvider {
         assertEquals(2, metadataProvider.getBuckets().size());
 
         // verify bucket2 exists and has no flows
-        final Bucket bucket2 = metadataProvider.getBucket("bucket2");
+        final BucketMetadata bucket2 = metadataProvider.getBucket("bucket2");
         assertNotNull(bucket2);
         assertEquals(0, 
metadataProvider.getFlows(bucket2.getIdentifier()).size());
 
-        final VersionedFlow versionedFlow = new VersionedFlow();
-        versionedFlow.setIdentifier("flow2");
-        versionedFlow.setName("New Flow");
-        versionedFlow.setDescription("This is a new flow");
-        versionedFlow.setCreatedTimestamp(System.currentTimeMillis());
-        versionedFlow.setModifiedTimestamp(System.currentTimeMillis());
+        final FlowMetadata flowMetadata = new StandardFlowMetadata.Builder()
+                .identifier("flow2")
+                .name("New Flow")
+                .description("This is a new flow")
+                .created(System.currentTimeMillis())
+                .modified(System.currentTimeMillis())
+                .build();
 
-        final VersionedFlow createdFlow = 
metadataProvider.createFlow(bucket2.getIdentifier(), versionedFlow);
+        final FlowMetadata createdFlow = 
metadataProvider.createFlow(bucket2.getIdentifier(), flowMetadata);
         assertNotNull(createdFlow);
-        assertEquals(versionedFlow.getIdentifier(), 
createdFlow.getIdentifier());
-        assertEquals(versionedFlow.getName(), createdFlow.getName());
-        assertEquals(versionedFlow.getDescription(), 
createdFlow.getDescription());
-        assertEquals(versionedFlow.getCreatedTimestamp(), 
createdFlow.getCreatedTimestamp());
-        assertEquals(versionedFlow.getModifiedTimestamp(), 
createdFlow.getModifiedTimestamp());
+        assertEquals(flowMetadata.getIdentifier(), 
createdFlow.getIdentifier());
+        assertEquals(flowMetadata.getName(), createdFlow.getName());
+        assertEquals(flowMetadata.getDescription(), 
createdFlow.getDescription());
+        assertEquals(flowMetadata.getCreatedTimestamp(), 
createdFlow.getCreatedTimestamp());
+        assertEquals(flowMetadata.getModifiedTimestamp(), 
createdFlow.getModifiedTimestamp());
+        assertEquals(bucket2.getIdentifier(), 
createdFlow.getBucketIdentifier());
 
         assertEquals(1, 
metadataProvider.getFlows(bucket2.getIdentifier()).size());
     }
@@ -268,58 +271,62 @@ public class TestFileSystemMetadataProvider {
     public void testGetFlowExists() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
-        assertNotNull(versionedFlow);
-        assertEquals("flow1", versionedFlow.getIdentifier());
-        assertEquals("Bryan's Flow", versionedFlow.getName());
-        assertEquals("The description for Bryan's Flow.", 
versionedFlow.getDescription());
-        assertEquals(333333333, versionedFlow.getCreatedTimestamp());
-        assertEquals(444444444, versionedFlow.getModifiedTimestamp());
-        assertEquals(3, versionedFlow.getSnapshots().size());
+        final FlowMetadata flowMetadata = metadataProvider.getFlow("flow1");
+        assertNotNull(flowMetadata);
+        assertEquals("flow1", flowMetadata.getIdentifier());
+        assertEquals("Bryan's Flow", flowMetadata.getName());
+        assertEquals("The description for Bryan's Flow.", 
flowMetadata.getDescription());
+        assertEquals(333333333, flowMetadata.getCreatedTimestamp());
+        assertEquals(444444444, flowMetadata.getModifiedTimestamp());
+        assertEquals(3, flowMetadata.getSnapshotMetadata().size());
+        assertEquals("bucket1", flowMetadata.getBucketIdentifier());
     }
 
     @Test
     public void testGetFlowDoesNotExist() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = 
metadataProvider.getFlow("flow-does-not-exist");
-        assertNull(versionedFlow);
+        final FlowMetadata flowMetadata = 
metadataProvider.getFlow("flow-does-not-exist");
+        assertNull(flowMetadata);
     }
 
     @Test
     public void testUpdateFlowExists() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
-        assertNotNull(versionedFlow);
+        final FlowMetadata flowMetadata = metadataProvider.getFlow("flow1");
+        assertNotNull(flowMetadata);
 
         final String newFlowName = "New Flow Name";
         final String newFlowDescription = "New Flow Description";
-        assertNotEquals(versionedFlow.getName(), newFlowName);
-        assertNotEquals(versionedFlow.getDescription(), newFlowDescription);
-
-        versionedFlow.setName("New Flow Name");
-        versionedFlow.setDescription("New Flow Description");
-
-        final VersionedFlow updatedFlow = 
metadataProvider.updateFlow(versionedFlow);
-        assertEquals(newFlowName, updatedFlow.getName());
-        assertEquals(newFlowDescription, updatedFlow.getDescription());
-        assertEquals(versionedFlow.getCreatedTimestamp(), 
updatedFlow.getCreatedTimestamp());
-        assertTrue(updatedFlow.getModifiedTimestamp() > 
versionedFlow.getModifiedTimestamp());
+        assertNotEquals(flowMetadata.getName(), newFlowName);
+        assertNotEquals(flowMetadata.getDescription(), newFlowDescription);
+
+        final FlowMetadata updatedFlowMetadata = new 
StandardFlowMetadata.Builder(flowMetadata)
+                .name("New Flow Name")
+                .description("New Flow Description")
+                .build();
+
+        final FlowMetadata returnedFlow = 
metadataProvider.updateFlow(updatedFlowMetadata);
+        assertEquals(newFlowName, returnedFlow.getName());
+        assertEquals(newFlowDescription, returnedFlow.getDescription());
+        assertEquals(flowMetadata.getCreatedTimestamp(), 
returnedFlow.getCreatedTimestamp());
+        assertTrue(returnedFlow.getModifiedTimestamp() > 
flowMetadata.getModifiedTimestamp());
     }
 
     @Test
     public void testUpdateFlowDoesNotExist() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = new VersionedFlow();
-        versionedFlow.setIdentifier("does-not-exist");
-        versionedFlow.setName("Does Not Exist");
-        versionedFlow.setDescription("Does Not Exist");
-        versionedFlow.setCreatedTimestamp(System.currentTimeMillis());
-        versionedFlow.setModifiedTimestamp(System.currentTimeMillis());
+        final FlowMetadata flowMetadata = new StandardFlowMetadata.Builder()
+                .identifier("does-not-exist")
+                .name("Does Not Exist")
+                .description("Does Not Exist")
+                .created(System.currentTimeMillis())
+                .modified(System.currentTimeMillis())
+                .build();
 
-        final VersionedFlow updatedFlow = 
metadataProvider.updateFlow(versionedFlow);
+        final FlowMetadata updatedFlow = 
metadataProvider.updateFlow(flowMetadata);
         assertNull(updatedFlow);
     }
 
@@ -327,14 +334,14 @@ public class TestFileSystemMetadataProvider {
     public void testDeleteFlowWithSnapshots() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
-        assertNotNull(versionedFlow);
-        assertNotNull(versionedFlow.getSnapshots());
-        assertTrue(versionedFlow.getSnapshots().size() > 0);
+        final FlowMetadata flowMetadata = metadataProvider.getFlow("flow1");
+        assertNotNull(flowMetadata);
+        assertNotNull(flowMetadata.getSnapshotMetadata());
+        assertTrue(flowMetadata.getSnapshotMetadata().size() > 0);
 
-        metadataProvider.deleteFlow(versionedFlow.getIdentifier());
+        metadataProvider.deleteFlow(flowMetadata.getIdentifier());
 
-        final VersionedFlow deletedFlow = metadataProvider.getFlow("flow1");
+        final FlowMetadata deletedFlow = metadataProvider.getFlow("flow1");
         assertNull(deletedFlow);
     }
 
@@ -351,55 +358,72 @@ public class TestFileSystemMetadataProvider {
     public void testCreateFlowSnapshot() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
+        final FlowMetadata versionedFlow = metadataProvider.getFlow("flow1");
         assertNotNull(versionedFlow);
-        assertNotNull(versionedFlow.getSnapshots());
+        assertNotNull(versionedFlow.getSnapshotMetadata());
 
         int lastVersion = 1;
-        for (final VersionedFlowSnapshot snapshot : 
versionedFlow.getSnapshots()) {
+        for (final FlowSnapshotMetadata snapshot : 
versionedFlow.getSnapshotMetadata()) {
             if (snapshot.getVersion() > lastVersion) {
                 lastVersion = snapshot.getVersion();
             }
         }
 
-        final VersionedFlowSnapshot nextSnapshot = new VersionedFlowSnapshot();
-        nextSnapshot.setFlowIdentifier(versionedFlow.getIdentifier());
-        nextSnapshot.setFlowName(versionedFlow.getName());
-        nextSnapshot.setVersion(lastVersion + 1);
-        nextSnapshot.setComments("This is the next snapshot");
-        nextSnapshot.setTimestamp(System.currentTimeMillis());
+        final FlowSnapshotMetadata nextSnapshot = new 
StandardFlowSnapshotMetadata.Builder()
+                .flowIdentifier(versionedFlow.getIdentifier())
+                .flowName(versionedFlow.getName())
+                .version(lastVersion + 1)
+                .comments("This is the next snapshot")
+                .created(System.currentTimeMillis())
+                .build();
 
-        final VersionedFlowSnapshot createdSnapshot = 
metadataProvider.createFlowSnapshot(nextSnapshot);
+        final FlowSnapshotMetadata createdSnapshot = 
metadataProvider.createFlowSnapshot(nextSnapshot);
         assertEquals(nextSnapshot.getFlowIdentifier(), 
createdSnapshot.getFlowIdentifier());
         assertEquals(nextSnapshot.getFlowName(), 
createdSnapshot.getFlowName());
         assertEquals(nextSnapshot.getVersion(), createdSnapshot.getVersion());
         assertEquals(nextSnapshot.getComments(), 
createdSnapshot.getComments());
-        assertEquals(nextSnapshot.getTimestamp(), 
createdSnapshot.getTimestamp());
+        assertEquals(nextSnapshot.getCreatedTimestamp(), 
createdSnapshot.getCreatedTimestamp());
 
-        final VersionedFlow updatedFlow = metadataProvider.getFlow("flow1");
+        final FlowMetadata updatedFlow = metadataProvider.getFlow("flow1");
         assertNotNull(updatedFlow);
-        assertNotNull(updatedFlow.getSnapshots());
-        assertEquals(updatedFlow.getSnapshots().size(), 
versionedFlow.getSnapshots().size() + 1);
+        assertNotNull(updatedFlow.getSnapshotMetadata());
+        assertEquals(updatedFlow.getSnapshotMetadata().size(), 
versionedFlow.getSnapshotMetadata().size() + 1);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testCreateFlowSnapshotWhenFlowDoesNotExist() {
+        
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
+
+        final FlowSnapshotMetadata nextSnapshot = new 
StandardFlowSnapshotMetadata.Builder()
+                .flowIdentifier("does-not-exist")
+                .flowName("New Snapshot")
+                .version(1)
+                .comments("This is the next snapshot")
+                .created(System.currentTimeMillis())
+                .build();
+
+        metadataProvider.createFlowSnapshot(nextSnapshot);
     }
 
     @Test
     public void testGetFlowSnapshotExists() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlowSnapshot snapshot = 
metadataProvider.getFlowSnapshot("flow1", 1);
+        final FlowSnapshotMetadata snapshot = 
metadataProvider.getFlowSnapshot("flow1", 1);
         assertNotNull(snapshot);
         assertEquals("flow1", snapshot.getFlowIdentifier());
         assertEquals("Bryan's Flow", snapshot.getFlowName());
         assertEquals(1, snapshot.getVersion());
-        assertEquals(555555555, snapshot.getTimestamp());
+        assertEquals(555555555, snapshot.getCreatedTimestamp());
         assertEquals("These are the comments for snapshot #1.", 
snapshot.getComments());
+        assertEquals("bucket1", snapshot.getBucketIdentifier());
     }
 
     @Test
     public void testGetFlowSnapshotNameDoesNotExist() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlowSnapshot snapshot = 
metadataProvider.getFlowSnapshot("does-not-exist", 1);
+        final FlowSnapshotMetadata snapshot = 
metadataProvider.getFlowSnapshot("does-not-exist", 1);
         assertNull(snapshot);
     }
 
@@ -407,7 +431,7 @@ public class TestFileSystemMetadataProvider {
     public void testGetFlowSnapshotVersionDoesNotExist() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlowSnapshot snapshot = 
metadataProvider.getFlowSnapshot("flow1", Integer.MAX_VALUE);
+        final FlowSnapshotMetadata snapshot = 
metadataProvider.getFlowSnapshot("flow1", Integer.MAX_VALUE);
         assertNull(snapshot);
     }
 
@@ -415,22 +439,22 @@ public class TestFileSystemMetadataProvider {
     public void testDeleteSnapshotExists() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
-        assertNotNull(versionedFlow);
-        assertNotNull(versionedFlow.getSnapshots());
-        assertEquals(3, versionedFlow.getSnapshots().size());
+        final FlowMetadata flowMetadata = metadataProvider.getFlow("flow1");
+        assertNotNull(flowMetadata);
+        assertNotNull(flowMetadata.getSnapshotMetadata());
+        assertEquals(3, flowMetadata.getSnapshotMetadata().size());
 
-        final VersionedFlowSnapshot firstSnapshot = 
versionedFlow.getSnapshots().stream().findFirst().orElse(null);
+        final FlowSnapshotMetadata firstSnapshot = 
flowMetadata.getSnapshotMetadata().stream().findFirst().orElse(null);
         assertNotNull(firstSnapshot);
 
-        metadataProvider.deleteFlowSnapshot(versionedFlow.getIdentifier(), 
firstSnapshot.getVersion());
+        metadataProvider.deleteFlowSnapshot(flowMetadata.getIdentifier(), 
firstSnapshot.getVersion());
 
-        final VersionedFlow updatedFlow = metadataProvider.getFlow("flow1");
+        final FlowMetadata updatedFlow = metadataProvider.getFlow("flow1");
         assertNotNull(updatedFlow);
-        assertNotNull(updatedFlow.getSnapshots());
-        assertEquals(2, updatedFlow.getSnapshots().size());
+        assertNotNull(updatedFlow.getSnapshotMetadata());
+        assertEquals(2, updatedFlow.getSnapshotMetadata().size());
 
-        final VersionedFlowSnapshot deletedSnapshot = 
updatedFlow.getSnapshots().stream()
+        final FlowSnapshotMetadata deletedSnapshot = 
updatedFlow.getSnapshotMetadata().stream()
                 .filter(s -> s.getVersion() == 
firstSnapshot.getVersion()).findFirst().orElse(null);
         assertNull(deletedSnapshot);
     }
@@ -439,16 +463,16 @@ public class TestFileSystemMetadataProvider {
     public void testDeleteSnapshotDoesNotExist() {
         
metadataProvider.onConfigured(createConfigContext(METADATA_DEST_EXISTING));
 
-        final VersionedFlow versionedFlow = metadataProvider.getFlow("flow1");
-        assertNotNull(versionedFlow);
-        assertNotNull(versionedFlow.getSnapshots());
-        assertEquals(3, versionedFlow.getSnapshots().size());
+        final FlowMetadata flowMetadata = metadataProvider.getFlow("flow1");
+        assertNotNull(flowMetadata);
+        assertNotNull(flowMetadata.getSnapshotMetadata());
+        assertEquals(3, flowMetadata.getSnapshotMetadata().size());
 
-        metadataProvider.deleteFlowSnapshot(versionedFlow.getIdentifier(), 
Integer.MAX_VALUE);
+        metadataProvider.deleteFlowSnapshot(flowMetadata.getIdentifier(), 
Integer.MAX_VALUE);
 
-        final VersionedFlow updatedFlow = metadataProvider.getFlow("flow1");
+        final FlowMetadata updatedFlow = metadataProvider.getFlow("flow1");
         assertNotNull(updatedFlow);
-        assertNotNull(updatedFlow.getSnapshots());
-        assertEquals(3, updatedFlow.getSnapshots().size());
+        assertNotNull(updatedFlow.getSnapshotMetadata());
+        assertEquals(3, updatedFlow.getSnapshotMetadata().size());
     }
 }

http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/88cae4f1/nifi-registry-web-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-registry-web-api/pom.xml b/nifi-registry-web-api/pom.xml
index d799c23..b1a7f07 100644
--- a/nifi-registry-web-api/pom.xml
+++ b/nifi-registry-web-api/pom.xml
@@ -85,6 +85,11 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi.registry</groupId>
+            <artifactId>nifi-registry-data-model</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.nifi.registry</groupId>
             <artifactId>nifi-registry-properties</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>provided</scope>
@@ -125,10 +130,5 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.16</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi.registry</groupId>
-            <artifactId>nifi-registry-flow-data-model</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/88cae4f1/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketResource.java
----------------------------------------------------------------------
diff --git 
a/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketResource.java
 
b/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketResource.java
index fff1f2c..25f62f5 100644
--- 
a/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketResource.java
+++ 
b/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/BucketResource.java
@@ -20,7 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.apache.nifi.registry.flow.Bucket;
+import org.apache.nifi.registry.bucket.Bucket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Reply via email to