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:20 UTC
[17/24] incubator-usergrid git commit: [USERGRID-333] updated code
formatting
[USERGRID-333] updated code formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cec3aac1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cec3aac1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cec3aac1
Branch: refs/heads/USERGRID-273
Commit: cec3aac127425d2ad4acc2fba24b06649bc00771
Parents: 56cca48
Author: ryan bridges <rb...@apigee.com>
Authored: Wed Feb 18 13:25:37 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Wed Feb 18 13:25:37 2015 -0500
----------------------------------------------------------------------
.../endpoints/TokenResource.java | 5 +-
.../endpoints/mgmt/ApplicationResource.java | 9 +---
.../endpoints/mgmt/AuthorizeResource.java | 17 ++++---
.../endpoints/mgmt/CredentialsResource.java | 17 ++++---
.../endpoints/mgmt/OrganizationResource.java | 49 ++++++++++----------
.../endpoints/mgmt/TokenResource.java | 11 ++---
.../test/resource2point0/model/Credentials.java | 13 ++++--
.../rest/test/resource2point0/model/Token.java | 30 ++++++------
8 files changed, 76 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/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 a0c81a1..dd88dbe 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
@@ -21,7 +21,6 @@
package org.apache.usergrid.rest.test.resource2point0.endpoints;
-
import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
import org.apache.usergrid.rest.test.resource2point0.model.Token;
@@ -38,14 +37,13 @@ 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(QueryParameters params) {
- WebResource resource = getResource();
+ WebResource resource = getResource();
resource = addParametersToResource(resource, params);
Token token = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
.get(Token.class);
@@ -82,6 +80,7 @@ public class TokenResource extends NamedResource {
this.context.setToken(token);
return this;
}
+
public TokenResource clearToken() {
this.context.setToken(null);
return this;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
index 4ee8055..95fd02b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/ApplicationResource.java
@@ -20,29 +20,24 @@
package org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt;
-import org.apache.usergrid.batch.service.App;
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.Application;
-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.state.ClientContext;
import javax.ws.rs.core.MediaType;
-import java.util.Map;
/**
* Classy class class.
*/
public class ApplicationResource extends NamedResource {
- public ApplicationResource( ClientContext context, UrlResource parent) {
+ public ApplicationResource(ClientContext context, UrlResource parent) {
super("applications", context, parent);
}
public void post(Application application) {
getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).post(application);
+ .accept(MediaType.APPLICATION_JSON).post(application);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/AuthorizeResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/AuthorizeResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/AuthorizeResource.java
index 621675d..b4b312d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/AuthorizeResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/AuthorizeResource.java
@@ -1,7 +1,6 @@
package org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt;
import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.representation.Form;
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.state.ClientContext;
@@ -11,26 +10,30 @@ import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
*/
public class AuthorizeResource extends NamedResource {
public AuthorizeResource(final ClientContext context, final UrlResource parent) {
- super( "authorize", context, parent );
+ super("authorize", context, parent);
}
+
/**
* Obtains an OAuth authorization
+ *
* @param requestEntity
* @return
*/
- public Object post(Object requestEntity){
- return getResource().post(Object.class,requestEntity);
+ public Object post(Object requestEntity) {
+ return getResource().post(Object.class, requestEntity);
}
+
/**
* Obtains an OAuth authorization
+ *
* @param type
* @param requestEntity
* @return
*/
- public <T> T post(Class<T> type, Object requestEntity){
- GenericType<T> gt = new GenericType<>((Class)type);
- return getResource().post(gt.getRawClass(),requestEntity);
+ public <T> T post(Class<T> type, Object requestEntity) {
+ GenericType<T> gt = new GenericType<>((Class) type);
+ return getResource().post(gt.getRawClass(), requestEntity);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/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
index 2cfb999..8e5a334 100644
--- 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
@@ -31,21 +31,24 @@ import javax.ws.rs.core.MediaType;
/**
*/
-public class CredentialsResource extends NamedResource {
+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){
- WebResource resource = getResource(useToken);
+ public CredentialsResource(final ClientContext context, final UrlResource parent) {
+ super("credentials", context, parent);
+ }
+
+ public Credentials get(final QueryParameters parameters, final boolean useToken) {
+ WebResource resource = getResource(useToken);
resource = addParametersToResource(resource, parameters);
ApiResponse response = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
.get(ApiResponse.class);
return new Credentials(response);
}
- public Credentials get(final QueryParameters parameters){
+
+ 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/cec3aac1/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 5249b35..24a7883 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
@@ -17,18 +17,15 @@
package org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
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.Organization;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
-import org.apache.usergrid.rest.test.resource2point0.model.User;
import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
/**
* This is for the Management endpoint.
@@ -37,49 +34,51 @@ import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
*/
public class OrganizationResource extends NamedResource {
- public OrganizationResource( final String name, final ClientContext context, final UrlResource parent ) {
- super( name, context, parent );
+ public OrganizationResource(final String name, final ClientContext context, final UrlResource parent) {
+ super(name, context, parent);
}
- public UsersResource users(){
- return new UsersResource( context,this );
+ public UsersResource users() {
+ return new UsersResource(context, this);
}
public Organization get() {
ApiResponse rep = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept( MediaType.APPLICATION_JSON ).get( ApiResponse.class );
+ .accept(MediaType.APPLICATION_JSON).get(ApiResponse.class);
//TODO: not sure if this will work for multiple users.
- Organization org = new Organization( rep );
- org.setUserOwner( rep );
+ Organization org = new Organization(rep);
+ org.setUserOwner(rep);
return org;
}
/**
* This has not been implemented and will return an error.
+ *
* @return
*/
- public Organization delete(){
- Map<String,Object> response = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).delete( Organization.class );
- Organization org = new Organization().mapOrgResponse(response);
+ public Organization delete() {
+ Map<String, Object> response = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
+ .accept(MediaType.APPLICATION_JSON).delete(Organization.class);
+ Organization org = new Organization().mapOrgResponse(response);
return org;
}
//Doesn't return anything useful server side so this was made as a void. .
- public void put( Organization organization ){
- Map<String,Object> response = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).put( Organization.class,
- organization );
+ public void put(Organization organization) {
+ Map<String, Object> response = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
+ .accept(MediaType.APPLICATION_JSON).put(Organization.class,
+ organization);
}
- public ApplicationResource app(){
- return new ApplicationResource( context ,this );
+ public ApplicationResource app() {
+ return new ApplicationResource(context, this);
}
- public CredentialsResource credentials(){
- return new CredentialsResource( context ,this );
+
+ public CredentialsResource credentials() {
+ return new CredentialsResource(context, this);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/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 f68a80a..ca90ab1 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
@@ -17,23 +17,22 @@
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.ApiResponse;
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;
+import javax.ws.rs.core.MediaType;
+
/**
* Called by the ManagementResource. This contains anything token related that comes back to the ManagementResource.
*/
public class TokenResource extends NamedResource {
- public TokenResource( final ClientContext context, final UrlResource parent ) {
- super( "token", context, parent );
+ public TokenResource(final ClientContext context, final UrlResource parent) {
+ super("token", context, parent);
}
@@ -55,7 +54,7 @@ public class TokenResource extends NamedResource {
* @return
*/
public Token post(QueryParameters params) {
- WebResource resource = getResource();
+ WebResource resource = getResource();
resource = addParametersToResource(resource, params);
Token token = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
.get(Token.class);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/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
index 9244e83..5494be5 100644
--- 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
@@ -25,20 +25,23 @@ import java.util.Map;
/**
*/
public class Credentials extends Entity {
- public Credentials(){}
+ public Credentials() {
+ }
+
public Credentials(ApiResponse response) {
- setResponse( response, "credentials");
+ setResponse(response, "credentials");
}
- public Credentials mapOrgResponse(Map<String,Object> map){
+
+ public Credentials mapOrgResponse(Map<String, Object> map) {
putAll((Map<String, Object>) map.get("credentials"));
return this;
}
public String getClientSecret() {
- return (String)get("secret");
+ return (String) get("secret");
}
public String getClientId() {
- return (String)get("id");
+ return (String) get("id");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cec3aac1/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
index 8b02cc4..a63525f 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Token.java
@@ -18,55 +18,55 @@ package org.apache.usergrid.rest.test.resource2point0.model;
import java.util.LinkedHashMap;
-import java.util.Map;
/**
* Token model that contains the operations that can be done on a token.
*/
-public class Token extends Entity{
+public class Token extends Entity {
private User user;
- public Token(){
+ public Token() {
}
- public Token( String username, String password){
- this.put("grant_type","password");
+ public Token(String username, String password) {
+ this.put("grant_type", "password");
this.put("username", username);
this.put("password", password);
}
/**
* Constructor for admin/application user ( difference is in the path )
+ *
* @param grantType
* @param username
* @param password
*/
- public Token(String grantType, String username, String password){
- this.put("grant_type",grantType);
- if("client_credentials".equals(grantType)){
+ public Token(String grantType, String username, String password) {
+ this.put("grant_type", grantType);
+ if ("client_credentials".equals(grantType)) {
this.put("client_id", username);
this.put("client_secret", password);
- }else{
+ } else {
this.put("username", username);
this.put("password", password);
}
}
- public String getAccessToken(){
+ public String getAccessToken() {
return (String) this.get("access_token");
}
- public String getGrantType(){
+ public String getGrantType() {
return (String) this.get("grant_type");
}
- public Long getExpirationDate(){
- return ((Integer)this.get("expires_in")).longValue();
+ public Long getExpirationDate() {
+ return ((Integer) this.get("expires_in")).longValue();
}
- public Long getPasswordChanged(){
+ public Long getPasswordChanged() {
return (Long) this.get("passwordChanged");
}
@@ -75,7 +75,7 @@ public class Token extends Entity{
}
public User getUser() {
- return user != null ? user : new User((LinkedHashMap)get("user"));
+ return user != null ? user : new User((LinkedHashMap) get("user"));
}
}