usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject incubator-usergrid git commit: change framework to remove excess calls
Date Wed, 03 Jun 2015 20:39:00 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev 67354d04b -> 2f980d03e


change framework to remove excess calls


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

Branch: refs/heads/two-dot-o-dev
Commit: 2f980d03e1012ebda28ca4b4d569a98549c834f6
Parents: 67354d0
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Jun 3 14:38:38 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Jun 3 14:38:38 2015 -0600

----------------------------------------------------------------------
 .../rest/applications/collection/users/UserResourceIT.java       | 4 ++--
 .../rest/test/resource2point0/endpoints/SetupResource.java       | 2 +-
 .../rest/test/resource2point0/endpoints/TokenResource.java       | 4 ++--
 .../rest/test/resource2point0/endpoints/mgmt/TokenResource.java  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f980d03/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
index dd3cfe1..06004bb 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
@@ -871,7 +871,7 @@ public class UserResourceIT extends AbstractRestIT {
         assertNotNull(entity1);
 
         assertNotNull(entity2);
-        Token adminToken = this.clientSetup.getRestClient().management().token().post(Token.class,new
Token(clientSetup.getUsername(), clientSetup.getUsername()));
+        Token adminToken = this.clientSetup.getRestClient().management().token().post(false,Token.class,new
Token(clientSetup.getUsername(), clientSetup.getUsername()),null);
         // now revoke the tokens
         this.app().token().setToken(adminToken);
 
@@ -919,7 +919,7 @@ public class UserResourceIT extends AbstractRestIT {
         assertNotNull(entity2);
 
         // now revoke the token3
-        adminToken = this.clientSetup.getRestClient().management().token().post(Token.class,new
Token(clientSetup.getUsername(), clientSetup.getUsername()));
+        adminToken = this.clientSetup.getRestClient().management().token().post(false,Token.class,new
Token(clientSetup.getUsername(), clientSetup.getUsername()),null);
         // now revoke the tokens
         this.app().token().setToken(adminToken);
         usersResource.entity("edanuff").connection("revoketokens").post();

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f980d03/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
index 086a34f..4b88cf8 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
@@ -47,6 +47,6 @@ public class SetupResource extends NamedResource {
         resource.addFilter( httpBasicAuthFilter );
 
         return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON
)
-                                .get( Entity.class );
+                                .get( Entity.class);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f980d03/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 dd88dbe..9ecbadc 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
@@ -43,7 +43,7 @@ public class TokenResource extends NamedResource {
      * @return
      */
     public Token post(QueryParameters params) {
-        WebResource resource = getResource();
+        WebResource resource = getResource(false);
         resource = addParametersToResource(resource, params);
         Token token = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
             .get(Token.class);
@@ -70,7 +70,7 @@ public class TokenResource extends NamedResource {
      * @return
      */
     public Token post(Token token) {
-        token = getResource().type(MediaType.APPLICATION_JSON_TYPE)
+        token = getResource(false).type(MediaType.APPLICATION_JSON_TYPE)
             .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/2f980d03/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 ff342f7..d22665d 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
@@ -49,7 +49,7 @@ public class TokenResource extends NamedResource {
      * @return
      */
     public Token get(QueryParameters params) {
-        WebResource resource = getResource();
+        WebResource resource = getResource(false);
         resource = addParametersToResource(resource, params);
         Token token = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
                               .get(Token.class);


Mime
View raw message