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 2015/02/26 16:43:12 UTC
[09/24] incubator-usergrid git commit: [USERGRID-333] Adding post()
method to TokenResource
[USERGRID-333] Adding post() method to TokenResource
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8fa14bee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8fa14bee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8fa14bee
Branch: refs/heads/USERGRID-273
Commit: 8fa14bee65eebca56c6587843061cc6cc5f28d06
Parents: 4698cc8
Author: ryan bridges <rb...@apigee.com>
Authored: Fri Feb 13 14:31:11 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Fri Feb 13 14:31:11 2015 -0500
----------------------------------------------------------------------
.../collection/users/RetrieveUsersTest.java | 8 +------
.../endpoints/TokenResource.java | 13 +++++++++-
.../endpoints/mgmt/TokenResource.java | 25 ++++++++++++++++----
3 files changed, 33 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8fa14bee/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
index f85cd5a..e506eee 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
@@ -37,12 +37,6 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
-/**
- * // TODO: Document this
- *
- * @author ApigeeCorporation
- * @since 4.0
- */
public class RetrieveUsersTest extends AbstractRestIT {
private static final Logger log = LoggerFactory.getLogger( RetrieveUsersTest.class );
@@ -50,10 +44,10 @@ public class RetrieveUsersTest extends AbstractRestIT {
@Test // USERGRID-1222
public void queryForUsername() throws IOException {
+
CollectionEndpoint users =this.app().collection( "users" );
Entity props = new Entity();
-
props.put( "username", "Alica" );
users.post(props);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8fa14bee/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/TokenResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/TokenResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/TokenResource.java
index d28bde2..4f9727c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/TokenResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/TokenResource.java
@@ -39,12 +39,23 @@ public class TokenResource extends NamedResource {
/**
* Obtains an access token and sets the token for the context to use in later calls
*
+ * @return
+ */
+ public Token post() {
+ Token token = getResource().accept(MediaType.APPLICATION_JSON).post(Token.class);
+ this.context.setToken(token);
+ return token;
+ }
+
+ /**
+ * Obtains an access token and sets the token for the context to use in later calls
+ *
* @param token
* @return
*/
public Token post(Token token) {
token = getResource().type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).post(Token.class, token);
+ .accept(MediaType.APPLICATION_JSON).post(Token.class, token);
this.context.setToken(token);
return token;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8fa14bee/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/TokenResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/TokenResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/TokenResource.java
index 74939ff..e19a328 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/TokenResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/TokenResource.java
@@ -19,8 +19,10 @@ package org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt;
import javax.ws.rs.core.MediaType;
+import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource2point0.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource2point0.endpoints.UrlResource;
+import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
import org.apache.usergrid.rest.test.resource2point0.model.Token;
import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
@@ -35,18 +37,31 @@ public class TokenResource extends NamedResource {
/**
- * Obtains an access token of type "application user"
- * @param token
+ * Obtains an access token and sets the token for the context to use in later calls
+ *
* @return
*/
- public Token post(Token token){
- token = getResource().type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).post(Token.class,token);
+ public Token post() {
+ Token token = getResource().type(MediaType.APPLICATION_JSON_TYPE)
+ .accept(MediaType.APPLICATION_JSON).post(Token.class);
this.context.setToken(token);
return token;
+ }
+ /**
+ * Obtains an access token and sets the token for the context to use in later calls
+ *
+ * @param token
+ * @return
+ */
+ public Token post(Token token) {
+ token = getResource().type(MediaType.APPLICATION_JSON_TYPE)
+ .accept(MediaType.APPLICATION_JSON).post(Token.class, token);
+ this.context.setToken(token);
+ return token;
}
+
public TokenResource setToken(Token token) {
this.context.setToken(token);
return this;