You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/04/01 21:45:13 UTC
incubator-usergrid git commit: Fix for
https://issues.apache.org/jira/browse/USERGRID-530
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 4d7be242c -> 5000c3324
Fix for https://issues.apache.org/jira/browse/USERGRID-530
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5000c332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5000c332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5000c332
Branch: refs/heads/master
Commit: 5000c332454b2162044f35ba350835ed5509ef11
Parents: 4d7be24
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Apr 1 12:16:40 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Apr 1 12:16:40 2015 -0400
----------------------------------------------------------------------
.../rest/applications/ServiceResource.java | 13 ++-
.../applications/assets/AssetResourceIT.java | 107 +++++++++++++++++++
2 files changed, 117 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5000c332/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
index 8fd57bf..d5ef311 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
@@ -387,9 +387,16 @@ public class ServiceResource extends AbstractContextResource {
ServiceResults sr = executeServiceRequest( ui, response, ServiceAction.DELETE, null );
- for ( Entity entity : sr.getEntities() ) {
- if ( entity.getProperty( AssetUtils.FILE_METADATA ) != null ) {
- binaryStore.delete( services.getApplicationId(), entity );
+ // if we deleted an entity (and not a connection or collection) then
+ // we may need to clean up binary asset data associated with that entity
+
+ if ( !sr.getResultsType().equals( ServiceResults.Type.CONNECTION )
+ && !sr.getResultsType().equals( ServiceResults.Type.COLLECTION )) {
+
+ for ( Entity entity : sr.getEntities() ) {
+ if ( entity.getProperty( AssetUtils.FILE_METADATA ) != null ) {
+ binaryStore.delete( services.getApplicationId(), entity );
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5000c332/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
index deab062..b41659d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
@@ -17,6 +17,7 @@
package org.apache.usergrid.rest.applications.assets;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.UUID;
@@ -40,6 +41,7 @@ import org.apache.commons.io.IOUtils;
import com.sun.jersey.multipart.FormDataMultiPart;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.apache.usergrid.utils.MapUtils.hashMap;
@@ -273,4 +275,109 @@ public class AssetResourceIT extends AbstractRestIT {
node = resource().path( "/test-organization/test-app/foos/" + uuid ).queryParam( "access_token", access_token )
.accept( MediaType.APPLICATION_JSON_TYPE ).delete( JsonNode.class );
}
+
+
+ /**
+ * Deleting a connection to an asset should not delete the asset or the asset's data
+ */
+ @Test
+ public void deleteConnectionToAsset() throws IOException {
+
+ UserRepo.INSTANCE.load( resource(), access_token );
+
+ final String uuid;
+
+ // create the entity that will be the asset, an image
+
+ Map<String, String> payload = hashMap("name", "cassandra_eye.jpg");
+
+ JsonNode node = resource().path("/test-organization/test-app/foos")
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(JsonNode.class, payload);
+ JsonNode idNode = node.get("entities").get(0).get("uuid");
+ uuid = idNode.getTextValue();
+
+ // post image data to the asset entity
+
+ byte[] data = IOUtils.toByteArray(this.getClass().getResourceAsStream("/cassandra_eye.jpg"));
+ resource().path("/test-organization/test-app/foos/" + uuid)
+ .queryParam("access_token", access_token)
+ .type(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+ .put(data);
+
+ // create an imagegallery entity
+
+ Map<String, String> imageGalleryPayload = hashMap("name", "my image gallery");
+
+ JsonNode imageGalleryNode = resource().path("/test-organization/test-app/imagegalleries")
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(JsonNode.class, imageGalleryPayload);
+
+ JsonNode imageGalleryIdNode = imageGalleryNode.get("entities").get(0).get("uuid");
+ String imageGalleryId = imageGalleryIdNode.getTextValue();
+
+ // connect imagegallery to asset
+
+ JsonNode connectNode = resource()
+ .path("/test-organization/test-app/imagegalleries/" + imageGalleryId + "/contains/" + uuid)
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(JsonNode.class);
+
+ // verify connection from imagegallery to asset
+
+ JsonNode listConnectionsNode = resource()
+ .path("/test-organization/test-app/imagegalleries/" + imageGalleryId + "/contains/")
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(JsonNode.class);
+ assertEquals(uuid, listConnectionsNode.get("entities").get(0).get("uuid").getTextValue());
+
+ // delete the connection
+
+ resource().path("/test-organization/test-app/imagegalleries/" + imageGalleryId + "/contains/" + uuid)
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .delete();
+
+ // verify that connection is gone
+
+ listConnectionsNode = resource()
+ .path("/test-organization/test-app/imagegalleries/" + imageGalleryId + "/contains/")
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .get(JsonNode.class);
+ assertFalse(listConnectionsNode.get("entities").getElements().hasNext());
+
+ // asset should still be there
+
+ JsonNode assetNode = resource().path("/test-organization/test-app/foos/" + uuid)
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON_TYPE)
+ .get(JsonNode.class);
+
+ logNode(assetNode);
+ Assert.assertEquals("image/jpeg", assetNode.findValue(AssetUtils.CONTENT_TYPE).getTextValue());
+ Assert.assertEquals(7979, assetNode.findValue("content-length").getIntValue());
+ JsonNode assetIdNode = assetNode.get("entities").get(0).get("uuid");
+ assertEquals(uuid, assetIdNode.getTextValue());
+
+ // asset data should still be there
+
+ InputStream assetIs = resource().path("/test-organization/test-app/foos/" + uuid)
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+ .get(InputStream.class);
+
+ byte[] foundData = IOUtils.toByteArray(assetIs);
+ assertEquals(7979, foundData.length);
+ }
}