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:23 UTC
[17/50] incubator-usergrid git commit: add shorter method
add shorter method
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9ef6ec84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9ef6ec84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9ef6ec84
Branch: refs/heads/two-dot-o
Commit: 9ef6ec84e80bfdb3c4727dbb4aebf2724d84c1e8
Parents: 802d7dc
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Dec 16 13:54:54 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Dec 16 13:54:54 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/rest/management/OrganizationsIT.java | 6 +-----
.../usergrid/rest/test/resource2point0/AbstractRestIT.java | 4 ++++
.../test/resource2point0/endpoints/ApplicationsResource.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9ef6ec84/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 9f96193..7d576a9 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -27,6 +27,7 @@ import java.util.UUID;
import javax.ws.rs.core.MediaType;
import org.apache.usergrid.rest.test.resource2point0.ClientSetup;
+import org.apache.usergrid.rest.test.resource2point0.model.*;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -38,10 +39,6 @@ import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.TestContextSetup;
import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Organization;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
-import org.apache.usergrid.rest.test.resource2point0.model.User;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.jersey.api.client.ClientResponse;
@@ -90,7 +87,6 @@ public class OrganizationsIT extends AbstractRestIT {
assertNotNull( organizationResponse );
-
//Creates token
Token token =
clientSetup.getRestClient().management().token().post( new Token( "password", username, password ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9ef6ec84/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 1e0aa30..4918dce 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
@@ -103,4 +103,8 @@ public class AbstractRestIT extends JerseyTest {
return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app(clientSetup.getAppName());
}
+ protected ApplicationsResource getAppResource(){
+ return getApplicationResource();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9ef6ec84/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
index 5825f4f..5aad2fb 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
@@ -54,8 +54,8 @@ public class ApplicationsResource extends AbstractCollectionResource<Application
* The pattern should look like: orgs.apps.users , orgs.apps.groups and so on...
* @return
*/
- public CollectionResource users(){
- return new CollectionResource("users", context , this);
+ public UsersResource users(){
+ return new UsersResource( context , this);
}
/**