no message
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a2ec1dfa Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a2ec1dfa Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a2ec1dfa Branch: refs/heads/release-2.1.1 Commit: a2ec1dfaf8ea76e7e660f7103ebfabeded57cff0 Parents: 3c98c2d Author: George Reyes <g...@apache.org> Authored: Mon Mar 14 12:28:35 2016 -0700 Committer: George Reyes <g...@apache.org> Committed: Thu Mar 24 09:13:21 2016 -0700 ---------------------------------------------------------------------- .../rest/applications/CollectionResource.java | 18 +----------------- .../apache/usergrid/services/ServiceManager.java | 3 +-- 2 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a2ec1dfa/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java index 856bce0..b7f5f93 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/CollectionResource.java @@ -113,7 +113,7 @@ public class CollectionResource extends ServiceResource { @Produces({MediaType.APPLICATION_JSON,"application/javascript"}) @RequireApplicationAccess @JSONP - public ApiResponse executeGetOnIndex( @Context UriInfo ui, String body, + public ApiResponse executeGetOnIndex( @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -121,29 +121,13 @@ public class CollectionResource extends ServiceResource { logger.trace( "CollectionResource.executeGetOnIndex" ); } - Object json; - if ( StringUtils.isEmpty( body ) ) { - json = null; - } else { - json = readJsonToObject( body ); - } - ApiResponse response = createApiResponse(); - - - response.setAction( "get" ); response.setApplication( services.getApplication() ); response.setParams( ui.getQueryParameters() ); executeServiceGetRequestForSchema( ui,response,ServiceAction.GET,null ); - ///ServicePayload payload = getPayload( json ); - - ///emf.getEntityManager( getApplicationId() ).get - - //executeServiceRequest( ui, response, ServiceAction.GET, payload ); - return response; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/a2ec1dfa/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java index 0507818..9089ab7 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/ServiceManager.java @@ -290,12 +290,11 @@ public class ServiceManager { if ( ( cls != null ) && !Modifier.isAbstract( cls.getModifiers() ) ) { return cls; } - } + } //TODO:Find a different way to express this exception. The real exception is returned above. This just needs to be handled some way. catch ( ClassNotFoundException e1 ) { if(logger.isTraceEnabled()){ logger.trace("Could not find class", e1); } - } return null; }
