usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [43/50] [abbrv] usergrid git commit: Removed the export and import endpoints from the codebase.
Date Mon, 02 May 2016 17:55:14 GMT
Removed the export and import endpoints from the codebase.


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

Branch: refs/heads/USERGRID-1246-MASTER
Commit: 61698fcae9cf1e025d0b5d3627c5921110f1c5de
Parents: c915a31
Author: George Reyes <grey@apache.org>
Authored: Fri Apr 29 10:49:34 2016 -0700
Committer: George Reyes <grey@apache.org>
Committed: Mon May 2 10:50:49 2016 -0700

----------------------------------------------------------------------
 .../organizations/OrganizationResource.java     | 162 ++------------
 .../applications/ApplicationResource.java       | 214 +++----------------
 2 files changed, 53 insertions(+), 323 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/61698fca/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 a12e484..886bf61 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
@@ -17,43 +17,43 @@
 package org.apache.usergrid.rest.management.organizations;
 
 
-import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
-import org.apache.amber.oauth2.common.exception.OAuthSystemException;
-import org.apache.commons.lang.NullArgumentException;
+import java.util.Map;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+
+import org.glassfish.jersey.server.mvc.Viewable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
 import org.apache.usergrid.exception.NotImplementedException;
 import org.apache.usergrid.management.ActivationState;
 import org.apache.usergrid.management.OrganizationConfig;
 import org.apache.usergrid.management.OrganizationInfo;
-import org.apache.usergrid.management.export.ExportService;
-import org.apache.usergrid.persistence.entities.Export;
 import org.apache.usergrid.rest.AbstractContextResource;
 import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.applications.ServiceResource;
 import org.apache.usergrid.rest.exceptions.RedirectionException;
 import org.apache.usergrid.rest.management.organizations.applications.ApplicationsResource;
 import org.apache.usergrid.rest.management.organizations.users.UsersResource;
 import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
 import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
-import org.apache.usergrid.rest.utils.JSONPUtils;
 import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
 import org.apache.usergrid.security.tokens.exceptions.TokenException;
 import org.apache.usergrid.services.ServiceResults;
-import org.glassfish.jersey.server.mvc.Viewable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import java.util.*;
 
-import static javax.servlet.http.HttpServletResponse.*;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
 
 
 @Component("org.apache.usergrid.rest.management.organizations.OrganizationResource")
@@ -66,9 +66,6 @@ public class OrganizationResource extends AbstractContextResource {
 
     private static final Logger logger = LoggerFactory.getLogger( OrganizationsResource.class
);
 
-    @Autowired
-    protected ExportService exportService;
-
     OrganizationInfo organization;
 
 
@@ -281,121 +278,6 @@ public class OrganizationResource extends AbstractContextResource {
         return response;
     }
 
-    @POST
-    @Path("export")
-    @Consumes(APPLICATION_JSON)
-    @RequireOrganizationAccess
-    public Response exportPostJson( @Context UriInfo ui,Map<String, Object> json,
-                                    @QueryParam("callback") @DefaultValue("") String callback
)
-            throws OAuthSystemException {
-
-        if (logger.isTraceEnabled()) {
-            logger.trace("executePostJson");
-        }
-
-        Map<String, String> uuidRet = new HashMap<>();
-
-        try {
-            Object propertiesObj = json.get("properties");
-            if (propertiesObj == null) {
-                throw new NullArgumentException("Could not find 'properties'");
-            }
-            if (!(propertiesObj instanceof Map)) {
-                throw new IllegalArgumentException("'properties' not a map");
-            }
-
-            @SuppressWarnings("unchecked")
-            Map<String,Object> properties = (Map<String,Object>)propertiesObj;
-
-            String storage_provider = ( String ) properties.get( "storage_provider" );
-            if(storage_provider == null) {
-                throw new NullArgumentException( "Could not find field 'storage_provider'"
);
-            }
-
-            Object storageInfoObj = properties.get("storage_info");
-            if(storageInfoObj == null) {
-                throw new NullArgumentException( "Could not find field 'storage_info'" );
-            }
-            @SuppressWarnings("unchecked")
-            Map<String,Object> storage_info = (Map<String, Object>)storageInfoObj;
-
-            String bucketName = ( String ) storage_info.get( "bucket_location" );
-            String accessId = ( String ) storage_info.get( "s3_access_id" );
-            String secretKey = ( String ) storage_info.get( "s3_key" );
-
-            if ( bucketName == null ) {
-                throw new NullArgumentException( "Could not find field 'bucketName'" );
-            }
-            if ( accessId == null ) {
-                throw new NullArgumentException( "Could not find field 's3_access_id'" );
-            }
-            if ( secretKey == null ) {
-
-                throw new NullArgumentException( "Could not find field 's3_key'" );
-            }
-
-            json.put( "organizationId",organization.getUuid());
-
-            UUID jobUUID = exportService.schedule( json );
-            uuidRet.put( "Export Entity", jobUUID.toString() );
-        }
-        catch ( NullArgumentException e ) {
-            return Response.status( SC_BAD_REQUEST ).type( JSONPUtils.jsonMediaType( callback
) )
-                           .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback
) ).build();
-        }
-        catch ( Exception e ) {
-            //TODO:throw descriptive error message and or include on in the response
-            //TODO:fix below, it doesn't work if there is an exception. Make it look like
the OauthResponse.
-            return Response.status(  SC_INTERNAL_SERVER_ERROR ).type( JSONPUtils.jsonMediaType(
callback ) )
-                           .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback
) ).build();
-        }
-        return Response.status( SC_ACCEPTED ).entity( uuidRet ).build();
-    }
-
-    @GET
-    @RequireOrganizationAccess
-    @Path("export/{exportEntity: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
-    public Response exportGetJson( @Context UriInfo ui, @PathParam("exportEntity") UUID exportEntityUUIDStr,
-                                   @QueryParam("callback") @DefaultValue("") String callback
) throws Exception {
-
-        Export entity;
-        try {
-            entity = smf.getServiceManager( emf.getManagementAppId() ).getEntityManager()
-                        .get( exportEntityUUIDStr, Export.class );
-        }
-        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
) )
-                           .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback
) ).build();
-        }
-
-        if ( entity == null ) {
-            return Response.status( SC_BAD_REQUEST ).build();
-        }
-
-        return Response.status( SC_OK ).entity( entity).build();
-    }
-
-
-    protected Set<String> getSetFromCommaSeparatedString(String input) {
-        Set<String> ret = new HashSet<>();
-        StringTokenizer tokenizer = new StringTokenizer(input, ",");
-
-        while (tokenizer.hasMoreTokens()) {
-            ret.add(tokenizer.nextToken());
-        }
-
-        return ret;
-    }
-
-
-    protected Map<String, Object> getConfigData(OrganizationConfig orgConfig, String
itemsParam,
-                                                boolean includeDefaults, boolean includeOverrides)
{
-        boolean itemsParamEmpty = itemsParam == null || itemsParam.isEmpty() || itemsParam.equals("*");
-        return orgConfig.getOrgConfigCustomMap(itemsParamEmpty ? null : getSetFromCommaSeparatedString(itemsParam),
-                includeDefaults, includeOverrides);
-    }
-
-
     @JSONP
     @RequireSystemAccess
     @GET

http://git-wip-us.apache.org/repos/asf/usergrid/blob/61698fca/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index a8ed8dc..0e8486d 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -17,44 +17,51 @@
 package org.apache.usergrid.rest.management.organizations.applications;
 
 
-import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
-import com.google.common.base.Preconditions;
-import org.apache.amber.oauth2.common.exception.OAuthSystemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.commons.lang.NullArgumentException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
 import org.apache.commons.lang.StringUtils;
+
 import org.apache.usergrid.management.ApplicationInfo;
 import org.apache.usergrid.management.OrganizationInfo;
-import org.apache.usergrid.management.export.ExportService;
 import org.apache.usergrid.persistence.EntityManager;
 import org.apache.usergrid.persistence.core.util.Health;
-import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentials;
 import org.apache.usergrid.rest.AbstractContextResource;
 import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.applications.ServiceResource;
-import org.apache.usergrid.rest.management.organizations.applications.imports.ImportsResource;
 import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
-import org.apache.usergrid.rest.utils.JSONPUtils;
 import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
 import org.apache.usergrid.security.providers.SignInAsProvider;
 import org.apache.usergrid.security.providers.SignInProviderFactory;
 import org.apache.usergrid.services.ServiceManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-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.Map;
-import java.util.UUID;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.google.common.base.Preconditions;
 
-import static javax.servlet.http.HttpServletResponse.*;
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
 
@@ -74,9 +81,6 @@ public class ApplicationResource extends AbstractContextResource {
 
     public static final String CONFIRM_APPLICATION_IDENTIFIER = "confirm_application_identifier";
 
-    @Autowired
-    protected ExportService exportService;
-
     OrganizationInfo organization;
     UUID applicationId;
     ApplicationInfo application;
@@ -267,162 +271,6 @@ public class ApplicationResource extends AbstractContextResource {
         return response;
     }
 
-    @POST
-    @Path("export")
-    @Consumes(APPLICATION_JSON)
-    @RequireOrganizationAccess
-    public Response exportPostJson( @Context UriInfo ui,Map<String, Object> json,
-                                    @QueryParam("callback") @DefaultValue("") String callback
)
-            throws OAuthSystemException {
-
-        UsergridAwsCredentials uac = new UsergridAwsCredentials();
-
-        UUID jobUUID = null;
-        Map<String, String> uuidRet = new HashMap<String, String>();
-
-        Map<String,Object> properties;
-        Map<String, Object> storage_info;
-
-        try {
-            if((properties = ( Map<String, Object> )  json.get( "properties" )) ==
null){
-                throw new NullArgumentException("Could not find 'properties'");
-            }
-            storage_info = ( Map<String, Object> ) properties.get( "storage_info" );
-            String storage_provider = ( String ) properties.get( "storage_provider" );
-            if(storage_provider == null) {
-                throw new NullArgumentException( "Could not find field 'storage_provider'"
);
-            }
-            if(storage_info == null) {
-                throw new NullArgumentException( "Could not find field 'storage_info'" );
-            }
-
-
-            String bucketName = ( String ) storage_info.get( "bucket_location" );
-            String accessId = ( String ) storage_info.get( "s3_access_id" );
-            String secretKey = ( String ) storage_info.get( "s3_key" );
-
-            if ( bucketName == null ) {
-                throw new NullArgumentException( "Could not find field 'bucketName'" );
-            }
-            if ( accessId == null ) {
-                throw new NullArgumentException( "Could not find field 's3_access_id'" );
-            }
-            if ( secretKey == null ) {
-
-                throw new NullArgumentException( "Could not find field 's3_key'" );
-            }
-
-            json.put("organizationId", organization.getUuid());
-            json.put( "applicationId",applicationId);
-
-            jobUUID = exportService.schedule( json );
-            uuidRet.put( "Export Entity", jobUUID.toString() );
-        }
-        catch ( NullArgumentException e ) {
-            return Response.status( SC_BAD_REQUEST )
-                .type( JSONPUtils.jsonMediaType( callback ) )
-                .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback ) ).build();
-        }
-        catch ( Exception e ) {
-            // TODO: throw descriptive error message and or include on in the response
-            // TODO: fix below, it doesn't work if there is an exception.
-            // Make it look like the OauthResponse.
-            return Response.status( SC_INTERNAL_SERVER_ERROR )
-                .type( JSONPUtils.jsonMediaType( callback ) )
-                .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback ) ).build();
-        }
-
-        return Response.status( SC_ACCEPTED ).entity( uuidRet ).build();
-    }
-
-    @POST
-    @Path("collection/{collection_name}/export")
-    @Consumes(APPLICATION_JSON)
-    @RequireOrganizationAccess
-    public Response exportPostJson( @Context UriInfo ui,
-            @PathParam( "collection_name" ) String collection_name ,Map<String, Object>
json,
-            @QueryParam("callback") @DefaultValue("") String callback )
-            throws OAuthSystemException {
-
-        UsergridAwsCredentials uac = new UsergridAwsCredentials();
-        UUID jobUUID = null;
-        String colExport = collection_name;
-        Map<String, String> uuidRet = new HashMap<String, String>();
-
-        Map<String,Object> properties;
-        Map<String, Object> storage_info;
-
-        try {
-            //checkJsonExportProperties(json);
-            if((properties = ( Map<String, Object> )  json.get( "properties" )) ==
null){
-                throw new NullArgumentException("Could not find 'properties'");
-            }
-            storage_info = ( Map<String, Object> ) properties.get( "storage_info" );
-            String storage_provider = ( String ) properties.get( "storage_provider" );
-            if(storage_provider == null) {
-                throw new NullArgumentException( "Could not find field 'storage_provider'"
);
-            }
-            if(storage_info == null) {
-                throw new NullArgumentException( "Could not find field 'storage_info'" );
-            }
-
-            String bucketName = ( String ) storage_info.get( "bucket_location" );
-            String accessId = ( String ) storage_info.get( "s3_access_id" );
-            String secretKey = ( String ) storage_info.get( "s3_key" );
-
-            if ( accessId == null ) {
-                throw new NullArgumentException( "Could not find field 's3_access_id'" );
-            }
-            if ( secretKey == null ) {
-                throw new NullArgumentException( "Could not find field 's3_key'" );
-            }
-
-            if(bucketName == null) {
-                throw new NullArgumentException( "Could not find field 'bucketName'" );
-            }
-
-            json.put( "organizationId",organization.getUuid() );
-            json.put( "applicationId", applicationId);
-            json.put( "collectionName", colExport);
-
-            jobUUID = exportService.schedule( json );
-            uuidRet.put( "Export Entity", jobUUID.toString() );
-        }
-        catch ( NullArgumentException e ) {
-            return Response.status( SC_BAD_REQUEST )
-                .type( JSONPUtils.jsonMediaType( callback ) )
-                .entity( ServiceResource.wrapWithCallback( e.getMessage(), callback ) )
-                .build();
-        }
-        catch ( Exception e ) {
-
-            // TODO: throw descriptive error message and or include on in the response
-            // TODO: fix below, it doesn't work if there is an exception.
-            // Make it look like the OauthResponse.
-
-            OAuthResponse errorMsg = OAuthResponse.errorResponse( SC_INTERNAL_SERVER_ERROR
)
-                .setErrorDescription( e.getMessage() )
-                .buildJSONMessage();
-
-            return Response.status( errorMsg.getResponseStatus() )
-                .type( JSONPUtils.jsonMediaType( callback ) )
-                .entity( ServiceResource.wrapWithCallback( errorMsg.getBody(), callback )
)
-                .build();
-        }
-
-        return Response.status( SC_ACCEPTED ).entity( uuidRet ).build();
-    }
-
-
-    @Path( "imports" )
-    public ImportsResource importGetJson( @Context UriInfo ui,
-                                          @QueryParam( "callback" ) @DefaultValue( "" ) String
callback )
-        throws Exception {
-
-
-        return getSubResource( ImportsResource.class ).init( organization, application );
-    }
-
     @GET
     @Path("/status")
     public Response getStatus() {


Mime
View raw message