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 2015/02/27 00:23:55 UTC

[08/27] incubator-usergrid git commit: [USERGRID-333] Adding Credentials object and associated resources and endpoints for retrieving client credentials in the REST test framework

[USERGRID-333] Adding Credentials object and associated resources and endpoints for retrieving client credentials in the REST test framework


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

Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 3170fccdf11dd250f472a7cd5cbda63d69e7961c
Parents: fc3a757
Author: ryan bridges <rb...@apigee.com>
Authored: Thu Feb 5 11:52:59 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Thu Feb 5 11:59:56 2015 -0500

----------------------------------------------------------------------
 .../endpoints/ApplicationsResource.java         |  5 +++
 .../endpoints/mgmt/CredentialsResource.java     | 30 ++++++++++++++++
 .../endpoints/mgmt/OrgResource.java             |  3 ++
 .../endpoints/mgmt/OrganizationResource.java    |  5 ++-
 .../test/resource2point0/model/Credentials.java | 38 ++++++++++++++++++++
 5 files changed, 80 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3170fccd/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 09c0f72..705585c 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
@@ -18,6 +18,7 @@ package org.apache.usergrid.rest.test.resource2point0.endpoints;
 
 
 import org.apache.usergrid.rest.test.resource.app.Collection;
+import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.CredentialsResource;
 import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
 import org.apache.usergrid.rest.test.resource2point0.model.Application;
 import org.apache.usergrid.rest.test.resource2point0.model.Token;
@@ -44,5 +45,9 @@ public class ApplicationsResource extends CollectionEndpoint {
 
     public TokenResource token(){return new TokenResource(context,this);}
 
+    public CredentialsResource credentials(){
+        return new CredentialsResource(  context ,this );
+    }
+
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3170fccd/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/CredentialsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/CredentialsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/CredentialsResource.java
new file mode 100644
index 0000000..a9f0fb8
--- /dev/null
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/CredentialsResource.java
@@ -0,0 +1,30 @@
+package org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt;
+
+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.ApiResponse;
+import org.apache.usergrid.rest.test.resource2point0.model.Credentials;
+import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
+
+import javax.ws.rs.core.MediaType;
+
+/**
+ */
+public class CredentialsResource  extends NamedResource {
+
+   public CredentialsResource( final ClientContext context, final UrlResource parent ) {
+       super( "credentials", context, parent );
+   }
+    public Credentials get(final QueryParameters parameters, final boolean useToken){
+        ApiResponse response = getResource(useToken).type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
+            .get(ApiResponse.class);
+        return new Credentials(response);
+    }
+    public Credentials get(final QueryParameters parameters){
+        return get(parameters, true);
+    }
+    public Credentials get() {
+        return get(null, true);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3170fccd/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
index a026271..839f2cd 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/OrgResource.java
@@ -110,5 +110,8 @@ public class OrgResource  extends NamedResource {
                 .delete(ApiResponse.class);
 
     }
+    public CredentialsResource credentials(){
+        return new CredentialsResource(  context ,this );
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3170fccd/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 a436358..5249b35 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
@@ -74,10 +74,13 @@ public class OrganizationResource extends NamedResource {
                         organization );
 
     }
-    
+
     public ApplicationResource app(){
         return new ApplicationResource(  context ,this );
     }
+    public CredentialsResource credentials(){
+        return new CredentialsResource(  context ,this );
+    }
 
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3170fccd/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
new file mode 100644
index 0000000..8a9bfc4
--- /dev/null
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Credentials.java
@@ -0,0 +1,38 @@
+package org.apache.usergrid.rest.test.resource2point0.model;
+
+import java.util.Map;
+
+/**
+ */
+public class Credentials extends Entity {
+    private String clientId;
+    private String clientSecret;
+
+    public Credentials(ApiResponse response) {
+        super(response);
+        Map<String, Object> properties = response.getProperties();
+        if (properties.containsKey("credentials")) {
+            Map<String, String> credentials = (Map<String, String>) properties.get("credentials");
+            this.setClientId(credentials.get("client_id"));
+            this.setClientSecret(credentials.get("client_secret"));
+        }
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+
+}