You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/15 22:51:37 UTC
incubator-usergrid git commit: add overload for token
Repository: incubator-usergrid
Updated Branches:
refs/heads/UG-rest-test-framework-overhaul c7ca54e7a -> 90b516792
add overload for token
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/90b51679
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/90b51679
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/90b51679
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 90b516792060c1ca3a6d600b739a7c3ae05d680c
Parents: c7ca54e
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 15 14:51:33 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 15 14:51:33 2014 -0700
----------------------------------------------------------------------
.../endpoints/ApplicationResource.java | 8 ++++----
.../test/resource2point0/endpoints/Collection.java | 10 ++++++++--
.../resource2point0/endpoints/NamedResource.java | 17 +++++++++++++----
.../endpoints/mgmt/OrganizationResource.java | 2 +-
4 files changed, 26 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/90b51679/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationResource.java
index fd79fcb..edd2cd8 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationResource.java
@@ -40,7 +40,7 @@ public class ApplicationResource extends NamedResource {
public Application post(Application application){
- ApiResponse response = getResourceWithToken().type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ ApiResponse response =getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
.post( ApiResponse.class, application );
return new Application(response);
@@ -48,7 +48,7 @@ public class ApplicationResource extends NamedResource {
}
public Application put(Application application){
- ApiResponse response = getResourceWithToken().type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ ApiResponse response =getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
.put(ApiResponse.class, application );
return new Application(response);
@@ -57,7 +57,7 @@ public class ApplicationResource extends NamedResource {
public Application get(){
- ApiResponse response = getResourceWithToken().type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ ApiResponse response =getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
.get(ApiResponse.class);
return new Application(response);
@@ -65,7 +65,7 @@ public class ApplicationResource extends NamedResource {
}
public void delete(Application application){
- ApiResponse response = getResourceWithToken().type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ ApiResponse response =getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
.delete(ApiResponse.class );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/90b51679/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/Collection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/Collection.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/Collection.java
index 2dc590f..3a0c020 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/Collection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/Collection.java
@@ -38,13 +38,19 @@ public class Collection extends NamedResource {
super( name, context, parent );
}
-
/**
* Get a list of entities
* @return
*/
public ApiResponse get(final Optional<String> cursor){
- return getResource().get( ApiResponse.class );
+ return get(cursor,true);
+ }
+ /**
+ * Get a list of entities
+ * @return
+ */
+ public ApiResponse get(final Optional<String> cursor, final boolean useToken){
+ return getResource(useToken).get( ApiResponse.class );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/90b51679/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
index 711b016..1f49832 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
@@ -34,12 +34,14 @@ public class NamedResource implements UrlResource {
i.e If we had a ApplicationResource ( an instance of a namedResource ) this would contain the OrganizationResource.
*/
protected final UrlResource parent;
+ private boolean useToken;
public NamedResource( final String name, final ClientContext context, final UrlResource parent ) {
this.name = name;
this.context = context;
this.parent = parent;
+ this.useToken = false;
}
@@ -48,15 +50,22 @@ public class NamedResource implements UrlResource {
return name;
}
-
@Override
public WebResource getResource() {
- return parent.getResource().path( getPath() );
+ return getResource(false);
}
- public WebResource getResourceWithToken() {
+ public WebResource getResource(boolean useToken) {
WebResource resource = parent.getResource().path( getPath() );
- return resource.queryParam("access_token",this.context.getToken().getAccessToken());
+ return useToken ? resource.queryParam("access_token",this.context.getToken().getAccessToken()) : parent.getResource().path( getPath() );
+ }
+
+ public boolean useToken(){
+ return useToken;
}
+ public boolean useToken(boolean useToken){
+ this.useToken = useToken;
+ return useToken;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/90b51679/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrganizationResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrganizationResource.java
index 353d964..0b6de42 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrganizationResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrganizationResource.java
@@ -40,7 +40,7 @@ public class OrganizationResource extends NamedResource {
super( name, context, parent );
}
public Organization get() {
- Map<String,Object> response = getResourceWithToken().type(MediaType.APPLICATION_JSON_TYPE)
+ Map<String,Object> response = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
.accept(MediaType.APPLICATION_JSON).get(Organization.class);
Organization org = new Organization().mapOrgResponse(response);
return org;