You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/22 17:54:15 UTC
[09/50] incubator-usergrid git commit: removing Query parameters
removing Query parameters
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/792b3e7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/792b3e7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/792b3e7f
Branch: refs/heads/two-dot-o
Commit: 792b3e7f0fcebaee6231a42f8e94ecee14d5b5c2
Parents: 9832eca
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 15 17:06:27 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 15 17:06:27 2014 -0700
----------------------------------------------------------------------
.../usergrid/rest/test/resource2point0/AbstractRestIT.java | 1 +
.../test/resource2point0/endpoints/CollectionResource.java | 3 ++-
.../rest/test/resource2point0/endpoints/EntityResource.java | 6 +-----
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/792b3e7f/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
index fe11c6f..4310718 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
@@ -21,6 +21,7 @@ import java.net.URI;
import java.net.URLClassLoader;
import java.util.Arrays;
+import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/792b3e7f/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
index 7b51a95..87f0098 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionResource.java
@@ -27,6 +27,7 @@ import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
import com.google.common.base.Optional;
+import org.apache.usergrid.services.ServiceParameter;
import javax.ws.rs.core.MediaType;
@@ -42,7 +43,7 @@ public class CollectionResource extends NamedResource {
super( name, context, parent );
}
- public EntityResource getEntityResource(final String identifier){
+ public EntityResource entity(final String identifier){
return new EntityResource( identifier, context, this );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/792b3e7f/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityResource.java
index e5a4e34..fb4e5f8 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityResource.java
@@ -36,13 +36,9 @@ public class EntityResource extends NamedResource {
super(name, context, parent);
}
- public ApiResponse get(){
- return get(new QueryParameters());
- }
- public ApiResponse get(final QueryParameters parameters){
+ public ApiResponse get(){
WebResource resource =getResource(true);
- addParametersToResource(resource,parameters);
return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
.get(ApiResponse.class);
}