You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/01/13 22:31:54 UTC

[1/4] usergrid git commit: Added additional test file and test case to verify the issue in USERGRID-144. Also, added fix to file not getting rid of text metadata and being properly replaced by image asset.

Repository: usergrid
Updated Branches:
  refs/heads/master c080b02b1 -> fb94d6e7a


Added additional test file and test case to verify the issue in USERGRID-144. Also, added fix to file not getting rid of text metadata and being properly replaced by image asset.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d9d69d28
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d9d69d28
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d9d69d28

Branch: refs/heads/master
Commit: d9d69d28e64d44a4bcb9efc3fb6d01e901e8cf8b
Parents: 3bb61da
Author: George Reyes <gr...@apache.org>
Authored: Tue Jan 12 15:42:35 2016 -0800
Committer: George Reyes <gr...@apache.org>
Committed: Tue Jan 12 15:42:35 2016 -0800

----------------------------------------------------------------------
 .../rest/applications/ServiceResource.java      | 11 ++-
 .../applications/assets/AssetResourceIT.java    | 80 ++++++++++++++++++++
 stack/rest/src/test/resources/test.txt          |  1 +
 3 files changed, 89 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/d9d69d28/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 9956ff7..2809eb7 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
@@ -657,16 +657,20 @@ public class ServiceResource extends AbstractContextResource {
 
         FormDataBodyPart fileBodyPart = multiPart.getField( FILE_FIELD_NAME );
 
-        if ( data.isEmpty() && fileBodyPart != null ) { // ensure entity is created even if there are no properties
+       // if ( data.isEmpty() && fileBodyPart != null ) { // ensure entity is created even if there are no properties
             data.put( AssetUtils.FILE_METADATA, new HashMap() );
-        }
+       // }
 
         // process entity
         ApiResponse response = createApiResponse();
         response.setAction( serviceAction.name().toLowerCase() );
         response.setApplication( services.getApplication() );
         response.setParams( ui.getQueryParameters() );
+        if(data.get( FILE_FIELD_NAME )==null){
+            data.put( FILE_FIELD_NAME,null );
+        }
         ServicePayload payload = getPayload( data );
+
         ServiceResults serviceResults = executeServiceRequest( ui, response, serviceAction, payload );
 
         // process file part
@@ -686,7 +690,8 @@ public class ServiceResource extends AbstractContextResource {
                     logger.error(re.getMessage());
                     response.setError( "500", re );
                 }
-                em.update( entity );
+                //em.update( entity );
+                entity = serviceResults.getEntity();
                 serviceResults.setEntity( entity );
             }
         }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d9d69d28/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 8d647e7..a413c5c 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
@@ -111,6 +111,86 @@ public class AssetResourceIT extends AbstractRestIT {
 
 
     @Test
+    public void verifyMetadataChanged() throws Exception {
+
+        //resource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).get(InputStream.class);
+
+        this.refreshIndex();
+
+        // post an entity
+
+        Map<String, String> payload = hashMap( "foo", "bar" );
+        ApiResponse postResponse = pathResource( getOrgAppPath( "foos" ) ).post( payload );
+        UUID assetId = postResponse.getEntities().get(0).getUuid();
+        assertNotNull( assetId );
+
+        // post asset to that entity
+
+        byte[] data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/cassandra_eye.jpg" ) );
+        FormDataMultiPart form = new FormDataMultiPart()
+            .field( "foo", "bar2" )
+            .field( "file", data, MediaType.MULTIPART_FORM_DATA_TYPE );
+        ApiResponse putResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
+        this.refreshIndex();
+
+        // get entity and check asset metadata
+
+        ApiResponse getResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).get( ApiResponse.class );
+        Entity entity = getResponse.getEntities().get( 0 );
+        Map<String, Object> fileMetadata = (Map<String, Object>)entity.get("file-metadata");
+        long lastModified = Long.parseLong( fileMetadata.get( AssetUtils.LAST_MODIFIED ).toString() );
+
+        assertEquals( assetId,      entity.getUuid() );
+        assertEquals( "bar2",       entity.get("foo") );
+        assertEquals( "image/jpeg", fileMetadata.get( AssetUtils.CONTENT_TYPE ) );
+        assertEquals( 7979,         fileMetadata.get( AssetUtils.CONTENT_LENGTH ));
+
+        // get asset and check size
+
+        InputStream is = pathResource( getOrgAppPath( "foos/" + assetId ) ).getAssetAsStream();
+        byte[] foundData = IOUtils.toByteArray( is );
+        assertEquals( 7979, foundData.length );
+
+        // upload new asset to entity, then check that it was updated
+
+
+        data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/test.txt" ) );
+        form = new FormDataMultiPart()
+            .field( "foo", "bar2" )
+            .field( "file", data,MediaType.MULTIPART_FORM_DATA_TYPE);
+
+        ApiResponse putResponse2 = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
+        entity = putResponse2.getEntities().get( 0 );
+        fileMetadata = (Map<String, Object>)entity.get("file-metadata");
+        long justModified = Long.parseLong( fileMetadata.get( AssetUtils.LAST_MODIFIED ).toString() );
+        assertNotEquals( lastModified, justModified );
+
+        assertEquals( assetId,      entity.getUuid() );
+        assertEquals( "text/plain", fileMetadata.get( AssetUtils.CONTENT_TYPE ) );
+        assertEquals( 76,         fileMetadata.get( AssetUtils.CONTENT_LENGTH ));
+
+        //now change it back to the picture asset
+        data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/cassandra_eye.jpg" ) );
+        form = new FormDataMultiPart()
+            .field( "foo", "bar2" )
+            .field( "file", data, MediaType.MULTIPART_FORM_DATA_TYPE );
+        putResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
+        this.refreshIndex();
+
+
+        getResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).get( ApiResponse.class );
+        entity = getResponse.getEntities().get( 0 );
+        fileMetadata = (Map<String, Object>)entity.get("file-metadata");
+        Long.parseLong( fileMetadata.get( AssetUtils.LAST_MODIFIED ).toString() );
+
+        assertEquals( assetId,      entity.getUuid() );
+        assertEquals( "bar2",       entity.get("foo") );
+        assertEquals( "image/jpeg", fileMetadata.get( AssetUtils.CONTENT_TYPE ) );
+        assertEquals( 7979,         fileMetadata.get( AssetUtils.CONTENT_LENGTH ));
+    }
+
+
+    @Test
     public void multipartPostFormOnDynamicEntity() throws Exception {
 
         this.refreshIndex();

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d9d69d28/stack/rest/src/test/resources/test.txt
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/test.txt b/stack/rest/src/test/resources/test.txt
new file mode 100644
index 0000000..79a34fc
--- /dev/null
+++ b/stack/rest/src/test/resources/test.txt
@@ -0,0 +1 @@
+random text to test assets and how they handle differing file formats here.


[2/4] usergrid git commit: Created a test that correctly emulates what occurs when running curl asset call.

Posted by sn...@apache.org.
Created a test that correctly emulates what occurs when running curl asset call.

Verified that previous assets re-write file metadata.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/818343c9
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/818343c9
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/818343c9

Branch: refs/heads/master
Commit: 818343c9cf8e4c81f4a06e311d8eda3226764118
Parents: d9d69d2
Author: George Reyes <gr...@apache.org>
Authored: Wed Jan 13 09:53:23 2016 -0800
Committer: George Reyes <gr...@apache.org>
Committed: Wed Jan 13 09:53:23 2016 -0800

----------------------------------------------------------------------
 .../applications/assets/AssetResourceIT.java    | 25 ++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/818343c9/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 a413c5c..9569d05 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
@@ -113,13 +113,11 @@ public class AssetResourceIT extends AbstractRestIT {
     @Test
     public void verifyMetadataChanged() throws Exception {
 
-        //resource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).get(InputStream.class);
-
         this.refreshIndex();
 
         // post an entity
 
-        Map<String, String> payload = hashMap( "foo", "bar" );
+        Map<String, String> payload = hashMap( "name", "verifed" );
         ApiResponse postResponse = pathResource( getOrgAppPath( "foos" ) ).post( payload );
         UUID assetId = postResponse.getEntities().get(0).getUuid();
         assertNotNull( assetId );
@@ -128,7 +126,8 @@ public class AssetResourceIT extends AbstractRestIT {
 
         byte[] data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/cassandra_eye.jpg" ) );
         FormDataMultiPart form = new FormDataMultiPart()
-            .field( "foo", "bar2" )
+            //TODO:Fix name field in assets, i mean what are they supposed to do?
+            .field( "name", "verifyMetadataChangedTest" )
             .field( "file", data, MediaType.MULTIPART_FORM_DATA_TYPE );
         ApiResponse putResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
         this.refreshIndex();
@@ -141,7 +140,6 @@ public class AssetResourceIT extends AbstractRestIT {
         long lastModified = Long.parseLong( fileMetadata.get( AssetUtils.LAST_MODIFIED ).toString() );
 
         assertEquals( assetId,      entity.getUuid() );
-        assertEquals( "bar2",       entity.get("foo") );
         assertEquals( "image/jpeg", fileMetadata.get( AssetUtils.CONTENT_TYPE ) );
         assertEquals( 7979,         fileMetadata.get( AssetUtils.CONTENT_LENGTH ));
 
@@ -154,25 +152,28 @@ public class AssetResourceIT extends AbstractRestIT {
         // upload new asset to entity, then check that it was updated
 
 
-        data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/test.txt" ) );
         form = new FormDataMultiPart()
-            .field( "foo", "bar2" )
-            .field( "file", data,MediaType.MULTIPART_FORM_DATA_TYPE);
+            .field( "name", "verifyMetadataChangedTest" )
+            .field( "file", this.getClass().getResourceAsStream( "/test.txt" ) ,MediaType.TEXT_PLAIN_TYPE);
 
-        ApiResponse putResponse2 = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
-        entity = putResponse2.getEntities().get( 0 );
+
+        pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
+        //re-get to verify data was saved to backend
+        getResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).get( ApiResponse.class );
+        entity = getResponse.getEntities().get( 0 );
         fileMetadata = (Map<String, Object>)entity.get("file-metadata");
         long justModified = Long.parseLong( fileMetadata.get( AssetUtils.LAST_MODIFIED ).toString() );
         assertNotEquals( lastModified, justModified );
 
         assertEquals( assetId,      entity.getUuid() );
+        assertNotNull(entity.get( "file" ));
         assertEquals( "text/plain", fileMetadata.get( AssetUtils.CONTENT_TYPE ) );
         assertEquals( 76,         fileMetadata.get( AssetUtils.CONTENT_LENGTH ));
 
         //now change it back to the picture asset
         data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/cassandra_eye.jpg" ) );
         form = new FormDataMultiPart()
-            .field( "foo", "bar2" )
+            .field( "name", "verifyMetadataChangedTest" )
             .field( "file", data, MediaType.MULTIPART_FORM_DATA_TYPE );
         putResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
         this.refreshIndex();
@@ -183,8 +184,8 @@ public class AssetResourceIT extends AbstractRestIT {
         fileMetadata = (Map<String, Object>)entity.get("file-metadata");
         Long.parseLong( fileMetadata.get( AssetUtils.LAST_MODIFIED ).toString() );
 
+        assertNull(entity.get( "file" ));
         assertEquals( assetId,      entity.getUuid() );
-        assertEquals( "bar2",       entity.get("foo") );
         assertEquals( "image/jpeg", fileMetadata.get( AssetUtils.CONTENT_TYPE ) );
         assertEquals( 7979,         fileMetadata.get( AssetUtils.CONTENT_LENGTH ));
     }


[3/4] usergrid git commit: Added some comments and deleting found commented out code.

Posted by sn...@apache.org.
Added some comments and deleting found commented out code.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/03c14cf0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/03c14cf0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/03c14cf0

Branch: refs/heads/master
Commit: 03c14cf01cbd277615631c9ccdbd13e447a054d5
Parents: 818343c
Author: George Reyes <gr...@apache.org>
Authored: Wed Jan 13 09:59:46 2016 -0800
Committer: George Reyes <gr...@apache.org>
Committed: Wed Jan 13 09:59:46 2016 -0800

----------------------------------------------------------------------
 .../apache/usergrid/rest/applications/ServiceResource.java    | 7 +++----
 .../usergrid/rest/applications/assets/AssetResourceIT.java    | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/03c14cf0/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 2809eb7..251ad90 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
@@ -657,20 +657,19 @@ public class ServiceResource extends AbstractContextResource {
 
         FormDataBodyPart fileBodyPart = multiPart.getField( FILE_FIELD_NAME );
 
-       // if ( data.isEmpty() && fileBodyPart != null ) { // ensure entity is created even if there are no properties
-            data.put( AssetUtils.FILE_METADATA, new HashMap() );
-       // }
+        data.put( AssetUtils.FILE_METADATA, new HashMap() );
 
         // process entity
         ApiResponse response = createApiResponse();
         response.setAction( serviceAction.name().toLowerCase() );
         response.setApplication( services.getApplication() );
         response.setParams( ui.getQueryParameters() );
+
+        //Updates entity with fields that are in text/plain as per loop above
         if(data.get( FILE_FIELD_NAME )==null){
             data.put( FILE_FIELD_NAME,null );
         }
         ServicePayload payload = getPayload( data );
-
         ServiceResults serviceResults = executeServiceRequest( ui, response, serviceAction, payload );
 
         // process file part

http://git-wip-us.apache.org/repos/asf/usergrid/blob/03c14cf0/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 9569d05..82fc999 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
@@ -155,9 +155,8 @@ public class AssetResourceIT extends AbstractRestIT {
         form = new FormDataMultiPart()
             .field( "name", "verifyMetadataChangedTest" )
             .field( "file", this.getClass().getResourceAsStream( "/test.txt" ) ,MediaType.TEXT_PLAIN_TYPE);
-
-
         pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
+
         //re-get to verify data was saved to backend
         getResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).get( ApiResponse.class );
         entity = getResponse.getEntities().get( 0 );
@@ -178,7 +177,7 @@ public class AssetResourceIT extends AbstractRestIT {
         putResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).put( form );
         this.refreshIndex();
 
-
+        //verify that data was correctly written to backend
         getResponse = pathResource( getOrgAppPath( "foos/" + assetId ) ).get( ApiResponse.class );
         entity = getResponse.getEntities().get( 0 );
         fileMetadata = (Map<String, Object>)entity.get("file-metadata");


[4/4] usergrid git commit: This closes #465 for USERGRID-144

Posted by sn...@apache.org.
This closes #465 for USERGRID-144


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fb94d6e7
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fb94d6e7
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fb94d6e7

Branch: refs/heads/master
Commit: fb94d6e7a57dcbc1bafd6ae6cbeb0091f9f47fd3
Parents: c080b02 03c14cf
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 13 16:29:12 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jan 13 16:29:12 2016 -0500

----------------------------------------------------------------------
 .../rest/applications/ServiceResource.java      | 12 ++-
 .../applications/assets/AssetResourceIT.java    | 80 ++++++++++++++++++++
 stack/rest/src/test/resources/test.txt          |  1 +
 3 files changed, 89 insertions(+), 4 deletions(-)
----------------------------------------------------------------------