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 2014/08/22 16:16:10 UTC
[74/95] [abbrv] git commit: fixed get status of file job to return
only the entities in list format and exclude the metadata information
fixed get status of file job to return only the entities in list format and exclude the metadata information
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6b089c29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6b089c29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6b089c29
Branch: refs/heads/import-feature
Commit: 6b089c29568a8095ae3547db1ce75e3defeae5b9
Parents: 16a22ff
Author: Pooja Jain <pj...@apigee.com>
Authored: Mon Aug 4 09:28:50 2014 -0700
Committer: Pooja Jain <pj...@apigee.com>
Committed: Mon Aug 4 09:28:50 2014 -0700
----------------------------------------------------------------------
.../rest/management/organizations/OrganizationResource.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6b089c29/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
index eca06ad..d7228b2 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
@@ -23,6 +23,7 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.usergrid.management.ActivationState;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.export.ExportService;
+import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.Results;
import org.apache.usergrid.persistence.cassandra.CassandraService;
import org.apache.usergrid.persistence.entities.Export;
@@ -50,6 +51,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -439,10 +441,10 @@ public class OrganizationResource extends AbstractContextResource {
public Response importFileGetJson( @Context UriInfo ui, @PathParam("importEntity") UUID importEntityUUIDStr,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
- Results entity;
+ List<Entity> entity;
try {
entity = smf.getServiceManager( CassandraService.MANAGEMENT_APPLICATION_ID ).getEntityManager()
- .getConnectedEntities(importEntityUUIDStr ,"includes",null, Results.Level.ALL_PROPERTIES);
+ .getConnectedEntities(importEntityUUIDStr ,"includes",null, Results.Level.ALL_PROPERTIES).getEntities();
}
catch ( Exception e ) { //this might not be a bad request and needs better error checking
return Response.status( SC_BAD_REQUEST ).type( JSONPUtils.jsonMediaType( callback ) )