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/09/03 22:30:27 UTC
[01/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Repository: usergrid
Updated Branches:
refs/heads/usergrid-103-upgrade-jersey [created] eb2aa6ff9
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
index 2a5b813..096422c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
@@ -17,8 +17,6 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import javax.ws.rs.core.MediaType;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
@@ -26,15 +24,14 @@ import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Organization;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
-import org.apache.usergrid.rest.test.resource.model.User;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-
-import com.sun.jersey.api.client.WebResource;
-
-import com.sun.jersey.api.representation.Form;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.io.StringReader;
@@ -62,9 +59,9 @@ public class OrgResource extends NamedResource {
// Seems like an apiresponse can't handle what gets returned from the from urlended media type
- ApiResponse response = getResource().type( MediaType.APPLICATION_FORM_URLENCODED )
+ ApiResponse response = getTarget().request()
.accept(MediaType.APPLICATION_JSON)
- .post(ApiResponse.class, form);
+ .post( Entity.form( form ), ApiResponse.class);
Organization organization = new Organization(response);
organization.setOwner( response );
@@ -77,12 +74,12 @@ public class OrgResource extends NamedResource {
public Organization post(QueryParameters parameters){
// Seems like an ApiResponse can't handle what gets returned from the from URL encoded media type
- WebResource resource = addParametersToResource( getResource(), parameters);
+ WebTarget resource = addParametersToResource( getTarget(), parameters);
// use string type so we can log actual response from server
- String responseString = resource.type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON)
- .post(String.class);
+ String responseString = resource.request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( Entity.json( null ), String.class );
logger.debug("Response from post: " + responseString);
@@ -103,9 +100,9 @@ public class OrgResource extends NamedResource {
public Organization post(Organization organization){
// use string type so we can log actual response from server
- String responseString = getResource(false).type( MediaType.APPLICATION_JSON_TYPE )
- .accept(MediaType.APPLICATION_JSON)
- .post(String.class, organization);
+ String responseString = getTarget(false).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( Entity.json(organization), String.class );
logger.debug("Response from post: " + responseString);
@@ -123,8 +120,9 @@ public class OrgResource extends NamedResource {
return org;
}
public Organization post(Organization organization, Token token){
- ApiResponse response = getResource(true,token).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
- .post( ApiResponse.class,organization );
+ ApiResponse response = getTarget(true,token).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( Entity.json(organization), ApiResponse.class );
Organization org = new Organization(response);
org.setOwner( response );
@@ -135,9 +133,9 @@ public class OrgResource extends NamedResource {
public Organization put(Organization organization){
// use string type so we can log actual response from server
- String responseString = getResource().type( MediaType.APPLICATION_JSON_TYPE )
+ String responseString = getTarget().request()
.accept(MediaType.APPLICATION_JSON)
- .put(String.class, organization);
+ .post( Entity.json( organization ), String.class );
logger.debug("Response from put: " + responseString);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrganizationResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrganizationResource.java
index cf0987e..b9bd35e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrganizationResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrganizationResource.java
@@ -43,8 +43,9 @@ public class OrganizationResource extends NamedResource {
}
public Organization get() {
- ApiResponse rep = getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).get(ApiResponse.class);
+ ApiResponse rep = getTarget( true ).request()
+ .accept(MediaType.APPLICATION_JSON)
+ .get(ApiResponse.class);
//TODO: not sure if this will work for multiple users.
Organization org = new Organization(rep);
@@ -54,9 +55,9 @@ public class OrganizationResource extends NamedResource {
// 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);
+ Map<String, Object> response = getTarget(true).request()
+ .accept(MediaType.APPLICATION_JSON)
+ .put( javax.ws.rs.client.Entity.json(organization), Organization.class);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/PasswordResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/PasswordResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/PasswordResource.java
index 59121ab..5779109 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/PasswordResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/PasswordResource.java
@@ -17,18 +17,10 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
-import org.apache.usergrid.rest.test.resource.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource.model.Entity;
-import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.client.WebResource;
/**
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ReactivateResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ReactivateResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ReactivateResource.java
index 3959b3e..70feb29 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ReactivateResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ReactivateResource.java
@@ -18,15 +18,14 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
/**
@@ -38,9 +37,8 @@ public class ReactivateResource extends NamedResource {
}
public Entity get(){
- WebResource resource = getResource(true);
- ApiResponse response = resource.type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).get( ApiResponse.class);
+ WebTarget resource = getTarget(true);
+ ApiResponse response = resource.request().accept( MediaType.APPLICATION_JSON ).get( ApiResponse.class);
return new Entity(response);
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ResetResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ResetResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ResetResource.java
index 076e284..739e2ac 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ResetResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ResetResource.java
@@ -17,13 +17,12 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
/**
@@ -36,7 +35,8 @@ public class ResetResource extends NamedResource {
}
public String post(Form formPayload) {
- return getResource().type( MediaType.APPLICATION_FORM_URLENCODED_TYPE )
- .accept( MediaType.TEXT_HTML ).post( String.class, formPayload);
+ return getTarget().request()
+ .accept( MediaType.TEXT_HTML )
+ .post( javax.ws.rs.client.Entity.form(formPayload), String.class);
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/TokenResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/TokenResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/TokenResource.java
index 613955a..54fe477 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/TokenResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/TokenResource.java
@@ -17,13 +17,13 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
@@ -49,10 +49,9 @@ public class TokenResource extends NamedResource {
* @return
*/
public Token get(QueryParameters params) {
- WebResource resource = getResource(false);
+ WebTarget resource = getTarget( false );
resource = addParametersToResource(resource, params);
- Token token = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
- .get(Token.class);
+ Token token = resource.request().accept(MediaType.APPLICATION_JSON).get(Token.class);
this.context.setToken(token);
return token;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UserResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UserResource.java
index ee804e6..a25784b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UserResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UserResource.java
@@ -16,15 +16,15 @@
*/
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
/**
@@ -71,17 +71,19 @@ public class UserResource extends NamedResource {
}
public Entity get() {
- WebResource resource = getResource( true );
- ApiResponse response = resource.type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).get( ApiResponse.class );
+ WebTarget resource = getTarget( true );
+ ApiResponse response = resource.request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get( ApiResponse.class );
return new Entity(response);
}
public Entity put(Entity userPayload){
- WebResource resource = getResource(true);
+ WebTarget resource = getTarget( true );
- ApiResponse response = resource.type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).put( ApiResponse.class, userPayload);
+ ApiResponse response = resource.request()
+ .accept( MediaType.APPLICATION_JSON )
+ .put( javax.ws.rs.client.Entity.json(userPayload), ApiResponse.class);
return new Entity(response);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UsersResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UsersResource.java
index 5ef681d..6c22469 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UsersResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/UsersResource.java
@@ -18,17 +18,11 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.EntityEndpoint;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
-import org.apache.usergrid.rest.test.resource.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.client.WebResource;
-
/**
* Handles calls to the users management endpoint
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index d1ec212..466bd45 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -197,20 +197,27 @@
<!-- SUN, Javax Package and Other Com Dependencies -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
+ <!-- Required only when you are using JAX-RS Client -->
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.21</version>
+ </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-core</artifactId>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-client</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-json</artifactId>-->
+ <!--</dependency>-->
<!-- Codehaus, JClouds, Spring and Other Org Dependencies -->
@@ -434,6 +441,7 @@
<artifactId>stream</artifactId>
<version>2.7.0</version>
</dependency>
+
<dependency>
<groupId>com.github.fernandospr</groupId>
<artifactId>java-wns</artifactId>
@@ -443,6 +451,17 @@
<artifactId>jackson-jaxrs</artifactId>
<groupId>org.codehaus.jackson</groupId>
</exclusion>
+ <!-- Would be nice if we could exclude this dependency on Jersey 1.
+ Apparently Java-WNS 1.3.1 will move to Jersey 2.
+ <exclusion>
+ <artifactId>jersey-apache-client</artifactId>
+ <groupId>com.sun.jersey.contribs</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jersey-client</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ -->
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/services/src/main/java/org/apache/usergrid/security/providers/AbstractProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/AbstractProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/AbstractProvider.java
index 85179e3..2ca1052 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/providers/AbstractProvider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/AbstractProvider.java
@@ -22,13 +22,11 @@ import java.util.Map;
import com.sun.jersey.core.util.MultivaluedMapImpl;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManager;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.jackson.JacksonFeature;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.core.MultivaluedMap;
@@ -43,9 +41,9 @@ public abstract class AbstractProvider implements SignInAsProvider {
AbstractProvider( EntityManager entityManager, ManagementService managementService ) {
this.entityManager = entityManager;
this.managementService = managementService;
- ClientConfig clientConfig = new DefaultClientConfig();
- clientConfig.getFeatures().put( JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE );
- client = Client.create( clientConfig );
+ ClientConfig clientConfig = new ClientConfig();
+ clientConfig.register( new JacksonFeature() );
+ client = ClientBuilder.newClient( clientConfig );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/services/src/main/java/org/apache/usergrid/security/providers/FacebookProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/FacebookProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/FacebookProvider.java
index 30a497e..3931091 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/providers/FacebookProvider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/FacebookProvider.java
@@ -93,8 +93,11 @@ public class FacebookProvider extends AbstractProvider {
@Override
Map<String, Object> userFromResource( String externalToken ) {
- return client.resource( apiUrl ).queryParam( "access_token", externalToken )
- .accept( MediaType.APPLICATION_JSON ).get( Map.class );
+ return client.target( apiUrl )
+ .queryParam( "access_token", externalToken )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get( Map.class );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
index d7b136e..738a20f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
@@ -17,14 +17,8 @@
package org.apache.usergrid.security.providers;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.Query;
@@ -32,12 +26,18 @@ import org.apache.usergrid.persistence.Results;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.security.tokens.exceptions.BadTokenException;
import org.apache.usergrid.utils.JsonUtils;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.jackson.JacksonFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
import static org.apache.usergrid.utils.ListUtils.anyNull;
@@ -85,12 +85,16 @@ public class FoursquareProvider extends AbstractProvider {
@Override
public User createOrAuthenticate( String externalToken ) throws BadTokenException {
- ClientConfig clientConfig = new DefaultClientConfig();
- clientConfig.getFeatures().put( JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE );
- Client client = Client.create( clientConfig );
- WebResource web_resource = client.resource( "https://api.foursquare.com/v2/users/self" );
- Map<String, Object> body = web_resource.queryParam( "oauth_token", externalToken ).queryParam( "v", "20120623" )
- .accept( MediaType.APPLICATION_JSON ).get( Map.class );
+ ClientConfig clientConfig = new ClientConfig();
+ clientConfig.register( new JacksonFeature() );
+ client = ClientBuilder.newClient( clientConfig );
+
+ Map<String, Object> body = client.target( "https://api.foursquare.com/v2/users/self" )
+ .queryParam( "oauth_token", externalToken )
+ .queryParam( "v", "20120623" )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get(Map.class);
Map<String, Object> fq_user = ( Map<String, Object> ) ( ( Map<?, ?> ) body.get( "response" ) ).get( "user" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
index f8a66e9..939532f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
@@ -17,22 +17,21 @@
package org.apache.usergrid.security.providers;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.persistence.entities.User;
+import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.security.tokens.exceptions.BadTokenException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JsonNode;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
/**
@@ -122,18 +121,17 @@ public class PingIdentityProvider extends AbstractProvider {
@Override
- Map<String, Object> userFromResource( String externalToken ) {
+ Map<String, Object> userFromResource(String externalToken) {
- MultivaluedMap<String, String> formData = getMultivaluedMapImpl();
- formData.add("grant_type", "urn:pingidentity.com:oauth2:grant_type:validate_bearer");
- formData.add("client_id", clientId);
- formData.add("client_secret", clientSecret);
- formData.add("token", externalToken);
+ MultivaluedMap<String, String> formData = getMultivaluedMapImpl();
+ formData.add( "grant_type", "urn:pingidentity.com:oauth2:grant_type:validate_bearer" );
+ formData.add( "client_id", clientId );
+ formData.add( "client_secret", clientSecret );
+ formData.add( "token", externalToken );
- JsonNode node = client.resource( apiUrl )
- .type( MediaType.APPLICATION_FORM_URLENCODED_TYPE )
- .post( JsonNode.class, formData );
+ JsonNode node = client.target( apiUrl ).request()
+ .post( Entity.entity( formData, MediaType.APPLICATION_FORM_URLENCODED_TYPE ), JsonNode.class );
String rawEmail = node.get( "access_token" ).get( "subject" ).asText();
[09/10] usergrid git commit: Changes to configure our filters
correctly, and numerous other test fixes. Only 7 REST tests are not passing.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
index 787306c..0db7601 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
@@ -24,7 +24,7 @@ import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Ignore;
import org.junit.Test;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import java.io.IOException;
import static org.junit.Assert.*;
@@ -149,7 +149,7 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.createGroup(groupName, groupSpacePath);
fail("Should not be able to create a group with a space in the path");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", node.get( "error" ).textValue() );
@@ -192,7 +192,7 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("groups").uniqueID(groupName).get();
fail("Entity still exists");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "entity_not_found", node.get( "error" ).textValue() );
@@ -298,7 +298,7 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("role").entity(role).get();
fail("Entity still exists");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "entity_not_found", node.get( "error" ).textValue() );
@@ -367,7 +367,7 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("cats").uniqueID(catName).put(fluffy);
fail("permissions should not allow this");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ) );
assertEquals( "unauthorized", node.get( "error" ).textValue() );
@@ -377,7 +377,7 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("cats").uniqueID(catName).delete();
fail("permissions should not allow this");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "unauthorized", node.get( "error" ).textValue() );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
index af3ce9b..3655300 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import java.io.IOException;
import java.util.Map;
@@ -71,7 +71,7 @@ public class ConnectionResourceTest extends AbstractRestIT {
this.app().collection("users").entity(scott).collection("likes").collection("peeps").entity(peep).get();
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
// Should return a 404 Not Found
assertEquals(404, uie.getResponse().getStatus());
}
@@ -162,7 +162,7 @@ public class ConnectionResourceTest extends AbstractRestIT {
//attempt to retrieve thing1
thing2 = this.app().collection("things").entity(thing2).get();
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
// Should return a 404 Not Found
assertEquals(404, uie.getResponse().getStatus());
}
@@ -198,7 +198,7 @@ public class ConnectionResourceTest extends AbstractRestIT {
//attempt to retrieve thing1
thing1 = this.app().collection("things").entity(thing1).get();
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
// Should return a 404 Not Found
assertEquals(404, uie.getResponse().getStatus());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
index f90b6ae..cfd08e5 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import org.apache.usergrid.utils.MapUtils;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -152,7 +152,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
int status = 0;
try {
data = devices.entity("device2").get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
@@ -176,7 +176,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
status = 0;
try{
data = devices.entity("device1").get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
@@ -283,7 +283,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
int status = 200;
try {
likeRestaurants.entity("arrogantbutcher").get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
assertEquals(status, 404);
@@ -291,7 +291,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
status = 200;
try {
likeRestaurants.entity( arrogantButcherId ).get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
assertEquals(status, 404);
@@ -320,7 +320,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
status = 200;
try {
data = likeRestaurants.entity( "4peaks" ).get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
@@ -331,7 +331,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
try {
likeRestaurants.entity( peaksId ).get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
index f9f1743..49d7c00 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
@@ -28,7 +28,7 @@ import org.apache.usergrid.utils.UUIDUtils;
import org.junit.Before;
import org.junit.Test;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Response;
import java.io.IOException;
@@ -106,7 +106,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
int status = 0;
try {
node = this.app().collection("users").entity(USER).collection("roles").entity(ROLE).get();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status = e.getResponse().getStatus();
}
@@ -158,7 +158,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
try {
this.app().collection("users").entity(user).collection("groups").entity( groupPath ).collection( "users" ).entity( user ).get();
fail("Should not have been able to retrieve the user as it was deleted");
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
status=e.getResponse().getStatus();
assertEquals( 404,status );
}
@@ -198,7 +198,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
//Call a get on a existing entity with no access token and check if we get a 401
try {
this.app().collection( "roles" ).entity( "guest" ).get( false );
- }catch(ResponseProcessingException uie){
+ }catch(ClientErrorException uie){
assertEquals( 401,uie.getResponse().getStatus() );
}
@@ -209,13 +209,13 @@ public class PermissionsResourceIT extends AbstractRestIT {
//Call a get on a non existing entity that doesn't need permissions and check it we get a 404.
try {
this.app().collection( "roles" ).entity( "banana" ).get( false );
- }catch(ResponseProcessingException uie){
+ }catch(ClientErrorException uie){
assertEquals( 404,uie.getResponse().getStatus() );
}
try {
this.app().collection( "roles" ).entity( UUIDUtils.newTimeUUID() ).get( false );
- }catch(ResponseProcessingException uie){
+ }catch(ClientErrorException uie){
assertEquals( 404,uie.getResponse().getStatus() );
}
}
@@ -302,7 +302,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("noca").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = uie.getResponse().getStatus();
}
@@ -315,7 +315,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("4peaks").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = uie.getResponse().getStatus();
}
@@ -355,7 +355,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("cowboyciao").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = uie.getResponse().getStatus();
}
@@ -369,7 +369,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("currycorner").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = uie.getResponse().getStatus();
}
@@ -472,7 +472,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("books").post(book);
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = uie.getResponse().getStatus();
}
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), status );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/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 71a8447..dc8daf9 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
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.rest.applications.utils.UserRepo;
import org.apache.usergrid.utils.UUIDUtils;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Response;
import java.io.IOException;
@@ -588,7 +588,7 @@ public class UserResourceIT extends AbstractRestIT {
userRoles = this.app().collection("roles").entity(roleId1).connection("users")
.get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
assertNull(userRoles);
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
assertEquals( Response.Status.NOT_FOUND.getStatusCode(), e.getResponse().getStatus());
}
@@ -817,7 +817,7 @@ public class UserResourceIT extends AbstractRestIT {
int responseStatus = 0;
try {
usersResource.entity("edanuff").connection("password").post(data);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = uie.getResponse().getStatus();
}
@@ -869,7 +869,7 @@ public class UserResourceIT extends AbstractRestIT {
role = usersResource.entity(createdId).collection("roles").entity(roleName).get();
assertNull(role);
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
assertEquals(e.getResponse().getStatus(), Response.Status.NOT_FOUND.getStatusCode());
}
}
@@ -907,7 +907,7 @@ public class UserResourceIT extends AbstractRestIT {
usersResource.entity("edanuff").get();
assertFalse(true);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
}
@@ -919,7 +919,7 @@ public class UserResourceIT extends AbstractRestIT {
this.app().token().setToken(token2);
usersResource.entity("edanuff").get();
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
}
@@ -955,7 +955,7 @@ public class UserResourceIT extends AbstractRestIT {
this.app().token().setToken(token3);
usersResource.entity("edanuff").get();
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
}
@@ -969,7 +969,7 @@ public class UserResourceIT extends AbstractRestIT {
status = Response.Status.OK.getStatusCode();
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
}
@@ -1002,7 +1002,7 @@ public class UserResourceIT extends AbstractRestIT {
userResource.entity("test_1").connection("token").get(
new QueryParameters().addParam("access_token", "blah"), false);
assertTrue(false);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
log.info("Error Response Body: " + uie.getResponse().readEntity(String.class));
}
@@ -1013,7 +1013,7 @@ public class UserResourceIT extends AbstractRestIT {
userResource.entity("test_2").connection("token").get(
new QueryParameters().addParam("access_token", token.getAccessToken()), false);
assertTrue(false);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
log.info("Error Response Body: " + uie.getResponse().readEntity(String.class));
}
@@ -1041,7 +1041,7 @@ public class UserResourceIT extends AbstractRestIT {
try {
this.app().token().post(new Token("test_1", "test123"));
fail("request for deactivated user should fail");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
status = uie.getResponse().getStatus();
JsonNode body = mapper.readTree(uie.getResponse().readEntity(String.class));
assertEquals("user not activated", body.findPath("error_description").textValue());
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
index c4b24b4..0692667 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
@@ -21,7 +21,7 @@ import org.apache.usergrid.rest.test.resource.model.Collection;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Test;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
@@ -54,7 +54,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -80,7 +80,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -106,7 +106,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -132,7 +132,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -158,7 +158,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -184,7 +184,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
index fba7c66..f47fba0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
@@ -22,7 +22,7 @@ import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -62,7 +62,7 @@ public class BasicGeoTests extends AbstractRestIT {
try {
node = this.app().collection( collectionType ).post( entityData ).getEntity();
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -100,7 +100,7 @@ public class BasicGeoTests extends AbstractRestIT {
try {
entity = this.app().collection( collectionType ).post( entityData ).getEntities().get(0);
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -116,7 +116,7 @@ public class BasicGeoTests extends AbstractRestIT {
try {
node = context.collection( collectionType ).get(entityName);
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -134,7 +134,7 @@ public class BasicGeoTests extends AbstractRestIT {
//entity.put(entityData);
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -177,7 +177,7 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( misspelledLatitudeEntityData ).getEntity();
fail("System allowed misspelled location property - latitudee, which it should not");
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
//verify the correct error was returned
JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ) );
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
@@ -193,7 +193,7 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( misspelledLongitudeEntityData ).getEntity();
fail("System allowed misspelled location property - longitudee, which it should not");
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
//verify the correct error was returned
JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
@@ -224,7 +224,7 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( latitudeOnlyEntityData ).getEntity();
fail("System allowed location with only one point, latitude, which it should not");
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
//verify the correct error was returned
JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
@@ -240,7 +240,7 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( notDoubleLatLonEntityData ).getEntity();
fail("System allowed misspelled location values that are not doubles for latitude and longitude, which it should not");
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
//verify the correct error was returned
JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
index 7edc2a7..431d224 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
@@ -27,7 +27,7 @@ import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
@@ -65,7 +65,7 @@ public class AccessTokenIT extends AbstractRestIT {
Response.Status responseStatus = null;
try {
management().users().user( clientSetup.getUsername() ).get( ApiResponse.class);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -198,8 +198,8 @@ public class AccessTokenIT extends AbstractRestIT {
try {
management().token().post( Token.class,payload );
- } catch (ResponseProcessingException uie) {
- assertEquals(Response.Status.BAD_REQUEST, uie.getResponse().getStatus());
+ } catch (ClientErrorException uie) {
+ assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus());
}
}
@@ -218,7 +218,7 @@ public class AccessTokenIT extends AbstractRestIT {
try {
management().token().post( Token.class, payload );
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus());
}
@@ -246,7 +246,7 @@ public class AccessTokenIT extends AbstractRestIT {
management().users().user( clientSetup.getUsername() ).get();
fail( "Token1 should have been revoked" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
@@ -257,7 +257,7 @@ public class AccessTokenIT extends AbstractRestIT {
management().users().user( clientSetup.getUsername() ).get();
fail( "Token2 should have been revoked" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
}
@@ -287,7 +287,7 @@ public class AccessTokenIT extends AbstractRestIT {
management().users().user( clientSetup.getUsername() ).get();
fail( "Token1 should have been revoked" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
@@ -297,7 +297,7 @@ public class AccessTokenIT extends AbstractRestIT {
management().token().setToken( token2 );
management().users().user( clientSetup.getUsername() ).get();
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "Token2 shouldn't have been revoked" );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index 09c49e1..9864e65 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -31,7 +31,8 @@ import org.jvnet.mock_javamail.Mailbox;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
+import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
import java.io.IOException;
@@ -83,7 +84,7 @@ public class AdminUsersIT extends AbstractRestIT {
try {
management.token().post(false, Token.class, new Token( username, password ),null);
fail( "We shouldn't be able to get a token using the old password" );
- }catch(ResponseProcessingException uie) {
+ }catch(ClientErrorException uie) {
errorParse( 400,"invalid_grant",uie );
}
}
@@ -120,7 +121,7 @@ public class AdminUsersIT extends AbstractRestIT {
management.users().user( username ).password().post( Entity.class ,passwordPayload );
fail("We shouldn't be able to change the password with the same payload");
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
errorParse( Response.Status.BAD_REQUEST.getStatusCode(),"auth_invalid_username_or_password",uie );
}
@@ -146,14 +147,14 @@ public class AdminUsersIT extends AbstractRestIT {
this.refreshIndex();
- assertNotNull(management.token().post( false,Token.class, new Token( username, "testPassword" ) ,null ));
+ assertNotNull( management.token().post( false, Token.class, new Token(username, "testPassword"), null ));
- //Check that we cannot get the token using the old password
+ // Check that we cannot get the token using the old password
try {
management.token().post( false,Token.class, new Token( username, password) ,null);
fail( "We shouldn't be able to get a token using the old password" );
- }catch(ResponseProcessingException uie) {
+ } catch(ClientErrorException uie) {
errorParse( 400,"invalid_grant",uie );
}
}
@@ -236,7 +237,7 @@ public class AdminUsersIT extends AbstractRestIT {
management().token().get( queryParameters );
fail( "Admin user should not be able to log in." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( "Admin user should have failed with 403", 403, uie.getResponse().getStatus() );
}
@@ -494,7 +495,7 @@ public class AdminUsersIT extends AbstractRestIT {
fail( "should fail with conflict" );
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
assertEquals( 409, e.getResponse().getStatus() );
}
@@ -513,7 +514,7 @@ public class AdminUsersIT extends AbstractRestIT {
fail( "should fail with conflict" );
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
assertEquals( 409, e.getResponse().getStatus() );
}
}
@@ -617,20 +618,24 @@ public class AdminUsersIT extends AbstractRestIT {
* Makes sure you can't create a already existing organization from a user connection.
* @throws Exception
*/
- //TODO: figure out what is the expected behavior from this test. While it fails it is not sure what it should return
+ // TODO: figure out what is the expected behavior from this test.
+ // While it fails it is not sure what it should return
@Test
public void createOrgFromUserConnectionFail() throws Exception {
- Token token = management().token().post(Token.class ,new Token( clientSetup.getUsername(),clientSetup.getPassword() ) );
+ Token token = management().token()
+ .post( Token.class, new Token( clientSetup.getUsername(), clientSetup.getPassword() ) );
management().token().setToken( token );
+
// try to create the same org again off the connection
try {
- management().users().user( clientSetup.getUsername() ).organizations().post( clientSetup.getOrganization(),token );
+ management().users().user( clientSetup.getUsername() ).organizations()
+ .post( clientSetup.getOrganization(), token );
fail( "Should have thrown unique exception on org name" );
}
- catch ( ResponseProcessingException uie ) {
- assertEquals(500,uie.getResponse().getStatus());
+ catch ( InternalServerErrorException ise ) {
+ assertEquals(500, ise.getResponse().getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
index a4f5f2d..939363f 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
@@ -23,7 +23,7 @@ import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.junit.Ignore;
import org.junit.Test;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Response;
import java.util.HashMap;
import java.util.Map;
@@ -48,7 +48,7 @@ public class ExportResourceIT extends AbstractRestIT {
management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() ).addToPath( "export" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail("We got back " + uie.getResponse().getStatus() + " instead of having a successful call" );
}
@@ -68,7 +68,7 @@ public class ExportResourceIT extends AbstractRestIT {
.app().addToPath( clientSetup.getAppUuid()).addToPath( "collection" )
.addToPath( "users" ).addToPath( "export" ).post(ApiResponse.class,payloadBuilder() );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -92,7 +92,7 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payloadBuilder() );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -106,7 +106,7 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -135,7 +135,7 @@ public class ExportResourceIT extends AbstractRestIT {
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class, payloadBuilder() );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -150,7 +150,7 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -180,7 +180,7 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -201,7 +201,7 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get( ApiResponse.class );
fail( "Should not have been able to get fake uuid" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -219,7 +219,7 @@ public class ExportResourceIT extends AbstractRestIT {
new HashMap<String, Object>() );
fail( "Should not have passed, The payload is empty." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -233,7 +233,7 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).post( ApiResponse.class, new HashMap<String, Object>() );
fail( "Should not have passed, The payload is empty." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -250,7 +250,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed, The payload is empty." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -267,7 +267,7 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -283,7 +283,7 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -298,7 +298,7 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -317,7 +317,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -339,7 +339,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -361,7 +361,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -380,7 +380,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -402,7 +402,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -424,7 +424,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -445,7 +445,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -461,7 +461,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -477,7 +477,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -498,7 +498,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -515,7 +515,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -532,7 +532,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -554,7 +554,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -572,7 +572,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
@@ -590,7 +590,7 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index c55f953..784ff67 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -49,7 +49,7 @@ import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Response;
import java.io.File;
import java.util.ArrayList;
@@ -211,7 +211,7 @@ public class ImportResourceIT extends AbstractRestIT {
this.management().orgs().org( org ).app().addToPath(app)
.addToPath("imports").addToPath(entity.getUuid().toString()).get();
fail("Should not be able to read import job with unauthorized token");
- } catch (ResponseProcessingException ex) {
+ } catch (ClientErrorException ex) {
errorParse(401, "unauthorized", ex);
}
@@ -229,7 +229,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertEquals(Response.Status.BAD_REQUEST, responseStatus);
@@ -249,7 +249,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertEquals(Response.Status.BAD_REQUEST, responseStatus);
@@ -271,7 +271,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertEquals(Response.Status.BAD_REQUEST, responseStatus);
@@ -294,7 +294,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertEquals(Response.Status.BAD_REQUEST, responseStatus);
@@ -307,7 +307,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertEquals(Response.Status.BAD_REQUEST, responseStatus);
@@ -320,7 +320,7 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertEquals(Response.Status.BAD_REQUEST, responseStatus);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 386f3b9..a26c8c7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -99,11 +99,12 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void crossOrgsNotViewable() throws Exception {
- String username = "test" + UUIDUtils.newTimeUUID();
- String name = "someguy2";
- String email = "someguy" + "@usergrid.com";
+ String differentiator = UUIDUtils.newTimeUUID().toString();
+ String username = "test" + differentiator;
+ String name = "someguy2" + differentiator;
+ String email = "someguy" + differentiator + "@usergrid.com";
String password = "password";
- String orgName = "someneworg" + UUIDUtils.newTimeUUID();
+ String orgName = "someneworg" + differentiator;
Entity payload =
new Entity().chainPut("company", "Apigee" );
@@ -121,7 +122,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
returnVal = this.management().orgs().org( orgName ).get(String.class);
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -133,7 +134,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( this.clientSetup.getOrganizationName() ).get( String.class );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -145,7 +146,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( this.clientSetup.getOrganizationName() ).get( String.class );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -336,7 +337,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
userdata = management.users().user(clientSetup.getEmail()).get();
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -455,7 +456,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
management.token().post( JsonNode.class, payload );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus());
}
@@ -476,7 +477,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
management.token().post( JsonNode.class, payload );
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -507,7 +508,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
response = management.users().user(clientSetup.getUsername()).get();
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -530,7 +531,7 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
management.users().user(clientSetup.getUsername()).get();
}
- catch ( ResponseProcessingException uie ) {
+ catch ( ClientErrorException uie ) {
status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
@@ -589,7 +590,7 @@ public class ManagementResourceIT extends AbstractRestIT {
fail( "Validation should have failed" );
- } catch (ResponseProcessingException actual) {
+ } catch (ClientErrorException actual) {
assertEquals( 404, actual.getResponse().getStatus() );
String errorMsg = actual.getResponse().readEntity( JsonNode.class )
.get( "error_description" ).toString();
@@ -640,7 +641,7 @@ public class ManagementResourceIT extends AbstractRestIT {
ApiResponse postResponse = pathResource( "management/token" ).post( false, ApiResponse.class, loginInfo );
fail( "Login as Admin User must fail when validate external tokens is enabled" );
- } catch (ResponseProcessingException actual) {
+ } catch (ClientErrorException actual) {
assertEquals( 400, actual.getResponse().getStatus() );
String errorMsg = actual.getResponse().readEntity( JsonNode.class )
.get( "error_description" ).toString();
@@ -648,7 +649,7 @@ public class ManagementResourceIT extends AbstractRestIT {
assertTrue( errorMsg.contains( "Admin Users must login via" ) );
} catch (Exception e) {
- fail( "We expected a ResponseProcessingException" );
+ fail( "We expected a ClientErrorException" );
}
// login as superuser must succeed
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index a0ebf6e..64ad8b0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -29,7 +29,7 @@ import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.RestClient;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
@@ -123,7 +123,7 @@ public class OrganizationsIT extends AbstractRestIT {
clientSetup.getRestClient().management().orgs().post( orgTestDuplicatePayload );
fail("Should not have been able to create duplicate organization");
}
- catch ( ResponseProcessingException ex ) {
+ catch ( ClientErrorException ex ) {
errorParse( 400,duplicateUniquePropertyExistsErrorMessage, ex );
}
@@ -135,7 +135,7 @@ public class OrganizationsIT extends AbstractRestIT {
tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
fail( "Should not have created user" );
}
- catch ( ResponseProcessingException ex ) {
+ catch ( ClientErrorException ex ) {
errorParse( 400,invalidGrantErrorMessage, ex );
}
@@ -179,7 +179,7 @@ public class OrganizationsIT extends AbstractRestIT {
clientSetup.getRestClient().management().orgs().post( orgDuplicatePayload );
fail( "Should not have created organization" );
}
- catch ( ResponseProcessingException ex ) {
+ catch ( ClientErrorException ex ) {
errorParse( 400,duplicateUniquePropertyExistsErrorMessage,ex);
}
@@ -190,7 +190,7 @@ public class OrganizationsIT extends AbstractRestIT {
tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
fail( "Should not have created organization" );
}
- catch ( ResponseProcessingException ex ) {
+ catch ( ClientErrorException ex ) {
errorParse( 400,invalidGrantErrorMessage,ex );
}
@@ -222,7 +222,7 @@ public class OrganizationsIT extends AbstractRestIT {
try{
Organization organizationReturned = clientSetup.getRestClient().management().orgs().post(queryParameters);
fail();
- }catch (ResponseProcessingException e){
+ }catch (ClientErrorException e){
assertEquals("ensure bad request",e.getResponse().getStatus(), 400);
}
@@ -295,7 +295,7 @@ public class OrganizationsIT extends AbstractRestIT {
//Delete default organization
clientSetup.getRestClient().management().orgs().org( clientSetup.getOrganizationName() ).delete();
fail( "Delete is not implemented yet" );
- }catch(ResponseProcessingException uie){
+ }catch(ClientErrorException uie){
assertEquals( Response.Status.NOT_IMPLEMENTED ,uie.getResponse().getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
index fc18292..efa1536 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
import javax.mail.*;
import javax.mail.internet.MimeMultipart;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
import java.io.IOException;
@@ -109,7 +109,7 @@ public class RegistrationIT extends AbstractRestIT {
.request()
.accept(MediaType.APPLICATION_JSON)
.put( javax.ws.rs.client.Entity.form(form) );
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
assertEquals("Should receive a 404 Not Found", 404, e.getResponse().getStatus());
}
} finally {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
index cc5807e..4282853 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
@@ -29,10 +29,16 @@ import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.test.DeploymentContext;
import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
+import org.glassfish.jersey.test.spi.TestContainer;
+import org.glassfish.jersey.test.spi.TestContainerFactory;
import org.junit.Rule;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Application;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLClassLoader;
@@ -56,13 +62,14 @@ public class AbstractRestIT extends JerseyTest {
@Rule
public ClientSetup clientSetup = new ClientSetup( this.getBaseURI().toString() );
-// protected static final Application descriptor;
-//
-// public AbstractRestIT() {
-// super( descriptor );
-// }
+ protected static final Application descriptor = new Application();
+ @Override
+ protected Application configure() {
+ return descriptor;
+ }
+
protected ObjectMapper mapper = new ObjectMapper();
static {
@@ -109,10 +116,31 @@ public class AbstractRestIT extends JerseyTest {
}
}
-// @Override
-// protected TestContainerFactory getTestContainerFactory() {
-// return new ExternalTestContainerFactory();
-// }
+ @Override
+ protected TestContainerFactory getTestContainerFactory() {
+ final URI baseURI = getBaseURI();
+ return (uri, deploymentContext) -> new TestContainer() {
+ @Override
+ public ClientConfig getClientConfig() {
+ return clientConfig;
+ }
+
+ @Override
+ public URI getBaseUri() {
+ return baseURI;
+ }
+
+ @Override
+ public void start() {
+ // noop
+ }
+
+ @Override
+ public void stop() {
+ // noop
+ }
+ };
+ }
///myorg/
protected OrganizationResource org(){
@@ -151,13 +179,13 @@ public class AbstractRestIT extends JerseyTest {
/**
- * Takes in the expectedStatus message and the expectedErrorMessage then compares it to the ResponseProcessingException
+ * Takes in the expectedStatus message and the expectedErrorMessage then compares it to the ClientErrorException
* to make sure that we got what we expected.
* @param expectedStatus
* @param expectedErrorMessage
* @param uie
*/
- public void errorParse(int expectedStatus, String expectedErrorMessage, ResponseProcessingException uie){
+ public void errorParse(int expectedStatus, String expectedErrorMessage, ClientErrorException uie){
assertEquals(expectedStatus,uie.getResponse().getStatus());
JsonNode errorJson = uie.getResponse().readEntity( JsonNode.class );
assertEquals( expectedErrorMessage, errorJson.get( "error" ).asText() );
@@ -165,16 +193,16 @@ public class AbstractRestIT extends JerseyTest {
}
- protected Token getAdminToken(String username, String password){
- return this.clientSetup.getRestClient().management().token().post(false,Token.class,
- new Token(username, password),null,false
- );
+ protected Token getAdminToken(String username, String password) {
+ Token token = new Token(username, password);
+ return this.clientSetup.getRestClient().management().token()
+ .post( false, Token.class, token, null, false );
}
- protected Token getAdminToken(){
- return this.clientSetup.getRestClient().management().token().post(false,Token.class,
- new Token(this.clientSetup.getUsername(),this.clientSetup.getUsername()),null,false
- );
+ protected Token getAdminToken() {
+ Token token = new Token(this.clientSetup.getUsername(), this.clientSetup.getPassword());
+ return this.clientSetup.getRestClient().management().token()
+ .post( false, Token.class, token, null, false);
}
public Map<String, Object> getRemoteTestProperties() {
return clientSetup.getRestClient().testPropertiesResource().get().getProperties();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
index 3254173..f13e215 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java
@@ -30,6 +30,7 @@ import org.junit.runners.model.Statement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.BadRequestException;
import java.io.IOException;
@@ -95,7 +96,7 @@ public class ClientSetup implements TestRule {
try {
restClient.superuserSetup();
superuserToken = restClient.management().token().get(superuserName, superuserPassword);
- } catch ( Exception e ) {
+ } catch ( BadRequestException e ) {
if ( logger.isDebugEnabled() ) {
logger.debug( "Error creating superuser, may already exist", e );
} else {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
index 23fa6c3..827f874 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
@@ -22,6 +22,7 @@ import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResource;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
@@ -40,7 +41,9 @@ public class RestClient implements UrlResource {
public WebTarget resource;
ClientConfig config = new ClientConfig();
- Client client = ClientBuilder.newClient( config );
+
+ Client client = ClientBuilder.newClient( config )
+ .register(MultiPartFeature.class);
/**
*
@@ -111,9 +114,11 @@ public class RestClient implements UrlResource {
}
public void superuserSetup() {
- this.getTarget().path( "system/superuser/setup" ).request()
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
+
+ HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder()
+ .credentials( "superuser", "superpassword" ).build();
+
+ getTarget().path( "system/superuser/setup" ).register( feature ).request()
.accept( MediaType.APPLICATION_JSON )
.get( JsonNode.class );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
index 336d709..34e3a84 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
@@ -22,8 +22,10 @@ import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import static org.glassfish.jersey.client.authentication.HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME;
+import static org.glassfish.jersey.client.authentication.HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.MultiPart;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
@@ -46,11 +48,10 @@ public class NamedResource implements UrlResource {
protected final String name;
protected final ClientContext context;
- /* Stores the path of the parent that called it.
- i.e If we had a ApplicationResource ( an instance of a namedResource ) this would contain the OrganizationResource.
- */
- protected final UrlResource parent;
+ /** Stores the path of the parent that called it. i.e If we had a ApplicationResource
+ (an instance of a namedResource) this would contain the OrganizationResource. */
+ protected final UrlResource parent;
public NamedResource( final String name, final ClientContext context, final UrlResource parent ) {
this.name = name;
@@ -58,7 +59,6 @@ public class NamedResource implements UrlResource {
this.parent = parent;
}
-
@Override
public String getPath() {
return name + getMatrix();
@@ -68,17 +68,19 @@ public class NamedResource implements UrlResource {
public WebTarget getTarget() {
return getTarget( false );
}
+
public WebTarget getTarget(boolean useToken) {
return getTarget( useToken, null );
}
- public WebTarget getTarget(boolean useToken,Token token) {
+
+ public WebTarget getTarget(boolean useToken, Token token) {
WebTarget resource = parent.getTarget().path( getPath() );
token = token !=null ? token : this.context.getToken();
//error checking
if (token == null) {
return resource;
}
- return useToken ? resource.queryParam("access_token",token.getAccessToken()) : resource;
+ return useToken ? resource.queryParam("access_token", token.getAccessToken()) : resource;
}
protected WebTarget addParametersToResource(WebTarget resource, final QueryParameters parameters){
@@ -246,8 +248,10 @@ public class NamedResource implements UrlResource {
if ( useBasicAuthentication ) {
- builder = builder.property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword");
+ String uname = (String)entity.get("username");
+ String pword = (String)entity.get("password");
+ builder = builder.property( HTTP_AUTHENTICATION_BASIC_USERNAME, uname )
+ .property( HTTP_AUTHENTICATION_BASIC_PASSWORD, pword );
}
// it's OK for the entity to be null
@@ -258,7 +262,7 @@ public class NamedResource implements UrlResource {
//For edge cases like Organizations and Tokens without any payload
public <T> T get(Class<T> type) {
- return get(type,null,true);
+ return get(type, null, true);
}
@@ -273,9 +277,9 @@ public class NamedResource implements UrlResource {
return get( type, queryParameters, true );
}
- public <T> T get(Class<T> type,QueryParameters queryParameters, boolean useToken) {
+ public <T> T get(Class<T> type, QueryParameters queryParameters, boolean useToken) {
WebTarget resource = getTarget( useToken );
- if(queryParameters!=null) {
+ if (queryParameters != null) {
resource = addParametersToResource(resource, queryParameters);
}
GenericType<T> gt = new GenericType<>((Class) type);
@@ -289,13 +293,13 @@ public class NamedResource implements UrlResource {
return "";
}
- public ApiResponse post( boolean useToken, FormDataMultiPart multiPartForm ) {
+ public ApiResponse post( boolean useToken, MultiPart multiPartForm ) {
WebTarget resource = getTarget( useToken );
return resource.request().post(
javax.ws.rs.client.Entity.entity( multiPartForm, multiPartForm.getMediaType() ), ApiResponse.class );
}
- public ApiResponse post( FormDataMultiPart multiPartForm ) {
+ public ApiResponse post( MultiPart multiPartForm ) {
return post( true, multiPartForm );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
index 75f1b6b..f11b062 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
@@ -39,10 +39,10 @@ public class SetupResource extends NamedResource {
WebTarget resource = getTarget();
resource = addParametersToResource( resource, queryParameters );
- return resource.request()
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
- .accept( MediaType.APPLICATION_JSON )
- .get( Entity.class );
+ HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder()
+ .credentials( "superuser", "superpassword" ).build();
+
+ return resource.register( feature ).request()
+ .accept( MediaType.APPLICATION_JSON ).get( Entity.class );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
index 096422c..0569ac2 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/OrgResource.java
@@ -28,7 +28,10 @@ import org.apache.usergrid.rest.test.resource.state.ClientContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
@@ -100,11 +103,14 @@ public class OrgResource extends NamedResource {
public Organization post(Organization organization){
// use string type so we can log actual response from server
- String responseString = getTarget(false).request()
- .accept( MediaType.APPLICATION_JSON )
- .post( Entity.json(organization), String.class );
-
- logger.debug("Response from post: " + responseString);
+ String responseString = null;
+ try {
+ responseString = getTarget( false ).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( Entity.json( organization ), String.class );
+ } catch ( ClientErrorException e ) {
+ logger.info("Response from post: " + e.getMessage() + ": " + e.getResponse().readEntity( String.class ));
+ }
ObjectMapper mapper = new ObjectMapper();
ApiResponse response;
@@ -120,9 +126,9 @@ public class OrgResource extends NamedResource {
return org;
}
public Organization post(Organization organization, Token token){
- ApiResponse response = getTarget(true,token).request()
+ ApiResponse response = getTarget( true, token ).request()
.accept( MediaType.APPLICATION_JSON )
- .post( Entity.json(organization), ApiResponse.class );
+ .post( Entity.json( organization ), ApiResponse.class );
Organization org = new Organization(response);
org.setOwner( response );
@@ -134,7 +140,7 @@ public class OrgResource extends NamedResource {
// use string type so we can log actual response from server
String responseString = getTarget().request()
- .accept(MediaType.APPLICATION_JSON)
+ .accept( MediaType.APPLICATION_JSON )
.post( Entity.json( organization ), String.class );
logger.debug("Response from put: " + responseString);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/log4j.properties b/stack/rest/src/test/resources/log4j.properties
index 71dd540..201550b 100644
--- a/stack/rest/src/test/resources/log4j.properties
+++ b/stack/rest/src/test/resources/log4j.properties
@@ -18,7 +18,7 @@
# and the pattern to %c instead of %l. (%l is slower.)
# output messages into a rolling log file as well as stdout
-log4j.rootLogger=WARN,stdout
+log4j.rootLogger=ERROR,stdout
# stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -26,12 +26,12 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
+log4j.logger.org.glassfish=DEBUG
+log4j.logger.org.apache.shiro=DEBUG
log4j.logger.org.apache.usergrid=INFO
+
#log4j.logger.org.apache.usergrid.cassandra=DEBUG
#log4j.logger.org.apache.usergrid.persistence.cassandra=DEBUG
-log4j.category.org.apache=ERROR
-log4j.category.org.apache.usergrid=WARN
-log4j.category.org.apache.usergrid.rest=INFO
log4j.logger.org.apache.usergrid.persistence.cassandra.CounterUtils=ERROR
log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN
@@ -46,6 +46,20 @@ log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR
log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG
log4j.logger.org.apache.usergrid.rest.filters.MeteringFilter=ERROR
+log4j.logger.org.apache.usergrid.rest=DEBUG
+log4j.logger.org.apache.usergrid.rest.exceptions=DEBUG
+
+#log4j.logger.org.apache.usergrid.rest.NotificationsIT=DEBUG
+#log4j.logger.org.apache.usergrid.cassandra.CassandraResource=DEBUG
+#log4j.logger.org.apache.usergrid.rest.TomcatResource=INFO
+#log4j.logger.org.apache.usergrid.rest.management=DEBUG
+#log4j.logger.org.apache.usergrid.rest.management.users=DEBUG
+#log4j.logger.org.apache.usergrid.rest.organizations.users=DEBUG
+#log4j.logger.org.apache.usergrid.rest.applications.users.UsersResource=DEBUG
+#log4j.logger.org.apache.usergrid.rest.applications.ServiceResource=DEBUG
+#log4j.logger.org.apache.usergrid.rest.security=DEBUG
+#log4j.logger.org.apache.usergrid.security=DEBUG
+
#log4j.logger.org.apache.usergrid.corepersistence=DEBUG
#log4j.logger.org.apache.usergrid.corepersistence.CpRelationManager=DEBUG
#log4j.logger.org.apache.usergrid.corepersistence.CpEntityManager=DEBUG
@@ -69,19 +83,7 @@ log4j.logger.org.apache.usergrid.rest.filters.MeteringFilter=ERROR
#log4j.logger.org.apache.usergrid.services.notifiers=DEBUG
#log4j.logger.org.apache.usergrid.services.groups.users.devices=DEBUG
-log4j.logger.org.apache.usergrid.rest=DEBUG
-log4j.logger.org.apache.usergrid.rest.exceptions=DEBUG
-#log4j.logger.org.apache.usergrid.rest.NotificationsIT=DEBUG
-#log4j.logger.org.apache.usergrid.cassandra.CassandraResource=DEBUG
-#log4j.logger.org.apache.usergrid.rest.TomcatResource=INFO
-#log4j.logger.org.apache.usergrid.rest.management=DEBUG
-#log4j.logger.org.apache.usergrid.rest.management.users=DEBUG
-#log4j.logger.org.apache.usergrid.rest.organizations.users=DEBUG
-#log4j.logger.org.apache.usergrid.rest.applications.users.UsersResource=DEBUG
-#log4j.logger.org.apache.usergrid.rest.applications.ServiceResource=DEBUG
-#log4j.logger.org.apache.usergrid.rest.security=DEBUG
-#log4j.logger.org.apache.usergrid.security=DEBUG
-
#log4j.logger.org.elasticsearch=DEBUG
#log4j.logger.com.netflix.hystrix=DEBUG
#log4j.logger.org.antlr=DEBUG
+
[08/10] usergrid git commit: Changes to configure our filters
correctly, and numerous other test fixes. Only 7 REST tests are not passing.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/resources/logging.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/logging.properties b/stack/rest/src/test/resources/logging.properties
index a0eca06..ecbbf0c 100644
--- a/stack/rest/src/test/resources/logging.properties
+++ b/stack/rest/src/test/resources/logging.properties
@@ -15,14 +15,15 @@
# limitations under the License.
# Tweak this file to get more logging out Jersey and other depedencies that use
-# Java Logging instead of our preferred SLF4J via Log4j setup.
+# Java Logging instead of our preferred SLF4J via Log4j setup.
-handlers=java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level=FINEST
-java.util.logging.SimpleFormatter.format=%4$-7s [%3$s] %5$s%6$s%n
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
+#java.util.logging.ConsoleHandler.level=FINEST
+#java.util.logging.SimpleFormatter.format=%4$-7s [%3$s] %5$s%6$s%n
#All log level details
.level=INFO
-#org.glassfish.jersey.level=FINE
-#org.glassfish.jersey.tracing.level=FINE
+org.glassfish.jersey.level=FINE
+org.glassfish.jersey.tracing.level=FINE
+
#com.sun.jersey.level=FINE
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 466bd45..a771b34 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -204,6 +204,12 @@
<version>2.21</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-jackson</artifactId>
+ <version>2.21</version>
+ </dependency>
+
<!--<dependency>-->
<!--<groupId>com.sun.jersey</groupId>-->
<!--<artifactId>jersey-core</artifactId>-->
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
index 738a20f..cdba485 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/FoursquareProvider.java
@@ -17,8 +17,6 @@
package org.apache.usergrid.security.providers;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.Query;
@@ -32,8 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -94,7 +90,7 @@ public class FoursquareProvider extends AbstractProvider {
.queryParam( "v", "20120623" )
.request()
.accept( MediaType.APPLICATION_JSON )
- .get(Map.class);
+ .get( Map.class );
Map<String, Object> fq_user = ( Map<String, Object> ) ( ( Map<?, ?> ) body.get( "response" ) ).get( "user" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java
index e0561a2..b48fd77 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java
@@ -62,12 +62,13 @@ public class OrganizationIT {
@Test
public void testCreateOrganization() throws Exception {
-// UserInfo user =
-// setup.getMgmtSvc().createAdminUser( uniqueUsername(), "Ed Anuff", uniqueEmail(), "test", false, false );
-// assertNotNull( user );
+// UserInfo user =
+// setup.getMgmtSvc().createAdminUser( uniqueUsername(), "Ed Anuff", uniqueEmail(), "test", false, false );
+// assertNotNull( user );
final String orgName = uniqueOrg();
- OrganizationOwnerInfo organization = newOrgAppAdminRule.createOwnerAndOrganization( orgName, uniqueUsername(), uniqueEmail(),"Ed Anuff", "test" ); //setup.getMgmtSvc().getOrganizationsForAdminUser( organization.getOwner().getUuid() );
+ OrganizationOwnerInfo organization =
+ newOrgAppAdminRule.createOwnerAndOrganization( orgName, uniqueUsername(), uniqueEmail(),"Ed Anuff", "test" ); //setup.getMgmtSvc().getOrganizationsForAdminUser( organization.getOwner().getUuid() );
//createOrganization( orgName, user, false );
assertNotNull( organization );
@@ -80,13 +81,15 @@ public class OrganizationIT {
organization.getOrganization().getUuid());
assertEquals("wrong number of users", 1, users.size());
- ApplicationInfo applicationInfo = setup.getMgmtSvc().createApplication(organization.getOrganization().getUuid(), "ed-application");
+ ApplicationInfo applicationInfo = setup.getMgmtSvc()
+ .createApplication(organization.getOrganization().getUuid(), "ed-application");
assertNotNull(applicationInfo.getId());
setup.getEntityIndex().refresh(applicationInfo.getId());
- Map<UUID, String> applications = setup.getMgmtSvc().getApplicationsForOrganization( organization.getOrganization().getUuid() );
+ Map<UUID, String> applications = setup.getMgmtSvc()
+ .getApplicationsForOrganization( organization.getOrganization().getUuid() );
assertEquals( "wrong number of applications", 1, applications.size() );
OrganizationInfo organization2 = setup.getMgmtSvc().getOrganizationForApplication( applicationInfo.getId() );
@@ -100,7 +103,8 @@ public class OrganizationIT {
setup.getEntityIndex().refresh(CpNamingUtils.MANAGEMENT_APPLICATION_ID);
- UserInfo u = setup.getMgmtSvc().verifyAdminUserPasswordCredentials( organization.getOwner().getUuid().toString(), "test" );
+ UserInfo u = setup.getMgmtSvc().verifyAdminUserPasswordCredentials(
+ organization.getOwner().getUuid().toString(), "test" );
assertNotNull( u );
String token = setup.getMgmtSvc().getAccessTokenForAdminUser( organization.getOwner().getUuid(), 0 );
[06/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
index 67498cd..9b9207b 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueResource.java
@@ -17,39 +17,23 @@
package org.apache.usergrid.rest.applications.queues;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import org.apache.commons.lang.StringUtils;
+import org.apache.usergrid.exception.NotImplementedException;
+import org.apache.usergrid.mq.*;
+import org.apache.usergrid.rest.AbstractContextResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-import org.apache.usergrid.exception.NotImplementedException;
-import org.apache.usergrid.mq.Message;
-import org.apache.usergrid.mq.QueueManager;
-import org.apache.usergrid.mq.QueueQuery;
-import org.apache.usergrid.mq.QueueResults;
-import org.apache.usergrid.rest.AbstractContextResource;
-
-import org.apache.commons.lang.StringUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Component
@@ -106,31 +90,37 @@ public class QueueResource extends AbstractContextResource {
@Path("properties")
@GET
- public JSONWithPadding getProperties( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Queue getProperties( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueResource.getProperties" );
- return new JSONWithPadding( mq.getQueue( queuePath ), callback );
+ return mq.getQueue( queuePath );
}
@Path("properties")
@PUT
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding putProperties( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Queue putProperties( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueResource.putProperties" );
- return new JSONWithPadding( mq.updateQueue( queuePath, json ), callback );
+ return mq.updateQueue( queuePath, json );
}
@GET
- public JSONWithPadding executeGet( @Context UriInfo ui, @QueryParam("start") String firstQueuePath,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Object executeGet( @Context UriInfo ui, @QueryParam("start") String firstQueuePath,
@QueryParam("limit") @DefaultValue("10") int limit,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -140,33 +130,32 @@ public class QueueResource extends AbstractContextResource {
QueueQuery query = QueueQuery.fromQueryParams( ui.getQueryParameters() );
QueueResults results = mq.getFromQueue( queuePath, query );
- return new JSONWithPadding( results, callback );
+ return results;
}
logger.info( "QueueResource.executeGet" );
- return new JSONWithPadding( mq.getQueues( firstQueuePath, limit ), callback );
+ return mq.getQueues( firstQueuePath, limit );
}
@SuppressWarnings("unchecked")
@POST
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePost( @Context UriInfo ui, EntityHolder<Object> body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueResults executePost( @Context UriInfo ui, Object body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueResource.executePost: " + queuePath );
- Object json = body.getEntity();
+ Object json = body;
if ( json instanceof Map ) {
- return new JSONWithPadding(
- new QueueResults( mq.postToQueue( queuePath, new Message( ( Map<String, Object> ) json ) ) ),
- callback );
+ return new QueueResults( mq.postToQueue( queuePath, new Message( ( Map<String, Object> ) json ) ));
}
else if ( json instanceof List ) {
- return new JSONWithPadding( new QueueResults(
- mq.postToQueue( queuePath, Message.fromList( ( List<Map<String, Object>> ) json ) ) ), callback );
+ return new QueueResults( mq.postToQueue( queuePath, Message.fromList( ( List<Map<String, Object>> ) json ) ) );
}
return null;
@@ -175,7 +164,9 @@ public class QueueResource extends AbstractContextResource {
@PUT
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePut( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Map<String, Object> executePut( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -183,14 +174,15 @@ public class QueueResource extends AbstractContextResource {
Map<String, Object> results = new HashMap<String, Object>();
- return new JSONWithPadding( results, callback );
+ return results;
}
@DELETE
- public JSONWithPadding executeDelete( @Context UriInfo ui,
- @QueryParam("callback") @DefaultValue("callback") String callback )
- throws Exception {
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Queue executeDelete(
+ @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
throw new NotImplementedException( "Queue delete is not implemented yet" );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
index 12db937..5e6b57d 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriberResource.java
@@ -17,35 +17,22 @@
package org.apache.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import org.apache.commons.lang.StringUtils;
+import org.apache.usergrid.mq.QueueManager;
+import org.apache.usergrid.mq.QueueSet;
+import org.apache.usergrid.rest.AbstractContextResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-import org.apache.usergrid.mq.QueueManager;
-import org.apache.usergrid.mq.QueueSet;
-import org.apache.usergrid.rest.AbstractContextResource;
-
-import org.apache.commons.lang.StringUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
@Component
@@ -93,7 +80,9 @@ public class QueueSubscriberResource extends AbstractContextResource {
@GET
- public JSONWithPadding executeGet( @Context UriInfo ui, @QueryParam("start") String firstSubscriberQueuePath,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executeGet( @Context UriInfo ui, @QueryParam("start") String firstSubscriberQueuePath,
@QueryParam("limit") @DefaultValue("10") int limit,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -102,13 +91,15 @@ public class QueueSubscriberResource extends AbstractContextResource {
QueueSet results = mq.getSubscribers( queuePath, firstSubscriberQueuePath, limit );
- return new JSONWithPadding( results, callback );
+ return results;
}
@POST
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePost( @Context UriInfo ui, EntityHolder<Map<String, Object>> body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executePost( @Context UriInfo ui, Map<String, Object> body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -120,23 +111,25 @@ public class QueueSubscriberResource extends AbstractContextResource {
@PUT
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePut( @Context UriInfo ui, EntityHolder<Map<String, Object>> body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executePut( @Context UriInfo ui, Map<String, Object> body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueSubscriberResource.executePut: " + queuePath );
- Map<String, Object> json = body.getEntity();
+ Map<String, Object> json = body;
if ( StringUtils.isNotBlank( subscriberPath ) ) {
- return new JSONWithPadding( mq.subscribeToQueue( queuePath, subscriberPath ), callback );
+ return mq.subscribeToQueue( queuePath, subscriberPath );
}
else if ( ( json != null ) && ( json.containsKey( "subscriber" ) ) ) {
String subscriber = ( String ) json.get( "subscriber" );
- return new JSONWithPadding( mq.subscribeToQueue( queuePath, subscriber ), callback );
+ return mq.subscribeToQueue( queuePath, subscriber );
}
else if ( ( json != null ) && ( json.containsKey( "subscribers" ) ) ) {
@SuppressWarnings("unchecked") List<String> subscribers = ( List<String> ) json.get( "subscribers" );
- return new JSONWithPadding( mq.addSubscribersToQueue( queuePath, subscribers ), callback );
+ return mq.addSubscribersToQueue( queuePath, subscribers );
}
return null;
@@ -144,14 +137,16 @@ public class QueueSubscriberResource extends AbstractContextResource {
@DELETE
- public JSONWithPadding executeDelete( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executeDelete( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueSubscriberResource.executeDelete: " + queuePath );
if ( StringUtils.isNotBlank( subscriberPath ) ) {
- return new JSONWithPadding( mq.unsubscribeFromQueue( queuePath, subscriberPath ), callback );
+ return mq.unsubscribeFromQueue( queuePath, subscriberPath );
}
return null;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
index a822b1e..b99ecad 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueSubscriptionResource.java
@@ -17,35 +17,22 @@
package org.apache.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import org.apache.commons.lang.StringUtils;
+import org.apache.usergrid.mq.QueueManager;
+import org.apache.usergrid.mq.QueueSet;
+import org.apache.usergrid.rest.AbstractContextResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-import org.apache.usergrid.mq.QueueManager;
-import org.apache.usergrid.mq.QueueSet;
-import org.apache.usergrid.rest.AbstractContextResource;
-
-import org.apache.commons.lang.StringUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
@Component
@@ -95,7 +82,9 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@GET
- public JSONWithPadding executeGet( @Context UriInfo ui, @QueryParam("start") String firstSubscriptionQueuePath,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executeGet( @Context UriInfo ui, @QueryParam("start") String firstSubscriptionQueuePath,
@QueryParam("limit") @DefaultValue("10") int limit,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -104,13 +93,15 @@ public class QueueSubscriptionResource extends AbstractContextResource {
QueueSet results = mq.getSubscriptions( queuePath, firstSubscriptionQueuePath, limit );
- return new JSONWithPadding( results, callback );
+ return results;
}
@POST
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePost( @Context UriInfo ui, EntityHolder<Map<String, Object>> body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executePost( @Context UriInfo ui, Map<String, Object> body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -122,23 +113,25 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@PUT
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePut( @Context UriInfo ui, EntityHolder<Map<String, Object>> body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executePut( @Context UriInfo ui, Map<String, Object> body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueSubscriptionResource.executePut: " + queuePath );
- Map<String, Object> json = body.getEntity();
+ Map<String, Object> json = body;
if ( StringUtils.isNotBlank( subscriptionPath ) ) {
- return new JSONWithPadding( mq.subscribeToQueue( subscriptionPath, queuePath ), callback );
+ return mq.subscribeToQueue( subscriptionPath, queuePath );
}
else if ( ( json != null ) && ( json.containsKey( "subscriber" ) ) ) {
String supscription = ( String ) json.get( "supscription" );
- return new JSONWithPadding( mq.subscribeToQueue( supscription, queuePath ), callback );
+ return mq.subscribeToQueue( supscription, queuePath );
}
else if ( ( json != null ) && ( json.containsKey( "subscribers" ) ) ) {
@SuppressWarnings("unchecked") List<String> supscriptions = ( List<String> ) json.get( "supscriptions" );
- return new JSONWithPadding( mq.unsubscribeFromQueues( queuePath, supscriptions ), callback );
+ return mq.unsubscribeFromQueues( queuePath, supscriptions );
}
return null;
@@ -146,14 +139,16 @@ public class QueueSubscriptionResource extends AbstractContextResource {
@DELETE
- public JSONWithPadding executeDelete( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueSet executeDelete( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "QueueSubscriptionResource.executeDelete: " + queuePath );
if ( StringUtils.isNotBlank( subscriptionPath ) ) {
- return new JSONWithPadding( mq.unsubscribeFromQueue( subscriptionPath, queuePath ), callback );
+ return mq.unsubscribeFromQueue( subscriptionPath, queuePath );
}
return null;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java
index 2f9819d..1e7e304 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/queues/QueueTransactionsResource.java
@@ -17,29 +17,21 @@
package org.apache.usergrid.rest.applications.queues;
-import java.util.UUID;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.usergrid.mq.QueueManager;
import org.apache.usergrid.mq.QueueQuery;
import org.apache.usergrid.persistence.Results;
import org.apache.usergrid.rest.AbstractContextResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.UUID;
import static org.apache.usergrid.utils.MapUtils.hashMap;
@@ -72,7 +64,9 @@ public class QueueTransactionsResource extends AbstractContextResource {
@Path("{id}")
@PUT
- public JSONWithPadding updateTransaction( @Context UriInfo ui, @PathParam("id") UUID transactionId,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Results updateTransaction( @Context UriInfo ui, @PathParam("id") UUID transactionId,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -80,13 +74,15 @@ public class QueueTransactionsResource extends AbstractContextResource {
UUID newTransactionId = mq.renewTransaction( queuePath, transactionId, query );
- return new JSONWithPadding( Results.fromData( hashMap( "transaction", newTransactionId ) ), callback );
+ return Results.fromData( hashMap( "transaction", newTransactionId ) );
}
@Path("{id}")
@DELETE
- public JSONWithPadding removeTransaction( @Context UriInfo ui, @PathParam("id") UUID transactionId,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Results removeTransaction( @Context UriInfo ui, @PathParam("id") UUID transactionId,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -95,6 +91,6 @@ public class QueueTransactionsResource extends AbstractContextResource {
mq.deleteTransaction( this.queuePath, transactionId, query );
- return new JSONWithPadding( Results.fromData( hashMap( "transaction", transactionId ) ), callback );
+ return Results.fromData( hashMap( "transaction", transactionId ) );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
index a8b0f81..95adfc4 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
@@ -19,33 +19,16 @@ package org.apache.usergrid.rest.applications.users;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.management.ActivationState;
import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.persistence.entities.User;
+import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.applications.ServiceResource;
@@ -53,24 +36,19 @@ import org.apache.usergrid.rest.exceptions.RedirectionException;
import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.apache.usergrid.security.oauth.AccessInfo;
import org.apache.usergrid.security.tokens.exceptions.TokenException;
+import org.glassfish.jersey.server.mvc.Viewable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
-
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.util.Map;
+import java.util.UUID;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.getSubjectUserId;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isApplicationAdmin;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isApplicationUser;
+import static javax.servlet.http.HttpServletResponse.*;
+import static org.apache.usergrid.security.shiro.utils.SubjectUtils.*;
import static org.apache.usergrid.utils.ConversionUtils.string;
@@ -105,7 +83,9 @@ public class UserResource extends ServiceResource {
@PUT
@RequireApplicationAccess
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePut( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePut( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -123,7 +103,9 @@ public class UserResource extends ServiceResource {
@PUT
@Path("password")
- public JSONWithPadding setUserPasswordPut( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setUserPasswordPut( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -147,7 +129,7 @@ public class UserResource extends ServiceResource {
if ( targetUserId == null ) {
response.setError( "User not found" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -161,13 +143,15 @@ public class UserResource extends ServiceResource {
management.setAppUserPassword( getApplicationId(), targetUserId, oldPassword, newPassword );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@Path("password")
- public JSONWithPadding setUserPasswordPost( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setUserPasswordPost( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
return setUserPasswordPut( ui, json, callback );
@@ -176,7 +160,9 @@ public class UserResource extends ServiceResource {
@POST
@Path("deactivate")
- public JSONWithPadding deactivate( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse deactivate( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("") String callback ) throws Exception {
ApiResponse response = createApiResponse();
@@ -186,13 +172,15 @@ public class UserResource extends ServiceResource {
response.withEntity( user );
- return new JSONWithPadding( response, callback );
+ return response;
}
@GET
@Path("sendpin")
- public JSONWithPadding sendPin( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse sendPin( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -208,13 +196,15 @@ public class UserResource extends ServiceResource {
response.setError( "User not found" );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@Path("sendpin")
- public JSONWithPadding postSendPin( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse postSendPin( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
return sendPin( ui, callback );
@@ -224,7 +214,9 @@ public class UserResource extends ServiceResource {
@GET
@Path("setpin")
@RequireApplicationAccess
- public JSONWithPadding setPin( @Context UriInfo ui, @QueryParam("pin") String pin,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setPin( @Context UriInfo ui, @QueryParam("pin") String pin,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -240,7 +232,7 @@ public class UserResource extends ServiceResource {
response.setError( "User not found" );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -248,7 +240,9 @@ public class UserResource extends ServiceResource {
@Path("setpin")
@Consumes("application/x-www-form-urlencoded")
@RequireApplicationAccess
- public JSONWithPadding postPin( @Context UriInfo ui, @FormParam("pin") String pin,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse postPin( @Context UriInfo ui, @FormParam("pin") String pin,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -264,7 +258,7 @@ public class UserResource extends ServiceResource {
response.setError( "User not found" );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -272,7 +266,9 @@ public class UserResource extends ServiceResource {
@Path("setpin")
@Consumes(MediaType.APPLICATION_JSON)
@RequireApplicationAccess
- public JSONWithPadding jsonPin( @Context UriInfo ui, JsonNode json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse jsonPin( @Context UriInfo ui, JsonNode json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -288,7 +284,7 @@ public class UserResource extends ServiceResource {
response.setError( "User not found" );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -460,7 +456,9 @@ public class UserResource extends ServiceResource {
@GET
@Path("reactivate")
- public JSONWithPadding reactivate( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse reactivate( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -471,13 +469,15 @@ public class UserResource extends ServiceResource {
management.startAppUserActivationFlow( getApplicationId(), user );
response.setAction( "reactivate user" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@Path("revoketokens")
- public JSONWithPadding revokeTokensPost( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokensPost( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -488,13 +488,15 @@ public class UserResource extends ServiceResource {
management.revokeAccessTokensForAppUser( getApplicationId(), getUserUuid() );
response.setAction( "revoked user tokens" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@PUT
@Path("revoketokens")
- public JSONWithPadding revokeTokensPut( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokensPut( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
return revokeTokensPost( ui, callback );
@@ -503,7 +505,9 @@ public class UserResource extends ServiceResource {
@POST
@Path("revoketoken")
- public JSONWithPadding revokeTokenPost( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokenPost( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
@QueryParam("token") String token ) throws Exception {
@@ -514,13 +518,15 @@ public class UserResource extends ServiceResource {
management.revokeAccessTokenForAppUser( token );
response.setAction( "revoked user token" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@PUT
@Path("revoketoken")
- public JSONWithPadding revokeTokenPut( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokenPut( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
@QueryParam("token") String token ) throws Exception {
return revokeTokenPost( ui, callback, token );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
index c3f0283..e39a311 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
@@ -18,45 +18,38 @@ package org.apache.usergrid.rest.applications.users;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriInfo;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import net.tanesha.recaptcha.ReCaptchaImpl;
import net.tanesha.recaptcha.ReCaptchaResponse;
-import static org.apache.commons.lang.StringUtils.isBlank;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
import org.apache.usergrid.persistence.Entity;
+import org.apache.usergrid.persistence.Query;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.persistence.index.query.Identifier;
-import org.apache.usergrid.persistence.Query;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.applications.ServiceResource;
import org.apache.usergrid.rest.exceptions.RedirectionException;
import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
-import static org.apache.usergrid.services.ServiceParameter.addParameter;
+import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static org.apache.usergrid.services.ServiceParameter.addParameter;
+
@Component("org.apache.usergrid.rest.applications.users.UsersResource")
@Scope("prototype")
@@ -186,7 +179,9 @@ public class UsersResource extends ServiceResource {
@PUT
@Override
@RequireApplicationAccess
- public JSONWithPadding executePut( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePut( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -208,7 +203,9 @@ public class UsersResource extends ServiceResource {
@POST
@Override
@RequireApplicationAccess
- public JSONWithPadding executePost( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePost( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -245,7 +242,7 @@ public class UsersResource extends ServiceResource {
}
}
- ApiResponse response = ( ApiResponse ) super.executePostWithObject( ui, json, callback ).getJsonSource();
+ ApiResponse response = ( ApiResponse ) super.executePostWithObject( ui, json, callback );
if ( ( response.getEntities() != null ) && ( response.getEntities().size() == 1 ) ) {
@@ -264,6 +261,6 @@ public class UsersResource extends ServiceResource {
management.startAppUserActivationFlow( getApplicationId(), user );
}
}
- return new JSONWithPadding( response, callback );
+ return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotFoundExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotFoundExceptionMapper.java
index 165a8d3..557be08 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/NotFoundExceptionMapper.java
@@ -17,8 +17,7 @@
package org.apache.usergrid.rest.exceptions;
-import com.sun.jersey.api.NotFoundException;
-
+import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityException.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityException.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityException.java
index 93be148..6b0d232 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityException.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/SecurityException.java
@@ -19,7 +19,7 @@ package org.apache.usergrid.rest.exceptions;
import org.apache.usergrid.rest.ApiResponse;
-import com.sun.jersey.api.container.MappableContainerException;
+import javax.ws.rs.ext.ExceptionMapper;
import static org.apache.usergrid.utils.JsonUtils.mapToJsonString;
@@ -36,12 +36,14 @@ public class SecurityException extends RuntimeException {
private String realm = null;
private String type = null;
+ private Exception root = null;
- private SecurityException( String type, String message, String realm ) {
+ private SecurityException( String type, String message, String realm, Exception root ) {
super( message );
this.type = type;
this.realm = realm;
+ this.root = root;
}
@@ -54,6 +56,9 @@ public class SecurityException extends RuntimeException {
return type;
}
+ public Exception getRoot() {
+ return root;
+ }
public String getJsonResponse() {
ApiResponse response = new ApiResponse();
@@ -62,28 +67,28 @@ public class SecurityException extends RuntimeException {
}
- public static MappableContainerException mappableSecurityException( AuthErrorInfo errorInfo ) {
+ public static RuntimeException mappableSecurityException( AuthErrorInfo errorInfo ) {
return mappableSecurityException( errorInfo.getType(), errorInfo.getMessage() );
}
-
- public static MappableContainerException mappableSecurityException( AuthErrorInfo errorInfo, String message ) {
+ public static RuntimeException mappableSecurityException( AuthErrorInfo errorInfo, String message ) {
return mappableSecurityException( errorInfo.getType(), message );
}
-
- public static MappableContainerException mappableSecurityException( String type, String message ) {
- return new MappableContainerException( new SecurityException( type, message, null ) );
+ public static RuntimeException mappableSecurityException( String type, String message ) {
+ return new SecurityException( type, message, null, null );
}
-
- public static MappableContainerException mappableSecurityException( AuthErrorInfo errorInfo, String message,
- String realm ) {
+ public static RuntimeException mappableSecurityException( AuthErrorInfo errorInfo, String message, String realm ) {
return mappableSecurityException( errorInfo.getType(), message, realm );
}
+ public static RuntimeException mappableSecurityException( String type, String message, String realm ) {
+ return new SecurityException( type, message, realm, null );
+ }
- public static MappableContainerException mappableSecurityException( String type, String message, String realm ) {
- return new MappableContainerException( new SecurityException( type, message, realm ) );
+ public static RuntimeException mappableSecurityException( Exception e, AuthErrorInfo errorInfo ) {
+ return new SecurityException( errorInfo.getType(), e.getMessage(), null, e );
}
+
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
index 5eca8c9..bc2bdc7d 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
@@ -17,15 +17,15 @@
package org.apache.usergrid.rest.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.Context;
+import java.io.IOException;
import static org.apache.commons.lang.StringUtils.isNotBlank;
@@ -45,23 +45,15 @@ public class JSONPCallbackFilter implements ContainerRequestFilter {
@Override
- public ContainerRequest filter( ContainerRequest request ) {
+ public void filter(ContainerRequestContext crc) throws IOException {
String callback = null;
try {
callback = httpServletRequest.getParameter( "callback" );
}
catch ( IllegalStateException e ) {
}
- if ( callback == null ) {
- try {
- callback = request.getQueryParameters().getFirst( "callback" );
- }
- catch ( IllegalStateException e ) {
- }
- }
if ( isNotBlank( callback ) ) {
- request.getRequestHeaders().putSingle( "Accept", "application/javascript" );
+ crc.getHeaders().putSingle( "Accept", "application/javascript" );
}
- return request;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
index b483f5f..24051ad 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
@@ -17,330 +17,348 @@
package org.apache.usergrid.rest.filters;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
+import org.apache.usergrid.management.ManagementService;
+import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.EntityManagerFactory;
+import org.apache.usergrid.services.ServiceManagerFactory;
+import org.apache.usergrid.system.UsergridSystemMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Context;
import java.io.FilterInputStream;
-import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.apache.usergrid.management.ManagementService;
-import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.EntityManagerFactory;
-import org.apache.usergrid.services.ServiceManagerFactory;
-import org.apache.usergrid.system.UsergridSystemMonitor;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ContainerResponseWriter;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
-
+// TODO: Metering for Jersey 2
@Component
public class MeteringFilter implements ContainerRequestFilter, ContainerResponseFilter {
- @Context
- protected HttpServletRequest httpServletRequest;
-
- EntityManagerFactory emf;
- ServiceManagerFactory smf;
- Properties properties;
- ManagementService management;
- UsergridSystemMonitor usergridSystemMonitor;
- final Counter activeRequests;
- final Timer requestTimer;
-
- private static final Logger logger = LoggerFactory.getLogger( MeteringFilter.class );
-
-
- public MeteringFilter() {
- logger.info( "MeteringFilter installed" );
- this.activeRequests = Metrics.newCounter( MeteringFilter.class, "activeRequests" );
- this.requestTimer =
- Metrics.newTimer( MeteringFilter.class, "requests", TimeUnit.MILLISECONDS, TimeUnit.SECONDS );
- }
-
-
- @Autowired
- public void setEntityManagerFactory( EntityManagerFactory emf ) {
- this.emf = emf;
- }
-
-
- @Autowired
- public void setServiceManagerFactory( ServiceManagerFactory smf ) {
- this.smf = smf;
- }
-
-
- @Autowired
- @Qualifier("properties")
- public void setProperties( Properties properties ) {
- this.properties = properties;
- }
-
-
- @Autowired
- public void setManagementService( ManagementService management ) {
- this.management = management;
- }
-
-
- @Autowired
- public void setUsergridSystemMonitor( UsergridSystemMonitor usergridSystemMonitor ) {
- this.usergridSystemMonitor = usergridSystemMonitor;
- }
-
-
@Override
- public ContainerRequest filter( ContainerRequest request ) {
-
- try {
- activeRequests.inc();
- request.setEntityInputStream( new InputStreamAdapter( request.getEntityInputStream() ) );
- httpServletRequest.setAttribute( "application.request.timetamp", System.currentTimeMillis() );
- httpServletRequest.setAttribute( "application.request.requestTimer", requestTimer.time() );
- }
- catch ( Exception e ) {
- logger.error( "Unable to capture request", e );
- }
- return request;
- }
-
-
- public void countDataWritten( long written ) {
- TimerContext timer = ( TimerContext ) httpServletRequest.getAttribute( "application.request.requestTimer" );
- try {
- UUID applicationId = ( UUID ) httpServletRequest.getAttribute( "applicationId" );
- Long timestamp = ( Long ) httpServletRequest.getAttribute( "application.request.timetamp" );
- long time;
- if ( ( timestamp != null ) && ( timestamp > 0 ) ) {
- time = System.currentTimeMillis() - timestamp;
- }
- else {
- time = -1;
- }
- usergridSystemMonitor.maybeLogPayload( time, "path", httpServletRequest.getRequestURI(), "applicationId",
- applicationId );
- if ( applicationId != null ) {
-
- Map<String, Long> counters = new HashMap<String, Long>();
-
-
- if ( time > 0 ) {
- logger.trace( "Application: {}, spent {} milliseconds of CPU time", applicationId, time );
- counters.put( "application.request.time", time );
- }
-
- Long read = ( Long ) httpServletRequest.getAttribute( "application.request.upload" );
- if ( ( read != null ) && ( read > 0 ) ) {
- logger.trace( "Application: {}, received {} bytes", applicationId, written );
- counters.put( "application.request.upload", read );
- }
-
- if ( written > 0 ) {
- logger.trace( "Application: {}, sending {} bytes", applicationId, written );
- counters.put( "application.request.download", written );
- }
-
- if ( emf != null ) {
- EntityManager em = emf.getEntityManager( applicationId );
- em.incrementAggregateCounters( null, null, null, counters );
- }
- else {
- logger.error( "No EntityManagerFactory configured" );
- }
- }
- }
- catch ( Exception e ) {
- logger.error( "Unable to capture output", e );
- }
- finally {
- if ( timer != null ) {
- timer.stop();
- }
- activeRequests.dec();
- }
- }
-
-
- public void countDataRead( long read ) {
- try {
- if ( read > 0 ) {
- httpServletRequest.setAttribute( "application.request.upload", read );
- }
- }
- catch ( Exception e ) {
- logger.error( "Unable to capture input", e );
- }
- }
-
-
- private final class InputStreamAdapter extends FilterInputStream {
-
- long total = 0;
-
-
- protected InputStreamAdapter( InputStream in ) {
- super( in );
- }
-
-
- @Override
- public int available() throws IOException {
- int i = super.available();
- return i;
- }
-
-
- @Override
- public int read() throws IOException {
- int b = super.read();
- if ( b != -1 ) {
- total++;
- }
- else {
- countDataRead( total );
- total = 0;
- }
- return b;
- }
-
-
- @Override
- public int read( byte[] b, int off, int len ) throws IOException {
- int l = super.read( b, off, len );
- if ( l != -1 ) {
- total += l;
- }
- if ( ( l == -1 ) || ( l < len ) ) {
- countDataRead( total );
- total = 0;
- }
- return l;
- }
-
-
- @Override
- public int read( byte[] b ) throws IOException {
- int l = super.read( b );
- if ( l != -1 ) {
- total += l;
- }
- if ( ( l == -1 ) || ( l < b.length ) ) {
- countDataRead( total );
- total = 0;
- }
- return l;
- }
-
+ public void filter(ContainerRequestContext containerRequestContext) throws IOException {
- @Override
- public void close() throws IOException {
- super.close();
- countDataRead( total );
- }
}
-
- private final class ContainerResponseWriterAdapter implements ContainerResponseWriter {
-
- private final ContainerResponseWriter crw;
- private OutputStreamAdapter out = null;
-
-
- ContainerResponseWriterAdapter( ContainerResponseWriter crw ) {
- this.crw = crw;
- }
-
-
- @Override
- public OutputStream writeStatusAndHeaders( long contentLength, ContainerResponse response ) throws IOException {
-
- // logger.info("Wrapping output stream");
- OutputStream o = crw.writeStatusAndHeaders( contentLength, response );
-
- if ( out == null ) {
- out = new OutputStreamAdapter( o );
- }
-
- return out;
- }
-
-
- @Override
- public void finish() throws IOException {
- crw.finish();
- if ( out != null ) {
- countDataWritten( out.getTotal() );
- }
- }
-
-
- private final class OutputStreamAdapter extends FilterOutputStream {
-
- long total = 0;
-
-
- public OutputStreamAdapter( OutputStream out ) {
- super( out );
- }
-
-
- public long getTotal() {
- return total;
- }
-
-
- @Override
- public void write( byte[] b, int off, int len ) throws IOException {
- out.write( b, off, len );
- total += len;
- }
-
-
- @Override
- public void write( byte[] b ) throws IOException {
- out.write( b );
- total += b.length;
- }
-
-
- @Override
- public void write( int b ) throws IOException {
- out.write( b );
- total += 1;
- }
- }
- }
-
-
@Override
- public ContainerResponse filter( ContainerRequest request, ContainerResponse response ) {
- try {
- response.setContainerResponseWriter(
- new ContainerResponseWriterAdapter( response.getContainerResponseWriter() ) );
- }
- catch ( Exception e ) {
- logger.error( "Unable to capture response", e );
- }
- return response;
+ public void filter(ContainerRequestContext containerRequestContext, ContainerResponseContext containerResponseContext) throws IOException {
+
}
+//
+// @Context
+// protected HttpServletRequest httpServletRequest;
+//
+// EntityManagerFactory emf;
+// ServiceManagerFactory smf;
+// Properties properties;
+// ManagementService management;
+// UsergridSystemMonitor usergridSystemMonitor;
+// final Counter activeRequests;
+// final Timer requestTimer;
+//
+// private static final Logger logger = LoggerFactory.getLogger( MeteringFilter.class );
+//
+//
+// public MeteringFilter() {
+// logger.info( "MeteringFilter installed" );
+// this.activeRequests = Metrics.newCounter( MeteringFilter.class, "activeRequests" );
+// this.requestTimer =
+// Metrics.newTimer( MeteringFilter.class, "requests", TimeUnit.MILLISECONDS, TimeUnit.SECONDS );
+// }
+//
+//
+// @Autowired
+// public void setEntityManagerFactory( EntityManagerFactory emf ) {
+// this.emf = emf;
+// }
+//
+//
+// @Autowired
+// public void setServiceManagerFactory( ServiceManagerFactory smf ) {
+// this.smf = smf;
+// }
+//
+//
+// @Autowired
+// @Qualifier("properties")
+// public void setProperties( Properties properties ) {
+// this.properties = properties;
+// }
+//
+//
+// @Autowired
+// public void setManagementService( ManagementService management ) {
+// this.management = management;
+// }
+//
+//
+// @Autowired
+// public void setUsergridSystemMonitor( UsergridSystemMonitor usergridSystemMonitor ) {
+// this.usergridSystemMonitor = usergridSystemMonitor;
+// }
+//
+//
+// @Override
+// public void filter(ContainerRequestContext creq) throws IOException {
+//
+// try {
+// activeRequests.inc();
+// creq.setEntityStream( new InputStreamAdapter( creq.getEntityStream() ) );
+// httpServletRequest.setAttribute( "application.request.timetamp", System.currentTimeMillis() );
+// httpServletRequest.setAttribute( "application.request.requestTimer", requestTimer.time() );
+// }
+// catch ( Exception e ) {
+// logger.error( "Unable to capture request", e );
+// }
+// }
+//
+// public void countDataWritten( long written ) {
+// TimerContext timer = ( TimerContext ) httpServletRequest.getAttribute( "application.request.requestTimer" );
+// try {
+// UUID applicationId = ( UUID ) httpServletRequest.getAttribute( "applicationId" );
+// Long timestamp = ( Long ) httpServletRequest.getAttribute( "application.request.timetamp" );
+// long time;
+// if ( ( timestamp != null ) && ( timestamp > 0 ) ) {
+// time = System.currentTimeMillis() - timestamp;
+// }
+// else {
+// time = -1;
+// }
+// usergridSystemMonitor.maybeLogPayload( time, "path", httpServletRequest.getRequestURI(), "applicationId",
+// applicationId );
+// if ( applicationId != null ) {
+//
+// Map<String, Long> counters = new HashMap<String, Long>();
+//
+//
+// if ( time > 0 ) {
+// logger.trace( "Application: {}, spent {} milliseconds of CPU time", applicationId, time );
+// counters.put( "application.request.time", time );
+// }
+//
+// Long read = ( Long ) httpServletRequest.getAttribute( "application.request.upload" );
+// if ( ( read != null ) && ( read > 0 ) ) {
+// logger.trace( "Application: {}, received {} bytes", applicationId, written );
+// counters.put( "application.request.upload", read );
+// }
+//
+// if ( written > 0 ) {
+// logger.trace( "Application: {}, sending {} bytes", applicationId, written );
+// counters.put( "application.request.download", written );
+// }
+//
+// if ( emf != null ) {
+// EntityManager em = emf.getEntityManager( applicationId );
+// em.incrementAggregateCounters( null, null, null, counters );
+// }
+// else {
+// logger.error( "No EntityManagerFactory configured" );
+// }
+// }
+// }
+// catch ( Exception e ) {
+// logger.error( "Unable to capture output", e );
+// }
+// finally {
+// if ( timer != null ) {
+// timer.stop();
+// }
+// activeRequests.dec();
+// }
+// }
+//
+//
+// public void countDataRead( long read ) {
+// try {
+// if ( read > 0 ) {
+// httpServletRequest.setAttribute( "application.request.upload", read );
+// }
+// }
+// catch ( Exception e ) {
+// logger.error( "Unable to capture input", e );
+// }
+// }
+//
+//
+// private final class InputStreamAdapter extends FilterInputStream {
+//
+// long total = 0;
+//
+//
+// protected InputStreamAdapter( InputStream in ) {
+// super( in );
+// }
+//
+//
+// @Override
+// public int available() throws IOException {
+// int i = super.available();
+// return i;
+// }
+//
+//
+// @Override
+// public int read() throws IOException {
+// int b = super.read();
+// if ( b != -1 ) {
+// total++;
+// }
+// else {
+// countDataRead( total );
+// total = 0;
+// }
+// return b;
+// }
+//
+//
+// @Override
+// public int read( byte[] b, int off, int len ) throws IOException {
+// int l = super.read( b, off, len );
+// if ( l != -1 ) {
+// total += l;
+// }
+// if ( ( l == -1 ) || ( l < len ) ) {
+// countDataRead( total );
+// total = 0;
+// }
+// return l;
+// }
+//
+//
+// @Override
+// public int read( byte[] b ) throws IOException {
+// int l = super.read( b );
+// if ( l != -1 ) {
+// total += l;
+// }
+// if ( ( l == -1 ) || ( l < b.length ) ) {
+// countDataRead( total );
+// total = 0;
+// }
+// return l;
+// }
+//
+//
+// @Override
+// public void close() throws IOException {
+// super.close();
+// countDataRead( total );
+// }
+// }
+//
+//
+// private final class ContainerResponseWriterAdapter implements ContainerResponseWriter {
+//
+// private final ContainerResponseWriter crw;
+// private OutputStreamAdapter out = null;
+//
+//
+// ContainerResponseWriterAdapter( ContainerResponseWriter crw ) {
+// this.crw = crw;
+// }
+//
+//
+// @Override
+// public OutputStream writeResponseStatusAndHeaders(
+// long contentLength, ContainerResponse response) throws ContainerException {
+//
+// // logger.info("Wrapping output stream");
+// OutputStream o = crw.writeResponseStatusAndHeaders( contentLength, response );
+//
+// if ( out == null ) {
+// out = new OutputStreamAdapter( o );
+// }
+//
+// return out;
+// }
+//
+// @Override
+// public boolean suspend(long l, TimeUnit timeUnit, TimeoutHandler timeoutHandler) {
+// return crw.suspend( l, timeUnit, timeoutHandler );
+// }
+//
+// @Override
+// public void setSuspendTimeout(long l, TimeUnit timeUnit) throws IllegalStateException {
+// crw.setSuspendTimeout( l, timeUnit );
+// }
+//
+// @Override
+// public void commit() {
+// crw.commit();
+// }
+//
+// @Override
+// public void failure(Throwable throwable) {
+// crw.failure( throwable );
+// }
+//
+// @Override
+// public boolean enableResponseBuffering() {
+// return false;
+// }
+//
+//
+// private final class OutputStreamAdapter extends FilterOutputStream {
+//
+// long total = 0;
+//
+//
+// public OutputStreamAdapter( OutputStream out ) {
+// super( out );
+// }
+//
+//
+// public long getTotal() {
+// return total;
+// }
+//
+//
+// @Override
+// public void write( byte[] b, int off, int len ) throws IOException {
+// out.write( b, off, len );
+// total += len;
+// }
+//
+//
+// @Override
+// public void write( byte[] b ) throws IOException {
+// out.write( b );
+// total += b.length;
+// }
+//
+//
+// @Override
+// public void write( int b ) throws IOException {
+// out.write( b );
+// total += 1;
+// }
+// }
+// }
+//
+// @Override
+// public void filter(ContainerRequestContext req, ContainerResponseContext res) throws IOException {
+// try {
+// res.setEntityStream( res.getEntityStream() );
+// }
+// catch ( Exception e ) {
+// logger.error( "Unable to capture response", e );
+// }
+// }
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
index cc28028..fcff69d 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
@@ -17,22 +17,21 @@
package org.apache.usergrid.rest.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.apache.usergrid.persistence.cassandra.util.TraceTag;
import org.apache.usergrid.persistence.cassandra.util.TraceTagManager;
import org.apache.usergrid.persistence.cassandra.util.TraceTagReporter;
import org.apache.usergrid.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Context;
/**
@@ -56,35 +55,33 @@ public class TracingFilter implements ContainerRequestFilter, ContainerResponseF
@Override
- public ContainerRequest filter( ContainerRequest request ) {
+ public void filter( ContainerRequestContext request ) {
if ( !traceTagManager.getTraceEnabled() && !traceTagManager.getExplicitOnly() ) {
- return request;
+ return;
}
String traceId;
if ( traceTagManager.getExplicitOnly() ) {
// if we are set in explicit mode and the header is not present, leave.
String id = httpServletRequest.getHeader( "XX-TRACE-ID" );
if ( StringUtils.isBlank( id ) ) {
- return request;
+ return;
}
- traceId = id.concat( "-REST-" ).concat( request.getPath( true ) );
+ traceId = id.concat( "-REST-" ).concat( request.getUriInfo().getPath( true ) );
}
else {
- traceId = "TRACE-".concat( request.getPath( true ) );
+ traceId = "TRACE-".concat( request.getUriInfo().getPath( true ) );
}
TraceTag traceTag = traceTagManager.create( traceId );
traceTagManager.attach( traceTag );
-
- return request;
}
@Override
- public ContainerResponse filter( ContainerRequest request, ContainerResponse response ) {
+ public void filter( ContainerRequestContext request, ContainerResponseContext response ) {
if ( traceTagManager.isActive() ) {
TraceTag traceTag = traceTagManager.detach();
traceTagReporter.report( traceTag );
}
- return response;
}
+
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index caed361..e79e521 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@ -21,13 +21,6 @@ import com.codahale.metrics.Counter;
import com.codahale.metrics.Timer;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.inject.Injector;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.client.apache.ApacheHttpClient;
-import com.sun.jersey.client.apache.ApacheHttpClientHandler;
import org.apache.amber.oauth2.common.error.OAuthError;
import org.apache.amber.oauth2.common.exception.OAuthProblemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
@@ -37,6 +30,9 @@ import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpHost;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.shiro.codec.Base64;
import org.apache.usergrid.exception.NotImplementedException;
import org.apache.usergrid.management.ApplicationCreator;
@@ -54,6 +50,14 @@ import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
import org.apache.usergrid.rest.management.users.UsersResource;
import org.apache.usergrid.security.oauth.AccessInfo;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.spi.Connector;
+import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,10 +65,9 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.*;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.Iterator;
@@ -707,8 +710,8 @@ public class ManagementResource extends AbstractContextResource {
Client client = getJerseyClient();
final JsonNode accessInfoNode;
try {
- accessInfoNode = client.resource( me )
- .type( MediaType.APPLICATION_JSON_TYPE)
+ accessInfoNode = client.target( me ).request()
+ .accept( MediaType.APPLICATION_JSON_TYPE )
.get(JsonNode.class);
tokensValidatedCounter.inc();
@@ -738,12 +741,8 @@ public class ManagementResource extends AbstractContextResource {
poolSize = Integer.parseInt( poolSizeStr );
}
- MultiThreadedHttpConnectionManager cm = new MultiThreadedHttpConnectionManager();
- HttpConnectionManagerParams cmParams = cm.getParams();
- cmParams.setMaxTotalConnections( poolSize );
- HttpClient httpClient = new HttpClient( cm );
-
- // create Jersey Client using that HTTPClient and with configured timeouts
+ PoolingClientConnectionManager connectionManager = new PoolingClientConnectionManager();
+ connectionManager.setMaxTotal(poolSize);
int timeout = 20000; // ms
final String timeoutStr = properties.getProperty( CENTRAL_CONNECTION_TIMEOUT );
@@ -757,14 +756,14 @@ public class ManagementResource extends AbstractContextResource {
readTimeout = Integer.parseInt( readTimeoutStr );
}
- ClientConfig clientConfig = new DefaultClientConfig();
- clientConfig.getFeatures().put( JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE );
- clientConfig.getProperties().put( ClientConfig.PROPERTY_CONNECT_TIMEOUT, timeout ); // ms
- clientConfig.getProperties().put( ClientConfig.PROPERTY_READ_TIMEOUT, readTimeout ); // ms
-
- ApacheHttpClientHandler handler = new ApacheHttpClientHandler( httpClient, clientConfig );
- jerseyClient = new ApacheHttpClient( handler );
+ ClientConfig clientConfig = new ClientConfig();
+ clientConfig.register( new JacksonFeature() );
+ clientConfig.property( ApacheClientProperties.CONNECTION_MANAGER, connectionManager );
+ clientConfig.connectorProvider( new ApacheConnectorProvider() );
+ jerseyClient = ClientBuilder.newClient( clientConfig );
+ jerseyClient.property( ClientProperties.CONNECT_TIMEOUT, timeout);
+ jerseyClient.property( ClientProperties.READ_TIMEOUT, readTimeout );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/metrics/MetricsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/metrics/MetricsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/metrics/MetricsResource.java
index 7072ae6..af4e3ad 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/metrics/MetricsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/metrics/MetricsResource.java
@@ -24,13 +24,12 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
-import com.sun.jersey.api.json.JSONWithPadding;
-
/** @author zznate */
@Component("org.apache.usergrid.rest.management.metrics.MetricsResource")
@@ -45,11 +44,13 @@ public class MetricsResource extends AbstractContextResource {
@GET
@Path("all")
- public JSONWithPadding getDeveloperMetrics( @Context UriInfo ui ) {
+ @JSONP
+ @Produces({MediaType.APPLICATION_JSON, "application/javascript"})
+ public ApiResponse getDeveloperMetrics( @Context UriInfo ui ) {
ApiResponse response = createApiResponse();
response.setAction( "get developer metrics" );
- return new JSONWithPadding( response );
+ return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
index afd4d26..287b5a7 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
@@ -17,20 +17,13 @@
package org.apache.usergrid.rest.management.organizations;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.commons.lang.NullArgumentException;
-
-import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.management.ActivationState;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.export.ExportService;
-import org.apache.usergrid.management.importer.ImportService;
-import org.apache.usergrid.persistence.EntityRef;
-import org.apache.usergrid.persistence.SimpleEntityRef;
import org.apache.usergrid.persistence.entities.Export;
-import org.apache.usergrid.persistence.entities.Import;
import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentials;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
@@ -43,6 +36,7 @@ import org.apache.usergrid.rest.utils.JSONPUtils;
import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
import org.apache.usergrid.security.tokens.exceptions.TokenException;
import org.apache.usergrid.services.ServiceResults;
+import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,16 +48,12 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.UUID;
import static javax.servlet.http.HttpServletResponse.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import org.apache.usergrid.persistence.Entity;
-import org.apache.usergrid.persistence.Query.Level;
@Component("org.apache.usergrid.rest.management.organizations.OrganizationResource")
@@ -116,7 +106,9 @@ public class OrganizationResource extends AbstractContextResource {
@GET
- public JSONWithPadding getOrganizationDetails( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getOrganizationDetails( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -125,7 +117,7 @@ public class OrganizationResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setProperty( "organization", management.getOrganizationData( organization ) );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -176,7 +168,9 @@ public class OrganizationResource extends AbstractContextResource {
@GET
@Path("reactivate")
- public JSONWithPadding reactivate( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse reactivate( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -187,14 +181,16 @@ public class OrganizationResource extends AbstractContextResource {
management.startOrganizationActivationFlow( organization );
response.setAction( "reactivate organization" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@GET
@Path("feed")
- public JSONWithPadding getFeed( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getFeed( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -205,14 +201,16 @@ public class OrganizationResource extends AbstractContextResource {
response.setEntities( results.getEntities() );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@GET
@Path("credentials")
- public JSONWithPadding getCredentials( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getCredentials( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -224,14 +222,16 @@ public class OrganizationResource extends AbstractContextResource {
management.getClientSecretForOrganization( organization.getUuid() ) );
response.setCredentials( keys );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@POST
@Path("credentials")
- public JSONWithPadding generateCredentials( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse generateCredentials( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -243,7 +243,7 @@ public class OrganizationResource extends AbstractContextResource {
management.newClientSecretForOrganization( organization.getUuid() ) );
response.setCredentials( credentials );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -255,7 +255,9 @@ public class OrganizationResource extends AbstractContextResource {
@RequireOrganizationAccess
@Consumes(MediaType.APPLICATION_JSON)
@PUT
- public JSONWithPadding executePut( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePut( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -270,7 +272,7 @@ public class OrganizationResource extends AbstractContextResource {
organization.setProperties( customProperties );
management.updateOrganization( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
[10/10] usergrid git commit: Changes to configure our filters
correctly, and numerous other test fixes. Only 7 REST tests are not passing.
Posted by sn...@apache.org.
Changes to configure our filters correctly, and numerous other test fixes. Only 7 REST tests are not passing.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/eb2aa6ff
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/eb2aa6ff
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/eb2aa6ff
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: eb2aa6ff9d45861c9a3e7d7cb0496423fc3c9a23
Parents: 0578d98
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Sep 3 15:01:37 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Sep 3 15:01:37 2015 -0400
----------------------------------------------------------------------
stack/pom.xml | 2 +-
stack/rest/pom.xml | 120 +++++++------------
.../rest/filters/ContentTypeFilter.java | 34 +++---
.../rest/filters/JSONPCallbackFilter.java | 4 +
.../usergrid/rest/filters/MeteringFilter.java | 8 +-
.../usergrid/rest/filters/TracingFilter.java | 8 +-
.../rest/management/ManagementResource.java | 22 ++--
.../organizations/OrganizationsResource.java | 25 ++++
.../rest/security/CrossOriginRequestFilter.java | 2 +
.../security/SecuredResourceFilterFactory.java | 73 ++++++++---
.../shiro/filters/BasicAuthSecurityFilter.java | 10 +-
.../ClientCredentialsSecurityFilter.java | 8 +-
.../OAuth2AccessTokenSecurityFilter.java | 29 +++--
.../security/shiro/filters/SecurityFilter.java | 26 ++--
stack/rest/src/main/webapp/WEB-INF/web.xml | 66 +++++++---
.../java/org/apache/usergrid/rest/BasicIT.java | 7 +-
.../apache/usergrid/rest/IndexResourceIT.java | 15 +--
.../apache/usergrid/rest/PartialUpdateTest.java | 6 +-
.../rest/applications/ApplicationDeleteIT.java | 103 +++++++---------
.../applications/ApplicationResourceIT.java | 17 +--
.../applications/assets/AssetResourceIT.java | 12 +-
.../applications/assets/AwsAssetResourceIT.java | 8 +-
.../collection/CollectionsResourceIT.java | 10 +-
.../collection/DuplicateNameIT.java | 4 +-
.../activities/ActivityResourceIT.java | 4 +-
.../collection/devices/DevicesResourceIT.java | 4 +-
.../collection/groups/GroupResourceIT.java | 12 +-
.../users/ConnectionResourceTest.java | 8 +-
.../collection/users/OwnershipResourceIT.java | 14 +--
.../collection/users/PermissionsResourceIT.java | 22 ++--
.../collection/users/UserResourceIT.java | 22 ++--
.../queries/BadGrammarQueryTest.java | 14 +--
.../applications/queries/BasicGeoTests.java | 18 +--
.../usergrid/rest/management/AccessTokenIT.java | 18 +--
.../usergrid/rest/management/AdminUsersIT.java | 33 ++---
.../rest/management/ExportResourceIT.java | 60 +++++-----
.../rest/management/ImportResourceIT.java | 16 +--
.../rest/management/ManagementResourceIT.java | 33 ++---
.../rest/management/OrganizationsIT.java | 14 +--
.../rest/management/RegistrationIT.java | 4 +-
.../rest/test/resource/AbstractRestIT.java | 68 +++++++----
.../rest/test/resource/ClientSetup.java | 3 +-
.../usergrid/rest/test/resource/RestClient.java | 13 +-
.../test/resource/endpoints/NamedResource.java | 34 +++---
.../test/resource/endpoints/SetupResource.java | 10 +-
.../resource/endpoints/mgmt/OrgResource.java | 22 ++--
stack/rest/src/test/resources/log4j.properties | 36 +++---
.../rest/src/test/resources/logging.properties | 13 +-
stack/services/pom.xml | 6 +
.../security/providers/FoursquareProvider.java | 6 +-
.../usergrid/management/OrganizationIT.java | 18 +--
51 files changed, 628 insertions(+), 516 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index dc42920..15cca38 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -114,7 +114,7 @@
<shiro-version>1.2.4</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
<snakeyaml-version>1.9</snakeyaml-version>
- <tomcat-version>7.0.59</tomcat-version>
+ <tomcat-version>7.0.64</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
<mockito.version>1.10.8</mockito.version>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index e95e66f..bea05fe 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -39,26 +39,28 @@
<!-- profile that arquillian uses when it builds/starts tomcat -->
<profiles>
- <!--<profile>-->
- <!--<id>arquillian-tomcat</id>-->
- <!--<activation>-->
- <!--<activeByDefault>true</activeByDefault>-->
- <!--</activation>-->
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>org.jboss.arquillian.container</groupId>-->
- <!--<artifactId>arquillian-tomcat-remote-7</artifactId>-->
- <!--<version>1.0.0.CR7</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.eu.ingwar.tools</groupId>-->
- <!--<artifactId>arquillian-suite-extension</artifactId>-->
- <!--<version>1.1.1</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
- <!--</dependencies>-->
- <!--</profile>-->
+ <!--
+ <profile>
+ <id>arquillian-tomcat</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-tomcat-remote-7</artifactId>
+ <version>1.0.0.CR7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eu.ingwar.tools</groupId>
+ <artifactId>arquillian-suite-extension</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ -->
</profiles>
@@ -103,7 +105,7 @@
<threadCount>${usergrid.rest.threads}</threadCount>
<useSystemClassLoader>false</useSystemClassLoader>
<reuseForks>true</reuseForks>
- <argLine>-Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}
+ <argLine>-Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar -Djava.util.logging.config.file=${basedir}/src/test/resources/logging.properties ${ug.argline}
</argLine>
<includes>
<include>**/*IT.java</include>
@@ -128,6 +130,7 @@
<version>2.6</version>
</plugin>
+ <!-- TODO: do we need this?
<plugin>
<groupId>org.jasig.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
@@ -144,14 +147,7 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.jasig.mojo.jspc</groupId>
- <artifactId>jspc-compiler-tomcat6</artifactId>
- <version>2.0.0</version>
- </dependency>
- </dependencies>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -213,11 +209,11 @@
</exclusions>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.usergrid</groupId>-->
- <!--<artifactId>usergrid-mongo-emulator</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
+ <!-- <dependency>
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>usergrid-mongo-emulator</artifactId>
+ <version>${project.version}</version>
+ </dependency> -->
<!-- Apache Dependencies -->
@@ -226,7 +222,7 @@
<artifactId>commons-collections</artifactId>
</dependency>
- <!-- SUN, Javax Package, and Other Com Dependencies -->
+ <!-- Java EE and Jersey dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -241,12 +237,10 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
- <!-- if your container implements Servlet API older than 3.0, use "jersey-container-servlet-core" -->
<artifactId>jersey-container-servlet</artifactId>
<version>2.21</version>
</dependency>
- <!-- Required only when you are using JAX-RS Client -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
@@ -259,7 +253,6 @@
<version>2.21</version>
</dependency>
- <!-- support for JSP and Viewable -->
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-mvc-jsp</artifactId>
@@ -269,7 +262,7 @@
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
- <version>2.7</version>
+ <version>2.21</version>
</dependency>
<dependency>
@@ -278,42 +271,24 @@
<version>2.21</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.contribs</groupId>-->
- <!--<artifactId>jersey-multipart</artifactId>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-spring3</artifactId>
+ <version>2.21</version>
+ </dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-json</artifactId>-->
- <!--</dependency>-->
+ <!-- Jackson, Spring, and other dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-client</artifactId>-->
- <!--</dependency>-->
-
<dependency>
<groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
<artifactId>recaptcha4j</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey</groupId>-->
- <!--<artifactId>jersey-server</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.contribs</groupId>-->
- <!--<artifactId>jersey-spring</artifactId>-->
- <!--</dependency>-->
-
- <!-- Codehaus, Spring, and Other Org Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
@@ -415,24 +390,17 @@
<scope>test</scope>
</dependency>
- <!-- use the in-memory test setup. Just depend on the maven jetty plugin to launch jetty -->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-inmemory</artifactId>
+ <artifactId>jersey-test-framework-provider-external</artifactId>
<version>2.21</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
- <!--<artifactId>jersey-test-framework-external</artifactId>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
- <!--<artifactId>jersey-test-framework-core</artifactId>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.glassfish.jersey.test-framework</groupId>
+ <artifactId>jersey-test-framework-core</artifactId>
+ <version>2.21</version>
+ </dependency>
<dependency>
<groupId>org.apache.usergrid</groupId>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
index 14f8fb2..93048db 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/ContentTypeFilter.java
@@ -59,7 +59,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/
@Override
@@ -70,7 +70,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest,
* javax.servlet.ServletResponse, javax.servlet.FilterChain)
*/
@@ -98,7 +98,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see javax.servlet.Filter#destroy()
*/
@Override
@@ -153,12 +153,10 @@ public class ContentTypeFilter implements Filter {
// nothing to read, check if it's a put or a post. If so set the
// content type to json to create an empty json request
if ( initial == -1 ) {
- if ( ( HttpMethod.POST.equals( method ) || HttpMethod.PUT.equals( method ) ) && !MediaType
- .APPLICATION_FORM_URLENCODED.equals( getContentType() ) ) {
-
- logger.debug(
- "Setting content type to application/json for POST or PUT with no content at path '{}'",
- path );
+ if ( ( HttpMethod.POST.equals( method ) || HttpMethod.PUT.equals( method ) )
+ && !MediaType.APPLICATION_FORM_URLENCODED.equals( getContentType() ) ) {
+ logger.debug("Setting content type to application/json " +
+ "for POST or PUT with no content at path '{}'", path );
setHeader( HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON );
setHeader( HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON );
@@ -170,9 +168,11 @@ public class ContentTypeFilter implements Filter {
char firstChar = ( char ) initial;
// its json, make it so
- if ( firstChar == '{' || firstChar == '[' ) {
- logger.debug( "Setting content type to application/json for POST or PUT with json content at path '{}'",
- path );
+ if ( firstChar == '{' || firstChar == '['
+ && !MediaType.APPLICATION_JSON.equals( getContentType() )) {
+
+ logger.debug( "Setting content type to application/json " +
+ "for POST or PUT with json content at path '{}'", path );
setHeader( HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON );
setHeader( HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON );
@@ -193,7 +193,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see
* javax.servlet.http.HttpServletRequestWrapper#getHeader(java.lang.
* String)
@@ -212,7 +212,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see
* javax.servlet.http.HttpServletRequestWrapper#getHeaders(java.lang
* .String)
@@ -238,7 +238,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see javax.servlet.http.HttpServletRequestWrapper#getHeaderNames()
*/
@Override
@@ -257,7 +257,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see javax.servlet.ServletRequestWrapper#getInputStream()
*/
@Override
@@ -268,7 +268,7 @@ public class ContentTypeFilter implements Filter {
/*
* (non-Javadoc)
- *
+ *
* @see javax.servlet.ServletRequestWrapper#getReader()
*/
@Override
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
index bc2bdc7d..23ccdf9 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/JSONPCallbackFilter.java
@@ -21,15 +21,19 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.Context;
import java.io.IOException;
import static org.apache.commons.lang.StringUtils.isNotBlank;
+@Resource
+@PreMatching
@Component
public class JSONPCallbackFilter implements ContainerRequestFilter {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
index 24051ad..2735cdf 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/MeteringFilter.java
@@ -32,11 +32,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.*;
import javax.ws.rs.core.Context;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -49,6 +47,8 @@ import java.util.concurrent.TimeUnit;
// TODO: Metering for Jersey 2
+@Resource
+@PreMatching
@Component
public class MeteringFilter implements ContainerRequestFilter, ContainerResponseFilter {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
index fcff69d..64d0209 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/filters/TracingFilter.java
@@ -26,11 +26,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.*;
import javax.ws.rs.core.Context;
@@ -39,6 +37,8 @@ import javax.ws.rs.core.Context;
*
* @author zznate
*/
+@Resource
+@PreMatching
@Component
public class TracingFilter implements ContainerRequestFilter, ContainerResponseFilter {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index e79e521..8fba027 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@ -25,13 +25,8 @@ import org.apache.amber.oauth2.common.error.OAuthError;
import org.apache.amber.oauth2.common.exception.OAuthProblemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
import org.apache.amber.oauth2.common.message.types.GrantType;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpHost;
-import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.shiro.codec.Base64;
import org.apache.usergrid.exception.NotImplementedException;
@@ -54,8 +49,6 @@ import org.glassfish.jersey.apache.connector.ApacheClientProperties;
import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.spi.Connector;
-import org.glassfish.jersey.client.spi.ConnectorProvider;
import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
@@ -67,7 +60,10 @@ import org.springframework.stereotype.Component;
import javax.ws.rs.*;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.Iterator;
@@ -650,7 +646,8 @@ public class ManagementResource extends AbstractContextResource {
} else {
// already created user, so just create an org
- final OrganizationInfo organization = management.createOrganization( orgName, userInfo, true );
+ final OrganizationInfo organization =
+ management.createOrganization( orgName, userInfo, true );
applicationCreator.createSampleFor( organization );
@@ -674,7 +671,8 @@ public class ManagementResource extends AbstractContextResource {
throw e;
}
- final Response response = Response.status( SC_OK ).type( jsonMediaType( callback ) ).entity( accessInfo ).build();
+ final Response response = Response.status( SC_OK )
+ .type( jsonMediaType( callback ) ).entity( accessInfo ).build();
timerContext.stop();
@@ -695,7 +693,7 @@ public class ManagementResource extends AbstractContextResource {
Counter tokensRejectedCounter = getMetricsFactory().getCounter(
ManagementResource.class, SSO_TOKENS_REJECTED );
Counter tokensValidatedCounter = getMetricsFactory().getCounter(
- ManagementResource.class, SSO_TOKENS_VALIDATED );
+ ManagementResource.class, SSO_TOKENS_VALIDATED );
// create URL of central Usergrid's /management/me endpoint
@@ -762,7 +760,7 @@ public class ManagementResource extends AbstractContextResource {
clientConfig.connectorProvider( new ApacheConnectorProvider() );
jerseyClient = ClientBuilder.newClient( clientConfig );
- jerseyClient.property( ClientProperties.CONNECT_TIMEOUT, timeout);
+ jerseyClient.property( ClientProperties.CONNECT_TIMEOUT, timeout );
jerseyClient.property( ClientProperties.READ_TIMEOUT, readTimeout );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
index 9398f0e..26f6b5c 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -24,6 +24,7 @@ import org.apache.usergrid.management.ApplicationCreator;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.OrganizationOwnerInfo;
import org.apache.usergrid.management.exceptions.ManagementException;
+import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
@@ -42,6 +43,9 @@ import javax.ws.rs.core.UriInfo;
import java.util.Map;
import java.util.UUID;
+import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
+import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToOrganization;
+
@Component( "org.apache.usergrid.rest.management.organizations.OrganizationsResource" )
@Scope( "prototype" )
@@ -62,7 +66,13 @@ public class OrganizationsResource extends AbstractContextResource {
public OrganizationsResource() {
}
+ // TODO: better solution to this Jersey 2 introduced problem:
+ // Problem is that when Jersey scans the resources classes and methods to add our
+ // secured resource filter, it only recognizes methods with an HTTP method annotation
+ // but when I add the @GET annotation to the methods below, Jersey fails to resolve
+ // the resource methods when they are called.
+ //@GET
@Path(RootResource.ORGANIZATION_ID_PATH)
@RequireOrganizationAccess
public OrganizationResource getOrganizationById( @Context UriInfo ui,
@@ -72,10 +82,18 @@ public class OrganizationsResource extends AbstractContextResource {
if ( organization == null ) {
throw new ManagementException( "Could not find organization for ID: " + organizationIdStr );
}
+
+// // TODO: get rid of this and make annotations work (see above)
+// if ( !isPermittedAccessToOrganization( Identifier.from(organization) ) ) {
+// logger.debug("No organization access authorized");
+// throw mappableSecurityException( "unauthorized", "No organization access authorized" );
+// }
+
return getSubResource( OrganizationResource.class ).init( organization );
}
+ //@GET
@Path( "{organizationName}" )
@RequireOrganizationAccess
public OrganizationResource getOrganizationByName( @Context UriInfo ui,
@@ -85,6 +103,13 @@ public class OrganizationsResource extends AbstractContextResource {
if ( organization == null ) {
throw new ManagementException( "Could not find organization for name: " + organizationName );
}
+
+// // TODO: get rid of this and make annotations work (see above)
+// if ( !isPermittedAccessToOrganization( Identifier.from(organization) ) ) {
+// logger.debug("No organization access authorized");
+// throw mappableSecurityException( "unauthorized", "No organization access authorized" );
+// }
+
return getSubResource( OrganizationResource.class ).init(organization);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
index be6c3e9..00c12d7 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
@@ -21,12 +21,14 @@ import org.apache.usergrid.rest.utils.CORSUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import java.io.IOException;
+@Resource
public class CrossOriginRequestFilter implements ContainerResponseFilter {
public static final Logger logger = LoggerFactory.getLogger( CrossOriginRequestFilter.class );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
index 6e4fc1e..f6edfcc 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
@@ -34,8 +34,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import javax.inject.Inject;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.DynamicFeature;
@@ -54,14 +55,12 @@ import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecu
import static org.apache.usergrid.security.shiro.utils.SubjectUtils.*;
-@Component
+@Resource
public class SecuredResourceFilterFactory implements DynamicFeature {
private static final Logger logger = LoggerFactory.getLogger( SecuredResourceFilterFactory.class );
- private
- @Context
- UriInfo uriInfo;
+ private @Context UriInfo uriInfo;
EntityManagerFactory emf;
ServiceManagerFactory smf;
@@ -71,6 +70,7 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
ManagementService management;
+ @Inject
public SecuredResourceFilterFactory() {
logger.info( "SecuredResourceFilterFactory is installed" );
}
@@ -115,6 +115,9 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
public void configure(ResourceInfo resourceInfo, FeatureContext featureContext) {
Method am = resourceInfo.getResourceMethod();
+ logger.debug( "configure {} method {}",
+ resourceInfo.getResourceClass().getSimpleName(), resourceInfo.getResourceMethod().getName() );
+
if ( am.isAnnotationPresent( RequireApplicationAccess.class ) ) {
featureContext.register( ApplicationFilter.class );
}
@@ -130,8 +133,12 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
}
- public abstract class AbstractFilter implements ContainerRequestFilter {
- public AbstractFilter() {
+ public static abstract class AbstractFilter implements ContainerRequestFilter {
+
+ private UriInfo uriInfo;
+
+ public AbstractFilter( UriInfo uriInfo ) {
+ this.uriInfo = uriInfo;
}
@Override
@@ -209,13 +216,14 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
}
}
+ @Resource
+ public static class OrganizationFilter extends AbstractFilter {
- private class OrganizationFilter extends AbstractFilter {
-
- protected OrganizationFilter() {
+ @Inject
+ public OrganizationFilter( UriInfo uriInfo ) {
+ super(uriInfo);
}
-
@Override
public void authorize( ContainerRequestContext request ) {
logger.debug( "OrganizationFilter.authorize" );
@@ -230,12 +238,32 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
}
- private class ApplicationFilter extends AbstractFilter {
+ @Resource
+ public static class ApplicationFilter extends AbstractFilter {
+
+ EntityManagerFactory emf;
+ ManagementService management;
- protected ApplicationFilter() {
+ @Autowired
+ public void setEntityManagerFactory( EntityManagerFactory emf ) {
+ this.emf = emf;
}
+ public EntityManagerFactory getEntityManagerFactory() {
+ return emf;
+ }
+
+ @Autowired
+ public void setManagementService( ManagementService management ) {
+ this.management = management;
+ }
+
+ @Inject
+ public ApplicationFilter( UriInfo uriInfo ) {
+ super(uriInfo);
+ }
+
@Override
public void authorize( ContainerRequestContext request ) {
logger.debug( "ApplicationFilter.authorize" );
@@ -248,7 +276,7 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
catch ( Exception e ) {
e.printStackTrace();
}
- EntityManager em = emf.getEntityManager( application.getId() );
+ EntityManager em = getEntityManagerFactory().getEntityManager( application.getId() );
Map<String, String> roles = null;
try {
roles = em.getRoles();
@@ -271,8 +299,12 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
}
- public class SystemFilter extends AbstractFilter {
- public SystemFilter() {
+ @Resource
+ public static class SystemFilter extends AbstractFilter {
+
+ @Inject
+ public SystemFilter( UriInfo uriInfo ) {
+ super(uriInfo);
}
@@ -298,10 +330,13 @@ public class SecuredResourceFilterFactory implements DynamicFeature {
}
- public class AdminUserFilter extends AbstractFilter {
- public AdminUserFilter() {
- }
+ @Resource
+ public static class AdminUserFilter extends AbstractFilter {
+ @Inject
+ public AdminUserFilter( UriInfo uriInfo ) {
+ super(uriInfo);
+ }
@Override
public void authorize( ContainerRequestContext request ) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
index 6bf825f..cb0745a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
@@ -20,15 +20,17 @@ package org.apache.usergrid.rest.security.shiro.filters;
import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.ext.Provider;
import java.security.Principal;
import java.util.Map;
-@Component
+@Provider
+@PreMatching
public class BasicAuthSecurityFilter extends SecurityFilter {
private static final Logger logger = LoggerFactory.getLogger( BasicAuthSecurityFilter.class );
@@ -41,6 +43,8 @@ public class BasicAuthSecurityFilter extends SecurityFilter {
@Override
public void filter( ContainerRequestContext request ) {
+ logger.info("Filtering: " + request.getUriInfo().getBaseUri());
+
Map<String, String> auth_types = getAuthTypes( request );
if ( ( auth_types == null ) || !auth_types.containsKey( AUTH_BASIC_TYPE ) ) {
return;
@@ -59,7 +63,7 @@ public class BasicAuthSecurityFilter extends SecurityFilter {
if ( name.equals( sysadmin_login_name ) && password.equals( sysadmin_login_password )
&& sysadmin_login_allowed ) {
request.setSecurityContext( new SysAdminRoleAuthenticator() );
- logger.info( "System administrator access allowed" );
+ logger.debug( "System administrator access allowed" );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
index c4ee3e7..eb982b8 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
@@ -22,18 +22,20 @@ import org.apache.usergrid.security.shiro.PrincipalCredentialsToken;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.OAUTH2_INVALID_CLIENT;
import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
-@Component
+@Provider
+@PreMatching
public class ClientCredentialsSecurityFilter extends SecurityFilter {
private static final Logger logger = LoggerFactory.getLogger( ClientCredentialsSecurityFilter.class );
@@ -49,6 +51,8 @@ public class ClientCredentialsSecurityFilter extends SecurityFilter {
@Override
public void filter( ContainerRequestContext request ) {
+ logger.debug("Filtering: " + request.getUriInfo().getBaseUri());
+
String clientId = httpServletRequest.getParameter( "client_id" );
String clientSecret = httpServletRequest.getParameter( "client_secret" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
index 08de618..4bb0c83 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
@@ -38,27 +38,29 @@ import org.apache.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.apache.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Provider;
import java.io.IOException;
import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.*;
import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
-
-@Component
-public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
+@Provider
+@PreMatching
+public class OAuth2AccessTokenSecurityFilter extends SecurityFilter implements ContainerRequestFilter {
public static final String REALM = "Usergrid Authentication";
- private static final Logger LOG = LoggerFactory.getLogger( OAuth2AccessTokenSecurityFilter.class );
+ private static final Logger logger = LoggerFactory.getLogger( OAuth2AccessTokenSecurityFilter.class );
public OAuth2AccessTokenSecurityFilter() {
- LOG.info( "OAuth2AccessTokenSecurityFilter is installed" );
+ logger.info( "OAuth2AccessTokenSecurityFilter is installed" );
}
@@ -68,6 +70,7 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
@Override
public void filter(ContainerRequestContext request) throws IOException {
+ logger.debug("Filtering: " + request.getUriInfo().getBaseUri());
try {
try {
@@ -102,10 +105,10 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
// token is just some rubbish string
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
} catch (Exception e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug( "Unable to verify OAuth token: " + accessToken, e );
+ if (logger.isDebugEnabled()) {
+ logger.debug( "Unable to verify OAuth token: " + accessToken, e );
} else {
- LOG.warn( "Unable to verify OAuth token" );
+ logger.warn( "Unable to verify OAuth token" );
}
throw mappableSecurityException( UNVERIFIED_OAUTH_ERROR );
}
@@ -124,7 +127,7 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
} catch (ManagementException e) {
throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
} catch (Exception e) {
- LOG.error( "failed to get admin user info from access token", e );
+ logger.error( "failed to get admin user info from access token", e );
}
if (user == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
@@ -140,7 +143,7 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
} catch (ManagementException e) {
throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
} catch (Exception e) {
- LOG.error( "failed to get app user from access token", e );
+ logger.error( "failed to get app user from access token", e );
}
if (user == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
@@ -155,7 +158,7 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
} catch (ManagementException e) {
throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
} catch (Exception e) {
- LOG.error( "failed to get organization info from access token", e );
+ logger.error( "failed to get organization info from access token", e );
}
if (organization == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
@@ -171,7 +174,7 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
} catch (ManagementException e) {
throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
} catch (Exception e) {
- LOG.error( "failed to get application info from access token", e );
+ logger.error( "failed to get application info from access token", e );
}
if (application == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
index 625d352..e0dadba 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
@@ -17,9 +17,13 @@
package org.apache.usergrid.rest.security.shiro.filters;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.commons.lang.StringUtils;
+import org.apache.usergrid.management.ManagementService;
+import org.apache.usergrid.persistence.EntityManagerFactory;
+import org.apache.usergrid.security.tokens.TokenService;
+import org.apache.usergrid.services.ServiceManagerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
@@ -27,23 +31,13 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
import javax.xml.ws.spi.http.HttpContext;
-
-import org.glassfish.jersey.server.ContainerRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
-import org.apache.usergrid.management.ManagementService;
-import org.apache.usergrid.persistence.EntityManagerFactory;
-import org.apache.usergrid.security.tokens.TokenService;
-import org.apache.usergrid.services.ServiceManagerFactory;
-
-import org.apache.commons.lang.StringUtils;
-
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
import static org.apache.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
-
public abstract class SecurityFilter implements ContainerRequestFilter {
public static final String AUTH_OAUTH_2_ACCESS_TOKEN_TYPE = "BEARER";
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/webapp/WEB-INF/web.xml b/stack/rest/src/main/webapp/WEB-INF/web.xml
index 23c0751..0c46fe4 100644
--- a/stack/rest/src/main/webapp/WEB-INF/web.xml
+++ b/stack/rest/src/main/webapp/WEB-INF/web.xml
@@ -40,7 +40,6 @@
<filter-name>swaggerFilter</filter-name>
<filter-class>org.apache.usergrid.rest.SwaggerServlet</filter-class>
</filter>
-
<filter-mapping>
<filter-name>swaggerFilter</filter-name>
<url-pattern>/resources.json</url-pattern>
@@ -54,7 +53,7 @@
<url-pattern>/management.json</url-pattern>
</filter-mapping>
- <!-- filter for setting default accept and Content-Type as application/json when undefined by client -->
+ <!-- filter for setting default accept and Content-Type as application/json when undefined by client
<filter>
<filter-name>contentTypeFilter</filter-name>
<filter-class>org.apache.usergrid.rest.filters.ContentTypeFilter</filter-class>
@@ -63,6 +62,7 @@
<filter-name>contentTypeFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+ -->
<filter>
<filter-name>shiroFilter</filter-name>
@@ -79,43 +79,71 @@
<filter>
<filter-name>Usergrid REST API Server</filter-name>
- <filter-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</filter-class>
+ <filter-class>org.glassfish.jersey.servlet.ServletContainer</filter-class>
+
+ <init-param>
+ <param-name>jersey.config.servlet.filter.contextPath</param-name>
+ <param-value>/</param-value>
+ </init-param>
+
+ <!-- Look for resources, providers and other annotated JAX-RS things in rest package -->
<init-param>
- <param-name>com.sun.jersey.config.property.packages</param-name>
+ <param-name>jersey.config.server.provider.packages</param-name>
<param-value>org.apache.usergrid.rest</param-value>
</init-param>
+
+ <!-- Look recursively in all packages -->
<init-param>
- <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+ <param-name>jersey.config.server.provider.scanning.recursive</param-name>
<param-value>true</param-value>
</init-param>
+
<init-param>
- <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
- <param-value>org.apache.usergrid.rest.filters.TracingFilter,org.apache.usergrid.rest.filters.MeteringFilter,org.apache.usergrid.rest.filters.JSONPCallbackFilter,org.apache.usergrid.rest.security.shiro.filters.OAuth2AccessTokenSecurityFilter,org.apache.usergrid.rest.security.shiro.filters.BasicAuthSecurityFilter,org.apache.usergrid.rest.security.shiro.filters.ClientCredentialsSecurityFilter</param-value>
+ <param-name>jersey.config.server.provider.classnames</param-name>
+ <param-value>
+
+ org.apache.usergrid.rest.security.SecuredResourceFilterFactory,
+ org.glassfish.jersey.server.mvc.jsp.JspMvcFeature,
+ org.glassfish.jersey.media.multipart.MultiPartFeature
+
+ <!-- Currently, we do not use the JAX-RS annotations @PermitAll, @DenyAll, @RolesAllowed -->
+ <!-- , org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature -->
+
+ </param-value>
</init-param>
+
<init-param>
- <param-name>com.sun.jersey.spi.container.ContainerResponseFilters</param-name>
- <param-value>org.apache.usergrid.rest.filters.TracingFilter,org.apache.usergrid.rest.security.CrossOriginRequestFilter,org.apache.usergrid.rest.filters.MeteringFilter</param-value>
+ <param-name>jersey.config.server.mvc.templateBasePath.jsp</param-name>
+ <param-value>/WEB-INF/jsp</param-value>
</init-param>
+
<init-param>
- <param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
- <param-value>org.apache.usergrid.rest.security.SecuredResourceFilterFactory,com.sun.jersey.api.container.filter.RolesAllowedResourceFilterFactory</param-value>
+ <param-name>jersey.config.server.wadl.disableWadl</param-name>
+ <param-value>true</param-value>
</init-param>
+
<init-param>
- <param-name>com.sun.jersey.config.feature.DisableWADL</param-name>
- <param-value>true</param-value>
+ <param-name>jersey.config.servlet.filter.staticContentRegex</param-name>
+ <param-value>/(((images|css|js|jsp|WEB-INF/jsp)/.*)|(favicon\.ico))</param-value>
</init-param>
+
<init-param>
- <param-name>com.sun.jersey.config.property.JSPTemplatesBasePath</param-name>
- <param-value>/WEB-INF/jsp</param-value>
+ <param-name>jersey.config.server.mediaTypeMappings</param-name>
+ <param-value>json:application/json,js:application/javascript</param-value>
</init-param>
+
+ <!-- Have not had success with this yet:
<init-param>
- <param-name>com.sun.jersey.config.property.WebPageContentRegex</param-name>
- <param-value>/(((images|css|js|jsp|WEB-INF/jsp)/.*)|(favicon\.ico))</param-value>
+ <param-name>jersey.config.server.tracing.threshold</param-name>
+ <param-value>TRACE</param-value>
</init-param>
+
<init-param>
- <param-name>com.sun.jersey.config.property.MediaTypeMappings</param-name>
- <param-value>json:application/json,js:application/javascript<!-- Temporarily removed until more testing can occur,csv:text/csv --></param-value>
+ <param-name>jersey.config.server.tracing.type</param-name>
+ <param-value>ALL</param-value>
</init-param>
+ -->
+
</filter>
<filter-mapping>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
index edda5e5..905c522 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
@@ -25,7 +25,8 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+
+import javax.ws.rs.ClientErrorException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -74,9 +75,9 @@ public class BasicIT extends AbstractRestIT {
try {
clientSetup.getRestClient().pathResource( getOrgAppPath( "users/JOE" ) ).get( ApiResponse.class );
fail("A get on a nonexistant object should fail");
- } catch ( ResponseProcessingException e ) {
+ } catch ( ClientErrorException e ) {
assertEquals( "Guests should not be able to get a 404", 404,
- e.getResponse().getStatusInfo().getStatusCode());
+ e.getResponse().getStatusInfo().getStatusCode() );
}
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
index 065cd10..2bf9855 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
@@ -87,10 +87,10 @@ public class IndexResourceIT extends AbstractRestIT {
.get( "jobId" ).toString() )
.getTarget();
- result = res.request()
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
- .get(ApiResponse.class);
+ HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder()
+ .credentials( "superuser", "superpassword" ).build();
+
+ result = res.register( feature ).request().get( ApiResponse.class );
assertNotNull( result );
assertEquals(status,result.getProperties().get("jobId").toString());
@@ -116,9 +116,10 @@ public class IndexResourceIT extends AbstractRestIT {
WebTarget resource = this.clientSetup.getRestClient().pathResource("/system/index/" + appId).getTarget();
- node = resource.request()
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
- .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
+ HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder()
+ .credentials( "superuser", "superpassword" ).build();
+
+ node = resource.register( feature ).request()
.accept( MediaType.APPLICATION_JSON )
.get( org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
index 109c76d..bc66467 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -77,7 +77,7 @@ public class PartialUpdateTest extends AbstractRestIT {
try {
// PUT the updates to the user and ensure they were saved
userNode = this.app().collection("users").entity(userNode).put(updateProps);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
fail("Update failed due to: " + uie.getResponse().readEntity(String.class));
}
@@ -118,7 +118,7 @@ public class PartialUpdateTest extends AbstractRestIT {
try { // PUT /users/fred put /users/uuid
userNode = this.app().collection("users").entity(props.get("username").toString()).put(updateProps);
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
fail("Update failed due to: " + uie.getResponse().readEntity(String.class));
}
refreshIndex();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
index b863a8e..d215256 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
@@ -30,8 +30,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -72,20 +73,13 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
- try {
- clientSetup.getRestClient() .management().orgs()
- .org(orgName).apps().app(appToDeleteId.toString()).getTarget()
- .queryParam("access_token", orgAdminToken.getAccessToken())
- .request()
- .delete();
-
- fail("Delete must fail without app_delete_confirm parameter");
+ final Response response = clientSetup.getRestClient().management().orgs()
+ .org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .request()
+ .delete();
- } catch ( ResponseProcessingException expected ) {
- Assert.assertEquals("Error must be 400", 400, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
- Assert.assertEquals("Cannot delete application without app_delete_confirm parameter", node.get("error_description").textValue());
- }
+ Assert.assertEquals("Error must be 400", 400, response.getStatus() );
clientSetup.getRestClient().management().orgs()
.org(orgName).apps().app(appToDeleteId.toString() ).getTarget()
@@ -105,7 +99,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
fail("Must not be able to get deleted app");
- } catch ( ResponseProcessingException expected ) {
+ } catch ( ClientErrorException expected ) {
Assert.assertEquals("Error must be 404", 404, expected.getResponse().getStatus() );
JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
Assert.assertEquals("entity_not_found", node.get("error").textValue());
@@ -119,7 +113,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
fail( "Must not be able to get deleted app" );
}
- catch ( ResponseProcessingException expected ) {
+ catch ( ClientErrorException expected ) {
Assert.assertEquals( "Error must be 404", 404, expected.getResponse().getStatus() );
JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ) );
Assert.assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
@@ -137,7 +131,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
fail("Must not be able to get deleted app's collection");
- } catch ( ResponseProcessingException expected ) {
+ } catch ( ClientErrorException expected ) {
Assert.assertEquals("Error must be 400", 404, expected.getResponse().getStatus() );
JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
Assert.assertEquals("organization_application_not_found", node.get("error").textValue());
@@ -155,7 +149,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
fail("Must not be able to get deleted app entity");
- } catch ( ResponseProcessingException expected ) {
+ } catch ( ClientErrorException expected ) {
// TODO: why not a 404?
Assert.assertEquals("Error must be 400", 404, expected.getResponse().getStatus() );
JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
@@ -178,20 +172,13 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// test that we cannot delete the application a second time
- try {
- clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( appToDeleteId.toString() )
- .getTarget().queryParam( "access_token", orgAdminToken.getAccessToken() )
- .queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
- .request()
- .delete();
-
- fail("Can't delete a non existent app twice");
- }
- catch ( ResponseProcessingException expected ) {
- Assert.assertEquals( "Error must be 404", 404, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ) );
- Assert.assertEquals( "entity_not_found", node.get( "error" ).textValue() );
- }
+ final Response response1 = clientSetup.getRestClient().management()
+ .orgs().org( orgName ).apps().app( appToDeleteId.toString() )
+ .getTarget().queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
+ .request()
+ .delete();
+ Assert.assertEquals( "Error must be 404", 404, response1.getStatus() );
// test that we can create a new application with the same name
@@ -203,7 +190,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
Assert.assertEquals("Must be able to create app with same name as deleted app",
(orgName + "/" + appToDeleteName).toLowerCase(),
- appCreateAgainResponse.getEntities().get(0).get("name"));
+ appCreateAgainResponse.getEntities().get(0).get( "name" ));
}
@@ -245,13 +232,13 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// restore the app
- logger.debug("\n\nRestoring app\n");
+ logger.debug( "\n\nRestoring app\n" );
clientSetup.getRestClient().management().orgs()
.org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.request()
- .put( javax.ws.rs.client.Entity.json( null ));
+ .put( javax.ws.rs.client.Entity.entity( "", MediaType.APPLICATION_JSON )); // must send body
refreshIndex();
@@ -274,9 +261,9 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// test that we can get an app entity
- logger.debug("\n\nGetting entities from app\n");
+ logger.debug( "\n\nGetting entities from app\n" );
- UUID entityId = entities.get(0).getUuid();
+ UUID entityId = entities.get( 0 ).getUuid();
ApiResponse entityResponse = clientSetup.getRestClient()
.org( orgName ).app( appToDeleteName ).collection( "things" ).entity( entityId ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
@@ -290,7 +277,7 @@ public class ApplicationDeleteIT extends AbstractRestIT {
.org( orgName ).app( appToDeleteName ).collection( "things" ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.request()
- .get(ApiResponse.class);
+ .get( ApiResponse.class );
Assert.assertEquals( entities.size(), collectionReponse.getEntityCount() );
}
@@ -326,19 +313,13 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// attempt to restore original app, should get 409
- try {
-
- clientSetup.getRestClient() .management().orgs()
- .org(orgName).apps().app(appToDeleteId.toString()).getTarget()
- .queryParam("access_token", orgAdminToken.getAccessToken())
- .request()
- .put( javax.ws.rs.client.Entity.json(null) );
-
- fail("Must fail to restore app with same name as existing app");
+ final Response response = clientSetup.getRestClient().management().orgs()
+ .org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .request()
+ .put( javax.ws.rs.client.Entity.entity( "", MediaType.TEXT_PLAIN ) );// must send body with put
- } catch ( ResponseProcessingException e ) {
- Assert.assertEquals(409, e.getResponse().getStatus());
- }
+ Assert.assertEquals( 409, response.getStatus() );
}
@@ -361,7 +342,8 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
- clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
+ clientSetup.getRestClient().management()
+ .orgs().org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
.request()
@@ -373,19 +355,14 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// attempt to delete new app, it should fail
- try {
-
- clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( newAppId.toString() ).getTarget()
- .queryParam( "access_token", orgAdminToken.getAccessToken() )
- .queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
- .request()
- .delete();
-
- fail("Must fail to delete app with same name as deleted app");
+ final Response response = clientSetup.getRestClient().management()
+ .orgs().org( orgName ).apps().app( newAppId.toString() ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
+ .request()
+ .delete();
- } catch ( ResponseProcessingException e ) {
- Assert.assertEquals( 409, e.getResponse().getStatus() );
- }
+ Assert.assertEquals( 409, response.getStatus() );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index f071b5e..bc24f5b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -32,8 +32,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -228,6 +229,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
* (for backwards compatibility)
*/
@Test
+ @Ignore("this form of backwards compatibility no longer needed")
public void jsonForAcceptsTextHtml() throws Exception {
//Create the organization resource
@@ -414,7 +416,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
.accept(MediaType.APPLICATION_JSON)
.post( javax.ws.rs.client.Entity.entity(entity, MediaType.APPLICATION_JSON_TYPE ), ApiResponse.class);
fail("This should cause an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
assertEquals(
String.valueOf( Response.Status.BAD_REQUEST.getStatusCode()),
String.valueOf(uie.getResponse().getStatus()));
@@ -480,7 +482,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
this.app().collection("users").entity(entity).get(
new QueryParameters().addParam("access_token", token), false);
fail("The expired token should cause an exception");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
@@ -519,8 +521,8 @@ public class ApplicationResourceIT extends AbstractRestIT {
.get( ApiResponse.class );
fail("The invalid TTL should cause an exception");
- } catch (ResponseProcessingException uie) {
- //TODO should this be handled and returned as a Status.BAD_REQUEST?
+ } catch (InternalServerErrorException uie) {
+ // TODO should this be handled and returned as a Status.BAD_REQUEST?
//Status.INTERNAL_SERVER_ERROR is thrown because Jersey throws a NumberFormatException
assertEquals( Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), uie.getResponse().getStatus());
}
@@ -655,7 +657,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
.request()
.accept( MediaType.TEXT_HTML )
.post( javax.ws.rs.client.Entity.form( payload ), String.class );
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
assertEquals(String.valueOf( Response.Status.TEMPORARY_REDIRECT.getStatusCode()), uie.getResponse().getStatus());
}
@@ -780,6 +782,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
* Ensure that the Apigee Mobile Analytics config returns valid JSON
*/
@Test
+ @Ignore
public void validateApigeeApmConfigAPP() throws IOException {
String orgName = clientSetup.getOrganizationName().toLowerCase();
String appName = clientSetup.getAppName().toLowerCase();
@@ -795,7 +798,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
//if things are kosher then JSON should have value for instaOpsApplicationId
assertTrue("it's valid json for APM", node.has("instaOpsApplicationId"));
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Validate that APM config exists
assertNotEquals("APM Config API exists", Response.Status.NOT_FOUND,
uie.getResponse().getStatus()); //i.e It should not be "Not Found"
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
index 92705b2..0342883 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
@@ -24,6 +24,10 @@ import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.services.assets.data.AssetUtils;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.MultiPart;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
+import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -240,9 +244,11 @@ public class AssetResourceIT extends AbstractRestIT {
// upload a file larger than 6mb
- byte[] data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/ship-larger-than-6mb.gif" ) );
- FormDataMultiPart form = new FormDataMultiPart().field( "file", data, MediaType.MULTIPART_FORM_DATA_TYPE );
- ApiResponse postResponse = pathResource( getOrgAppPath( "bars" ) ).post( form );
+ final StreamDataBodyPart part = new StreamDataBodyPart(
+ "file", getClass().getResourceAsStream( "/ship-larger-than-6mb.gif" ), "ship");
+ final MultiPart multipart = new FormDataMultiPart().bodyPart( part );
+
+ ApiResponse postResponse = pathResource( getOrgAppPath( "bars" ) ).post( multipart );
UUID assetId = postResponse.getEntities().get(0).getUuid();
String errorMessage = null;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
index 72d45de..af41b69 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
@@ -31,7 +31,7 @@ import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.io.InputStream;
@@ -95,7 +95,7 @@ public class AwsAssetResourceIT extends AbstractRestIT {
}catch ( AwsPropertiesNotFoundException e ){
fail("Shouldn't interrupt runtime if access key isnt found.");
}
- catch( ResponseProcessingException uie){
+ catch( ClientErrorException uie){
assertEquals(500,uie.getResponse().getStatus());
}
finally{
@@ -129,7 +129,7 @@ public class AwsAssetResourceIT extends AbstractRestIT {
}catch ( AwsPropertiesNotFoundException e ){
fail("Shouldn't interrupt runtime if access key isnt found.");
}
- catch( ResponseProcessingException uie){
+ catch( ClientErrorException uie){
assertEquals( 500, uie.getResponse().getStatus() );
}
finally{
@@ -171,7 +171,7 @@ public class AwsAssetResourceIT extends AbstractRestIT {
}catch ( AwsPropertiesNotFoundException e ){
fail("Shouldn't interrupt runtime if access key isnt found.");
}
- catch( ResponseProcessingException uie){
+ catch( ClientErrorException uie){
assertEquals( 500, uie.getResponse().getStatus() );
}
finally{
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index b2bab35..92eac90 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import java.io.IOException;
import static org.junit.Assert.*;
@@ -62,7 +62,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").get();
fail("Call to bad path exists, but it should not");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
@@ -75,7 +75,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").post(payload);
fail("Call to bad path exists, but it should not");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
@@ -85,7 +85,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").entity(entity).put(payload);
fail("Call to bad path exists, but it should not");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
@@ -95,7 +95,7 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").entity(entity).delete();
fail("Call to bad path exists, but it should not");
- } catch (ResponseProcessingException e) {
+ } catch (ClientErrorException e) {
//verify the correct error was returned
JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
index 4e21ca7..0776705 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
@@ -20,7 +20,7 @@ import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -47,7 +47,7 @@ public class DuplicateNameIT extends AbstractRestIT {
this.app().collection(collectionName).post(entity);
// fail if the POST did not return an exception
fail("Should not have created duplicate entity");
- } catch (ResponseProcessingException uie) {
+ } catch (ClientErrorException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
index 239bb13..e71f4a8 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.utils.UUIDUtils;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -88,7 +88,7 @@ public class ActivityResourceIT extends AbstractRestIT {
// don't populate the user, it will use the currently authenticated user.
try {
groupActivityResource.post(activity);
- }catch (ResponseProcessingException e)
+ }catch (ClientErrorException e)
{
throw e;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/eb2aa6ff/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
index 6e44e39..02716a7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import org.junit.Ignore;
-import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.ClientErrorException;
public class DevicesResourceIT extends AbstractRestIT {
@@ -68,7 +68,7 @@ public class DevicesResourceIT extends AbstractRestIT {
entity = devicesResource.entity(uuid).get();
fail( "should get 404 error" );
}
- catch ( ResponseProcessingException e ) {
+ catch ( ClientErrorException e ) {
assertEquals( 404, e.getResponse().getStatus() );
}
refreshIndex();
[02/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index a754eb0..c55f953 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -21,8 +21,6 @@ import com.amazonaws.SDKGlobalConfiguration;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.Service;
import com.google.inject.Module;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.usergrid.ServiceITSetup;
@@ -51,6 +49,8 @@ import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Response;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -211,7 +211,7 @@ public class ImportResourceIT extends AbstractRestIT {
this.management().orgs().org( org ).app().addToPath(app)
.addToPath("imports").addToPath(entity.getUuid().toString()).get();
fail("Should not be able to read import job with unauthorized token");
- } catch (UniformInterfaceException ex) {
+ } catch (ResponseProcessingException ex) {
errorParse(401, "unauthorized", ex);
}
@@ -223,16 +223,16 @@ public class ImportResourceIT extends AbstractRestIT {
public void importPostApplicationNullPointerProperties() throws Exception {
String org = clientSetup.getOrganizationName();
String app = clientSetup.getAppName();
- ClientResponse.Status responseStatus = ClientResponse.Status.OK;
+ Response.Status responseStatus = Response.Status.OK;
Entity payload = new Entity();
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
+ assertEquals(Response.Status.BAD_REQUEST, responseStatus);
}
@Ignore
@@ -240,7 +240,7 @@ public class ImportResourceIT extends AbstractRestIT {
public void importPostApplicationNullPointerStorageInfo() throws Exception {
String org = clientSetup.getOrganizationName();
String app = clientSetup.getAppName();
- ClientResponse.Status responseStatus = ClientResponse.Status.OK;
+ Response.Status responseStatus = Response.Status.OK;
Entity payload = payloadBuilder();
Entity properties = (Entity) payload.get("properties");
@@ -249,10 +249,10 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
+ assertEquals(Response.Status.BAD_REQUEST, responseStatus);
}
@@ -261,7 +261,7 @@ public class ImportResourceIT extends AbstractRestIT {
public void importPostApplicationNullPointerStorageProvider() throws Exception {
String org = clientSetup.getOrganizationName();
String app = clientSetup.getAppName();
- ClientResponse.Status responseStatus = ClientResponse.Status.OK;
+ Response.Status responseStatus = Response.Status.OK;
Entity payload = payloadBuilder();
Entity properties = (Entity) payload.get("properties");
@@ -271,10 +271,10 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
+ assertEquals(Response.Status.BAD_REQUEST, responseStatus);
}
@@ -283,7 +283,7 @@ public class ImportResourceIT extends AbstractRestIT {
public void importPostApplicationNullPointerStorageVerification() throws Exception {
String org = clientSetup.getOrganizationName();
String app = clientSetup.getAppName();
- ClientResponse.Status responseStatus = ClientResponse.Status.OK;
+ Response.Status responseStatus = Response.Status.OK;
Entity payload = payloadBuilder();
@@ -294,10 +294,10 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
+ assertEquals(Response.Status.BAD_REQUEST, responseStatus);
payload = payloadBuilder();
properties = (Entity) payload.get("properties");
@@ -307,10 +307,10 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
+ assertEquals(Response.Status.BAD_REQUEST, responseStatus);
payload = payloadBuilder();
properties = (Entity) payload.get("properties");
@@ -320,10 +320,10 @@ public class ImportResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( org ).app().addToPath(app).addToPath("imports").post(Entity.class,payload);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.BAD_REQUEST, responseStatus);
+ assertEquals(Response.Status.BAD_REQUEST, responseStatus);
}
// @Test
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 1fe4974..386f3b9 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -18,9 +18,6 @@ package org.apache.usergrid.rest.management;
import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
@@ -33,7 +30,10 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
import java.io.IOException;
import java.util.*;
@@ -115,26 +115,26 @@ public class ManagementResourceIT extends AbstractRestIT {
// check that the test admin cannot access the new org info
- Status status = null;
+ Response.Status status = null;
String returnVal = "";
try {
returnVal = this.management().orgs().org( orgName ).get(String.class);
}
- catch ( UniformInterfaceException uie ) {
- status = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertNotNull( status );
- assertEquals( Status.UNAUTHORIZED, status );
+ assertEquals( Response.Status.UNAUTHORIZED, status );
// this admin should have access to test org
status = null;
try {
this.management().orgs().org( this.clientSetup.getOrganizationName() ).get( String.class );
}
- catch ( UniformInterfaceException uie ) {
- status = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertNull( status );
@@ -145,8 +145,8 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
this.management().orgs().org( this.clientSetup.getOrganizationName() ).get( String.class );
}
- catch ( UniformInterfaceException uie ) {
- status = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
assertNull( status );
@@ -332,15 +332,15 @@ public class ManagementResourceIT extends AbstractRestIT {
// wait for the token to expire
Thread.sleep( (System.currentTimeMillis() - startTime) + ttl );
- Status responseStatus = null;
+ Response.Status responseStatus = null;
try {
userdata = management.users().user(clientSetup.getEmail()).get();
}
- catch ( UniformInterfaceException uie ) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals( Status.UNAUTHORIZED, responseStatus );
+ assertEquals( Response.Status.UNAUTHORIZED, responseStatus );
}
@@ -423,19 +423,21 @@ public class ManagementResourceIT extends AbstractRestIT {
public void meTokenPostForm() {
Form form = new Form();
- form.add( "grant_type", "password" );
- form.add( "username", clientSetup.getUsername() );
- form.add( "password", clientSetup.getPassword() );
+ form.param( "grant_type", "password" );
+ form.param( "username", clientSetup.getUsername() );
+ form.param( "password", clientSetup.getPassword() );
JsonNode node = management.me().post( JsonNode.class, form );
- logger.info("node:", node);
+ logger.info( "node:", node);
String token = node.get( "access_token" ).textValue();
assertNotNull( token );
- node = resource().path( "/management/me" ).queryParam( "access_token", token )
- .accept( MediaType.APPLICATION_JSON ).get( JsonNode.class );
+ node = target().path( "/management/me" )
+ .queryParam( "access_token", token ).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get( JsonNode.class );
logger.info("node:", node );
}
@@ -449,15 +451,15 @@ public class ManagementResourceIT extends AbstractRestIT {
.map( "password", clientSetup.getPassword() )
.map( "ttl", "derp" );
- Status responseStatus = null;
+ Response.Status responseStatus = null;
try {
management.token().post( JsonNode.class, payload );
}
- catch ( UniformInterfaceException uie ) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus());
}
- assertEquals( Status.BAD_REQUEST, responseStatus );
+ assertEquals( Response.Status.BAD_REQUEST, responseStatus );
}
@@ -469,16 +471,16 @@ public class ManagementResourceIT extends AbstractRestIT {
.map( "password", clientSetup.getPassword() )
.map( "ttl", Long.MAX_VALUE + "" );
- Status responseStatus = null;
+ Response.Status responseStatus = null;
try {
management.token().post( JsonNode.class, payload );
}
- catch ( UniformInterfaceException uie ) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals( Status.BAD_REQUEST, responseStatus );
+ assertEquals( Response.Status.BAD_REQUEST, responseStatus );
}
@@ -500,16 +502,16 @@ public class ManagementResourceIT extends AbstractRestIT {
// the tokens shouldn't work
- Status status = null;
+ Response.Status status = null;
try {
response = management.users().user(clientSetup.getUsername()).get();
}
- catch ( UniformInterfaceException uie ) {
- status = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals( Status.UNAUTHORIZED, status );
+ assertEquals( Response.Status.UNAUTHORIZED, status );
Token token3 = management.token().get(clientSetup.getUsername(), clientSetup.getPassword());
@@ -528,11 +530,11 @@ public class ManagementResourceIT extends AbstractRestIT {
try {
management.users().user(clientSetup.getUsername()).get();
}
- catch ( UniformInterfaceException uie ) {
- status = uie.getResponse().getClientResponseStatus();
+ catch ( ResponseProcessingException uie ) {
+ status = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals( Status.UNAUTHORIZED, status );
+ assertEquals( Response.Status.UNAUTHORIZED, status );
}
@@ -587,10 +589,10 @@ public class ManagementResourceIT extends AbstractRestIT {
fail( "Validation should have failed" );
- } catch (UniformInterfaceException actual) {
+ } catch (ResponseProcessingException actual) {
assertEquals( 404, actual.getResponse().getStatus() );
- String errorMsg = actual.getResponse().getEntity(
- JsonNode.class ).get( "error_description" ).toString();
+ String errorMsg = actual.getResponse().readEntity( JsonNode.class )
+ .get( "error_description" ).toString();
logger.error( "ERROR: " + errorMsg );
assertTrue( errorMsg.contains( "Cannot find Admin User" ) );
}
@@ -638,15 +640,15 @@ public class ManagementResourceIT extends AbstractRestIT {
ApiResponse postResponse = pathResource( "management/token" ).post( false, ApiResponse.class, loginInfo );
fail( "Login as Admin User must fail when validate external tokens is enabled" );
- } catch (UniformInterfaceException actual) {
+ } catch (ResponseProcessingException actual) {
assertEquals( 400, actual.getResponse().getStatus() );
- String errorMsg = actual.getResponse()
- .getEntity( JsonNode.class ).get( "error_description" ).toString();
+ String errorMsg = actual.getResponse().readEntity( JsonNode.class )
+ .get( "error_description" ).toString();
logger.error( "ERROR: " + errorMsg );
assertTrue( errorMsg.contains( "Admin Users must login via" ) );
} catch (Exception e) {
- fail( "We expected a UniformInterfaceException" );
+ fail( "We expected a ResponseProcessingException" );
}
// login as superuser must succeed
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 782c8cd..a0ebf6e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -29,9 +29,9 @@ import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.RestClient;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.Response;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -123,7 +123,7 @@ public class OrganizationsIT extends AbstractRestIT {
clientSetup.getRestClient().management().orgs().post( orgTestDuplicatePayload );
fail("Should not have been able to create duplicate organization");
}
- catch ( UniformInterfaceException ex ) {
+ catch ( ResponseProcessingException ex ) {
errorParse( 400,duplicateUniquePropertyExistsErrorMessage, ex );
}
@@ -135,7 +135,7 @@ public class OrganizationsIT extends AbstractRestIT {
tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
fail( "Should not have created user" );
}
- catch ( UniformInterfaceException ex ) {
+ catch ( ResponseProcessingException ex ) {
errorParse( 400,invalidGrantErrorMessage, ex );
}
@@ -179,7 +179,7 @@ public class OrganizationsIT extends AbstractRestIT {
clientSetup.getRestClient().management().orgs().post( orgDuplicatePayload );
fail( "Should not have created organization" );
}
- catch ( UniformInterfaceException ex ) {
+ catch ( ResponseProcessingException ex ) {
errorParse( 400,duplicateUniquePropertyExistsErrorMessage,ex);
}
@@ -190,7 +190,7 @@ public class OrganizationsIT extends AbstractRestIT {
tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
fail( "Should not have created organization" );
}
- catch ( UniformInterfaceException ex ) {
+ catch ( ResponseProcessingException ex ) {
errorParse( 400,invalidGrantErrorMessage,ex );
}
@@ -222,7 +222,7 @@ public class OrganizationsIT extends AbstractRestIT {
try{
Organization organizationReturned = clientSetup.getRestClient().management().orgs().post(queryParameters);
fail();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
assertEquals("ensure bad request",e.getResponse().getStatus(), 400);
}
@@ -254,12 +254,12 @@ public class OrganizationsIT extends AbstractRestIT {
//create the form to hold the organization
Form form = new Form();
- form.add( "organization", organization.getOrganization() );
- form.add("username", organization.getUsername());
- form.add( "grant_type", "password" );
- form.add( "email", organization.getEmail() );
- form.add( "name", organization.getName() );
- form.add("password", organization.getPassword());
+ form.param( "organization", organization.getOrganization() );
+ form.param( "username", organization.getUsername() );
+ form.param( "grant_type", "password" );
+ form.param( "email", organization.getEmail() );
+ form.param( "name", organization.getName() );
+ form.param( "password", organization.getPassword() );
//Post the organization and verify it worked.
Organization organizationReturned = clientSetup.getRestClient().management().orgs().post( form );
@@ -295,8 +295,8 @@ public class OrganizationsIT extends AbstractRestIT {
//Delete default organization
clientSetup.getRestClient().management().orgs().org( clientSetup.getOrganizationName() ).delete();
fail( "Delete is not implemented yet" );
- }catch(UniformInterfaceException uie){
- assertEquals( ClientResponse.Status.NOT_IMPLEMENTED ,uie.getResponse().getStatus());
+ }catch(ResponseProcessingException uie){
+ assertEquals( Response.Status.NOT_IMPLEMENTED ,uie.getResponse().getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
index abe2230..fc18292 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
@@ -17,8 +17,6 @@
package org.apache.usergrid.rest.management;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
@@ -32,6 +30,8 @@ import org.slf4j.LoggerFactory;
import javax.mail.*;
import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.util.Map;
@@ -102,12 +102,14 @@ public class RegistrationIT extends AbstractRestIT {
String t = this.getAdminToken().getAccessToken();
Form form = new Form();
- form.add("foo", "bar");
+ form.param( "foo", "bar" );
try {
- this.org().getResource(false).path("/users/test-admin-null@mockserver.com")
- .queryParam("access_token", t).accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_FORM_URLENCODED).put(String.class, form);
- } catch (UniformInterfaceException e) {
+ this.org().getTarget(false).path("/users/test-admin-null@mockserver.com")
+ .queryParam("access_token", t)
+ .request()
+ .accept(MediaType.APPLICATION_JSON)
+ .put( javax.ws.rs.client.Entity.form(form) );
+ } catch (ResponseProcessingException e) {
assertEquals("Should receive a 404 Not Found", 404, e.getResponse().getStatus());
}
} finally {
@@ -179,13 +181,9 @@ public class RegistrationIT extends AbstractRestIT {
//reset token
String token = getTokenFromMessage(msgs[0]);
- this
- .management()
- .orgs()
- .org( this.clientSetup.getOrganizationName() )
- .users()
- .getResource( false )
+ this.management().orgs().org( this.clientSetup.getOrganizationName() ).users().getTarget( false )
.queryParam( "access_token", token )
+ .request()
.get( String.class );
//There is nothing in this test that should indicate why an admin access wouldn't be allowed.
@@ -218,10 +216,10 @@ public class RegistrationIT extends AbstractRestIT {
//A form is REQUIRED to post a user to a management application
Form userForm = new Form();
- userForm.add( "username", adminUserEmail );
- userForm.add( "name", adminUserEmail );
- userForm.add( "email", adminUserEmail );
- userForm.add( "password", "password1" );
+ userForm.param( "username", adminUserEmail );
+ userForm.param( "name", adminUserEmail );
+ userForm.param( "email", adminUserEmail );
+ userForm.param( "password", "password1" );
//Disgusting data manipulation to parse the form response.
Map adminUserPostResponse = (management().users().post( User.class, userForm ));
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
index 1392749..c615b60 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -17,7 +17,6 @@
package org.apache.usergrid.rest.management.organizations;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Application;
import org.apache.usergrid.rest.test.resource.model.Entity;
@@ -89,9 +88,9 @@ public class AdminEmailEncodingIT extends AbstractRestIT {
* the given string is a part of the admin email address
*
* @param symbol
- * @throws UniformInterfaceException
+ * @throws Exception
*/
- private void doTest(String symbol) throws UniformInterfaceException {
+ private void doTest(String symbol) throws Exception {
String unique = UUID.randomUUID().toString();
String org = "org_getTokenDash" + unique;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
index 1d9c23e..cc5807e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
@@ -19,14 +19,6 @@ package org.apache.usergrid.rest.test.resource;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.test.framework.AppDescriptor;
-import com.sun.jersey.test.framework.JerseyTest;
-import com.sun.jersey.test.framework.WebAppDescriptor;
-import com.sun.jersey.test.framework.spi.container.TestContainerFactory;
import org.apache.usergrid.rest.TomcatRuntime;
import org.apache.usergrid.rest.test.resource.endpoints.ApplicationsResource;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
@@ -35,8 +27,12 @@ import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResource;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.test.JerseyTest;
import org.junit.Rule;
+import javax.ws.rs.client.ResponseProcessingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLClassLoader;
@@ -53,26 +49,24 @@ import static org.junit.Assert.assertEquals;
//@RunWith( Arquillian.class )
public class AbstractRestIT extends JerseyTest {
- private static ClientConfig clientConfig = new DefaultClientConfig();
+ private static ClientConfig clientConfig = new ClientConfig();
public static TomcatRuntime tomcatRuntime = TomcatRuntime.getInstance();
@Rule
public ClientSetup clientSetup = new ClientSetup( this.getBaseURI().toString() );
- protected static final AppDescriptor descriptor;
-
- public AbstractRestIT() {
- super( descriptor );
- }
+// protected static final Application descriptor;
+//
+// public AbstractRestIT() {
+// super( descriptor );
+// }
protected ObjectMapper mapper = new ObjectMapper();
static {
- clientConfig.getFeatures().put( JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE );
- descriptor = new WebAppDescriptor.Builder( "org.apache.usergrid.rest" )
- .clientConfig( clientConfig ).build();
+ clientConfig.register( new JacksonFeature() );
dumpClasspath( AbstractRestIT.class.getClassLoader() );
}
@@ -107,7 +101,6 @@ public class AbstractRestIT extends JerseyTest {
}
}
- @Override
protected URI getBaseURI() {
try {
return new URI("http://localhost:" + tomcatRuntime.getPort());
@@ -116,10 +109,10 @@ public class AbstractRestIT extends JerseyTest {
}
}
- @Override
- protected TestContainerFactory getTestContainerFactory() {
- return new com.sun.jersey.test.framework.spi.container.external.ExternalTestContainerFactory();
- }
+// @Override
+// protected TestContainerFactory getTestContainerFactory() {
+// return new ExternalTestContainerFactory();
+// }
///myorg/
protected OrganizationResource org(){
@@ -158,15 +151,15 @@ public class AbstractRestIT extends JerseyTest {
/**
- * Takes in the expectedStatus message and the expectedErrorMessage then compares it to the UniformInterfaceException
+ * Takes in the expectedStatus message and the expectedErrorMessage then compares it to the ResponseProcessingException
* to make sure that we got what we expected.
* @param expectedStatus
* @param expectedErrorMessage
* @param uie
*/
- public void errorParse(int expectedStatus, String expectedErrorMessage, UniformInterfaceException uie){
+ public void errorParse(int expectedStatus, String expectedErrorMessage, ResponseProcessingException uie){
assertEquals(expectedStatus,uie.getResponse().getStatus());
- JsonNode errorJson = uie.getResponse().getEntity( JsonNode.class );
+ JsonNode errorJson = uie.getResponse().readEntity( JsonNode.class );
assertEquals( expectedErrorMessage, errorJson.get( "error" ).asText() );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
index 30e008c..23fa6c3 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/RestClient.java
@@ -17,15 +17,15 @@
package org.apache.usergrid.rest.test.resource;
import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
import org.apache.usergrid.rest.test.resource.endpoints.*;
import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResource;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
@@ -38,9 +38,9 @@ public class RestClient implements UrlResource {
private final String serverUrl;
private ClientContext context;
- public WebResource resource;
- ClientConfig config = new DefaultClientConfig();
- Client client = Client.create( config );
+ public WebTarget resource;
+ ClientConfig config = new ClientConfig();
+ Client client = ClientBuilder.newClient( config );
/**
*
@@ -49,7 +49,7 @@ public class RestClient implements UrlResource {
public RestClient( final String serverUrl ) {
this.serverUrl = serverUrl;
this.context = new ClientContext();
- resource = client.resource( serverUrl );
+ resource = client.target( serverUrl );
resource.path( serverUrl );
}
@@ -59,12 +59,12 @@ public class RestClient implements UrlResource {
*/
@Override
public String getPath() {
- return resource.getURI().toString();
+ return resource.getUri().toString();
}
@Override
- public WebResource getResource() {
- return client.resource( serverUrl );
+ public WebTarget getTarget(){
+ return client.target( serverUrl );
}
public ClientContext getContext() {
@@ -98,11 +98,12 @@ public class RestClient implements UrlResource {
}
public void refreshIndex(String orgname, String appName, String appid) {
//TODO: add error checking and logging
- this.getResource().path( "/refreshindex" )
+ this.getTarget().path( "/refreshindex" )
.queryParam( "org_name", orgname )
.queryParam( "app_name",appName )
.queryParam("app_id", appid)
- .accept( MediaType.APPLICATION_JSON ).post();
+ .request()
+ .accept( MediaType.APPLICATION_JSON ).post( javax.ws.rs.client.Entity.json(null) );
}
public NamedResource pathResource(String path){
@@ -110,13 +111,11 @@ public class RestClient implements UrlResource {
}
public void superuserSetup() {
- //TODO: change this when we upgrade to new version of jersey
- HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( "superuser","superpassword" );
- client.addFilter( httpBasicAuthFilter );
-
- this.getResource().path( "system/superuser/setup" )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON ).get( JsonNode.class );
- client.removeFilter( httpBasicAuthFilter );
+ this.getTarget().path( "system/superuser/setup" ).request()
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
+ .accept( MediaType.APPLICATION_JSON )
+ .get( JsonNode.class );
}
//todo:fix this method for the client.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/TestPropertiesResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/TestPropertiesResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/TestPropertiesResource.java
index ad08d94..21aece5 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/TestPropertiesResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/TestPropertiesResource.java
@@ -17,14 +17,14 @@
package org.apache.usergrid.rest.test.resource;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import javax.ws.rs.core.MediaType;
+
/**
*Adds support for changing the management properties in the rest testing framework.
@@ -36,12 +36,14 @@ public class TestPropertiesResource extends NamedResource {
public ApiResponse post(Entity testProperties){
- return getResource(true).type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).post( ApiResponse.class, testProperties );
+ return getTarget( true ).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( javax.ws.rs.client.Entity.json( testProperties), ApiResponse.class);
}
public ApiResponse get(){
- return getResource(true).type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).get(ApiResponse.class );
+ return getTarget(true).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get( ApiResponse.class );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/ApplicationsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/ApplicationsResource.java
index 78f906f..709d1ad 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/ApplicationsResource.java
@@ -50,8 +50,8 @@ public class ApplicationsResource extends NamedResource {
* Delete this application.
*/
public ApiResponse delete() {
- return getResource(true)
- .type( MediaType.APPLICATION_JSON_TYPE )
+ return getTarget( true ).request()
+ //.type( MediaType.APPLICATION_JSON_TYPE )
.accept( MediaType.APPLICATION_JSON )
.delete( ApiResponse.class );
}
@@ -65,8 +65,8 @@ public class ApplicationsResource extends NamedResource {
* Used to get an application entity.
*/
public ApiResponse get() {
- return getResource(true)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ return getTarget(true).request()
+ //.type(MediaType.APPLICATION_JSON_TYPE)
.accept( MediaType.APPLICATION_JSON )
.get(ApiResponse.class);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/CollectionEndpoint.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/CollectionEndpoint.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/CollectionEndpoint.java
index 520bab3..6873955 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/CollectionEndpoint.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/CollectionEndpoint.java
@@ -17,19 +17,20 @@
package org.apache.usergrid.rest.test.resource.endpoints;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.client.WebResource;
-import org.apache.usergrid.rest.test.resource.model.*;
import org.apache.usergrid.rest.test.resource.model.Collection;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import org.apache.usergrid.services.ServiceParameter;
import org.apache.usergrid.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import java.io.IOException;
import java.io.StringReader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
/**
@@ -114,20 +115,22 @@ public class CollectionEndpoint extends NamedResource {
return get(parameters, true);
}
- public Collection get(final org.apache.usergrid.rest.test.resource.model.QueryParameters parameters, final boolean useToken){
+ public Collection get(
+ final org.apache.usergrid.rest.test.resource.model.QueryParameters parameters,
+ final boolean useToken){
String acceptHeader = MediaType.APPLICATION_JSON;
if (this.acceptHeaders.size() > 0) {
acceptHeader = StringUtils.join(this.acceptHeaders, ',');
}
- WebResource resource = getResource(useToken);
+ WebTarget resource = getTarget( useToken );
resource = addParametersToResource(resource, parameters);
- logger.info("PATH is "+ resource.getURI().getRawPath()+"?"+resource.getURI().getRawQuery());
+ logger.info("PATH is "+ resource.getUri().getRawPath()+"?"+resource.getUri().getRawQuery());
// use string type so we can log actual response from server
- String responseString = resource.type( MediaType.APPLICATION_JSON_TYPE )
- .accept(acceptHeader)
+ String responseString = resource.request()
+ .accept( acceptHeader )
.get(String.class);
logger.debug("Response from get: " + responseString);
@@ -135,7 +138,8 @@ public class CollectionEndpoint extends NamedResource {
ObjectMapper mapper = new ObjectMapper();
org.apache.usergrid.rest.test.resource.model.ApiResponse response;
try {
- response = mapper.readValue( new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+ response = mapper.readValue(
+ new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
} catch (IOException e) {
throw new RuntimeException("Error parsing response", e);
}
@@ -157,13 +161,16 @@ public class CollectionEndpoint extends NamedResource {
* </pre>
*/
//TODO: add queryParameters here
- public Collection getNextPage(Collection collection, org.apache.usergrid.rest.test.resource.model.QueryParameters passedParameters ,final boolean useToken) {
+ public Collection getNextPage(Collection collection,
+ org.apache.usergrid.rest.test.resource.model.QueryParameters passedParameters ,
+ final boolean useToken) {
+
String acceptHeader = MediaType.APPLICATION_JSON;
if (this.acceptHeaders.size() > 0) {
acceptHeader = StringUtils.join(this.acceptHeaders, ',');
}
- WebResource resource = getResource(useToken);
+ WebTarget resource = getTarget( useToken );
org.apache.usergrid.rest.test.resource.model.QueryParameters queryParameters = passedParameters;
if( queryParameters == null){
queryParameters = new org.apache.usergrid.rest.test.resource.model.QueryParameters();
@@ -172,8 +179,10 @@ public class CollectionEndpoint extends NamedResource {
queryParameters.setCursor(collection.getCursor());
resource = addParametersToResource(resource, queryParameters);
- org.apache.usergrid.rest.test.resource.model.ApiResponse response = resource.type( MediaType.APPLICATION_JSON_TYPE ).accept(acceptHeader)
- .get(org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+ org.apache.usergrid.rest.test.resource.model.ApiResponse response =
+ resource.request()
+ .accept( acceptHeader )
+ .get(org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
return new Collection(response);
}
@@ -206,10 +215,10 @@ public class CollectionEndpoint extends NamedResource {
acceptHeader = StringUtils.join(this.acceptHeaders, ',');
}
- WebResource resource = getResource(useToken);
+ WebTarget resource = getTarget( useToken );
resource = addParametersToResource(resource, parameters);
- return resource.type( MediaType.APPLICATION_JSON_TYPE )
- .accept(acceptHeader)
+ return resource.request()
+ .accept( acceptHeader )
.delete(org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
}
@@ -229,10 +238,10 @@ public class CollectionEndpoint extends NamedResource {
}
// use string type so we can log actual response from server
- String responseString = getResource(true)
- .type( MediaType.APPLICATION_JSON_TYPE )
+ String responseString = getTarget( true )
+ .request()
.accept(acceptHeader)
- .post(String.class, payload);
+ .post( javax.ws.rs.client.Entity.json( payload ), String.class);
logger.debug("Response from post: " + responseString);
@@ -256,10 +265,10 @@ public class CollectionEndpoint extends NamedResource {
}
// use string type so we can log actual response from server
- String responseString = getResource(true)
- .type( MediaType.APPLICATION_JSON_TYPE )
- .accept(acceptHeader)
- .post(String.class);
+ String responseString = getTarget( true )
+ .request()
+ .accept( acceptHeader )
+ .post( javax.ws.rs.client.Entity.json( null ), String.class);
logger.debug("Response from post: " + responseString);
@@ -283,17 +292,18 @@ public class CollectionEndpoint extends NamedResource {
}
// use string type so we can log actual response from server
- String responseString = getResource(true)
- .type( MediaType.APPLICATION_JSON_TYPE )
- .accept(acceptHeader)
- .post(String.class, entityList );
+ String responseString = getTarget( true )
+ .request()
+ .accept( acceptHeader )
+ .post( javax.ws.rs.client.Entity.json( entityList ), String.class);
logger.debug("Response from post: " + responseString);
ObjectMapper mapper = new ObjectMapper();
org.apache.usergrid.rest.test.resource.model.ApiResponse response;
try {
- response = mapper.readValue( new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+ response = mapper.readValue(
+ new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
} catch (IOException e) {
throw new RuntimeException("Error parsing response", e);
}
@@ -312,31 +322,37 @@ public class CollectionEndpoint extends NamedResource {
* PUT /users?ql=select * where created > 0
* </pre>
*/
- public org.apache.usergrid.rest.test.resource.model.ApiResponse put( final org.apache.usergrid.rest.test.resource.model.QueryParameters parameters, org.apache.usergrid.rest.test.resource.model.Entity entity ){
+ public org.apache.usergrid.rest.test.resource.model.ApiResponse put(
+ final org.apache.usergrid.rest.test.resource.model.QueryParameters parameters,
+ org.apache.usergrid.rest.test.resource.model.Entity entity ){
return put(parameters, true, entity);
}
- public org.apache.usergrid.rest.test.resource.model.ApiResponse put(final org.apache.usergrid.rest.test.resource.model.QueryParameters parameters, final boolean useToken, org.apache.usergrid.rest.test.resource.model.Entity entity) {
+ public org.apache.usergrid.rest.test.resource.model.ApiResponse put(
+ final org.apache.usergrid.rest.test.resource.model.QueryParameters parameters,
+ final boolean useToken,
+ org.apache.usergrid.rest.test.resource.model.Entity entity) {
String acceptHeader = MediaType.APPLICATION_JSON;
if (this.acceptHeaders.size() > 0) {
acceptHeader = StringUtils.join(this.acceptHeaders, ',');
}
- WebResource resource = getResource(useToken);
- addParametersToResource(getResource(), parameters);
+ WebTarget resource = getTarget( useToken );
+ addParametersToResource(getTarget(), parameters);
// use string type so we can log actual response from server
- String responseString = resource.type(MediaType.APPLICATION_JSON_TYPE)
+ String responseString = resource.request()
.accept(acceptHeader)
- .post(String.class, entity);
+ .post( javax.ws.rs.client.Entity.json( entity ), String.class);
logger.debug("Response from put: " + responseString);
ObjectMapper mapper = new ObjectMapper();
org.apache.usergrid.rest.test.resource.model.ApiResponse response;
try {
- response = mapper.readValue( new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+ response = mapper.readValue(
+ new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
} catch (IOException e) {
throw new RuntimeException("Error parsing response", e);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/EntityEndpoint.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/EntityEndpoint.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/EntityEndpoint.java
index 70b2c3a..63949ec 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/EntityEndpoint.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/EntityEndpoint.java
@@ -20,14 +20,13 @@
package org.apache.usergrid.rest.test.resource.endpoints;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
public class EntityEndpoint extends NamedResource {
@@ -63,19 +62,21 @@ public class EntityEndpoint extends NamedResource {
}
public Entity get(final boolean useToken, final Token token){
- WebResource resource = getResource(useToken,token);
- ApiResponse response = resource.type( MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
- .get(ApiResponse.class);
+ WebTarget resource = getTarget( useToken, token );
+ ApiResponse response = resource.request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get(ApiResponse.class);
return new Entity(response);
}
//For testing purposes only
public Entity get(QueryParameters parameters, final boolean useToken){
- WebResource resource = getResource(useToken);
+ WebTarget resource = getTarget(useToken);
resource = addParametersToResource(resource, parameters);
- ApiResponse response = resource.type( MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
- .get(ApiResponse.class);
+ ApiResponse response = resource.request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get(ApiResponse.class);
return new Entity(response);
}
@@ -96,9 +97,10 @@ public class EntityEndpoint extends NamedResource {
}
public ApiResponse delete(final boolean useToken){
- WebResource resource = getResource(useToken);
- return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
- .delete(ApiResponse.class);
+ WebTarget resource = getTarget( useToken );
+ return resource.request()
+ .accept( MediaType.APPLICATION_JSON )
+ .delete(ApiResponse.class);
}
/**
@@ -113,9 +115,10 @@ public class EntityEndpoint extends NamedResource {
* PUT /users/fred {"color":"red"}
*/
public Entity put(Entity entity){
- ApiResponse response = getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
- .put(ApiResponse.class, entity);
- return new Entity(response);
+ ApiResponse response = getTarget( true ).request()
+ .accept(MediaType.APPLICATION_JSON)
+ .put( javax.ws.rs.client.Entity.json(entity), ApiResponse.class );
+ return new Entity( response);
}
@@ -134,11 +137,12 @@ public class EntityEndpoint extends NamedResource {
}
public Entity post(final boolean useToken){
- WebResource resource = getResource(useToken);
- ApiResponse response = resource.type(MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
- .post(ApiResponse.class);
+ WebTarget resource = getTarget(useToken);
+ ApiResponse response = resource.request()
+ .accept(MediaType.APPLICATION_JSON)
+ .post( javax.ws.rs.client.Entity.json(null), ApiResponse.class );
- return new Entity(response);
+ return new Entity( response);
}
/**
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
index 2258312..336d709 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/NamedResource.java
@@ -17,17 +17,18 @@
package org.apache.usergrid.rest.test.resource.endpoints;
-import com.sun.jersey.api.client.GenericType;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.multipart.FormDataMultiPart;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import java.io.InputStream;
import java.util.Iterator;
@@ -64,14 +65,14 @@ public class NamedResource implements UrlResource {
}
@Override
- public WebResource getResource() {
- return getResource(false);
+ public WebTarget getTarget() {
+ return getTarget( false );
}
- public WebResource getResource(boolean useToken) {
- return getResource(useToken,null);
+ public WebTarget getTarget(boolean useToken) {
+ return getTarget( useToken, null );
}
- public WebResource getResource(boolean useToken,Token token) {
- WebResource resource = parent.getResource().path( getPath() );
+ public WebTarget getTarget(boolean useToken,Token token) {
+ WebTarget resource = parent.getTarget().path( getPath() );
token = token !=null ? token : this.context.getToken();
//error checking
if (token == null) {
@@ -80,7 +81,7 @@ public class NamedResource implements UrlResource {
return useToken ? resource.queryParam("access_token",token.getAccessToken()) : resource;
}
- protected WebResource addParametersToResource(WebResource resource, final QueryParameters parameters){
+ protected WebTarget addParametersToResource(WebTarget resource, final QueryParameters parameters){
if(parameters == null){
return resource;
@@ -178,11 +179,8 @@ public class NamedResource implements UrlResource {
/**
* Need to refactor all instances of tokens to either be passed in or manually set during the test.
* There isn't any reason we would want a rest forwarding framework to set something on behave of the user.
- * @param type
- * @param <T>
- * @return
+ * For edge cases like Organizations and Tokens
*/
- //For edge cases like Organizations and Tokens
public <T> T post(Class<T> type) {
return post(true,type,null,null,false);
@@ -191,26 +189,18 @@ public class NamedResource implements UrlResource {
/**
* Need to refactor all instances of tokens to either be passed in or manually set during the test.
* There isn't any reason we would want a rest forwarding framework to set something on behave of the user.
- * @param type
- * @param requestEntity
- * @param <T>
- * @return
+ * For edge cases like Organizations and Tokens.
*/
- //For edge cases like Organizations and Tokens
public <T> T post(Class<T> type, Entity requestEntity) {
- return post(true,type,requestEntity,null,false);
+ return post( true, type, requestEntity, null, false);
}
/**
* Need to refactor all instances of tokens to either be passed in or manually set during the test.
* There isn't any reason we would want a rest forwarding framework to set something on behave of the user.
- * @param type
- * @param requestEntity
- * @param <T>
- * @return
+ * For edge cases like Organizations and Tokens
*/
- //For edge cases like Organizations and Tokens
public <T> T post(Class<T> type, Map requestEntity) {
return post(true,type,requestEntity,null,false);
@@ -223,59 +213,46 @@ public class NamedResource implements UrlResource {
/**
* Used to test POST using form payloads.
- * @param type
- * @param requestEntity
- * @param <T>
- * @return
*/
- public <T> T post(Class<T> type, Form requestEntity) {
+ public <T> T post(Class<T> type, Form form) {
GenericType<T> gt = new GenericType<>((Class) type);
- return getResource()
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
- .entity(requestEntity, MediaType.APPLICATION_FORM_URLENCODED_TYPE)
- .post(gt.getRawClass());
-
+ return getTarget().request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( javax.ws.rs.client.Entity.entity( form, MediaType.APPLICATION_FORM_URLENCODED_TYPE ), gt );
}
- //Used for empty posts
+ // Used for empty posts
public <T> T post( boolean useToken, Class<T> type, Map entity, final QueryParameters queryParameters) {
- WebResource resource = getResource(useToken);
- resource = addParametersToResource(resource, queryParameters);
- WebResource.Builder builder = resource
- .type(MediaType.APPLICATION_JSON_TYPE)
+ WebTarget resource = getTarget( useToken );
+ resource = addParametersToResource( resource, queryParameters );
+
+ Invocation.Builder builder = resource.request()
.accept( MediaType.APPLICATION_JSON );
- if(entity!=null){
- builder.entity(entity);
- }
+ // it's OK for the entity to be null
GenericType<T> gt = new GenericType<>((Class) type);
- return builder
- .post(gt.getRawClass());
-
+ return builder.post( javax.ws.rs.client.Entity.json( entity ), gt );
}
- //Used for empty posts
- public <T> T post( boolean useToken, Class<T> type, Map entity, final QueryParameters queryParameters, boolean useBasicAuthentication ) {
- WebResource resource = getResource(useToken);
+ // Used for empty posts
+ public <T> T post( boolean useToken, Class<T> type, Map entity,
+ final QueryParameters queryParameters, boolean useBasicAuthentication ) {
+
+ WebTarget resource = getTarget( useToken );
resource = addParametersToResource(resource, queryParameters);
- WebResource.Builder builder = resource
- .type(MediaType.APPLICATION_JSON_TYPE)
+ Invocation.Builder builder = resource.request()
.accept( MediaType.APPLICATION_JSON );
- if(entity!=null){
- builder.entity(entity);
- }
- if(useBasicAuthentication){
- //added httpBasicauth filter to all setup calls because they all do verification this way.
- HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( "superuser","superpassword" );
- resource.addFilter( httpBasicAuthFilter );
+ if ( useBasicAuthentication ) {
+ builder = builder.property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword");
}
+ // it's OK for the entity to be null
GenericType<T> gt = new GenericType<>((Class) type);
- return builder.post( gt.getRawClass() );
+ return builder.post( javax.ws.rs.client.Entity.json( entity ), gt );
}
@@ -297,14 +274,14 @@ public class NamedResource implements UrlResource {
}
public <T> T get(Class<T> type,QueryParameters queryParameters, boolean useToken) {
- WebResource resource = getResource(useToken);
+ WebTarget resource = getTarget( useToken );
if(queryParameters!=null) {
resource = addParametersToResource(resource, queryParameters);
}
GenericType<T> gt = new GenericType<>((Class) type);
- return resource.type(MediaType.APPLICATION_JSON_TYPE)
+ return resource.request()
.accept( MediaType.APPLICATION_JSON )
- .get( gt.getRawClass() );
+ .get( gt );
}
@@ -313,8 +290,9 @@ public class NamedResource implements UrlResource {
}
public ApiResponse post( boolean useToken, FormDataMultiPart multiPartForm ) {
- WebResource resource = getResource( useToken );
- return resource.type( MediaType.MULTIPART_FORM_DATA_TYPE ).post( ApiResponse.class, multiPartForm );
+ WebTarget resource = getTarget( useToken );
+ return resource.request().post(
+ javax.ws.rs.client.Entity.entity( multiPartForm, multiPartForm.getMediaType() ), ApiResponse.class );
}
public ApiResponse post( FormDataMultiPart multiPartForm ) {
@@ -322,8 +300,9 @@ public class NamedResource implements UrlResource {
}
public ApiResponse put( boolean useToken, byte[] data, MediaType type ) {
- WebResource resource = getResource(useToken);
- return resource.type( type ).put( ApiResponse.class, data );
+ WebTarget resource = getTarget(useToken );
+ return resource.request().put(
+ javax.ws.rs.client.Entity.entity(data, type), ApiResponse.class );
}
public ApiResponse put( byte[] data, MediaType type ) {
@@ -331,8 +310,9 @@ public class NamedResource implements UrlResource {
}
public ApiResponse put( boolean useToken, FormDataMultiPart multiPartForm ) {
- WebResource resource = getResource(useToken);
- return resource.type( MediaType.MULTIPART_FORM_DATA_TYPE ).put( ApiResponse.class, multiPartForm );
+ WebTarget resource = getTarget(useToken );
+ return resource.request().put(
+ javax.ws.rs.client.Entity.entity(multiPartForm, multiPartForm.getMediaType()), ApiResponse.class );
}
public ApiResponse put( FormDataMultiPart multiPartForm ) {
@@ -340,8 +320,8 @@ public class NamedResource implements UrlResource {
}
public InputStream getAssetAsStream( boolean useToken ) {
- WebResource resource = getResource(useToken);
- return resource.accept( MediaType.APPLICATION_OCTET_STREAM_TYPE ).get( InputStream.class );
+ WebTarget resource = getTarget(useToken );
+ return resource.request().accept( MediaType.APPLICATION_OCTET_STREAM_TYPE ).get( InputStream.class );
}
public InputStream getAssetAsStream() {
@@ -353,6 +333,6 @@ public class NamedResource implements UrlResource {
}
public ApiResponse delete( boolean useToken ) {
- return getResource(useToken).delete( ApiResponse.class );
+ return getTarget(useToken).request().delete( ApiResponse.class );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/RootResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/RootResource.java
index 8537251..88ec1c4 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/RootResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/RootResource.java
@@ -21,7 +21,7 @@ import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResource;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.client.WebTarget;
/**
@@ -61,7 +61,7 @@ public class RootResource implements UrlResource {
}
@Override
- public WebResource getResource() {
+ public WebTarget getTarget() {
//TODO: fix this to return the proper resource in the scope we expect it, might not be needed here.
return null;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
index b374cdc..75f1b6b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java
@@ -17,16 +17,13 @@
package org.apache.usergrid.rest.test.resource.endpoints;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
-import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
-
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
/**
* Functions as the endpoint for all resources that hit /system/ * /setup
@@ -39,14 +36,13 @@ public class SetupResource extends NamedResource {
public Entity get(QueryParameters queryParameters){
- WebResource resource = getResource();
+ WebTarget resource = getTarget();
resource = addParametersToResource( resource, queryParameters );
- //added httpBasicauth filter to all setup calls because they all do verification this way.
- HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( "superuser","superpassword" );
- resource.addFilter( httpBasicAuthFilter );
-
- return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
- .get( Entity.class);
+ return resource.request()
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
+ .accept( MediaType.APPLICATION_JSON )
+ .get( Entity.class );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
index 6a97dad..35ffc21 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java
@@ -18,12 +18,11 @@
package org.apache.usergrid.rest.test.resource.endpoints;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import javax.ws.rs.core.MediaType;
+
/**
* Handles making rest calls to system resources.
@@ -50,8 +49,10 @@ public class SystemResource extends NamedResource {
public ApiResponse put(){
ApiResponse
- response = getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept(MediaType.APPLICATION_JSON)
- .put(ApiResponse.class);
+ response = getTarget(true)
+ .request()
+ .accept(MediaType.APPLICATION_JSON)
+ .put( javax.ws.rs.client.Entity.json(null), ApiResponse.class);
return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/TokenResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/TokenResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/TokenResource.java
index 59ad354..2c777dd 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/TokenResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/TokenResource.java
@@ -21,11 +21,12 @@
package org.apache.usergrid.rest.test.resource.endpoints;
-import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
/**
@@ -43,9 +44,10 @@ public class TokenResource extends NamedResource {
* @return
*/
public Token post(QueryParameters params) {
- WebResource resource = getResource(false);
+ WebTarget resource = getTarget( false );
resource = addParametersToResource(resource, params);
- Token token = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
+ Token token = resource.request()
+ .accept( MediaType.APPLICATION_JSON )
.get(Token.class);
this.context.setToken(token);
@@ -58,7 +60,7 @@ public class TokenResource extends NamedResource {
* @return
*/
public Token post() {
- Token token = getResource().accept(MediaType.APPLICATION_JSON).post(Token.class);
+ Token token = getTarget().request().accept( MediaType.APPLICATION_JSON ).post( Entity.json(null), Token.class );
this.context.setToken(token);
return token;
}
@@ -70,8 +72,9 @@ public class TokenResource extends NamedResource {
* @return
*/
public Token post(Token token) {
- token = getResource(false).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).post(Token.class, token);
+ token = getTarget(false).request()
+ .accept(MediaType.APPLICATION_JSON)
+ .post( Entity.json( token ), Token.class);
this.context.setToken(token);
return token;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/UrlResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/UrlResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/UrlResource.java
index eb16d4d..6e5ee1b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/UrlResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/UrlResource.java
@@ -17,10 +17,7 @@
package org.apache.usergrid.rest.test.resource.endpoints;
-import org.apache.usergrid.rest.test.resource.state.ClientContext;
-
-import com.sun.jersey.api.client.WebResource;
-
+import javax.ws.rs.client.WebTarget;
/**
* Interface that returns the path that is currently being pointed to.
@@ -38,7 +35,7 @@ public interface UrlResource {
* Get the resource
* @return
*/
- public WebResource getResource();
+ public WebTarget getTarget();
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationResource.java
index dbf653d..4b9d195 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationResource.java
@@ -59,23 +59,29 @@ public class ApplicationResource extends NamedResource {
public org.apache.usergrid.rest.test.resource.model.ApiResponse post(Application application) {
- org.apache.usergrid.rest.test.resource.model.ApiResponse apiResponse =getResource(true).type(MediaType.APPLICATION_JSON_TYPE)
- .accept(MediaType.APPLICATION_JSON).post(org.apache.usergrid.rest.test.resource.model.ApiResponse.class, application);
+ org.apache.usergrid.rest.test.resource.model.ApiResponse apiResponse = getTarget(true)
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
+ .post( javax.ws.rs.client.Entity.json(application),
+ org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
return apiResponse;
}
- public org.apache.usergrid.rest.test.resource.model.Entity post(org.apache.usergrid.rest.test.resource.model.Entity payload) {
+ public org.apache.usergrid.rest.test.resource.model.Entity post(
+ org.apache.usergrid.rest.test.resource.model.Entity payload) {
- String responseString = getResource(true)
- .type( MediaType.APPLICATION_JSON_TYPE )
+ String responseString = getTarget( true )
+ .request()
.accept(MediaType.APPLICATION_JSON)
- .post(String.class, payload);
+ .post( javax.ws.rs.client.Entity.json(payload), String.class);
logger.debug("Response from post: " + responseString);
org.apache.usergrid.rest.test.resource.model.ApiResponse response;
try {
- response = mapper.readValue(new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+ response = mapper.readValue(
+ new StringReader(responseString),
+ org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
} catch (IOException e) {
throw new RuntimeException("Error parsing response", e);
}
@@ -86,8 +92,8 @@ public class ApplicationResource extends NamedResource {
public org.apache.usergrid.rest.test.resource.model.Entity get() {
- String responseString = getResource(true)
- .type( MediaType.APPLICATION_JSON_TYPE )
+ String responseString = getTarget(true)
+ .request()
.accept(MediaType.APPLICATION_JSON)
.get(String.class);
@@ -95,7 +101,8 @@ public class ApplicationResource extends NamedResource {
org.apache.usergrid.rest.test.resource.model.ApiResponse response;
try {
- response = mapper.readValue(new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+ response = mapper.readValue(
+ new StringReader(responseString), org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
} catch (IOException e) {
throw new RuntimeException("Error parsing response", e);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationsResource.java
index caf93e8..bd0c824 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ApplicationsResource.java
@@ -45,9 +45,9 @@ public class ApplicationsResource extends NamedResource {
public ManagementResponse getOrganizationApplications() throws IOException {
- String responseString = this.getResource()
+ String responseString = this.getTarget()
.queryParam( "access_token", context.getToken().getAccessToken() )
- .type(MediaType.APPLICATION_JSON)
+ .request()
.get(String.class);
logger.info("Response: " + responseString);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/AuthorizeResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/AuthorizeResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/AuthorizeResource.java
index 694f9c4..d93612a 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/AuthorizeResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/AuthorizeResource.java
@@ -19,7 +19,6 @@
*/
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import com.sun.jersey.api.client.GenericType;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
@@ -39,7 +38,7 @@ public class AuthorizeResource extends NamedResource {
* @return
*/
public Object post(Object requestEntity) {
- return getResource().post(Object.class, requestEntity);
+ return getTarget().request().post( javax.ws.rs.client.Entity.json(requestEntity), Object.class);
}
@@ -51,9 +50,7 @@ public class AuthorizeResource extends NamedResource {
* @return
*/
public <T> T post(Class<T> type, Object requestEntity) {
- GenericType<T> gt = new GenericType<>((Class) type);
- return getResource().post(gt.getRawClass(), requestEntity);
-
+ return getTarget().request().post( javax.ws.rs.client.Entity.json( requestEntity ), type );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ConfirmResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ConfirmResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ConfirmResource.java
index 0a35353..9e0c443 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ConfirmResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/ConfirmResource.java
@@ -17,15 +17,13 @@
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import javax.ws.rs.core.MediaType;
-
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
-import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
/**
@@ -37,10 +35,8 @@ public class ConfirmResource extends NamedResource {
}
public void get(QueryParameters queryParameters){
- WebResource resource = getResource();
+ WebTarget resource = getTarget();
resource = addParametersToResource( resource, queryParameters );
- String obj = resource.type( MediaType.TEXT_HTML_TYPE )
- .accept( MediaType.TEXT_HTML).get( String.class );
-
+ String obj = resource.request().accept( MediaType.TEXT_HTML).get( String.class );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/CredentialsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/CredentialsResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/CredentialsResource.java
index 073d6d6..31df4ba 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/CredentialsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/CredentialsResource.java
@@ -19,7 +19,6 @@
*/
package org.apache.usergrid.rest.test.resource.endpoints.mgmt;
-import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
import org.apache.usergrid.rest.test.resource.endpoints.UrlResource;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
@@ -27,6 +26,7 @@ import org.apache.usergrid.rest.test.resource.model.Credentials;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
/**
@@ -38,9 +38,10 @@ public class CredentialsResource extends NamedResource {
}
public Credentials get(final QueryParameters parameters, final boolean useToken) {
- WebResource resource = getResource(useToken);
+ WebTarget resource = getTarget(useToken);
resource = addParametersToResource(resource, parameters);
- ApiResponse response = resource.type(MediaType.APPLICATION_JSON_TYPE).accept(MediaType.APPLICATION_JSON)
+ ApiResponse response = resource.request()
+ .accept(MediaType.APPLICATION_JSON)
.get(ApiResponse.class);
return new Credentials(response);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/FeedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/FeedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/FeedResource.java
index 8fd873b..4895659 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/FeedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/mgmt/FeedResource.java
@@ -41,8 +41,9 @@ public class FeedResource extends NamedResource {
}
public ApiResponse get() {
- return getResource( true ).type( MediaType.APPLICATION_JSON_TYPE )
- .accept( MediaType.APPLICATION_JSON ).get( ApiResponse.class);
+ return getTarget( true ).request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get( ApiResponse.class);
}
[05/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
index 13489a3..9398f0e 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -17,40 +17,30 @@
package org.apache.usergrid.rest.management.organizations;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.usergrid.rest.RootResource;
-import org.apache.usergrid.rest.management.ManagementResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.management.ApplicationCreator;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.OrganizationOwnerInfo;
import org.apache.usergrid.management.exceptions.ManagementException;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
+import org.apache.usergrid.rest.RootResource;
+import org.apache.usergrid.rest.management.ManagementResource;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.apache.usergrid.rest.management.organizations.OrganizationsResource" )
@@ -101,7 +91,9 @@ public class OrganizationsResource extends AbstractContextResource {
@POST
@Consumes( MediaType.APPLICATION_JSON )
- public JSONWithPadding newOrganization( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newOrganization( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
@@ -126,7 +118,9 @@ public class OrganizationsResource extends AbstractContextResource {
@POST
@Consumes( MediaType.APPLICATION_FORM_URLENCODED )
- public JSONWithPadding newOrganizationFromForm( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newOrganizationFromForm( @Context UriInfo ui,
@FormParam( "organization" ) String organizationNameForm,
@QueryParam( "organization" ) String organizationNameQuery,
@FormParam( "username" ) String usernameForm,
@@ -153,7 +147,9 @@ public class OrganizationsResource extends AbstractContextResource {
/** Create a new organization */
- private JSONWithPadding newOrganization( @Context UriInfo ui, String organizationName, String username, String name,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ private ApiResponse newOrganization( @Context UriInfo ui, String organizationName, String username, String name,
String email, String password, Map<String, Object> userProperties,
Map<String, Object> orgProperties, String callback ) throws Exception {
@@ -191,7 +187,7 @@ public class OrganizationsResource extends AbstractContextResource {
response.setSuccess();
logger.info( "New organization complete: {}", organizationName );
- return new JSONWithPadding( response, callback );
+ return response;
}
/*
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
index bcec775..ae60123 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -17,16 +17,17 @@
package org.apache.usergrid.rest.management.organizations.applications;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
import org.apache.commons.lang.NullArgumentException;
import org.apache.commons.lang.StringUtils;
-
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.export.ExportService;
+import org.apache.usergrid.persistence.EntityManager;
+import org.apache.usergrid.persistence.core.util.Health;
import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentials;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
@@ -38,7 +39,6 @@ import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
import org.apache.usergrid.security.providers.SignInAsProvider;
import org.apache.usergrid.security.providers.SignInProviderFactory;
import org.apache.usergrid.services.ServiceManager;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,14 +55,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.UUID;
-import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static javax.servlet.http.HttpServletResponse.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.core.util.Health;
@Component("org.apache.usergrid.rest.management.organizations.applications.ApplicationResource")
@@ -112,7 +106,9 @@ public class ApplicationResource extends AbstractContextResource {
@RequireOrganizationAccess
@GET
- public JSONWithPadding getApplication(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getApplication(
@Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -122,14 +118,16 @@ public class ApplicationResource extends AbstractContextResource {
response.setApplication( sm.getApplication() );
response.setParams( ui.getQueryParameters() );
response.setResults( management.getApplicationMetadata( applicationId ) );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@GET
@Path("credentials")
- public JSONWithPadding getCredentials(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getCredentials(
@Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -141,14 +139,16 @@ public class ApplicationResource extends AbstractContextResource {
management.getClientSecretForApplication( applicationId ) );
response.setCredentials( credentials );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@POST
@Path("credentials")
- public JSONWithPadding generateCredentials( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse generateCredentials( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -160,7 +160,7 @@ public class ApplicationResource extends AbstractContextResource {
management.newClientSecretForApplication( applicationId ) );
response.setCredentials( credentials );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -168,7 +168,9 @@ public class ApplicationResource extends AbstractContextResource {
@Path("sia-provider")
@Consumes(APPLICATION_JSON)
@RequireOrganizationAccess
- public JSONWithPadding configureProvider(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse configureProvider(
@Context UriInfo ui,
@QueryParam("provider_key") String siaProvider,
Map<String, Object> json,
@@ -200,7 +202,7 @@ public class ApplicationResource extends AbstractContextResource {
signInAsProvider.saveToConfiguration( json );
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@@ -393,7 +395,9 @@ public class ApplicationResource extends AbstractContextResource {
*/
@PUT
@RequireOrganizationAccess
- public JSONWithPadding executePut( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePut( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
if ( applicationId == null ) {
@@ -407,13 +411,15 @@ public class ApplicationResource extends AbstractContextResource {
response.setApplication( emf.getEntityManager( applicationId ).getApplication() );
response.setParams( ui.getQueryParameters() );
- return new JSONWithPadding( response, callback );
+ return response;
}
@DELETE
@RequireOrganizationAccess
- public JSONWithPadding executeDelete( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executeDelete( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
@QueryParam("app_delete_confirm") String confirmDelete) throws Exception {
@@ -445,7 +451,7 @@ public class ApplicationResource extends AbstractContextResource {
logger.debug( "ApplicationResource.delete() sending response ");
- return new JSONWithPadding( response, callback );
+ return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index 28eff4e..ef9a5f4 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -17,30 +17,28 @@
package org.apache.usergrid.rest.management.organizations.applications;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.usergrid.rest.RootResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.BiMap;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
+import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isEmpty;
@@ -70,7 +68,9 @@ public class ApplicationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@GET
- public JSONWithPadding getOrganizationApplications(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getOrganizationApplications(
@Context UriInfo ui,
@QueryParam( "deleted" ) @DefaultValue( "false" ) Boolean deleted, // only return deleted apps if true
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception {
@@ -81,14 +81,16 @@ public class ApplicationsResource extends AbstractContextResource {
BiMap<UUID, String> applications = management.getApplicationsForOrganization( organization.getUuid() );
response.setData( applications.inverse() );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@POST
@Consumes( MediaType.APPLICATION_JSON )
- public JSONWithPadding newApplicationForOrganization( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newApplicationForOrganization( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" )
String callback ) throws Exception {
String applicationName = ( String ) json.get( "name" );
@@ -99,7 +101,9 @@ public class ApplicationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@POST
@Consumes( MediaType.APPLICATION_FORM_URLENCODED )
- public JSONWithPadding newApplicationForOrganizationFromForm( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newApplicationForOrganizationFromForm( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" )
String callback,
@FormParam( "name" ) String applicationName )
@@ -119,7 +123,7 @@ public class ApplicationsResource extends AbstractContextResource {
applications.put( applicationInfo.getName(), applicationInfo.getId() );
response.setData( applications );
response.setResults( management.getApplicationMetadata( applicationInfo.getId() ) );
- return new JSONWithPadding( response, callback );
+ return response;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java
index a72a8f0..d9fc009 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileErrorsResource.java
@@ -20,23 +20,7 @@
package org.apache.usergrid.rest.management.organizations.applications.imports;
-import java.util.Collections;
-import java.util.UUID;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriInfo;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.importer.ImportService;
import org.apache.usergrid.persistence.Entity;
@@ -46,8 +30,17 @@ import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriInfo;
+import java.util.Collections;
+import java.util.UUID;
@Component("org.apache.usergrid.rest.management.organizations.applications.imports.FileErrorsResource")
@@ -82,7 +75,9 @@ public class FileErrorsResource extends AbstractContextResource {
@GET
- public JSONWithPadding getFileIncludes( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getFileIncludes( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor )
throws Exception {
@@ -103,13 +98,15 @@ public class FileErrorsResource extends AbstractContextResource {
response.withResults( importResults );
- return new JSONWithPadding( response );
+ return response;
}
@GET
@Path( RootResource.ENTITY_ID_PATH )
- public JSONWithPadding getFileIncludeById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getFileIncludeById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
throws Exception {
final UUID failedEntity = UUID.fromString( entityId.getPath() );
@@ -131,7 +128,7 @@ public class FileErrorsResource extends AbstractContextResource {
response.setEntities( Collections.<Entity>singletonList( importEntity ) );
- return new JSONWithPadding( response );
+ return response;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java
index 1cb44d0..708aa80 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/FileIncludesResource.java
@@ -33,6 +33,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -47,8 +48,6 @@ import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
-import com.sun.jersey.api.json.JSONWithPadding;
-
@Component("org.apache.usergrid.rest.management.organizations.applications.imports.FileIncludesResource")
@Scope("prototype")
@@ -80,7 +79,9 @@ public class FileIncludesResource extends AbstractContextResource {
@GET
- public JSONWithPadding getFileIncludes( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getFileIncludes( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor )
throws Exception {
@@ -100,13 +101,15 @@ public class FileIncludesResource extends AbstractContextResource {
response.withResults( importResults );
- return new JSONWithPadding( response );
+ return response;
}
@GET
@Path( RootResource.ENTITY_ID_PATH )
- public JSONWithPadding getFileIncludeById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getFileIncludeById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
throws Exception {
final UUID fileIncludeId = UUID.fromString( entityId.getPath() );
@@ -126,7 +129,7 @@ public class FileIncludesResource extends AbstractContextResource {
response.setEntities( Collections.<Entity>singletonList( importEntity ) );
- return new JSONWithPadding( response );
+ return response;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
index 5755c8e..d829f80 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/applications/imports/ImportsResource.java
@@ -20,31 +20,8 @@
package org.apache.usergrid.rest.management.organizations.applications.imports;
-import java.util.Collections;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.commons.lang.NullArgumentException;
-
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.importer.ImportService;
@@ -56,8 +33,20 @@ import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriInfo;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.apache.usergrid.rest.management.organizations.applications.imports.ImportsResource" )
@@ -93,7 +82,9 @@ public class ImportsResource extends AbstractContextResource {
@POST
@RequireOrganizationAccess
@Consumes( MediaType.APPLICATION_JSON )
- public JSONWithPadding executePost( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePost( @Context UriInfo ui, String body,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -142,12 +133,14 @@ public class ImportsResource extends AbstractContextResource {
response.setEntities( Collections.<Entity>singletonList( importEntity ) );
- return new JSONWithPadding( response, callback );
+ return response;
}
@GET
- public JSONWithPadding getImports( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor ) throws Exception {
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getImports( @Context UriInfo ui, @QueryParam( "ql" ) String query, @QueryParam( "cursor" ) String cursor ) throws Exception {
final Results importResults = importService.getImports( application.getId(), query, cursor );
@@ -161,13 +154,15 @@ public class ImportsResource extends AbstractContextResource {
response.setParams( ui.getQueryParameters() );
response.withResults( importResults );
- return new JSONWithPadding( response );
+ return response;
}
@GET
@Path( RootResource.ENTITY_ID_PATH )
- public JSONWithPadding getImportById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getImportById( @Context UriInfo ui, @PathParam( "entityId" ) PathSegment entityId )
throws Exception {
final UUID importId = UUID.fromString( entityId.getPath() );
@@ -186,7 +181,7 @@ public class ImportsResource extends AbstractContextResource {
response.setParams( ui.getQueryParameters() );
response.setEntities( Collections.<Entity>singletonList( importEntity ) );
- return new JSONWithPadding( response );
+ return response;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
index 036c3fb..a4e3f40 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
@@ -17,42 +17,34 @@
package org.apache.usergrid.rest.management.organizations.users;
-import com.sun.jersey.api.json.JSONWithPadding;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-import static org.apache.commons.collections.MapUtils.getObject;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.UserInfo;
import org.apache.usergrid.management.exceptions.ManagementException;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
-import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
-import static org.apache.usergrid.utils.ConversionUtils.getBoolean;
-import static org.apache.usergrid.utils.ConversionUtils.string;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.apache.commons.collections.MapUtils.getObject;
+import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
+import static org.apache.usergrid.utils.ConversionUtils.getBoolean;
+import static org.apache.usergrid.utils.ConversionUtils.string;
+
@Component("org.apache.usergrid.rest.management.organizations.users.UsersResource")
@Scope("prototype")
@@ -79,7 +71,9 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@GET
- public JSONWithPadding getOrganizationUsers( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getOrganizationUsers( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -88,14 +82,16 @@ public class UsersResource extends AbstractContextResource {
List<UserInfo> users = management.getAdminUsersForOrganization( organization.getUuid() );
response.setData( users );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@POST
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding newUserForOrganization( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newUserForOrganization( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -112,7 +108,9 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public JSONWithPadding newUserForOrganizationFromForm( @Context UriInfo ui, @FormParam("username") String username,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newUserForOrganizationFromForm( @Context UriInfo ui, @FormParam("username") String username,
@FormParam("name") String name,
@FormParam("email") String email,
@FormParam("password") String password,
@@ -150,7 +148,7 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
/*
@@ -177,7 +175,9 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
@Path(RootResource.USER_ID_PATH)
- public JSONWithPadding addUserToOrganization( @Context UriInfo ui, @PathParam("userId") String userIdStr,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse addUserToOrganization( @Context UriInfo ui, @PathParam("userId") String userIdStr,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -195,14 +195,16 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@PUT
@Path(RootResource.EMAIL_PATH)
- public JSONWithPadding addUserToOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse addUserToOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -220,14 +222,16 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@PUT
@Path("{username}")
- public JSONWithPadding addUserToOrganizationByUsername( @Context UriInfo ui, @PathParam("username") String username,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse addUserToOrganizationByUsername( @Context UriInfo ui, @PathParam("username") String username,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -253,14 +257,14 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@DELETE
@Path(RootResource.USER_ID_PATH)
- public JSONWithPadding removeUserFromOrganizationByUserId( @Context UriInfo ui,
+ public ApiResponse removeUserFromOrganizationByUserId( @Context UriInfo ui,
@PathParam("userId") String userIdStr,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -279,14 +283,16 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@DELETE
@Path("{username}")
- public JSONWithPadding removeUserFromOrganizationByUsername( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse removeUserFromOrganizationByUsername( @Context UriInfo ui,
@PathParam("username") String username,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -313,14 +319,16 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@DELETE
@Path(RootResource.EMAIL_PATH)
- public JSONWithPadding removeUserFromOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse removeUserFromOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -338,6 +346,6 @@ public class UsersResource extends AbstractContextResource {
response.setData( result );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
index 7ea4eec..1741db6 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
@@ -17,44 +17,33 @@
package org.apache.usergrid.rest.management.users;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.apache.commons.lang.StringUtils;
-import org.apache.usergrid.rest.management.ManagementResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
import org.apache.usergrid.management.ActivationState;
import org.apache.usergrid.management.UserInfo;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.exceptions.RedirectionException;
+import org.apache.usergrid.rest.management.ManagementResource;
import org.apache.usergrid.rest.management.users.organizations.OrganizationsResource;
import org.apache.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
import org.apache.usergrid.security.tokens.exceptions.TokenException;
import org.apache.usergrid.services.ServiceResults;
+import org.glassfish.jersey.server.mvc.Viewable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isServiceAdmin;
import static org.apache.usergrid.utils.ConversionUtils.string;
@@ -102,7 +91,9 @@ public class UserResource extends AbstractContextResource {
@PUT
- public JSONWithPadding setUserInfo( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setUserInfo( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -124,13 +115,15 @@ public class UserResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setAction( "update user info" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@PUT
@Path( "password" )
- public JSONWithPadding setUserPasswordPut( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setUserPasswordPut( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -151,13 +144,15 @@ public class UserResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setAction( "set user password" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@Path( "password" )
- public JSONWithPadding setUserPasswordPost( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setUserPasswordPost( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
return setUserPasswordPut( ui, json, callback );
@@ -167,7 +162,9 @@ public class UserResource extends AbstractContextResource {
@RequireAdminUserAccess
@GET
@Path( "feed" )
- public JSONWithPadding getFeed( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getFeed( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -178,13 +175,15 @@ public class UserResource extends AbstractContextResource {
response.setEntities( results.getEntities() );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireAdminUserAccess
@GET
- public JSONWithPadding getUserData( @Context UriInfo ui, @QueryParam( "ttl" ) long ttl,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getUserData( @Context UriInfo ui, @QueryParam( "ttl" ) long ttl,
@QueryParam( "shallow" ) boolean shallow,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -198,7 +197,7 @@ public class UserResource extends AbstractContextResource {
response.setData( userOrganizationData );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -387,7 +386,9 @@ public class UserResource extends AbstractContextResource {
@GET
@Path( "reactivate" )
- public JSONWithPadding reactivate( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse reactivate( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -406,13 +407,15 @@ public class UserResource extends AbstractContextResource {
management.startAdminUserActivationFlow( user );
response.setAction( "reactivate user" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@Path( "revoketokens" )
- public JSONWithPadding revokeTokensPost( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokensPost( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -425,13 +428,15 @@ public class UserResource extends AbstractContextResource {
management.revokeAccessTokensForAdminUser( adminId );
response.setAction( "revoked user tokens" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@PUT
@Path( "revoketokens" )
- public JSONWithPadding revokeTokensPut( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokensPut( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
return revokeTokensPost( ui, callback );
@@ -440,7 +445,9 @@ public class UserResource extends AbstractContextResource {
@POST
@Path( "revoketoken" )
- public JSONWithPadding revokeTokenPost( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokenPost( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback,
@QueryParam( "token" ) String token ) throws Exception {
@@ -454,13 +461,15 @@ public class UserResource extends AbstractContextResource {
management.revokeAccessTokenForAdminUser( adminId, token );
response.setAction( "revoked user tokens" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@PUT
@Path( "revoketoken" )
- public JSONWithPadding revokeTokenPut( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse revokeTokenPut( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback,
@QueryParam( "token" ) String token ) throws Exception {
return revokeTokenPost( ui, callback, token );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
index 7165d08..6136139 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
@@ -17,14 +17,12 @@
package org.apache.usergrid.rest.management.users;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import net.tanesha.recaptcha.ReCaptchaImpl;
import net.tanesha.recaptcha.ReCaptchaResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.management.UserInfo;
import org.apache.usergrid.management.exceptions.ManagementException;
-
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.RootResource;
@@ -32,6 +30,7 @@ import org.apache.usergrid.rest.exceptions.AuthErrorInfo;
import org.apache.usergrid.rest.exceptions.RedirectionException;
import org.apache.usergrid.rest.management.ManagementResource;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
+import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -105,7 +104,9 @@ public class UsersResource extends AbstractContextResource {
@POST
@Consumes( MediaType.APPLICATION_FORM_URLENCODED )
- public JSONWithPadding createUser( @Context UriInfo ui, @FormParam( "username" ) String username,
+ @JSONP
+ @Produces( {MediaType.APPLICATION_JSON, "application/javascript" })
+ public ApiResponse createUser( @Context UriInfo ui, @FormParam( "username" ) String username,
@FormParam( "name" ) String name, @FormParam( "email" ) String email,
@FormParam( "password" ) String password,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
@@ -135,7 +136,7 @@ public class UsersResource extends AbstractContextResource {
throw mappableSecurityException( AuthErrorInfo.BAD_CREDENTIALS_SYNTAX_ERROR );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
/*
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java
index 71eccbf..186ccd3 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java
@@ -17,38 +17,26 @@
package org.apache.usergrid.rest.management.users.organizations;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.usergrid.rest.RootResource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.google.common.collect.BiMap;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.UserInfo;
import org.apache.usergrid.management.exceptions.ManagementException;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.ApiResponse;
+import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.apache.usergrid.rest.management.users.organizations.OrganizationsResource" )
@@ -74,7 +62,9 @@ public class OrganizationsResource extends AbstractContextResource {
@RequireAdminUserAccess
@GET
- public JSONWithPadding getUserOrganizations( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getUserOrganizations( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -84,13 +74,15 @@ public class OrganizationsResource extends AbstractContextResource {
BiMap<UUID, String> userOrganizations = SubjectUtils.getOrganizations();
response.setData( userOrganizations.inverse() );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireAdminUserAccess
@POST
- public JSONWithPadding newOrganizationForUser( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newOrganizationForUser( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" )
String callback ) throws Exception {
@@ -103,14 +95,16 @@ public class OrganizationsResource extends AbstractContextResource {
management.activateOrganization( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireAdminUserAccess
@POST
@Consumes( MediaType.APPLICATION_FORM_URLENCODED )
- public JSONWithPadding newOrganizationForUserFromForm( @Context UriInfo ui, Map<String, Object> json,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse newOrganizationForUserFromForm( @Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "callback" )
String callback,
@FormParam( "organization" ) String organizationName )
@@ -128,14 +122,16 @@ public class OrganizationsResource extends AbstractContextResource {
management.activateOrganization( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@PUT
@Path( "{organizationName}" )
- public JSONWithPadding addUserToOrganizationByOrganizationName( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse addUserToOrganizationByOrganizationName( @Context UriInfo ui,
@PathParam( "organizationName" )
String organizationName, @QueryParam( "callback" )
@DefaultValue( "callback" ) String callback )
@@ -147,14 +143,16 @@ public class OrganizationsResource extends AbstractContextResource {
OrganizationInfo organization = management.getOrganizationByName( organizationName );
management.addAdminUserToOrganization( user, organization, true );
response.setData( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@PUT
@Path(RootResource.ORGANIZATION_ID_PATH)
- public JSONWithPadding addUserToOrganizationByOrganizationId( @Context UriInfo ui, @PathParam( "organizationId" )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse addUserToOrganizationByOrganizationId( @Context UriInfo ui, @PathParam( "organizationId" )
String organizationIdStr, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception {
ApiResponse response = createApiResponse();
@@ -163,14 +161,16 @@ public class OrganizationsResource extends AbstractContextResource {
OrganizationInfo organization = management.getOrganizationByUuid( UUID.fromString( organizationIdStr ) );
management.addAdminUserToOrganization( user, organization, true );
response.setData( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@DELETE
@Path( RootResource.ORGANIZATION_ID_PATH )
- public JSONWithPadding removeUserFromOrganizationByOrganizationId( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse removeUserFromOrganizationByOrganizationId( @Context UriInfo ui,
@PathParam( "organizationId" )
String organizationIdStr,
@QueryParam( "callback" )
@@ -183,14 +183,16 @@ public class OrganizationsResource extends AbstractContextResource {
OrganizationInfo organization = management.getOrganizationByUuid( UUID.fromString( organizationIdStr ) );
management.removeAdminUserFromOrganization( user.getUuid(), organization.getUuid() );
response.setData( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireOrganizationAccess
@DELETE
@Path( "{organizationName}" )
- public JSONWithPadding removeUserFromOrganizationByOrganizationName( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse removeUserFromOrganizationByOrganizationName( @Context UriInfo ui,
@PathParam( "organizationName" )
String organizationName,
@QueryParam( "callback" )
@@ -203,6 +205,6 @@ public class OrganizationsResource extends AbstractContextResource {
management.removeAdminUserFromOrganization( user.getUuid(), organization.getUuid() );
response.setData( organization );
- return new JSONWithPadding( response, callback );
+ return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
index 5e1d1f7..6ac7366 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/organizations/OrganizationResource.java
@@ -19,22 +19,9 @@ package org.apache.usergrid.rest.organizations;
import com.google.common.base.Optional;
import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
-import java.util.UUID;
-import java.util.regex.Pattern;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.usergrid.exception.NotImplementedException;
import org.apache.usergrid.management.OrganizationInfo;
-import org.apache.usergrid.persistence.index.query.Identifier;
import org.apache.usergrid.rest.AbstractContextResource;
import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.applications.ApplicationResource;
@@ -49,6 +36,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.UUID;
+
@Component("org.apache.usergrid.rest.organizations.OrganizationResource")
@Scope("prototype")
@@ -106,7 +99,7 @@ public class OrganizationResource extends AbstractContextResource {
}
// don't look up app if request is a PUT because a PUT can be used to restore a deleted app
- if ( !hc.getRequest().getMethod().equalsIgnoreCase("PUT") ) {
+ if ( httpServletRequest.getMethod().equalsIgnoreCase("PUT") ) {
BiMap<UUID, String> apps = management.getApplicationsForOrganization(organizationId);
if (apps.get(applicationId) == null) {
@@ -184,11 +177,8 @@ public class OrganizationResource extends AbstractContextResource {
@DELETE
@RequireOrganizationAccess
- public JSONWithPadding executeDelete( @Context UriInfo ui,
- @QueryParam("callback") @DefaultValue("callback") String callback )
- throws Exception {
-
-
+ public void executeDelete(
+ @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
throw new NotImplementedException( "Organization delete is not allowed yet" );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
index e975463..be6c3e9 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/CrossOriginRequestFilter.java
@@ -17,23 +17,21 @@
package org.apache.usergrid.rest.security;
+import org.apache.usergrid.rest.utils.CORSUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.usergrid.rest.utils.CORSUtils;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import java.io.IOException;
public class CrossOriginRequestFilter implements ContainerResponseFilter {
-
public static final Logger logger = LoggerFactory.getLogger( CrossOriginRequestFilter.class );
-
@Override
- public ContainerResponse filter( ContainerRequest request, ContainerResponse response ) {
-
- return CORSUtils.allowAllOrigins( request, response );
+ public void filter(ContainerRequestContext request, ContainerResponseContext response) throws IOException {
+ CORSUtils.allowAllOrigins( request, response );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
index 551c687..6e4fc1e 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java
@@ -17,20 +17,6 @@
package org.apache.usergrid.rest.security;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManager;
@@ -44,24 +30,32 @@ import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
import org.apache.usergrid.rest.utils.PathingUtils;
import org.apache.usergrid.security.shiro.utils.SubjectUtils;
import org.apache.usergrid.services.ServiceManagerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.model.AbstractMethod;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ResourceFilter;
-import com.sun.jersey.spi.container.ResourceFilterFactory;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.DynamicFeature;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.FeatureContext;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.commons.lang.StringUtils.isNotEmpty;
import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToApplication;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToOrganization;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isUser;
-import static org.apache.usergrid.security.shiro.utils.SubjectUtils.loginApplicationGuest;
+import static org.apache.usergrid.security.shiro.utils.SubjectUtils.*;
@Component
-public class SecuredResourceFilterFactory implements ResourceFilterFactory {
+public class SecuredResourceFilterFactory implements DynamicFeature {
private static final Logger logger = LoggerFactory.getLogger( SecuredResourceFilterFactory.class );
@@ -118,58 +112,45 @@ public class SecuredResourceFilterFactory implements ResourceFilterFactory {
@Override
- public List<ResourceFilter> create( AbstractMethod am ) {
+ public void configure(ResourceInfo resourceInfo, FeatureContext featureContext) {
+ Method am = resourceInfo.getResourceMethod();
+
if ( am.isAnnotationPresent( RequireApplicationAccess.class ) ) {
- return Collections.<ResourceFilter>singletonList( new ApplicationFilter() );
+ featureContext.register( ApplicationFilter.class );
}
else if ( am.isAnnotationPresent( RequireOrganizationAccess.class ) ) {
- return Collections.<ResourceFilter>singletonList( new OrganizationFilter() );
+ featureContext.register( OrganizationFilter.class );
}
else if ( am.isAnnotationPresent( RequireSystemAccess.class ) ) {
- return Collections.<ResourceFilter>singletonList( new SystemFilter() );
+ featureContext.register( SystemFilter.class );
}
else if ( am.isAnnotationPresent( RequireAdminUserAccess.class ) ) {
- return Collections.<ResourceFilter>singletonList( new AdminUserFilter() );
+ featureContext.register( AdminUserFilter.class );
}
- return null;
- }
+ }
- public abstract class AbstractFilter implements ResourceFilter, ContainerRequestFilter {
+ public abstract class AbstractFilter implements ContainerRequestFilter {
public AbstractFilter() {
}
-
@Override
- public ContainerRequestFilter getRequestFilter() {
- return this;
- }
-
-
- @Override
- public ContainerResponseFilter getResponseFilter() {
- return null;
- }
+ public void filter(ContainerRequestContext request) throws IOException {
-
- @Override
- public ContainerRequest filter( ContainerRequest request ) {
- logger.debug( "Filtering {}", request.getRequestUri().toString() );
+ logger.debug( "Filtering {}", request.getUriInfo().getRequestUri().toString() );
if ( request.getMethod().equalsIgnoreCase( "OPTIONS" ) ) {
logger.debug( "Skipping option request" );
- return request;
}
MultivaluedMap<java.lang.String, java.lang.String> params = uriInfo.getPathParameters();
logger.debug( "Params: {}", params.keySet() );
authorize( request );
- return request;
}
- public abstract void authorize( ContainerRequest request );
+ public abstract void authorize( ContainerRequestContext request );
public Identifier getApplicationIdentifier() {
@@ -236,7 +217,7 @@ public class SecuredResourceFilterFactory implements ResourceFilterFactory {
@Override
- public void authorize( ContainerRequest request ) {
+ public void authorize( ContainerRequestContext request ) {
logger.debug( "OrganizationFilter.authorize" );
if ( !isPermittedAccessToOrganization( getOrganizationIdentifier() ) ) {
@@ -256,7 +237,7 @@ public class SecuredResourceFilterFactory implements ResourceFilterFactory {
@Override
- public void authorize( ContainerRequest request ) {
+ public void authorize( ContainerRequestContext request ) {
logger.debug( "ApplicationFilter.authorize" );
if ( SubjectUtils.isAnonymous() ) {
ApplicationInfo application = null;
@@ -296,21 +277,21 @@ public class SecuredResourceFilterFactory implements ResourceFilterFactory {
@Override
- public void authorize( ContainerRequest request ) {
+ public void authorize( ContainerRequestContext request ) {
logger.debug( "SystemFilter.authorize" );
try {
- if ( !request.isUserInRole( "sysadmin" ) ) {
+ if ( !request.getSecurityContext().isUserInRole( "sysadmin" ) ) {
logger.debug( "You are not the system admin." );
throw mappableSecurityException( "unauthorized", "No system access authorized",
- SecurityException.REALM );
+ SecurityException.REALM );
}
}
catch ( IllegalStateException e ) {
logger.debug( "This is an invalid state",e );
- if ( ( request.getUserPrincipal() == null ) || !"sysadmin"
- .equals( request.getUserPrincipal().getName() ) ) {
+ if ( ( request.getSecurityContext().getUserPrincipal() == null ) || !"sysadmin"
+ .equals( request.getSecurityContext().getUserPrincipal().getName() ) ) {
throw mappableSecurityException( "unauthorized", "No system access authorized",
- SecurityException.REALM );
+ SecurityException.REALM );
}
}
}
@@ -323,7 +304,7 @@ public class SecuredResourceFilterFactory implements ResourceFilterFactory {
@Override
- public void authorize( ContainerRequest request ) {
+ public void authorize( ContainerRequestContext request ) {
logger.debug( "AdminUserFilter.authorize" );
if ( !isUser( getUserIdentifier() ) ) {
throw mappableSecurityException( "unauthorized", "No admin user access authorized" );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
index 5f03809..6bf825f 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
@@ -17,18 +17,15 @@
package org.apache.usergrid.rest.security.shiro.filters;
-import java.security.Principal;
-import java.util.Map;
-
-import javax.ws.rs.core.SecurityContext;
-
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.SecurityContext;
+import java.security.Principal;
+import java.util.Map;
@Component
@@ -43,15 +40,14 @@ public class BasicAuthSecurityFilter extends SecurityFilter {
@Override
- public ContainerRequest filter( ContainerRequest request ) {
+ public void filter( ContainerRequestContext request ) {
Map<String, String> auth_types = getAuthTypes( request );
if ( ( auth_types == null ) || !auth_types.containsKey( AUTH_BASIC_TYPE ) ) {
- return request;
+ return;
}
-
String[] values = Base64.decodeToString( auth_types.get( AUTH_BASIC_TYPE ) ).split( ":" );
if ( values.length < 2 ) {
- return request;
+ return;
}
String name = values[0].toLowerCase();
String password = values[1];
@@ -64,13 +60,9 @@ public class BasicAuthSecurityFilter extends SecurityFilter {
&& sysadmin_login_allowed ) {
request.setSecurityContext( new SysAdminRoleAuthenticator() );
logger.info( "System administrator access allowed" );
- return request;
}
-
- return request;
}
-
private static class SysAdminRoleAuthenticator implements SecurityContext {
private final Principal principal;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
index cdb7f50..c4ee3e7 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
@@ -17,18 +17,16 @@
package org.apache.usergrid.rest.security.shiro.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import org.apache.shiro.subject.Subject;
+import org.apache.usergrid.security.shiro.PrincipalCredentialsToken;
+import org.apache.usergrid.security.shiro.utils.SubjectUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import org.apache.usergrid.security.shiro.PrincipalCredentialsToken;
-import org.apache.usergrid.security.shiro.utils.SubjectUtils;
-
-import org.apache.shiro.subject.Subject;
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.Context;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.OAUTH2_INVALID_CLIENT;
@@ -50,7 +48,7 @@ public class ClientCredentialsSecurityFilter extends SecurityFilter {
@Override
- public ContainerRequest filter( ContainerRequest request ) {
+ public void filter( ContainerRequestContext request ) {
String clientId = httpServletRequest.getParameter( "client_id" );
String clientSecret = httpServletRequest.getParameter( "client_secret" );
@@ -65,6 +63,5 @@ public class ClientCredentialsSecurityFilter extends SecurityFilter {
throw mappableSecurityException( OAUTH2_INVALID_CLIENT );
}
}
- return request;
}
}
[07/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Posted by sn...@apache.org.
Switch to Jersey 2, fix all compilation errors. TODO: new MeteringFilter, new JSON-HTMP swap logic and correct use of dependency management.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0578d987
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0578d987
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0578d987
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: 0578d987abc9eacb41af50f8957e90d16f6f7025
Parents: 2303eea
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Aug 28 10:57:13 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Aug 28 10:57:13 2015 -0400
----------------------------------------------------------------------
stack/pom.xml | 248 ++++----
stack/rest/pom.xml | 91 ++-
.../usergrid/rest/AbstractContextResource.java | 45 +-
.../org/apache/usergrid/rest/IndexResource.java | 54 +-
.../apache/usergrid/rest/MigrateResource.java | 61 +-
.../org/apache/usergrid/rest/RootResource.java | 92 ++-
.../apache/usergrid/rest/SystemResource.java | 45 +-
.../usergrid/rest/TextToJsonSwapWriter.java | 180 +++---
.../rest/applications/ApplicationResource.java | 31 +-
.../rest/applications/ServiceResource.java | 109 ++--
.../applications/assets/AssetsResource.java | 13 +-
.../applications/events/EventsResource.java | 36 +-
.../notifiers/NotifierResource.java | 29 +-
.../notifiers/NotifiersResource.java | 29 +-
.../rest/applications/queues/QueueResource.java | 86 ++-
.../queues/QueueSubscriberResource.java | 63 +-
.../queues/QueueSubscriptionResource.java | 63 +-
.../queues/QueueTransactionsResource.java | 40 +-
.../rest/applications/users/UserResource.java | 134 ++--
.../rest/applications/users/UsersResource.java | 51 +-
.../exceptions/NotFoundExceptionMapper.java | 3 +-
.../rest/exceptions/SecurityException.java | 31 +-
.../rest/filters/JSONPCallbackFilter.java | 22 +-
.../usergrid/rest/filters/MeteringFilter.java | 632 ++++++++++---------
.../usergrid/rest/filters/TracingFilter.java | 37 +-
.../rest/management/ManagementResource.java | 51 +-
.../management/metrics/MetricsResource.java | 9 +-
.../organizations/OrganizationResource.java | 50 +-
.../organizations/OrganizationsResource.java | 56 +-
.../applications/ApplicationResource.java | 50 +-
.../applications/ApplicationsResource.java | 48 +-
.../imports/FileErrorsResource.java | 41 +-
.../imports/FileIncludesResource.java | 15 +-
.../applications/imports/ImportsResource.java | 57 +-
.../organizations/users/UsersResource.java | 88 +--
.../rest/management/users/UserResource.java | 95 +--
.../rest/management/users/UsersResource.java | 11 +-
.../organizations/OrganizationsResource.java | 76 +--
.../organizations/OrganizationResource.java | 28 +-
.../rest/security/CrossOriginRequestFilter.java | 16 +-
.../security/SecuredResourceFilterFactory.java | 99 ++-
.../shiro/filters/BasicAuthSecurityFilter.java | 24 +-
.../ClientCredentialsSecurityFilter.java | 17 +-
.../OAuth2AccessTokenSecurityFilter.java | 143 ++---
.../security/shiro/filters/SecurityFilter.java | 11 +-
.../apache/usergrid/rest/utils/CORSUtils.java | 42 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 23 +-
.../apache/usergrid/rest/IndexResourceIT.java | 39 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 10 +-
.../apache/usergrid/rest/SystemResourceIT.java | 7 +-
.../org/apache/usergrid/rest/TomcatRuntime.java | 12 +-
.../rest/applications/ApplicationCreateIT.java | 14 +-
.../rest/applications/ApplicationDeleteIT.java | 153 ++---
.../applications/ApplicationResourceIT.java | 253 ++++----
.../applications/assets/AssetResourceIT.java | 9 +-
.../applications/assets/AwsAssetResourceIT.java | 53 +-
.../applications/assets/aws/NoAWSCredsRule.java | 15 +-
.../collection/CollectionsResourceIT.java | 26 +-
.../collection/DuplicateNameIT.java | 5 +-
.../activities/ActivityResourceIT.java | 5 +-
.../collection/devices/DevicesResourceIT.java | 4 +-
.../collection/groups/GroupResourceIT.java | 28 +-
.../users/ConnectionResourceTest.java | 8 +-
.../collection/users/OwnershipResourceIT.java | 15 +-
.../collection/users/PermissionsResourceIT.java | 34 +-
.../collection/users/UserResourceIT.java | 126 ++--
.../queries/BadGrammarQueryTest.java | 15 +-
.../applications/queries/BasicGeoTests.java | 45 +-
.../rest/filters/ContentTypeResourceIT.java | 43 +-
.../usergrid/rest/management/AccessTokenIT.java | 42 +-
.../usergrid/rest/management/AdminUsersIT.java | 31 +-
.../rest/management/ExportResourceIT.java | 137 ++--
.../rest/management/ImportResourceIT.java | 50 +-
.../rest/management/ManagementResourceIT.java | 88 +--
.../rest/management/OrganizationsIT.java | 32 +-
.../rest/management/RegistrationIT.java | 32 +-
.../organizations/AdminEmailEncodingIT.java | 5 +-
.../rest/test/resource/AbstractRestIT.java | 43 +-
.../usergrid/rest/test/resource/RestClient.java | 41 +-
.../test/resource/TestPropertiesResource.java | 14 +-
.../endpoints/ApplicationsResource.java | 8 +-
.../resource/endpoints/CollectionEndpoint.java | 88 +--
.../test/resource/endpoints/EntityEndpoint.java | 40 +-
.../test/resource/endpoints/NamedResource.java | 128 ++--
.../test/resource/endpoints/RootResource.java | 4 +-
.../test/resource/endpoints/SetupResource.java | 22 +-
.../test/resource/endpoints/SystemResource.java | 11 +-
.../test/resource/endpoints/TokenResource.java | 15 +-
.../test/resource/endpoints/UrlResource.java | 7 +-
.../endpoints/mgmt/ApplicationResource.java | 27 +-
.../endpoints/mgmt/ApplicationsResource.java | 4 +-
.../endpoints/mgmt/AuthorizeResource.java | 7 +-
.../endpoints/mgmt/ConfirmResource.java | 12 +-
.../endpoints/mgmt/CredentialsResource.java | 7 +-
.../resource/endpoints/mgmt/FeedResource.java | 5 +-
.../resource/endpoints/mgmt/OrgResource.java | 38 +-
.../endpoints/mgmt/OrganizationResource.java | 11 +-
.../endpoints/mgmt/PasswordResource.java | 8 -
.../endpoints/mgmt/ReactivateResource.java | 10 +-
.../resource/endpoints/mgmt/ResetResource.java | 10 +-
.../resource/endpoints/mgmt/TokenResource.java | 7 +-
.../resource/endpoints/mgmt/UserResource.java | 20 +-
.../resource/endpoints/mgmt/UsersResource.java | 6 -
stack/services/pom.xml | 43 +-
.../security/providers/AbstractProvider.java | 16 +-
.../security/providers/FacebookProvider.java | 7 +-
.../security/providers/FoursquareProvider.java | 42 +-
.../providers/PingIdentityProvider.java | 38 +-
108 files changed, 2655 insertions(+), 2695 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 16783b2..dc42920 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -107,11 +107,11 @@
<jackson-version>1.9.9</jackson-version>
<jackson-2-version>2.3.3</jackson-2-version>
<jclouds.version>1.9.0</jclouds.version>
- <jersey-version>1.19</jersey-version>
+ <!--<jersey-version>1.19</jersey-version>-->
<junit-version>4.12</junit-version>
<log4j-version>1.2.16</log4j-version>
<org.springframework.version>3.2.13.RELEASE</org.springframework.version>
- <shiro-version>1.2.3</shiro-version>
+ <shiro-version>1.2.4</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
<snakeyaml-version>1.9</snakeyaml-version>
<tomcat-version>7.0.59</tomcat-version>
@@ -579,139 +579,139 @@
<!-- Sun and Javax Package Dependencies -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>${jersey-version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey-version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey-version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-grizzly2</artifactId>
- <version>${jersey-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.grizzly</groupId>
- <artifactId>grizzly-http-servlet-server</artifactId>
- <version>2.1.2</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-core</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-spring</artifactId>
- <version>${jersey-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-json</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.codehaus.jettison</groupId>-->
+ <!--<artifactId>jettison</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.codehaus.jackson</groupId>-->
+ <!--<artifactId>jackson-core-asl</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.codehaus.jackson</groupId>-->
+ <!--<artifactId>jackson-mapper-asl</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.codehaus.jackson</groupId>-->
+ <!--<artifactId>jackson-jaxrs</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.codehaus.jackson</groupId>-->
+ <!--<artifactId>jackson-xc</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>javax.activation</groupId>-->
+ <!--<artifactId>activation</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-client</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </exclusion>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-server</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-grizzly2</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
+ <!--<dependency>-->
+ <!--<groupId>org.glassfish.grizzly</groupId>-->
+ <!--<artifactId>grizzly-http-servlet-server</artifactId>-->
+ <!--<version>2.1.2</version>-->
+ <!--</dependency>-->
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.contribs</groupId>-->
+ <!--<artifactId>jersey-spring</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.springframework</groupId>-->
+ <!--<artifactId>spring-aop</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.springframework</groupId>-->
+ <!--<artifactId>spring-core</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.springframework</groupId>-->
+ <!--<artifactId>spring</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.springframework</groupId>-->
+ <!--<artifactId>spring-beans</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.springframework</groupId>-->
+ <!--<artifactId>spring-context</artifactId>-->
+ <!--</exclusion>-->
+
+ <!--<exclusion>-->
+ <!--<groupId>org.springframework</groupId>-->
+ <!--<artifactId>spring-web</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>${jersey-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.contribs</groupId>-->
+ <!--<artifactId>jersey-multipart</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey.contribs.jersey-oauth</groupId>
- <artifactId>oauth-signature</artifactId>
- <version>${jersey-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.contribs.jersey-oauth</groupId>-->
+ <!--<artifactId>oauth-signature</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey.contribs.jersey-oauth</groupId>
- <artifactId>oauth-server</artifactId>
- <version>${jersey-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.contribs.jersey-oauth</groupId>-->
+ <!--<artifactId>oauth-server</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-external</artifactId>
- <version>${jersey-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
+ <!--<artifactId>jersey-test-framework-external</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey-version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
+ <!--<artifactId>jersey-test-framework-core</artifactId>-->
+ <!--<version>${jersey-version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>com.sun.mail</groupId>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 6c47d82..e95e66f 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -240,46 +240,79 @@
</dependency>
<dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <!-- if your container implements Servlet API older than 3.0, use "jersey-container-servlet-core" -->
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>2.21</version>
</dependency>
+ <!-- Required only when you are using JAX-RS Client -->
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.21</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-apache-connector</artifactId>
+ <version>2.21</version>
</dependency>
+ <!-- support for JSP and Viewable -->
<dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-mvc-jsp</artifactId>
+ <version>2.21</version>
</dependency>
-
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-multipart</artifactId>
+ <version>2.7</version>
</dependency>
<dependency>
- <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
- <artifactId>recaptcha4j</artifactId>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-jackson</artifactId>
+ <version>2.21</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.contribs</groupId>-->
+ <!--<artifactId>jersey-multipart</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-json</artifactId>-->
+ <!--</dependency>-->
+
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-client</artifactId>-->
+ <!--</dependency>-->
+
<dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-spring</artifactId>
+ <groupId>com.google.code.maven-play-plugin.net.tanesha.recaptcha4j</groupId>
+ <artifactId>recaptcha4j</artifactId>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey</groupId>-->
+ <!--<artifactId>jersey-server</artifactId>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.contribs</groupId>-->
+ <!--<artifactId>jersey-spring</artifactId>-->
+ <!--</dependency>-->
+
<!-- Codehaus, Spring, and Other Org Dependencies -->
<dependency>
@@ -382,18 +415,24 @@
<scope>test</scope>
</dependency>
- <!-- use the external test client. Just depend on the maven jetty plugin to launch jetty -->
+ <!-- use the in-memory test setup. Just depend on the maven jetty plugin to launch jetty -->
<dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-external</artifactId>
- <scope>test</scope>
+ <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+ <artifactId>jersey-test-framework-provider-inmemory</artifactId>
+ <version>2.21</version>
</dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
+ <!--<artifactId>jersey-test-framework-external</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>com.sun.jersey.jersey-test-framework</groupId>-->
+ <!--<artifactId>jersey-test-framework-core</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.usergrid</groupId>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
index 1494814..c10b20f 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
@@ -17,41 +17,32 @@
package org.apache.usergrid.rest;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Injector;
-import org.apache.usergrid.persistence.index.EntityIndex;
-import org.springframework.beans.factory.annotation.Autowired;
+import net.tanesha.recaptcha.ReCaptcha;
+import net.tanesha.recaptcha.ReCaptchaFactory;
+import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.mq.QueueManagerFactory;
import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.rest.exceptions.RedirectionException;
import org.apache.usergrid.security.tokens.TokenService;
import org.apache.usergrid.services.ServiceManagerFactory;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.api.core.ResourceContext;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.spi.CloseableService;
-
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaFactory;
-
-import org.apache.commons.lang.StringUtils;
+import org.glassfish.jersey.server.CloseableService;
+import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.*;
+import javax.xml.ws.spi.http.HttpContext;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
public abstract class AbstractContextResource {
@@ -187,7 +178,7 @@ public abstract class AbstractContextResource {
logger.debug("Dispatching to viewable with template: {}",
template, template_property);
- Viewable viewable = new Viewable(template, model, this.getClass());
+ Viewable viewable = new Viewable(template, model);
return viewable;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
index a4a56bc..a785c0b 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
@@ -21,8 +21,8 @@
package org.apache.usergrid.rest;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
import org.apache.usergrid.corepersistence.index.ReIndexRequestBuilder;
import org.apache.usergrid.corepersistence.index.ReIndexRequestBuilderImpl;
import org.apache.usergrid.corepersistence.index.ReIndexService;
@@ -68,7 +68,7 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@POST
@Path( "rebuild" )
- public JSONWithPadding rebuildIndexesPost( @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
+ public ApiResponse rebuildIndexesPost( @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -82,7 +82,13 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@GET
@Path( "rebuild/{jobId}" )
- public JSONWithPadding rebuildIndexesGet(@PathParam( "jobId" ) String jobId, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildIndexesGet(
+ @PathParam( "jobId" ) String jobId,
+ @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
+
+
throws Exception {
logger.info("Getting status for index jobs");
@@ -101,13 +107,15 @@ public class IndexResource extends AbstractContextResource {
response.setProperty( "numberQueued", status.getNumberProcessed() );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@PUT
@Path( "rebuild" )
- public JSONWithPadding rebuildIndexesPut( final Map<String, Object> payload,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildIndexesPut( final Map<String, Object> payload,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -122,7 +130,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@POST
@Path( "rebuild/" + RootResource.APPLICATION_ID_PATH )
- public JSONWithPadding rebuildIndexesPut( @PathParam( "applicationId" ) String applicationIdStr,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildIndexesPut( @PathParam( "applicationId" ) String applicationIdStr,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback,
@QueryParam( "delay" ) @DefaultValue( "10" ) final long delay )
@@ -143,7 +153,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@PUT
@Path( "rebuild/" + RootResource.APPLICATION_ID_PATH )
- public JSONWithPadding rebuildIndexesPut( final Map<String, Object> payload,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildIndexesPut( final Map<String, Object> payload,
@PathParam( "applicationId" ) String applicationIdStr,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback,
@QueryParam( "delay" ) @DefaultValue( "10" ) final long delay )
@@ -163,7 +175,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@POST
@Path( "rebuild/" + RootResource.APPLICATION_ID_PATH + "/{collectionName}" )
- public JSONWithPadding rebuildIndexesPost( @PathParam( "applicationId" ) final String applicationIdStr,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildIndexesPost( @PathParam( "applicationId" ) final String applicationIdStr,
@PathParam( "collectionName" ) final String collectionName,
@QueryParam( "reverse" ) @DefaultValue( "false" ) final Boolean reverse,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
@@ -184,7 +198,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@PUT
@Path( "rebuild/" + RootResource.APPLICATION_ID_PATH + "/{collectionName}" )
- public JSONWithPadding rebuildIndexesPut( final Map<String, Object> payload,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildIndexesPut( final Map<String, Object> payload,
@PathParam( "applicationId" ) final String applicationIdStr,
@PathParam( "collectionName" ) final String collectionName,
@QueryParam( "reverse" ) @DefaultValue( "false" ) final Boolean reverse,
@@ -205,7 +221,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@POST
@Path( "rebuild/management" )
- public JSONWithPadding rebuildInternalIndexesPost(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildInternalIndexesPost(
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception {
@@ -221,7 +239,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@PUT
@Path( "rebuild/management" )
- public JSONWithPadding rebuildInternalIndexesPut( final Map<String, Object> payload,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse rebuildInternalIndexesPut( final Map<String, Object> payload,
@QueryParam( "callback" ) @DefaultValue( "callback" )
String callback ) throws Exception {
@@ -238,7 +258,9 @@ public class IndexResource extends AbstractContextResource {
@RequireSystemAccess
@POST
@Path(RootResource.APPLICATION_ID_PATH)
- public JSONWithPadding addIndex( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse addIndex( @Context UriInfo ui,
@PathParam( "applicationId" ) final String applicationIdStr,
Map<String, Object> config,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
@@ -268,7 +290,7 @@ public class IndexResource extends AbstractContextResource {
(int) config.get("replicas"), (String) config.get("writeConsistency"));
response.setAction( "Add index to alias" );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -283,7 +305,7 @@ public class IndexResource extends AbstractContextResource {
}
- private JSONWithPadding executeResumeAndCreateResponse( final Map<String, Object> payload,
+ private ApiResponse executeResumeAndCreateResponse( final Map<String, Object> payload,
final ReIndexRequestBuilder request,
final String callback ) {
@@ -309,7 +331,7 @@ public class IndexResource extends AbstractContextResource {
/**
* Execute the request and return the response.
*/
- private JSONWithPadding executeAndCreateResponse( final ReIndexRequestBuilder request, final String callback ) {
+ private ApiResponse executeAndCreateResponse( final ReIndexRequestBuilder request, final String callback ) {
final ReIndexService.ReIndexStatus status = getReIndexService().rebuildIndex( request );
@@ -323,6 +345,6 @@ public class IndexResource extends AbstractContextResource {
response.setProperty( "numberQueued", status.getNumberProcessed() );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java
index 7410927..168a3b7 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/MigrateResource.java
@@ -19,29 +19,26 @@
package org.apache.usergrid.rest;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.google.common.base.Preconditions;
+import com.google.inject.Injector;
+import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
+import org.apache.usergrid.persistence.core.migration.schema.MigrationManager;
+import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
-import org.apache.usergrid.persistence.core.migration.schema.MigrationManager;
-import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
-
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
-import com.google.inject.Injector;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.Set;
@Component
@@ -68,7 +65,9 @@ public class MigrateResource extends AbstractContextResource {
@RequireSystemAccess
@PUT
@Path( "run" )
- public JSONWithPadding migrateData( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse migrateData( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -108,13 +107,15 @@ public class MigrateResource extends AbstractContextResource {
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@PUT
@Path( "run/{pluginName}" )
- public JSONWithPadding migrateData(@PathParam("pluginName") String pluginName , @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse migrateData(@PathParam("pluginName") String pluginName , @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -151,13 +152,15 @@ public class MigrateResource extends AbstractContextResource {
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@PUT
@Path( "set" )
- public JSONWithPadding setMigrationVersion(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse setMigrationVersion(
@Context UriInfo ui, Map<String, Object> json,
@QueryParam( "callback" ) @DefaultValue( "" ) String callback )
throws Exception {
@@ -197,14 +200,16 @@ public class MigrateResource extends AbstractContextResource {
response.setData( node );
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@GET
@Path( "status" )
- public JSONWithPadding migrateStatus(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse migrateStatus(
@Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -228,14 +233,16 @@ public class MigrateResource extends AbstractContextResource {
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@GET
@Path( "count" )
- public JSONWithPadding migrateCount(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse migrateCount(
@Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -247,7 +254,7 @@ public class MigrateResource extends AbstractContextResource {
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
index 7c17b7c..8875295 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
@@ -19,66 +19,40 @@ package org.apache.usergrid.rest;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.UUID;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import com.google.common.collect.BiMap;
import com.google.inject.Injector;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.*;
+import com.yammer.metrics.stats.Snapshot;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
import org.apache.usergrid.corepersistence.asyncevents.AsyncEventService;
-import org.apache.usergrid.persistence.index.IndexFig;
-import org.apache.usergrid.persistence.index.IndexRefreshCommand;
+import org.apache.usergrid.persistence.core.util.Health;
import org.apache.usergrid.persistence.index.query.Identifier;
-import org.apache.usergrid.persistence.queue.Queue;
-import org.apache.usergrid.persistence.queue.QueueManager;
-import org.apache.usergrid.persistence.queue.QueueManagerFactory;
-import org.apache.usergrid.persistence.queue.QueueScope;
-import org.apache.usergrid.persistence.queue.impl.QueueScopeImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
import org.apache.usergrid.rest.applications.ApplicationResource;
import org.apache.usergrid.rest.exceptions.NoOpException;
import org.apache.usergrid.rest.organizations.OrganizationResource;
import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
import org.apache.usergrid.system.UsergridSystemMonitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Gauge;
-import com.yammer.metrics.core.Histogram;
-import com.yammer.metrics.core.Metered;
-import com.yammer.metrics.core.Metric;
-import com.yammer.metrics.core.MetricName;
-import com.yammer.metrics.core.MetricProcessor;
-import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.core.Sampling;
-import com.yammer.metrics.core.Summarizable;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.stats.Snapshot;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
import java.io.IOException;
-import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.core.util.Health;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.UUID;
/** @author ed@anuff.com */
@@ -121,7 +95,9 @@ public class RootResource extends AbstractContextResource implements MetricProce
@RequireSystemAccess
@GET
@Path("applications")
- public JSONWithPadding getAllApplications(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getAllApplications(
@Context UriInfo ui,
@QueryParam("deleted") @DefaultValue("false") Boolean deleted,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws URISyntaxException {
@@ -146,14 +122,16 @@ public class RootResource extends AbstractContextResource implements MetricProce
response.setError( "Unable to retrieve applications" );
}
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@GET
@Path("apps")
- public JSONWithPadding getAllApplications2( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getAllApplications2( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws URISyntaxException {
return getAllApplications( ui, false, callback );
@@ -186,7 +164,9 @@ public class RootResource extends AbstractContextResource implements MetricProce
*/
@GET
@Path("status")
- public JSONWithPadding getStatus(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getStatus(
@QueryParam("ignore_error") @DefaultValue("true") Boolean ignoreError,
@QueryParam("callback") @DefaultValue("callback") String callback ) {
@@ -225,12 +205,14 @@ public class RootResource extends AbstractContextResource implements MetricProce
dumpMetrics(node);
response.setProperty( "status", node );
- return new JSONWithPadding( response, callback );
+ return response;
}
@GET
@Path("lb-status")
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
public Response getLbStatus() {
ResponseBuilder response;
if ( usergridSystemMonitor.getIsCassandraAlive() ) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
index fca3333..0a09eba 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/SystemResource.java
@@ -17,38 +17,17 @@
package org.apache.usergrid.rest;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.EntityManagerFactory;
-import org.apache.usergrid.persistence.EntityManagerFactory.ProgressObserver;
-import org.apache.usergrid.persistence.EntityRef;
-import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
-import org.apache.usergrid.rest.security.annotations.RequireSystemAccess;
-
-import com.clearspring.analytics.util.Preconditions;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
@Path( "/system" )
@@ -71,7 +50,9 @@ public class SystemResource extends AbstractContextResource {
@RequireSystemAccess
@GET
@Path( "database/setup" )
- public JSONWithPadding getSetup( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getSetup( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -88,14 +69,16 @@ public class SystemResource extends AbstractContextResource {
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@RequireSystemAccess
@GET
@Path( "superuser/setup" )
- public JSONWithPadding getSetupSuperuser( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getSetupSuperuser( @Context UriInfo ui,
@QueryParam( "callback" ) @DefaultValue( "callback" ) String callback )
throws Exception {
@@ -113,7 +96,7 @@ public class SystemResource extends AbstractContextResource {
response.setSuccess();
- return new JSONWithPadding( response, callback );
+ return response;
}
@Path( "migrate" )
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java
index 546a9f3..f4067df 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/TextToJsonSwapWriter.java
@@ -32,11 +32,13 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.spi.MessageBodyWorkers;
+import org.glassfish.jersey.message.MessageBodyWorkers;
+import org.glassfish.jersey.server.mvc.Viewable;
+
+// TODO: text to JSON swapping for Jersey 2
+
/**
* A writer that will redirect requests for "text/html" to "application/json" if the value
* returned by the resource is an instance of JSONWithPadding
@@ -46,91 +48,91 @@ import com.sun.jersey.spi.MessageBodyWorkers;
*/
@Provider
@Produces( MediaType.TEXT_HTML )
-public class TextToJsonSwapWriter implements MessageBodyWriter<JSONWithPadding> {
-
-
- private static final MediaType JSON_MEDIA_TYPE = MediaType.APPLICATION_JSON_TYPE;
-
- @Context
- MessageBodyWorkers bodyWorker;
-
-
- @Override
- public boolean isWriteable( final Class<?> type, final Type genericType, final Annotation[] annotations,
- final MediaType mediaType ) {
-
-
- // if type is Viewable them we want to return HTML, so no swap needed
- if ( type.isAssignableFrom(Viewable.class) ) {
- return false;
- }
-
- // this should only map no media type, or text/html requests with json responses
- final boolean mediaTypeCorrect = mediaType == null || MediaType.TEXT_HTML_TYPE.equals( mediaType );
-
- if(!mediaTypeCorrect){
- return false;
- }
-
- return true;
-
-// JsonSerializableWithType no longer exists in FasterXML Jackson
+public class TextToJsonSwapWriter { // implements MessageBodyWriter<JSONWithPadding> {
//
-// final boolean serializableAnnotation = type.getAnnotation( XmlRootElement.class ) != null;
-// final boolean jsonSerializable = JsonSerializableWithType.class.isAssignableFrom( type );
-// return serializableAnnotation || jsonSerializable;
- }
-
-
- @Override
- public long getSize( final JSONWithPadding jsonWithPadding, final Class<?> type, final Type genericType,
- final Annotation[] annotations, final MediaType mediaType ) {
- return -1;
- }
-
-
- @Override
- public void writeTo( final JSONWithPadding jsonWithPadding, final Class<?> type, final Type genericType,
- final Annotation[] annotations, final MediaType mediaType,
- final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream )
- throws IOException, WebApplicationException {
-
-
- Object jsonEntity = jsonWithPadding.getJsonSource();
- Type entityGenericType = jsonEntity.getClass();
- Class<?> entityType = jsonEntity.getClass();
-
- final boolean genericEntityUsed = jsonEntity instanceof GenericEntity;
-
- if ( genericEntityUsed ) {
- GenericEntity ge = ( GenericEntity ) jsonEntity;
- jsonEntity = ge.getEntity();
- entityGenericType = ge.getType();
- entityType = ge.getRawType();
- }
-
-
- //replace the text/html content type with application Json
- httpHeaders.remove( HttpHeaders.CONTENT_TYPE);
-
- httpHeaders.putSingle( HttpHeaders.CONTENT_TYPE, JSON_MEDIA_TYPE);
-
-
-
-
- MessageBodyWriter bw = bodyWorker.getMessageBodyWriter( entityType, entityGenericType, annotations, JSON_MEDIA_TYPE );
-
- if ( bw == null ) {
-
- throw new RuntimeException( "Couldn't find the serailziation writer for json type");
- }
-
-
-
-
- bw.writeTo( jsonEntity, entityType, entityGenericType, annotations, JSON_MEDIA_TYPE, httpHeaders,
- entityStream );
-
-
- }
+//
+// private static final MediaType JSON_MEDIA_TYPE = MediaType.APPLICATION_JSON_TYPE;
+//
+// @Context
+// MessageBodyWorkers bodyWorker;
+//
+//
+// @Override
+// public boolean isWriteable( final Class<?> type, final Type genericType, final Annotation[] annotations,
+// final MediaType mediaType ) {
+//
+//
+// // if type is Viewable them we want to return HTML, so no swap needed
+// if ( type.isAssignableFrom(Viewable.class) ) {
+// return false;
+// }
+//
+// // this should only map no media type, or text/html requests with json responses
+// final boolean mediaTypeCorrect = mediaType == null || MediaType.TEXT_HTML_TYPE.equals( mediaType );
+//
+// if(!mediaTypeCorrect){
+// return false;
+// }
+//
+// return true;
+//
+//// JsonSerializableWithType no longer exists in FasterXML Jackson
+////
+//// final boolean serializableAnnotation = type.getAnnotation( XmlRootElement.class ) != null;
+//// final boolean jsonSerializable = JsonSerializableWithType.class.isAssignableFrom( type );
+//// return serializableAnnotation || jsonSerializable;
+// }
+//
+//
+// @Override
+// public long getSize( final JSONWithPadding jsonWithPadding, final Class<?> type, final Type genericType,
+// final Annotation[] annotations, final MediaType mediaType ) {
+// return -1;
+// }
+//
+//
+// @Override
+// public void writeTo( final JSONWithPadding jsonWithPadding, final Class<?> type, final Type genericType,
+// final Annotation[] annotations, final MediaType mediaType,
+// final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream )
+// throws IOException, WebApplicationException {
+//
+//
+// Object jsonEntity = jsonWithPadding.getJsonSource();
+// Type entityGenericType = jsonEntity.getClass();
+// Class<?> entityType = jsonEntity.getClass();
+//
+// final boolean genericEntityUsed = jsonEntity instanceof GenericEntity;
+//
+// if ( genericEntityUsed ) {
+// GenericEntity ge = ( GenericEntity ) jsonEntity;
+// jsonEntity = ge.getEntity();
+// entityGenericType = ge.getType();
+// entityType = ge.getRawType();
+// }
+//
+//
+// //replace the text/html content type with application Json
+// httpHeaders.remove( HttpHeaders.CONTENT_TYPE);
+//
+// httpHeaders.putSingle( HttpHeaders.CONTENT_TYPE, JSON_MEDIA_TYPE);
+//
+//
+//
+//
+// MessageBodyWriter bw = bodyWorker.getMessageBodyWriter( entityType, entityGenericType, annotations, JSON_MEDIA_TYPE );
+//
+// if ( bw == null ) {
+//
+// throw new RuntimeException( "Couldn't find the serailziation writer for json type");
+// }
+//
+//
+//
+//
+// bw.writeTo( jsonEntity, entityType, entityGenericType, annotations, JSON_MEDIA_TYPE, httpHeaders,
+// entityStream );
+//
+//
+// }
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
index c49c543..f2bd8fc 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
@@ -38,6 +38,9 @@ import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
+import org.apache.usergrid.rest.ApiResponse;
+import org.glassfish.jersey.server.mvc.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -73,9 +76,6 @@ import org.apache.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.apache.usergrid.security.oauth.AccessInfo;
import org.apache.usergrid.security.oauth.ClientCredentialsInfo;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
@@ -354,7 +354,9 @@ public class ApplicationResource extends ServiceResource {
@GET
@Path("credentials")
@RequireApplicationAccess
- public JSONWithPadding getKeys( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse getKeys( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -368,17 +370,16 @@ public class ApplicationResource extends ServiceResource {
new ClientCredentialsInfo( management.getClientIdForApplication( services.getApplicationId() ),
management.getClientSecretForApplication( services.getApplicationId() ) );
- return new JSONWithPadding(
- createApiResponse().withCredentials( kp ).withAction( "get application keys" ).withSuccess(),
- callback );
+ return createApiResponse().withCredentials( kp ).withAction( "get application keys" ).withSuccess();
}
@POST
@Path("credentials")
@RequireApplicationAccess
- @Produces(MediaType.APPLICATION_JSON)
- public JSONWithPadding generateKeys( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse generateKeys( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
logger.debug( "AuthResource.keys" );
@@ -391,9 +392,7 @@ public class ApplicationResource extends ServiceResource {
management.getClientIdForApplication( services.getApplicationId() ),
management.newClientSecretForApplication( services.getApplicationId() ) );
- return new JSONWithPadding(
- createApiResponse().withCredentials( kp ).withAction( "generate application keys" ).withSuccess(),
- callback );
+ return createApiResponse().withCredentials( kp ).withAction( "generate application keys" ).withSuccess();
}
@@ -498,7 +497,7 @@ public class ApplicationResource extends ServiceResource {
@Override
@DELETE
@RequireOrganizationAccess
- public JSONWithPadding executeDelete( @Context final UriInfo ui, @DefaultValue( "callback" ) final String callback,
+ public ApiResponse executeDelete( @Context final UriInfo ui, @DefaultValue( "callback" ) final String callback,
final String confirmAppDelete ) throws Exception {
throw new UnsupportedOperationException( "Delete must be done from the management endpoint" );
}
@@ -599,7 +598,9 @@ public class ApplicationResource extends ServiceResource {
@GET
@Path("apm/apigeeMobileConfig")
- public JSONWithPadding getAPMConfig( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public Object getAPMConfig( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
EntityManager em = emf.getEntityManager( applicationId );
@@ -610,6 +611,6 @@ public class ApplicationResource extends ServiceResource {
value = management.registerAppWithAPM( management.getOrganizationForApplication( applicationId ),
management.getApplicationInfo( applicationId ) );
}
- return new JSONWithPadding( value, callback );
+ return value;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
index 9a5a403..6e10a9f 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
@@ -17,40 +17,9 @@
package org.apache.usergrid.rest.applications;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.commons.lang.StringUtils;
-
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.Query;
@@ -61,12 +30,7 @@ import org.apache.usergrid.rest.RootResource;
import org.apache.usergrid.rest.applications.assets.AssetsResource;
import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.apache.usergrid.security.oauth.AccessInfo;
-import org.apache.usergrid.services.ServiceAction;
-import org.apache.usergrid.services.ServiceManager;
-import org.apache.usergrid.services.ServiceParameter;
-import org.apache.usergrid.services.ServicePayload;
-import org.apache.usergrid.services.ServiceRequest;
-import org.apache.usergrid.services.ServiceResults;
+import org.apache.usergrid.services.*;
import org.apache.usergrid.services.assets.data.AssetUtils;
import org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore;
import org.apache.usergrid.services.assets.data.BinaryStore;
@@ -74,16 +38,22 @@ import org.apache.usergrid.services.assets.data.LocalFileBinaryStore;
import org.apache.usergrid.services.exceptions.AwsPropertiesNotFoundException;
import org.apache.usergrid.utils.InflectionUtils;
import org.apache.usergrid.utils.JsonUtils;
+import org.glassfish.jersey.media.multipart.BodyPart;
+import org.glassfish.jersey.media.multipart.BodyPartEntity;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.multipart.BodyPart;
-import com.sun.jersey.multipart.BodyPartEntity;
-import com.sun.jersey.multipart.FormDataBodyPart;
-import com.sun.jersey.multipart.FormDataMultiPart;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.InputStream;
+import java.util.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USERGRID_BINARY_UPLOADER;
@@ -306,9 +276,10 @@ public class ServiceResource extends AbstractContextResource {
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_HTML})
+ @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_HTML, "application/javascript"})
@RequireApplicationAccess
- public JSONWithPadding executeGet( @Context UriInfo ui,
+ @JSONP
+ public ApiResponse executeGet( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -322,7 +293,7 @@ public class ServiceResource extends AbstractContextResource {
executeServiceRequest( ui, response, ServiceAction.GET, null );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -358,7 +329,7 @@ public class ServiceResource extends AbstractContextResource {
* Necessary to work around inexplicable problems with EntityHolder.
* See above.
*/
- public JSONWithPadding executePostWithObject( @Context UriInfo ui, Object json,
+ public ApiResponse executePostWithObject( @Context UriInfo ui, Object json,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
logger.debug( "ServiceResource.executePostWithMap" );
@@ -374,7 +345,7 @@ public class ServiceResource extends AbstractContextResource {
executeServiceRequest( ui, response, ServiceAction.POST, payload );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -382,7 +353,7 @@ public class ServiceResource extends AbstractContextResource {
* Necessary to work around inexplicable problems with EntityHolder.
* See above.
*/
- public JSONWithPadding executePutWithMap( @Context UriInfo ui, Map<String, Object> json,
+ public ApiResponse executePutWithMap( @Context UriInfo ui, Map<String, Object> json,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
ApiResponse response = createApiResponse();
@@ -396,14 +367,16 @@ public class ServiceResource extends AbstractContextResource {
executeServiceRequest( ui, response, ServiceAction.PUT, payload );
- return new JSONWithPadding( response, callback );
+ return response;
}
@POST
@RequireApplicationAccess
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePost( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePost( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
logger.debug( "ServiceResource.executePost: body = " + body );
@@ -426,7 +399,7 @@ public class ServiceResource extends AbstractContextResource {
executeServiceRequest( ui, response, ServiceAction.POST, payload );
- return new JSONWithPadding( response, callback );
+ return response;
}
@@ -434,7 +407,9 @@ public class ServiceResource extends AbstractContextResource {
@PUT
@RequireApplicationAccess
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePut( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePut( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -449,7 +424,9 @@ public class ServiceResource extends AbstractContextResource {
@DELETE
@RequireApplicationAccess
- public JSONWithPadding executeDelete(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executeDelete(
@Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
@QueryParam("app_delete_confirm") String confirmAppDelete )
@@ -482,7 +459,7 @@ public class ServiceResource extends AbstractContextResource {
}
}
- return new JSONWithPadding( response, callback );
+ return response;
}
// TODO Temporarily removed until we test further
@@ -566,7 +543,9 @@ public class ServiceResource extends AbstractContextResource {
@POST
@RequireApplicationAccess
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public JSONWithPadding executeMultiPartPost( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executeMultiPartPost( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart ) throws Exception {
@@ -578,7 +557,9 @@ public class ServiceResource extends AbstractContextResource {
@PUT
@RequireApplicationAccess
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public JSONWithPadding executeMultiPartPut( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executeMultiPartPut( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart ) throws Exception {
@@ -587,7 +568,9 @@ public class ServiceResource extends AbstractContextResource {
}
- private JSONWithPadding executeMultiPart( UriInfo ui, String callback, FormDataMultiPart multiPart,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ private ApiResponse executeMultiPart( UriInfo ui, String callback, FormDataMultiPart multiPart,
ServiceAction serviceAction ) throws Exception {
//needed for testing
@@ -627,7 +610,7 @@ public class ServiceResource extends AbstractContextResource {
// process file part
if ( fileBodyPart != null ) {
- InputStream fileInput = ( ( BodyPartEntity ) fileBodyPart.getEntity() ).getInputStream();
+ InputStream fileInput = ( (BodyPartEntity) fileBodyPart.getEntity() ).getInputStream();
if ( fileInput != null ) {
Entity entity = serviceResults.getEntity();
EntityManager em = emf.getEntityManager( getApplicationId() );
@@ -647,7 +630,7 @@ public class ServiceResource extends AbstractContextResource {
}
}
- return new JSONWithPadding( response, callback );
+ return response;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
index fedffc4..4e2e6bb 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/assets/AssetsResource.java
@@ -18,11 +18,11 @@ package org.apache.usergrid.rest.applications.assets;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.multipart.FormDataParam;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.entities.Asset;
import org.apache.usergrid.rest.AbstractContextResource;
+import org.apache.usergrid.rest.ApiResponse;
import org.apache.usergrid.rest.applications.ServiceResource;
import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.apache.usergrid.services.assets.data.AssetUtils;
@@ -30,6 +30,7 @@ import org.apache.usergrid.services.assets.data.AwsSdkS3BinaryStore;
import org.apache.usergrid.services.assets.data.BinaryStore;
import org.apache.usergrid.services.assets.data.LocalFileBinaryStore;
import org.apache.usergrid.utils.StringUtils;
+import org.glassfish.jersey.media.multipart.FormDataParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +81,9 @@ public class AssetsResource extends ServiceResource {
@Override
@RequireApplicationAccess
@GET
- public JSONWithPadding executeGet( @Context UriInfo ui,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executeGet( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
logger.info( "In AssetsResource.executeGet with ui: {} and callback: {}", ui, callback );
@@ -92,7 +95,9 @@ public class AssetsResource extends ServiceResource {
@PUT
@RequireApplicationAccess
@Consumes(MediaType.APPLICATION_JSON)
- public JSONWithPadding executePut( @Context UriInfo ui, String body,
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executePut( @Context UriInfo ui, String body,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java
index ec6c937..5c528bd 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/events/EventsResource.java
@@ -17,26 +17,25 @@
package org.apache.usergrid.rest.applications.events;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.usergrid.mq.QueuePosition;
import org.apache.usergrid.mq.QueueQuery;
import org.apache.usergrid.mq.QueueResults;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.rest.applications.ApplicationResource;
import org.apache.usergrid.rest.applications.ServiceResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
@Component("org.apache.usergrid.rest.applications.events.EventsResource")
@@ -54,17 +53,18 @@ public class EventsResource extends ServiceResource {
}
- @Override
@GET
- public JSONWithPadding executeGet( @Context UriInfo ui,
- @QueryParam("callback") @DefaultValue("callback") String callback )
- throws Exception {
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public QueueResults executeQueueGet(
+ @Context UriInfo ui, @QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception {
+
QueueQuery query = QueueQuery.fromQueryParams( ui.getQueryParameters() );
if ( query == null ) {
query = new QueueQuery();
}
query.setPosition( QueuePosition.START );
QueueResults results = ( ( ApplicationResource ) parent ).getQueues().getFromQueue( "/events", query );
- return new JSONWithPadding( results, callback );
+ return results;
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
index 72883b0..1997601 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifierResource.java
@@ -16,11 +16,15 @@
*/
package org.apache.usergrid.rest.applications.notifiers;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.multipart.FormDataMultiPart;
-import java.io.InputStream;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.commons.io.IOUtils;
import org.apache.usergrid.persistence.index.query.Identifier;
+import org.apache.usergrid.rest.ApiResponse;
+import org.apache.usergrid.rest.applications.ServiceResource;
+import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
+import org.apache.usergrid.services.ServiceAction;
+import org.apache.usergrid.services.ServicePayload;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -30,15 +34,10 @@ import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.LinkedHashMap;
-import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.applications.ServiceResource;
-import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
-import org.apache.usergrid.services.ServiceAction;
-import org.apache.usergrid.services.ServicePayload;
-
@Component("org.apache.usergrid.rest.applications.notifiers.NotifierResource")
@Scope("prototype")
@Produces(MediaType.APPLICATION_JSON)
@@ -57,16 +56,18 @@ public class NotifierResource extends ServiceResource {
@PUT
@RequireApplicationAccess
@Consumes(MediaType.MULTIPART_FORM_DATA)
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
@Override
- public JSONWithPadding executeMultiPartPut(@Context UriInfo ui,
+ public ApiResponse executeMultiPartPut(@Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart) throws Exception {
logger.debug("NotifierResource.executePut");
- String name = getValueOrNull(multiPart, "name");
- String provider = getValueOrNull(multiPart, "provider");
- String certPassword = getValueOrNull(multiPart, "certificatePassword");
+ String name = getValueOrNull(multiPart, "name");
+ String provider = getValueOrNull(multiPart, "provider");
+ String certPassword = getValueOrNull(multiPart, "certificatePassword");
InputStream is = null;
if (multiPart.getField("p12Certificate") != null) {
@@ -90,7 +91,7 @@ public class NotifierResource extends ServiceResource {
ServicePayload payload = getPayload(properties);
executeServiceRequest(ui, response, ServiceAction.PUT, payload);
- return new JSONWithPadding(response, callback);
+ return response;
}
private String getValueOrNull(FormDataMultiPart multiPart, String name) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
index 1787be5..b72a857 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/notifiers/NotifiersResource.java
@@ -16,35 +16,32 @@
*/
package org.apache.usergrid.rest.applications.notifiers;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.multipart.FormDataMultiPart;
-import java.io.InputStream;
-import java.util.HashMap;
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP;
import org.apache.commons.io.IOUtils;
-
import org.apache.usergrid.persistence.Query;
import org.apache.usergrid.persistence.index.query.Identifier;
+import org.apache.usergrid.rest.AbstractContextResource;
+import org.apache.usergrid.rest.ApiResponse;
+import org.apache.usergrid.rest.applications.ServiceResource;
+import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
+import org.apache.usergrid.services.ServiceAction;
+import org.apache.usergrid.services.ServicePayload;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
-
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;
+import java.io.InputStream;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.UUID;
-import org.apache.usergrid.rest.AbstractContextResource;
-import org.apache.usergrid.rest.ApiResponse;
-import org.apache.usergrid.rest.applications.ServiceResource;
-import org.apache.usergrid.rest.security.annotations.RequireApplicationAccess;
-import org.apache.usergrid.services.ServiceAction;
-import org.apache.usergrid.services.ServicePayload;
-
import static org.apache.usergrid.services.ServiceParameter.addParameter;
@Component("org.apache.usergrid.rest.applications.notifiers.NotifiersResource")
@@ -106,7 +103,9 @@ public class NotifiersResource extends ServiceResource {
@RequireApplicationAccess
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Override
- public JSONWithPadding executeMultiPartPost(
+ @JSONP
+ @Produces({"application/json", "application/javascript"})
+ public ApiResponse executeMultiPartPost(
@Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback,
FormDataMultiPart multiPart)
@@ -142,7 +141,7 @@ public class NotifiersResource extends ServiceResource {
ServicePayload payload = getPayload(certProps);
executeServiceRequest(ui, response, ServiceAction.POST, payload);
- return new JSONWithPadding(response, callback);
+ return response;
}
private String getValueOrNull(FormDataMultiPart multiPart, String name) {
[03/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
index ec69405..4e21ca7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
@@ -16,11 +16,12 @@
package org.apache.usergrid.rest.applications.collection;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
+import javax.ws.rs.client.ResponseProcessingException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -46,7 +47,7 @@ public class DuplicateNameIT extends AbstractRestIT {
this.app().collection(collectionName).post(entity);
// fail if the POST did not return an exception
fail("Should not have created duplicate entity");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
index 94a1bb3..239bb13 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
@@ -17,7 +17,6 @@
package org.apache.usergrid.rest.applications.collection.activities;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.persistence.index.utils.MapUtils;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
@@ -29,6 +28,8 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.utils.UUIDUtils;
+import javax.ws.rs.client.ResponseProcessingException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -87,7 +88,7 @@ public class ActivityResourceIT extends AbstractRestIT {
// don't populate the user, it will use the currently authenticated user.
try {
groupActivityResource.post(activity);
- }catch (UniformInterfaceException e)
+ }catch (ResponseProcessingException e)
{
throw e;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
index ee18c62..6e44e39 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
@@ -29,7 +29,6 @@ import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
-import com.sun.jersey.api.client.UniformInterfaceException;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
@@ -37,6 +36,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import org.junit.Ignore;
+import javax.ws.rs.client.ResponseProcessingException;
public class DevicesResourceIT extends AbstractRestIT {
@@ -68,7 +68,7 @@ public class DevicesResourceIT extends AbstractRestIT {
entity = devicesResource.entity(uuid).get();
fail( "should get 404 error" );
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
assertEquals( 404, e.getResponse().getStatus() );
}
refreshIndex();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
index a52792a..787306c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
@@ -17,19 +17,15 @@
package org.apache.usergrid.rest.applications.collection.groups;
-import java.io.IOException;
-import java.util.NoSuchElementException;
import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Collection;
import org.apache.usergrid.rest.test.resource.model.Entity;
-
import org.junit.Ignore;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.ResponseProcessingException;
+import java.io.IOException;
import static org.junit.Assert.*;
@@ -153,9 +149,9 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.createGroup(groupName, groupSpacePath);
fail("Should not be able to create a group with a space in the path");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", node.get( "error" ).textValue() );
}
@@ -196,9 +192,9 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("groups").uniqueID(groupName).get();
fail("Entity still exists");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "entity_not_found", node.get( "error" ).textValue() );
}
@@ -302,9 +298,9 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("role").entity(role).get();
fail("Entity still exists");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "entity_not_found", node.get( "error" ).textValue() );
}
@@ -371,9 +367,9 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("cats").uniqueID(catName).put(fluffy);
fail("permissions should not allow this");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ) );
assertEquals( "unauthorized", node.get( "error" ).textValue() );
}
@@ -381,9 +377,9 @@ public class GroupResourceIT extends AbstractRestIT {
try {
this.app().collection("cats").uniqueID(catName).delete();
fail("permissions should not allow this");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "unauthorized", node.get( "error" ).textValue() );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
index 22a6165..af3ce9b 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
@@ -17,7 +17,6 @@
package org.apache.usergrid.rest.applications.collection.users;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
import org.apache.usergrid.rest.test.resource.model.Collection;
@@ -26,6 +25,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.ResponseProcessingException;
import java.io.IOException;
import java.util.Map;
@@ -71,7 +71,7 @@ public class ConnectionResourceTest extends AbstractRestIT {
this.app().collection("users").entity(scott).collection("likes").collection("peeps").entity(peep).get();
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
// Should return a 404 Not Found
assertEquals(404, uie.getResponse().getStatus());
}
@@ -162,7 +162,7 @@ public class ConnectionResourceTest extends AbstractRestIT {
//attempt to retrieve thing1
thing2 = this.app().collection("things").entity(thing2).get();
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
// Should return a 404 Not Found
assertEquals(404, uie.getResponse().getStatus());
}
@@ -198,7 +198,7 @@ public class ConnectionResourceTest extends AbstractRestIT {
//attempt to retrieve thing1
thing1 = this.app().collection("things").entity(thing1).get();
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
// Should return a 404 Not Found
assertEquals(404, uie.getResponse().getStatus());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
index 8667757..f90b6ae 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
@@ -20,7 +20,6 @@ package org.apache.usergrid.rest.applications.collection.users;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
import org.apache.usergrid.rest.test.resource.model.*;
@@ -31,6 +30,8 @@ import org.junit.Test;
import org.apache.usergrid.utils.MapUtils;
+import javax.ws.rs.client.ResponseProcessingException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -151,7 +152,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
int status = 0;
try {
data = devices.entity("device2").get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
@@ -175,7 +176,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
status = 0;
try{
data = devices.entity("device1").get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
@@ -282,7 +283,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
int status = 200;
try {
likeRestaurants.entity("arrogantbutcher").get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
assertEquals(status, 404);
@@ -290,7 +291,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
status = 200;
try {
likeRestaurants.entity( arrogantButcherId ).get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
assertEquals(status, 404);
@@ -319,7 +320,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
status = 200;
try {
data = likeRestaurants.entity( "4peaks" ).get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
@@ -330,7 +331,7 @@ public class OwnershipResourceIT extends AbstractRestIT {
try {
likeRestaurants.entity( peaksId ).get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
assertEquals( status,404 );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
index e0e852a..f9f1743 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
@@ -28,8 +28,8 @@ import org.apache.usergrid.utils.UUIDUtils;
import org.junit.Before;
import org.junit.Test;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Response;
import java.io.IOException;
import static org.junit.Assert.*;
@@ -106,7 +106,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
int status = 0;
try {
node = this.app().collection("users").entity(USER).collection("roles").entity(ROLE).get();
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status = e.getResponse().getStatus();
}
@@ -158,7 +158,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
try {
this.app().collection("users").entity(user).collection("groups").entity( groupPath ).collection( "users" ).entity( user ).get();
fail("Should not have been able to retrieve the user as it was deleted");
- }catch (UniformInterfaceException e){
+ }catch (ResponseProcessingException e){
status=e.getResponse().getStatus();
assertEquals( 404,status );
}
@@ -198,7 +198,7 @@ public class PermissionsResourceIT extends AbstractRestIT {
//Call a get on a existing entity with no access token and check if we get a 401
try {
this.app().collection( "roles" ).entity( "guest" ).get( false );
- }catch(UniformInterfaceException uie){
+ }catch(ResponseProcessingException uie){
assertEquals( 401,uie.getResponse().getStatus() );
}
@@ -209,13 +209,13 @@ public class PermissionsResourceIT extends AbstractRestIT {
//Call a get on a non existing entity that doesn't need permissions and check it we get a 404.
try {
this.app().collection( "roles" ).entity( "banana" ).get( false );
- }catch(UniformInterfaceException uie){
+ }catch(ResponseProcessingException uie){
assertEquals( 404,uie.getResponse().getStatus() );
}
try {
this.app().collection( "roles" ).entity( UUIDUtils.newTimeUUID() ).get( false );
- }catch(UniformInterfaceException uie){
+ }catch(ResponseProcessingException uie){
assertEquals( 404,uie.getResponse().getStatus() );
}
}
@@ -302,11 +302,11 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("noca").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
status = uie.getResponse().getStatus();
}
- assertEquals( Status.UNAUTHORIZED.getStatusCode(), status );
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), status );
status = 0;
@@ -315,11 +315,11 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("4peaks").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
status = uie.getResponse().getStatus();
}
- assertEquals( Status.UNAUTHORIZED.getStatusCode(), status );
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), status );
refreshIndex();
@@ -355,11 +355,11 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("cowboyciao").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
status = uie.getResponse().getStatus();
}
- assertEquals( Status.UNAUTHORIZED.getStatusCode(), status );
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), status );
refreshIndex();
@@ -369,11 +369,11 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("reviews").entity("currycorner").delete();
fail( "this should have failed due to having insufficient permissions" );
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
status = uie.getResponse().getStatus();
}
- assertEquals( Status.UNAUTHORIZED.getStatusCode(), status );
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), status );
}
@@ -472,10 +472,10 @@ public class PermissionsResourceIT extends AbstractRestIT {
this.app().collection("books").post(book);
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
status = uie.getResponse().getStatus();
}
- assertEquals( Status.UNAUTHORIZED.getStatusCode(), status );
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), status );
//Gets all books that user1 reviewed\
this.app().collection("users").entity("me").connection("reviewed").collection("books").get();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/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 a387436..71a8447 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
@@ -36,8 +36,8 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.rest.applications.utils.UserRepo;
import org.apache.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Response;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
@@ -381,7 +381,8 @@ public class UserResourceIT extends AbstractRestIT {
refreshIndex();
- Collection results = usersResource.get(new QueryParameters().setQuery(String.format("username = '%s'", username)));
+ Collection results = usersResource.get(
+ new QueryParameters().setQuery(String.format("username = '%s'", username)));
assertEquals(0, results.getResponse().getEntities().size());
// now create that same user again, it should work
@@ -422,14 +423,16 @@ public class UserResourceIT extends AbstractRestIT {
// plural collection name
- Entity conn1 = usersResource.entity(firstCreatedId.toString()).connection("conn1").entity(secondCreatedId.toString()).post();
+ Entity conn1 = usersResource.entity(
+ firstCreatedId.toString()).connection("conn1").entity(secondCreatedId.toString()).post();
assertEquals(secondCreatedId.toString(), conn1.getUuid().toString());
refreshIndex();
- Entity conn2 = usersResource.entity(firstCreatedId.toString()).connection("conn2").entity(secondCreatedId.toString()).post();
+ Entity conn2 = usersResource.entity(
+ firstCreatedId.toString()).connection("conn2").entity(secondCreatedId.toString()).post();
assertEquals(secondCreatedId.toString(), conn2.getUuid().toString());
@@ -437,19 +440,23 @@ public class UserResourceIT extends AbstractRestIT {
Collection conn1Connections = usersResource.entity(firstCreatedId.toString()).connection("conn1").get();
- assertEquals(secondCreatedId.toString(), ((Entity) conn1Connections.getResponse().getEntities().get(0)).getUuid().toString());
+ assertEquals(secondCreatedId.toString(),
+ ((Entity) conn1Connections.getResponse().getEntities().get(0)).getUuid().toString());
conn1Connections = userResource.entity(firstCreatedId.toString()).connection("conn1").get();
- assertEquals(secondCreatedId.toString(), ((Entity) conn1Connections.getResponse().getEntities().get(0)).getUuid().toString());
+ assertEquals(secondCreatedId.toString(),
+ ((Entity) conn1Connections.getResponse().getEntities().get(0)).getUuid().toString());
Collection conn2Connections = usersResource.entity(firstCreatedId.toString()).connection("conn1").get();
- assertEquals(secondCreatedId.toString(), ((Entity) conn2Connections.getResponse().getEntities().get(0)).getUuid().toString());
+ assertEquals(secondCreatedId.toString(),
+ ((Entity) conn2Connections.getResponse().getEntities().get(0)).getUuid().toString());
conn2Connections = userResource.entity(firstCreatedId.toString()).connection("conn1").get();
- assertEquals(secondCreatedId.toString(), ((Entity) conn2Connections.getResponse().getEntities().get(0)).getUuid().toString());
+ assertEquals(secondCreatedId.toString(),
+ ((Entity) conn2Connections.getResponse().getEntities().get(0)).getUuid().toString());
}
@@ -482,7 +489,8 @@ public class UserResourceIT extends AbstractRestIT {
refreshIndex();
// named entity in collection name
- Entity conn1 = usersResource.entity(firstCreatedId.toString()).connection("conn1", "users").entity(secondCreatedId.toString()).post();
+ Entity conn1 = usersResource.entity(firstCreatedId.toString()).connection("conn1", "users")
+ .entity(secondCreatedId.toString()).post();
assertEquals(secondCreatedId.toString(), conn1.getUuid().toString());
@@ -523,7 +531,8 @@ public class UserResourceIT extends AbstractRestIT {
perms.put("permission", "get:/stuff/**");
- Entity perms1 = this.app().collection("roles").entity(roleId1.toString()).connection("permissions").post(new Entity(perms));
+ Entity perms1 = this.app().collection("roles").entity(roleId1.toString()).connection("permissions")
+ .post(new Entity(perms));
//Create the second role
@@ -538,10 +547,12 @@ public class UserResourceIT extends AbstractRestIT {
perms = new HashMap<>();
perms.put("permission", "get:/stuff/**");
- Entity perms2 = this.app().collection("roles").entity(roleId2.toString()).connection("permissions").post(new Entity(perms));
+ Entity perms2 = this.app().collection("roles").entity(roleId2.toString()).connection("permissions")
+ .post(new Entity(perms));
refreshIndex();
//connect the entities where role is the root
- Entity perms3 = this.app().collection("roles").entity(roleId1.toString()).connection("users").entity(userId.toString()).post();
+ Entity perms3 = this.app().collection("roles").entity(roleId1.toString()).connection("users")
+ .entity(userId.toString()).post();
// now create a connection of "likes" between the first user and the
// second using pluralized form
@@ -557,12 +568,14 @@ public class UserResourceIT extends AbstractRestIT {
refreshIndex();
//query the second role, it should work
- Collection userRoles = this.app().collection("roles").entity(roleId2).connection("users").get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
+ Collection userRoles = this.app().collection("roles").entity(roleId2).connection("users")
+ .get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
assertEquals(userId.toString(), ((Entity) userRoles.iterator().next()).getUuid().toString());
//query the first role, it should work
- userRoles = this.app().collection("roles").entity(roleId1).connection("users").get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
+ userRoles = this.app().collection("roles").entity(roleId1).connection("users")
+ .get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
assertEquals(userId.toString(), ((Entity) userRoles.iterator().next()).getUuid().toString());
@@ -572,14 +585,16 @@ public class UserResourceIT extends AbstractRestIT {
//query the first role, it should 404
try {
- userRoles = this.app().collection("roles").entity(roleId1).connection("users").get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
+ userRoles = this.app().collection("roles").entity(roleId1).connection("users")
+ .get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
assertNull(userRoles);
- } catch (UniformInterfaceException e) {
- assertEquals(Status.NOT_FOUND.getStatusCode(), e.getResponse().getStatus());
+ } catch (ResponseProcessingException e) {
+ assertEquals( Response.Status.NOT_FOUND.getStatusCode(), e.getResponse().getStatus());
}
//query the second role, it should work
- userRoles = this.app().collection("roles").entity(roleId2).connection("users").get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
+ userRoles = this.app().collection("roles").entity(roleId2).connection("users")
+ .get(new QueryParameters().setQuery("select%20*%20where%20username%20=%20'" + email + "'"));
assertEquals(userId.toString(), userRoles.getResponse().getEntities().get(0).getUuid().toString());
}
@@ -613,7 +628,8 @@ public class UserResourceIT extends AbstractRestIT {
// second using pluralized form
// named entity in collection name
- Entity conn1 = usersResource.entity(firstCreatedId).connection("conn1").collection("pizzas").entity(secondCreatedId).post();
+ Entity conn1 = usersResource.entity(firstCreatedId).connection("conn1").collection("pizzas")
+ .entity(secondCreatedId).post();
assertEquals(secondCreatedId.toString(), conn1.getUuid().toString());
@@ -706,7 +722,8 @@ public class UserResourceIT extends AbstractRestIT {
String userName = String.format("test%s", newUserUuid);
User entity =
- (User) new User(userName, "Ed Anuff", String.format("%s@anuff.com", newUserUuid), "sesame").chainPut("pin", "1234");
+ (User) new User(userName, "Ed Anuff", String.format("%s@anuff.com", newUserUuid), "sesame")
+ .chainPut("pin", "1234");
usersResource.post(entity);
refreshIndex();
@@ -728,7 +745,8 @@ public class UserResourceIT extends AbstractRestIT {
refreshIndex();
boolean fail = false;
try {
- Entity changeResponse = usersResource.entity("edanuff").collection("password").post(new ChangePasswordEntity("foo", "bar"));
+ Entity changeResponse = usersResource.entity("edanuff").collection("password")
+ .post(new ChangePasswordEntity("foo", "bar"));
} catch (Exception e) {
fail = true;
}
@@ -762,7 +780,8 @@ public class UserResourceIT extends AbstractRestIT {
// if this was successful, we need to re-set the password for other
// tests
- Entity changeResponse = usersResource.entity("edanuff").collection("password").post(new ChangePasswordEntity("sesame1", "sesame"));
+ Entity changeResponse = usersResource.entity("edanuff").collection("password")
+ .post(new ChangePasswordEntity("sesame1", "sesame"));
refreshIndex();
assertNotNull(changeResponse);
@@ -776,7 +795,8 @@ public class UserResourceIT extends AbstractRestIT {
refreshIndex();
// change the password as admin. The old password isn't required
- Entity node = usersResource.entity("edanuff").connection("password").post(new ChangePasswordEntity(newPassword));
+ Entity node = usersResource.entity("edanuff").connection("password")
+ .post(new ChangePasswordEntity(newPassword));
assertNotNull(node);
refreshIndex();
@@ -797,7 +817,7 @@ public class UserResourceIT extends AbstractRestIT {
int responseStatus = 0;
try {
usersResource.entity("edanuff").connection("password").post(data);
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
responseStatus = uie.getResponse().getStatus();
}
@@ -849,8 +869,8 @@ public class UserResourceIT extends AbstractRestIT {
role = usersResource.entity(createdId).collection("roles").entity(roleName).get();
assertNull(role);
- } catch (UniformInterfaceException e) {
- assertEquals(e.getResponse().getStatus(), Status.NOT_FOUND.getStatusCode());
+ } catch (ResponseProcessingException e) {
+ assertEquals(e.getResponse().getStatus(), Response.Status.NOT_FOUND.getStatusCode());
}
}
@@ -871,7 +891,8 @@ public class UserResourceIT extends AbstractRestIT {
assertNotNull(entity1);
assertNotNull(entity2);
- Token adminToken = this.clientSetup.getRestClient().management().token().post(false,Token.class,new Token(clientSetup.getUsername(), clientSetup.getUsername()),null);
+ 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);
@@ -886,11 +907,11 @@ public class UserResourceIT extends AbstractRestIT {
usersResource.entity("edanuff").get();
assertFalse(true);
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
}
- assertEquals(Status.UNAUTHORIZED.getStatusCode(), status);
+ assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), status);
status = 0;
@@ -898,11 +919,11 @@ public class UserResourceIT extends AbstractRestIT {
this.app().token().setToken(token2);
usersResource.entity("edanuff").get();
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
}
- assertEquals(Status.UNAUTHORIZED.getStatusCode(), status);
+ assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), status);
Token token3 = this.app().token().post(new Token("edanuff", "sesame"));
Token token4 = this.app().token().post(new Token("edanuff", "sesame"));
@@ -919,7 +940,8 @@ public class UserResourceIT extends AbstractRestIT {
assertNotNull(entity2);
// now revoke the token3
- adminToken = this.clientSetup.getRestClient().management().token().post(false,Token.class,new Token(clientSetup.getUsername(), clientSetup.getUsername()),null);
+ 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();
@@ -933,11 +955,11 @@ public class UserResourceIT extends AbstractRestIT {
this.app().token().setToken(token3);
usersResource.entity("edanuff").get();
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
}
- assertEquals(Status.UNAUTHORIZED.getStatusCode(), status);
+ assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), status);
status = 0;
@@ -946,12 +968,12 @@ public class UserResourceIT extends AbstractRestIT {
usersResource.entity("edanuff").get();
- status = Status.OK.getStatusCode();
- } catch (UniformInterfaceException uie) {
+ status = Response.Status.OK.getStatusCode();
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
}
- assertEquals(Status.UNAUTHORIZED.getStatusCode(), status);
+ assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), status);
}
@@ -977,33 +999,37 @@ public class UserResourceIT extends AbstractRestIT {
// bad access token
try {
- userResource.entity("test_1").connection("token").get(new QueryParameters().addParam("access_token", "blah"), false);
+ userResource.entity("test_1").connection("token").get(
+ new QueryParameters().addParam("access_token", "blah"), false);
assertTrue(false);
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
- log.info("Error Response Body: " + uie.getResponse().getEntity(String.class));
+ log.info("Error Response Body: " + uie.getResponse().readEntity(String.class));
}
- assertEquals(Status.UNAUTHORIZED.getStatusCode(), status);
+ assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), status);
try {
- userResource.entity("test_2").connection("token").get(new QueryParameters().addParam("access_token", token.getAccessToken()), false);
+ userResource.entity("test_2").connection("token").get(
+ new QueryParameters().addParam("access_token", token.getAccessToken()), false);
assertTrue(false);
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
- log.info("Error Response Body: " + uie.getResponse().getEntity(String.class));
+ log.info("Error Response Body: " + uie.getResponse().readEntity(String.class));
}
- assertEquals(Status.FORBIDDEN.getStatusCode(), status);
+ assertEquals(Response.Status.FORBIDDEN.getStatusCode(), status);
String adminToken = this.getAdminToken().getAccessToken();
- Collection tokens = userResource.entity("test_1").connection("token").get(new QueryParameters().addParam("access_token", adminToken), false);
+ Collection tokens = userResource.entity("test_1").connection("token").get(
+ new QueryParameters().addParam("access_token", adminToken), false);
assertTrue(tokens.getResponse().getProperties().get("user") != null);
- tokens = userResource.entity("test_1").connection("token").get(new QueryParameters().addParam("access_token", adminToken), false);
+ tokens = userResource.entity("test_1").connection("token").get(
+ new QueryParameters().addParam("access_token", adminToken), false);
assertTrue(tokens.getResponse().getProperties().get("user") != null);
@@ -1015,9 +1041,9 @@ public class UserResourceIT extends AbstractRestIT {
try {
this.app().token().post(new Token("test_1", "test123"));
fail("request for deactivated user should fail");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
status = uie.getResponse().getStatus();
- JsonNode body = mapper.readTree(uie.getResponse().getEntity(String.class));
+ JsonNode body = mapper.readTree(uie.getResponse().readEntity(String.class));
assertEquals("user not activated", body.findPath("error_description").textValue());
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
index 5a2134d..c4b24b4 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
@@ -17,12 +17,11 @@
package org.apache.usergrid.rest.applications.queries;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.model.Collection;
-import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Test;
+import javax.ws.rs.client.ResponseProcessingException;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
@@ -55,7 +54,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -81,7 +80,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -107,7 +106,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -133,7 +132,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -159,7 +158,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
@@ -185,7 +184,7 @@ public class BadGrammarQueryTest extends QueryTestBase {
QueryParameters params = new QueryParameters().setQuery(query);
this.app().collection(collectionName).get(params);
fail("This should throw an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Check for an exception
assertEquals(400, uie.getResponse().getStatus());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
index 2246e17..fba7c66 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
@@ -17,23 +17,18 @@
package org.apache.usergrid.rest.applications.queries;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Entity;
-import org.junit.Rule;
import org.junit.Test;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.client.ResponseProcessingException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import static org.apache.usergrid.utils.MapUtils.hashMap;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
@@ -67,8 +62,8 @@ public class BasicGeoTests extends AbstractRestIT {
try {
node = this.app().collection( collectionType ).post( entityData ).getEntity();
}
- catch ( UniformInterfaceException e ) {
- JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
+ catch ( ResponseProcessingException e ) {
+ JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -105,8 +100,8 @@ public class BasicGeoTests extends AbstractRestIT {
try {
entity = this.app().collection( collectionType ).post( entityData ).getEntities().get(0);
}
- catch ( UniformInterfaceException e ) {
- JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
+ catch ( ResponseProcessingException e ) {
+ JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -121,7 +116,7 @@ public class BasicGeoTests extends AbstractRestIT {
try {
node = context.collection( collectionType ).get(entityName);
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -139,7 +134,7 @@ public class BasicGeoTests extends AbstractRestIT {
//entity.put(entityData);
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
fail( nodeError.get( "error" ).textValue() );
}
@@ -182,9 +177,9 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( misspelledLatitudeEntityData ).getEntity();
fail("System allowed misspelled location property - latitudee, which it should not");
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
//verify the correct error was returned
- JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ) );
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
}
@@ -198,9 +193,9 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( misspelledLongitudeEntityData ).getEntity();
fail("System allowed misspelled location property - longitudee, which it should not");
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
//verify the correct error was returned
- JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
}
@@ -229,9 +224,9 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( latitudeOnlyEntityData ).getEntity();
fail("System allowed location with only one point, latitude, which it should not");
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
//verify the correct error was returned
- JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
}
@@ -245,9 +240,9 @@ public class BasicGeoTests extends AbstractRestIT {
node = this.app().collection( collectionType ).post( notDoubleLatLonEntityData ).getEntity();
fail("System allowed misspelled location values that are not doubles for latitude and longitude, which it should not");
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
//verify the correct error was returned
- JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode nodeError = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "illegal_argument", nodeError.get( "error" ).textValue() );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
index c1dce29..31ceb8c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
@@ -16,10 +16,6 @@
*/
package org.apache.usergrid.rest.filters;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.representation.Form;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
@@ -28,15 +24,17 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
-
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Organization;
import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.model.User;
import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.UUIDUtils;
-import org.junit.Ignore;
+import org.glassfish.jersey.client.ClientResponse;
import org.junit.Test;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.Form;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
@@ -49,8 +47,6 @@ import static org.apache.usergrid.utils.MapUtils.hashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.usergrid.rest.test.resource.AbstractRestIT;
-
/**
* @author tnine
@@ -80,7 +76,8 @@ public class ContentTypeResourceIT extends AbstractRestIT {
HttpHost host = new HttpHost( super.getBaseURI().getHost(), super.getBaseURI().getPort() );
- HttpPost post = new HttpPost( String.format("/%s/%s/games", this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
+ HttpPost post = new HttpPost( String.format("/%s/%s/games",
+ this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
post.setEntity(new StringEntity(json));
post.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + token.getAccessToken());
post.setHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
@@ -118,7 +115,8 @@ public class ContentTypeResourceIT extends AbstractRestIT {
HttpHost host = new HttpHost( super.getBaseURI().getHost(), super.getBaseURI().getPort() );
- HttpPost post = new HttpPost( String.format("/%s/%s/games", this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
+ HttpPost post = new HttpPost( String.format("/%s/%s/games",
+ this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
post.setEntity( new StringEntity( json ) );
post.setHeader( HttpHeaders.AUTHORIZATION, "Bearer " + token.getAccessToken() );
@@ -142,11 +140,11 @@ public class ContentTypeResourceIT extends AbstractRestIT {
Form payload = new Form();
- payload.add( "organization", "formContentOrg" + UUIDUtils.newTimeUUID() );
- payload.add( "username", "formContentOrg" + UUIDUtils.newTimeUUID() );
- payload.add( "name", "Test User" + UUIDUtils.newTimeUUID() );
- payload.add( "email", UUIDUtils.newTimeUUID() + "@usergrid.org" );
- payload.add( "password", "foobar" );
+ payload.param( "organization", "formContentOrg" + UUIDUtils.newTimeUUID() );
+ payload.param( "username", "formContentOrg" + UUIDUtils.newTimeUUID() );
+ payload.param( "name", "Test User" + UUIDUtils.newTimeUUID() );
+ payload.param( "email", UUIDUtils.newTimeUUID() + "@usergrid.org" );
+ payload.param( "password", "foobar" );
//checks that the organization was created using a form encoded content type, this is checked else where so
//this test should be depreciated eventually.
@@ -209,7 +207,8 @@ public class ContentTypeResourceIT extends AbstractRestIT {
HttpHost host = new HttpHost( super.getBaseURI().getHost(), super.getBaseURI().getPort() );
- HttpPost post = new HttpPost( String.format("/%s/%s/games", this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
+ HttpPost post = new HttpPost( String.format("/%s/%s/games",
+ this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
post.setEntity( new StringEntity( json ) );
post.setHeader( HttpHeaders.AUTHORIZATION, "Bearer " + token.getAccessToken() );
@@ -219,11 +218,12 @@ public class ContentTypeResourceIT extends AbstractRestIT {
HttpResponse rsp = client.execute( host, post );
- WebResource.Builder builder = app().collection("games").getResource(true)
- .queryParam("access_token", this.getAdminToken().getAccessToken())
- .type(MediaType.APPLICATION_JSON_TYPE);
+ Invocation.Builder builder = app().collection( "games" ).getTarget()
+ .queryParam( "access_token", this.getAdminToken().getAccessToken() )
+ .request();
- ClientResponse clientResponse = builder.post(ClientResponse.class, JsonUtils.mapToJsonString(hashMap("name", "bar2")));
+ ClientResponse clientResponse = builder.post(
+ javax.ws.rs.client.Entity.json( hashMap( "name", "bar2" ) ), ClientResponse.class );
assertEquals(200, clientResponse.getStatus());
@@ -234,7 +234,8 @@ public class ContentTypeResourceIT extends AbstractRestIT {
assertEquals(MediaType.APPLICATION_JSON, contentType.get(0));
//do the get with no content type, it should get set to application/json
- HttpPost get = new HttpPost( String.format("/%s/%s/games", this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
+ HttpPost get = new HttpPost( String.format("/%s/%s/games",
+ this.clientSetup.getOrganization().getName(), this.clientSetup.getAppName()) );
get.setHeader( HttpHeaders.AUTHORIZATION, "Bearer " + token.getAccessToken() );
clientResponse = builder.get(ClientResponse.class);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
index d9089ca..7edc2a7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
@@ -27,9 +27,9 @@ import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.Response;
import static org.apache.usergrid.utils.MapUtils.hashMap;
import static org.junit.Assert.assertEquals;
@@ -62,14 +62,14 @@ public class AccessTokenIT extends AbstractRestIT {
// wait for the token to expire
Thread.sleep(ttl - (System.currentTimeMillis() - startTime) + 1000);
- ClientResponse.Status responseStatus = null;
+ Response.Status responseStatus = null;
try {
management().users().user( clientSetup.getUsername() ).get( ApiResponse.class);
- } catch (UniformInterfaceException uie) {
- responseStatus = uie.getResponse().getClientResponseStatus();
+ } catch (ResponseProcessingException uie) {
+ responseStatus = Response.Status.fromStatusCode( uie.getResponse().getStatus() );
}
- assertEquals(ClientResponse.Status.UNAUTHORIZED, responseStatus);
+ assertEquals(Response.Status.UNAUTHORIZED, responseStatus);
}
@@ -168,9 +168,9 @@ public class AccessTokenIT extends AbstractRestIT {
public void meTokenPostForm() throws IOException {
Form form = new Form();
- form.add("grant_type", "password");
- form.add("username", clientSetup.getUsername());
- form.add("password", clientSetup.getPassword());
+ form.param( "grant_type", "password" );
+ form.param( "username", clientSetup.getUsername() );
+ form.param( "password", clientSetup.getPassword() );
Token adminToken = management().me().post( Token.class,form );
@@ -198,8 +198,8 @@ public class AccessTokenIT extends AbstractRestIT {
try {
management().token().post( Token.class,payload );
- } catch (UniformInterfaceException uie) {
- assertEquals(ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus());
+ } catch (ResponseProcessingException uie) {
+ assertEquals(Response.Status.BAD_REQUEST, uie.getResponse().getStatus());
}
}
@@ -218,8 +218,8 @@ public class AccessTokenIT extends AbstractRestIT {
try {
management().token().post( Token.class, payload );
- } catch (UniformInterfaceException uie) {
- assertEquals(ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus());
+ } catch (ResponseProcessingException uie) {
+ assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus());
}
}
@@ -246,8 +246,8 @@ public class AccessTokenIT extends AbstractRestIT {
management().users().user( clientSetup.getUsername() ).get();
fail( "Token1 should have been revoked" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.UNAUTHORIZED, uie.getResponse().getClientResponseStatus());
+ catch ( ResponseProcessingException uie ) {
+ assertEquals(Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
@@ -257,8 +257,8 @@ public class AccessTokenIT extends AbstractRestIT {
management().users().user( clientSetup.getUsername() ).get();
fail( "Token2 should have been revoked" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.UNAUTHORIZED, uie.getResponse().getClientResponseStatus());
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
}
@@ -287,8 +287,8 @@ public class AccessTokenIT extends AbstractRestIT {
management().users().user( clientSetup.getUsername() ).get();
fail( "Token1 should have been revoked" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.UNAUTHORIZED, uie.getResponse().getClientResponseStatus());
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
@@ -297,7 +297,7 @@ public class AccessTokenIT extends AbstractRestIT {
management().token().setToken( token2 );
management().users().user( clientSetup.getUsername() ).get();
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
fail( "Token2 shouldn't have been revoked" );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index 286f893..09c49e1 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -17,9 +17,6 @@
package org.apache.usergrid.rest.management;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
import org.apache.usergrid.management.MockImapClient;
import org.apache.usergrid.persistence.core.util.StringUtils;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
@@ -34,6 +31,9 @@ import org.jvnet.mock_javamail.Mailbox;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.Response;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -83,7 +83,7 @@ public class AdminUsersIT extends AbstractRestIT {
try {
management.token().post(false, Token.class, new Token( username, password ),null);
fail( "We shouldn't be able to get a token using the old password" );
- }catch(UniformInterfaceException uie) {
+ }catch(ResponseProcessingException uie) {
errorParse( 400,"invalid_grant",uie );
}
}
@@ -120,8 +120,8 @@ public class AdminUsersIT extends AbstractRestIT {
management.users().user( username ).password().post( Entity.class ,passwordPayload );
fail("We shouldn't be able to change the password with the same payload");
}
- catch ( UniformInterfaceException uie ) {
- errorParse( ClientResponse.Status.BAD_REQUEST.getStatusCode(),"auth_invalid_username_or_password",uie );
+ catch ( ResponseProcessingException uie ) {
+ errorParse( Response.Status.BAD_REQUEST.getStatusCode(),"auth_invalid_username_or_password",uie );
}
}
@@ -153,7 +153,7 @@ public class AdminUsersIT extends AbstractRestIT {
try {
management.token().post( false,Token.class, new Token( username, password) ,null);
fail( "We shouldn't be able to get a token using the old password" );
- }catch(UniformInterfaceException uie) {
+ }catch(ResponseProcessingException uie) {
errorParse( 400,"invalid_grant",uie );
}
}
@@ -236,7 +236,7 @@ public class AdminUsersIT extends AbstractRestIT {
management().token().get( queryParameters );
fail( "Admin user should not be able to log in." );
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
assertEquals( "Admin user should have failed with 403", 403, uie.getResponse().getStatus() );
}
@@ -417,11 +417,12 @@ public class AdminUsersIT extends AbstractRestIT {
String token = getTokenFromMessage( confirmation );
Form formData = new Form();
- formData.add( "token", token );
- formData.add( "password1", "sesame" );
- formData.add( "password2", "sesame" );
+ formData.param( "token", token );
+ formData.param( "password1", "sesame" );
+ formData.param( "password2", "sesame" );
- String html = management().users().user( clientSetup.getUsername() ).resetpw().post( formData );
+ String html = management().users().user( clientSetup.getUsername() ).resetpw().getTarget().request()
+ .post( javax.ws.rs.client.Entity.form(formData), String.class );
assertTrue( html.contains( "password set" ) );
@@ -493,7 +494,7 @@ public class AdminUsersIT extends AbstractRestIT {
fail( "should fail with conflict" );
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
assertEquals( 409, e.getResponse().getStatus() );
}
@@ -512,7 +513,7 @@ public class AdminUsersIT extends AbstractRestIT {
fail( "should fail with conflict" );
}
- catch ( UniformInterfaceException e ) {
+ catch ( ResponseProcessingException e ) {
assertEquals( 409, e.getResponse().getStatus() );
}
}
@@ -628,7 +629,7 @@ public class AdminUsersIT extends AbstractRestIT {
fail( "Should have thrown unique exception on org name" );
}
- catch ( UniformInterfaceException uie ) {
+ catch ( ResponseProcessingException uie ) {
assertEquals(500,uie.getResponse().getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
index 33bf360..a4f5f2d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
@@ -18,23 +18,18 @@
package org.apache.usergrid.rest.management;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.junit.Ignore;
+import org.junit.Test;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Response;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
public class ExportResourceIT extends AbstractRestIT {
@@ -53,8 +48,8 @@ public class ExportResourceIT extends AbstractRestIT {
management().orgs().org( clientSetup.getOrganizationName() )
.app().addToPath( clientSetup.getAppUuid() ).addToPath( "export" );
}
- catch ( UniformInterfaceException uie ) {
- fail("We got back " + uie.getResponse().getClientResponseStatus() + " instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail("We got back " + uie.getResponse().getStatus() + " instead of having a successful call" );
}
}
@@ -73,8 +68,8 @@ public class ExportResourceIT extends AbstractRestIT {
.app().addToPath( clientSetup.getAppUuid()).addToPath( "collection" )
.addToPath( "users" ).addToPath( "export" ).post(ApiResponse.class,payloadBuilder() );
}
- catch ( UniformInterfaceException uie ) {
- fail( "We got back "+uie.getResponse().getClientResponseStatus()+" instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
assertNotNull( exportEntity );
@@ -97,8 +92,8 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).post( ApiResponse.class, payloadBuilder() );
}
- catch ( UniformInterfaceException uie ) {
- fail( "We got back "+uie.getResponse().getClientResponseStatus()+" instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
assertNotNull( exportEntity );
@@ -111,8 +106,8 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
- catch ( UniformInterfaceException uie ) {
- fail( "We got back "+uie.getResponse().getClientResponseStatus()+" instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
assertNotNull( exportEntity );
@@ -140,8 +135,8 @@ public class ExportResourceIT extends AbstractRestIT {
.app().addToPath( clientSetup.getAppUuid() )
.addToPath( "export" ).post( ApiResponse.class, payloadBuilder() );
}
- catch ( UniformInterfaceException uie ) {
- fail( "We got back "+uie.getResponse().getClientResponseStatus()+" instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
assertNotNull( exportEntity );
@@ -155,8 +150,8 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
- catch ( UniformInterfaceException uie ) {
- fail( "We got back "+uie.getResponse().getClientResponseStatus()+" instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
assertNotNull( exportEntity );
@@ -185,8 +180,8 @@ public class ExportResourceIT extends AbstractRestIT {
exportEntity = management().orgs().org( clientSetup.getOrganizationName() )
.addToPath( "export" ).addToPath( uuid ).get( ApiResponse.class );
}
- catch ( UniformInterfaceException uie ) {
- fail( "We got back "+uie.getResponse().getClientResponseStatus()+" instead of having a successful call" );
+ catch ( ResponseProcessingException uie ) {
+ fail( "We got back "+uie.getResponse().getStatus()+" instead of having a successful call" );
}
@@ -206,8 +201,8 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get( ApiResponse.class );
fail( "Should not have been able to get fake uuid" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -224,8 +219,8 @@ public class ExportResourceIT extends AbstractRestIT {
new HashMap<String, Object>() );
fail( "Should not have passed, The payload is empty." );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -238,8 +233,8 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).post( ApiResponse.class, new HashMap<String, Object>() );
fail( "Should not have passed, The payload is empty." );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -255,8 +250,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed, The payload is empty." );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -272,8 +267,8 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.UNAUTHORIZED, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -288,8 +283,8 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.UNAUTHORIZED, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -303,8 +298,8 @@ public class ExportResourceIT extends AbstractRestIT {
.addToPath( "export" ).addToPath( fake.toString() ).get(ApiResponse.class ,false);
fail( "Should not have passed as we didn't have an access token." );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.UNAUTHORIZED, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -322,8 +317,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -344,8 +339,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -366,8 +361,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -385,8 +380,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -407,8 +402,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -429,8 +424,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -450,8 +445,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
payload = payloadBuilder();
@@ -466,8 +461,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
payload = payloadBuilder();
@@ -482,8 +477,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -503,8 +498,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
payload = payloadBuilder();
@@ -520,8 +515,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
payload = payloadBuilder();
@@ -537,8 +532,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
@@ -559,8 +554,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
payload = payloadBuilder();
@@ -577,8 +572,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
payload = payloadBuilder();
@@ -595,8 +590,8 @@ public class ExportResourceIT extends AbstractRestIT {
fail( "Should not have passed as we were missing an important part of the payload" );
}
- catch ( UniformInterfaceException uie ) {
- assertEquals( ClientResponse.Status.BAD_REQUEST, uie.getResponse().getClientResponseStatus() );
+ catch ( ResponseProcessingException uie ) {
+ assertEquals( Response.Status.BAD_REQUEST.getStatusCode(), uie.getResponse().getStatus() );
}
}
[04/10] usergrid git commit: Switch to Jersey 2,
fix all compilation errors. TODO: new MeteringFilter,
new JSON-HTMP swap logic and correct use of dependency management.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
index 87b85ac..08de618 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
@@ -17,12 +17,13 @@
package org.apache.usergrid.rest.security.shiro.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.exception.OAuthSystemException;
+import org.apache.amber.oauth2.common.message.types.ParameterStyle;
+import org.apache.amber.oauth2.common.utils.OAuthUtils;
+import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.subject.Subject;
import org.apache.usergrid.management.ApplicationInfo;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.UserInfo;
@@ -35,22 +36,16 @@ import org.apache.usergrid.security.tokens.TokenInfo;
import org.apache.usergrid.security.tokens.exceptions.BadTokenException;
import org.apache.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.apache.usergrid.security.tokens.exceptions.InvalidTokenException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.exception.OAuthSystemException;
-import org.apache.amber.oauth2.common.message.types.ParameterStyle;
-import org.apache.amber.oauth2.common.utils.OAuthUtils;
-import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest;
-import org.apache.shiro.subject.Subject;
-
-import com.sun.jersey.api.container.MappableContainerException;
-import com.sun.jersey.spi.container.ContainerRequest;
-import org.apache.commons.lang.StringUtils;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.core.Context;
+import java.io.IOException;
-import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.BAD_ACCESS_TOKEN_ERROR;
-import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.EXPIRED_ACCESS_TOKEN_ERROR;
-import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.INVALID_AUTH_ERROR;
-import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.UNVERIFIED_OAUTH_ERROR;
+import static org.apache.usergrid.rest.exceptions.AuthErrorInfo.*;
import static org.apache.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
@@ -72,47 +67,42 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
@Override
- public ContainerRequest filter( ContainerRequest request ) {
+ public void filter(ContainerRequestContext request) throws IOException {
try {
try {
- String accessToken = request.getQueryParameters().getFirst( "access_token" );
+ String accessToken = httpServletRequest.getParameter( "access_token" );
- if ( StringUtils.isEmpty(accessToken) ) {
+ if (StringUtils.isEmpty( accessToken )) {
// Make the OAuth Request out of this request
OAuthAccessResourceRequest oauthRequest =
- new OAuthAccessResourceRequest( httpServletRequest, ParameterStyle.HEADER );
+ new OAuthAccessResourceRequest( httpServletRequest, ParameterStyle.HEADER );
// Get the access token
accessToken = oauthRequest.getAccessToken();
}
- if ( StringUtils.isEmpty(accessToken) ) {
- return request;
+ if (StringUtils.isEmpty( accessToken )) {
+ return;
}
AuthPrincipalInfo principal = null;
try {
TokenInfo tokenInfo = tokens.getTokenInfo( accessToken );
principal = tokenInfo.getPrincipal();
- }
- catch ( BadTokenException e1 ) {
+ } catch (BadTokenException e1) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
- }
- catch ( ExpiredTokenException ete ) {
+ } catch (ExpiredTokenException ete) {
throw mappableSecurityException( EXPIRED_ACCESS_TOKEN_ERROR );
- }
- catch ( InvalidTokenException ite ) {
+ } catch (InvalidTokenException ite) {
throw mappableSecurityException( INVALID_AUTH_ERROR );
- }
- catch ( IndexOutOfBoundsException ioobe ) {
+ } catch (IndexOutOfBoundsException ioobe) {
// token is just some rubbish string
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
- }
- catch ( Exception e ) {
- if ( LOG.isDebugEnabled() ) {
+ } catch (Exception e) {
+ if (LOG.isDebugEnabled()) {
LOG.debug( "Unable to verify OAuth token: " + accessToken, e );
} else {
LOG.warn( "Unable to verify OAuth token" );
@@ -120,81 +110,70 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
throw mappableSecurityException( UNVERIFIED_OAUTH_ERROR );
}
- if ( principal == null ) {
- return request;
+ if (principal == null) {
+ return;
}
PrincipalCredentialsToken token = null;
- if ( AuthPrincipalType.ADMIN_USER.equals( principal.getType() ) ) {
+ if (AuthPrincipalType.ADMIN_USER.equals( principal.getType() )) {
UserInfo user = null;
try {
user = management.getAdminUserInfoFromAccessToken( accessToken );
- }
- catch ( ManagementException e ) {
- throw new MappableContainerException( e );
- }
- catch ( Exception e ) {
+ } catch (ManagementException e) {
+ throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
+ } catch (Exception e) {
LOG.error( "failed to get admin user info from access token", e );
}
- if ( user == null ) {
+ if (user == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
}
token = PrincipalCredentialsToken.getFromAdminUserInfoAndAccessToken(
- user, accessToken, emf.getManagementAppId() );
- }
- else if ( AuthPrincipalType.APPLICATION_USER.equals( principal.getType() ) ) {
+ user, accessToken, emf.getManagementAppId() );
+ } else if (AuthPrincipalType.APPLICATION_USER.equals( principal.getType() )) {
UserInfo user = null;
try {
user = management.getAppUserFromAccessToken( accessToken );
- }
- catch ( ManagementException e ) {
- throw new MappableContainerException( e );
- }
- catch ( Exception e ) {
+ } catch (ManagementException e) {
+ throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
+ } catch (Exception e) {
LOG.error( "failed to get app user from access token", e );
}
- if ( user == null ) {
+ if (user == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
}
token = PrincipalCredentialsToken.getFromAppUserInfoAndAccessToken( user, accessToken );
- }
- else if ( AuthPrincipalType.ORGANIZATION.equals( principal.getType() ) ) {
+ } else if (AuthPrincipalType.ORGANIZATION.equals( principal.getType() )) {
OrganizationInfo organization = null;
try {
organization = management.getOrganizationInfoFromAccessToken( accessToken );
- }
- catch ( ManagementException e ) {
- throw new MappableContainerException( e );
- }
- catch ( Exception e ) {
+ } catch (ManagementException e) {
+ throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
+ } catch (Exception e) {
LOG.error( "failed to get organization info from access token", e );
}
- if ( organization == null ) {
+ if (organization == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
}
token = PrincipalCredentialsToken
- .getFromOrganizationInfoAndAccessToken( organization, accessToken );
- }
- else if ( AuthPrincipalType.APPLICATION.equals( principal.getType() ) ) {
+ .getFromOrganizationInfoAndAccessToken( organization, accessToken );
+ } else if (AuthPrincipalType.APPLICATION.equals( principal.getType() )) {
ApplicationInfo application = null;
try {
application = management.getApplicationInfoFromAccessToken( accessToken );
- }
- catch ( ManagementException e ) {
- throw new MappableContainerException( e );
- }
- catch ( Exception e ) {
+ } catch (ManagementException e) {
+ throw mappableSecurityException( e, BAD_ACCESS_TOKEN_ERROR );
+ } catch (Exception e) {
LOG.error( "failed to get application info from access token", e );
}
- if ( application == null ) {
+ if (application == null) {
throw mappableSecurityException( BAD_ACCESS_TOKEN_ERROR );
}
@@ -203,22 +182,22 @@ public class OAuth2AccessTokenSecurityFilter extends SecurityFilter {
Subject subject = SubjectUtils.getSubject();
subject.login( token );
- }
- catch ( OAuthProblemException e ) {
+
+ } catch (OAuthProblemException e) {
// Check if the error code has been set
String errorCode = e.getError();
- if ( OAuthUtils.isEmpty( errorCode ) ) {
-
- return request;
+ if (OAuthUtils.isEmpty( errorCode )) {
+ return;
}
- throw new MappableContainerException( e );
+ throw mappableSecurityException( errorCode, e.getMessage(), null );
}
- }
- catch ( OAuthSystemException ose ) {
- throw new MappableContainerException( ose );
+
+ } catch (OAuthSystemException ose) {
+ throw mappableSecurityException( ose, null );
}
- return request;
}
+
}
+
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
index 53f9354..625d352 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/shiro/filters/SecurityFilter.java
@@ -21,10 +21,14 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
+import javax.xml.ws.spi.http.HttpContext;
+import org.glassfish.jersey.server.ContainerRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -35,9 +39,6 @@ import org.apache.usergrid.services.ServiceManagerFactory;
import org.apache.commons.lang.StringUtils;
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
import static org.apache.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
import static org.apache.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
@@ -118,8 +119,8 @@ public abstract class SecurityFilter implements ContainerRequestFilter {
}
- public static Map<String, String> getAuthTypes( ContainerRequest request ) {
- String auth_header = request.getHeaderValue( HttpHeaders.AUTHORIZATION );
+ public static Map<String, String> getAuthTypes( ContainerRequestContext request ) {
+ String auth_header = request.getHeaderString( HttpHeaders.AUTHORIZATION );
if ( auth_header == null ) {
return null;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/main/java/org/apache/usergrid/rest/utils/CORSUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/utils/CORSUtils.java b/stack/rest/src/main/java/org/apache/usergrid/rest/utils/CORSUtils.java
index a082573..daaf5ab 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/utils/CORSUtils.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/utils/CORSUtils.java
@@ -17,13 +17,15 @@
package org.apache.usergrid.rest.utils;
+import org.glassfish.jersey.server.ContainerRequest;
+import org.glassfish.jersey.server.ContainerResponse;
+
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerResponseContext;
/* Note: At one point there was a special case in this code that would
@@ -96,27 +98,27 @@ public class CORSUtils {
}
- public static ContainerResponse allowAllOrigins( ContainerRequest request, ContainerResponse response ) {
+ public static ContainerResponseContext allowAllOrigins( ContainerRequestContext request, ContainerResponseContext response ) {
- if ( request.getRequestHeaders().containsKey( ACCESS_CONTROL_REQUEST_METHOD ) ) {
+ if ( request.getHeaders().containsKey( ACCESS_CONTROL_REQUEST_METHOD ) ) {
- for ( String value : request.getRequestHeaders().get( ACCESS_CONTROL_REQUEST_METHOD ) ) {
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_METHODS, value );
+ for ( String value : request.getHeaders().get( ACCESS_CONTROL_REQUEST_METHOD ) ) {
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_METHODS, value );
}
}
- if ( request.getRequestHeaders().containsKey( ACCESS_CONTROL_REQUEST_HEADERS ) ) {
- for ( String value : request.getRequestHeaders().get( ACCESS_CONTROL_REQUEST_HEADERS ) ) {
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_HEADERS, value );
+ if ( request.getHeaders().containsKey( ACCESS_CONTROL_REQUEST_HEADERS ) ) {
+ for ( String value : request.getHeaders().get( ACCESS_CONTROL_REQUEST_HEADERS ) ) {
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_HEADERS, value );
}
}
boolean origin_sent = false;
- if ( request.getRequestHeaders().containsKey( ORIGIN_HEADER ) ) {
- for ( String value : request.getRequestHeaders().get( ORIGIN_HEADER ) ) {
+ if ( request.getHeaders().containsKey( ORIGIN_HEADER ) ) {
+ for ( String value : request.getHeaders().get( ORIGIN_HEADER ) ) {
if ( value != null ) {
origin_sent = true;
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_ORIGIN, value );
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_ORIGIN, value );
}
}
}
@@ -124,15 +126,15 @@ public class CORSUtils {
if ( !origin_sent ) {
String origin = getOrigin( request );
if ( origin != null ) {
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_CREDENTIALS, "true" );
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_ORIGIN, origin );
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_CREDENTIALS, "true" );
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_ORIGIN, origin );
}
else {
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_ORIGIN, "*" );
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_ORIGIN, "*" );
}
}
else {
- response.getHttpHeaders().add( ACCESS_CONTROL_ALLOW_CREDENTIALS, "true" );
+ response.getHeaders().add( ACCESS_CONTROL_ALLOW_CREDENTIALS, "true" );
}
return response;
@@ -166,9 +168,9 @@ public class CORSUtils {
}
- public static String getOrigin( ContainerRequest request ) {
- String origin = request.getRequestHeaders().getFirst( ORIGIN_HEADER );
- String referer = request.getRequestHeaders().getFirst( REFERER_HEADER );
+ public static String getOrigin( ContainerRequestContext request ) {
+ String origin = request.getHeaders().getFirst( ORIGIN_HEADER );
+ String referer = request.getHeaders().getFirst( REFERER_HEADER );
return getOrigin( origin, referer );
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
index fc20147..edda5e5 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
@@ -17,23 +17,15 @@
package org.apache.usergrid.rest;
-import java.io.IOException;
-
-import javax.ws.rs.core.MediaType;
-
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-
-import org.junit.Ignore;
+import javax.ws.rs.client.ResponseProcessingException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -82,8 +74,9 @@ public class BasicIT extends AbstractRestIT {
try {
clientSetup.getRestClient().pathResource( getOrgAppPath( "users/JOE" ) ).get( ApiResponse.class );
fail("A get on a nonexistant object should fail");
- }catch ( UniformInterfaceException e ) {
- assertEquals( "Guests should not be able to get a 404", 404, e.getResponse().getStatus() );
+ } catch ( ResponseProcessingException e ) {
+ assertEquals( "Guests should not be able to get a 404", 404,
+ e.getResponse().getStatusInfo().getStatusCode());
}
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
index a84f91c..065cd10 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
@@ -20,25 +20,22 @@
package org.apache.usergrid.rest;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
@@ -81,16 +78,20 @@ public class IndexResourceIT extends AbstractRestIT {
result = clientSetup.getRestClient()
.pathResource( "system/index/rebuild/"+clientSetup.getAppUuid()+"/storelatlons" )
.post( false, ApiResponse.class,null,queryParameters,true);
+ String status = result.getProperties().get("jobId").toString();
assertNotNull( result );
- WebResource res = clientSetup.getRestClient()
- .pathResource( "system/index/rebuild/"+result.getProperties().get("jobId").toString() ).getResource();
- String status = result.getProperties().get("jobId").toString();
- //added httpBasicauth filter to all setup calls because they all do verification this way.
- HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( clientSetup.getSuperuserName(),clientSetup.getSuperuserPassword() );
- res.addFilter( httpBasicAuthFilter );
- result = res.get(ApiResponse.class);
+ WebTarget res = clientSetup.getRestClient()
+ .pathResource( "system/index/rebuild/" + result.getProperties()
+ .get( "jobId" ).toString() )
+ .getTarget();
+
+ result = res.request()
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
+ .get(ApiResponse.class);
+
assertNotNull( result );
assertEquals(status,result.getProperties().get("jobId").toString());
@@ -113,14 +114,14 @@ public class IndexResourceIT extends AbstractRestIT {
org.apache.usergrid.rest.test.resource.model.ApiResponse node = null;
try {
- WebResource resource = this.clientSetup.getRestClient().pathResource("/system/index/" + appId).getResource();
-
- //added httpBasicauth filter to all setup calls because they all do verification this way.
- HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( clientSetup.getSuperuserName(),clientSetup.getSuperuserPassword() );
- resource.addFilter( httpBasicAuthFilter );
+ WebTarget resource = this.clientSetup.getRestClient().pathResource("/system/index/" + appId).getTarget();
- node = resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ node = resource.request()
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_USERNAME, "superuser")
+ .property( HttpAuthenticationFeature.HTTP_AUTHENTICATION_BASIC_PASSWORD, "superpassword" )
+ .accept( MediaType.APPLICATION_JSON )
.get( org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
+
} catch (Exception e) {
LOG.error("failed", e);
fail(e.toString());
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
index 97a02fd..109c76d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java
@@ -17,7 +17,6 @@
package org.apache.usergrid.rest;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.utils.MapUtils;
@@ -25,6 +24,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.ResponseProcessingException;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -77,8 +77,8 @@ public class PartialUpdateTest extends AbstractRestIT {
try {
// PUT the updates to the user and ensure they were saved
userNode = this.app().collection("users").entity(userNode).put(updateProps);
- } catch (UniformInterfaceException uie) {
- fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ } catch (ResponseProcessingException uie) {
+ fail("Update failed due to: " + uie.getResponse().readEntity(String.class));
}
refreshIndex();
@@ -118,8 +118,8 @@ public class PartialUpdateTest extends AbstractRestIT {
try { // PUT /users/fred put /users/uuid
userNode = this.app().collection("users").entity(props.get("username").toString()).put(updateProps);
- } catch (UniformInterfaceException uie) {
- fail("Update failed due to: " + uie.getResponse().getEntity(String.class));
+ } catch (ResponseProcessingException uie) {
+ fail("Update failed due to: " + uie.getResponse().readEntity(String.class));
}
refreshIndex();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
index 7f09fa5..354589c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
@@ -17,15 +17,10 @@
package org.apache.usergrid.rest;
-import org.junit.Test;
-
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
-import org.apache.usergrid.rest.test.resource.model.Token;
-
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
+import org.junit.Test;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatRuntime.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatRuntime.java b/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatRuntime.java
index 498068a..4c09565 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatRuntime.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/TomcatRuntime.java
@@ -31,8 +31,10 @@ import org.apache.usergrid.cassandra.AvailablePortFinder;
import org.apache.usergrid.setup.ConcurrentProcessSingleton;
import com.google.common.io.Files;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
/**
@@ -173,9 +175,9 @@ public class TomcatRuntime extends ExternalResource {
while ( count++ < 30 ) {
try {
Thread.sleep( 1000 );
- Client c = Client.create();
- WebResource wr = c.resource( url );
- wr.get( String.class );
+ Client c = ClientBuilder.newClient();
+ WebTarget wr = c.target( url );
+ wr.request().get( String.class );
log.info( "Tomcat is started." );
started = true;
break;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
index d2ad7ba..cfcc91d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
@@ -108,15 +108,15 @@ public class ApplicationCreateIT extends AbstractRestIT {
final String entityName = "entity" + i;
Entity entity = new Entity();
- entity.setProperties(new HashMap<String, Object>() {{
- put("name", entityName );
- }});
+ entity.setProperties( new HashMap<String, Object>() {{
+ put( "name", entityName );
+ }} );
ApiResponse createResponse = clientSetup.getRestClient()
- .org(orgName).app( appName ).collection("things").getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken())
- .type(MediaType.APPLICATION_JSON)
- .post( ApiResponse.class, entity );
+ .org( orgName ).app( appName ).collection( "things" ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .request()
+ .post( javax.ws.rs.client.Entity.entity(entity, MediaType.APPLICATION_JSON_TYPE ), ApiResponse.class);
entities.add( createResponse.getEntities().get(0) );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
index cad0a37..b863a8e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
@@ -18,27 +18,24 @@
package org.apache.usergrid.rest.applications;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import com.fasterxml.jackson.databind.JsonNode;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResponse;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Application;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.Token;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
import static org.junit.Assert.fail;
@@ -77,52 +74,54 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
clientSetup.getRestClient() .management().orgs()
- .org(orgName).apps().app(appToDeleteId.toString()).getResource()
+ .org(orgName).apps().app(appToDeleteId.toString()).getTarget()
.queryParam("access_token", orgAdminToken.getAccessToken())
+ .request()
.delete();
fail("Delete must fail without app_delete_confirm parameter");
- } catch ( UniformInterfaceException expected ) {
+ } catch ( ResponseProcessingException expected ) {
Assert.assertEquals("Error must be 400", 400, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
Assert.assertEquals("Cannot delete application without app_delete_confirm parameter", node.get("error_description").textValue());
}
clientSetup.getRestClient().management().orgs()
- .org(orgName).apps().app(appToDeleteId.toString() ).getResource()
+ .org(orgName).apps().app(appToDeleteId.toString() ).getTarget()
.queryParam("access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
+ .request()
.delete();
// test that we can no longer get the app
try {
clientSetup.getRestClient().management().orgs()
- .org(orgName).apps().app(appToDeleteName).getResource()
+ .org(orgName).apps().app(appToDeleteName).getTarget()
.queryParam("access_token", orgAdminToken.getAccessToken())
- .type(MediaType.APPLICATION_JSON)
+ .request()
.get(ApiResponse.class);
fail("Must not be able to get deleted app");
- } catch ( UniformInterfaceException expected ) {
+ } catch ( ResponseProcessingException expected ) {
Assert.assertEquals("Error must be 404", 404, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
Assert.assertEquals("entity_not_found", node.get("error").textValue());
}
try {
- clientSetup.getRestClient().org( orgName ).app( appToDeleteName ).getResource()
- .queryParam( "access_token", orgAdminToken.getAccessToken() ).type( MediaType.APPLICATION_JSON )
+ clientSetup.getRestClient().org( orgName ).app( appToDeleteName ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() ).request()
.get( ApiResponse.class );
fail( "Must not be able to get deleted app" );
}
- catch ( UniformInterfaceException expected ) {
+ catch ( ResponseProcessingException expected ) {
Assert.assertEquals( "Error must be 404", 404, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().getEntity( String.class ) );
+ JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ) );
Assert.assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
}
@@ -131,16 +130,16 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
clientSetup.getRestClient()
- .org(orgName).app(appToDeleteName).collection("things").getResource()
+ .org(orgName).app(appToDeleteName).collection("things").getTarget()
.queryParam("access_token", orgAdminToken.getAccessToken() )
- .type(MediaType.APPLICATION_JSON )
- .get(ApiResponse.class);
+ .request()
+ .get( ApiResponse.class );
fail("Must not be able to get deleted app's collection");
- } catch ( UniformInterfaceException expected ) {
+ } catch ( ResponseProcessingException expected ) {
Assert.assertEquals("Error must be 400", 404, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
Assert.assertEquals("organization_application_not_found", node.get("error").textValue());
}
@@ -149,17 +148,17 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
UUID entityId = entities.get(0).getUuid();
clientSetup.getRestClient()
- .org(orgName).app(appToDeleteName).collection("things").entity( entityId ).getResource()
+ .org(orgName).app(appToDeleteName).collection("things").entity( entityId ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken())
- .type( MediaType.APPLICATION_JSON)
- .get(ApiResponse.class);
+ .request()
+ .get( ApiResponse.class );
fail("Must not be able to get deleted app entity");
- } catch ( UniformInterfaceException expected ) {
+ } catch ( ResponseProcessingException expected ) {
// TODO: why not a 404?
Assert.assertEquals("Error must be 400", 404, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ));
Assert.assertEquals("organization_application_not_found", node.get("error").textValue());
}
@@ -181,24 +180,26 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( appToDeleteId.toString() )
- .getResource().queryParam( "access_token", orgAdminToken.getAccessToken() )
- .queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" ).delete();
+ .getTarget().queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
+ .request()
+ .delete();
fail("Can't delete a non existent app twice");
}
- catch ( UniformInterfaceException expected ) {
+ catch ( ResponseProcessingException expected ) {
Assert.assertEquals( "Error must be 404", 404, expected.getResponse().getStatus() );
- JsonNode node = mapper.readTree( expected.getResponse().getEntity( String.class ) );
+ JsonNode node = mapper.readTree( expected.getResponse().readEntity( String.class ) );
Assert.assertEquals( "entity_not_found", node.get( "error" ).textValue() );
}
// test that we can create a new application with the same name
ApiResponse appCreateAgainResponse = clientSetup.getRestClient()
- .management().orgs().org( orgName ).app().getResource()
+ .management().orgs().org( orgName ).app().getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
- .type( MediaType.APPLICATION_JSON )
- .post( ApiResponse.class, new Application( appToDeleteName ) );
+ .request()
+ .post( javax.ws.rs.client.Entity.json( new Application( appToDeleteName ) ), ApiResponse.class );
Assert.assertEquals("Must be able to create app with same name as deleted app",
(orgName + "/" + appToDeleteName).toLowerCase(),
@@ -230,12 +231,13 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
- logger.debug("\n\nDeleting app\n");
+ logger.debug( "\n\nDeleting app\n" );
clientSetup.getRestClient().management().orgs()
- .org(orgName).apps().app( appToDeleteName ).getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken() )
+ .org( orgName ).apps().app( appToDeleteName ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
+ .request()
.delete();
refreshIndex();
@@ -246,9 +248,10 @@ public class ApplicationDeleteIT extends AbstractRestIT {
logger.debug("\n\nRestoring app\n");
clientSetup.getRestClient().management().orgs()
- .org(orgName).apps().app( appToDeleteId.toString() ).getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken() )
- .put();
+ .org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .request()
+ .put( javax.ws.rs.client.Entity.json( null ));
refreshIndex();
@@ -275,18 +278,18 @@ public class ApplicationDeleteIT extends AbstractRestIT {
UUID entityId = entities.get(0).getUuid();
ApiResponse entityResponse = clientSetup.getRestClient()
- .org(orgName).app(appToDeleteName).collection("things").entity( entityId ).getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken())
- .type(MediaType.APPLICATION_JSON)
- .get(ApiResponse.class);
+ .org( orgName ).app( appToDeleteName ).collection( "things" ).entity( entityId ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .request()
+ .get( ApiResponse.class );
Assert.assertEquals( entityId, entityResponse.getEntities().get(0).getUuid() );
// test that we can get deleted app's collection
ApiResponse collectionReponse = clientSetup.getRestClient()
- .org(orgName).app(appToDeleteName).collection("things").getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken())
- .type(MediaType.APPLICATION_JSON)
+ .org( orgName ).app( appToDeleteName ).collection( "things" ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
+ .request()
.get(ApiResponse.class);
Assert.assertEquals( entities.size(), collectionReponse.getEntityCount() );
}
@@ -311,9 +314,10 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
clientSetup.getRestClient().management().orgs()
- .org( orgName ).apps().app(appToDeleteId.toString() ).getResource()
+ .org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
+ .request()
.delete();
// create new app with same name
@@ -325,13 +329,14 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
clientSetup.getRestClient() .management().orgs()
- .org(orgName).apps().app(appToDeleteId.toString()).getResource()
+ .org(orgName).apps().app(appToDeleteId.toString()).getTarget()
.queryParam("access_token", orgAdminToken.getAccessToken())
- .put();
+ .request()
+ .put( javax.ws.rs.client.Entity.json(null) );
fail("Must fail to restore app with same name as existing app");
- } catch ( UniformInterfaceException e ) {
+ } catch ( ResponseProcessingException e ) {
Assert.assertEquals(409, e.getResponse().getStatus());
}
}
@@ -356,9 +361,10 @@ public class ApplicationDeleteIT extends AbstractRestIT {
// delete the app
- clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( appToDeleteId.toString() ).getResource()
+ clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( appToDeleteId.toString() ).getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam( "app_delete_confirm", "confirm_delete_of_application_and_data" )
+ .request()
.delete();
// create new app with same name
@@ -369,14 +375,15 @@ public class ApplicationDeleteIT extends AbstractRestIT {
try {
- clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( newAppId.toString() ).getResource()
- .queryParam("access_token", orgAdminToken.getAccessToken())
+ clientSetup.getRestClient().management().orgs().org( orgName ).apps().app( newAppId.toString() ).getTarget()
+ .queryParam( "access_token", orgAdminToken.getAccessToken() )
.queryParam("app_delete_confirm", "confirm_delete_of_application_and_data")
+ .request()
.delete();
fail("Must fail to delete app with same name as deleted app");
- } catch ( UniformInterfaceException e ) {
+ } catch ( ResponseProcessingException e ) {
Assert.assertEquals( 409, e.getResponse().getStatus() );
}
}
@@ -386,10 +393,10 @@ public class ApplicationDeleteIT extends AbstractRestIT {
String orgName, String appName, Token orgAdminToken, List<Entity> entities) {
ApiResponse appCreateResponse = clientSetup.getRestClient()
- .management().orgs().org( orgName ).app().getResource()
+ .management().orgs().org( orgName ).app().getTarget()
.queryParam( "access_token", orgAdminToken.getAccessToken() )
- .type( MediaType.APPLICATION_JSON )
- .post( ApiResponse.class, new Application( appName ) );
+ .request()
+ .post( javax.ws.rs.client.Entity.json(new Application( appName )), ApiResponse.class );
UUID appId = appCreateResponse.getEntities().get(0).getUuid();
try { Thread.sleep(INDEXING_WAIT); } catch (InterruptedException ignored ) { }
@@ -398,15 +405,15 @@ public class ApplicationDeleteIT extends AbstractRestIT {
final String entityName = "entity" + i;
Entity entity = new Entity();
- entity.setProperties(new HashMap<String, Object>() {{
- put("name", entityName );
- }});
+ entity.setProperties( new HashMap<String, Object>() {{
+ put( "name", entityName );
+ }} );
ApiResponse createResponse = clientSetup.getRestClient()
- .org(orgName).app( appName ).collection("things").getResource()
+ .org(orgName).app( appName ).collection("things").getTarget()
.queryParam("access_token", orgAdminToken.getAccessToken())
- .type(MediaType.APPLICATION_JSON)
- .post( ApiResponse.class, entity );
+ .request()
+ .post( javax.ws.rs.client.Entity.json(entity), ApiResponse.class );
entities.add( createResponse.getEntities().get(0) );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index ec858f7..f071b5e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -17,10 +17,6 @@
package org.apache.usergrid.rest.applications;
import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.representation.Form;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.shiro.codec.Base64;
import org.apache.usergrid.cassandra.SpringResource;
@@ -30,12 +26,17 @@ import org.apache.usergrid.rest.test.resource.endpoints.mgmt.OrganizationResourc
import org.apache.usergrid.rest.test.resource.model.*;
import org.apache.usergrid.setup.ConcurrentProcessSingleton;
import org.apache.usergrid.utils.MapUtils;
+import org.glassfish.jersey.client.ClientProperties;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -60,12 +61,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
Credentials orgCredentials = getOrgCredentials();
//retrieve the app using only the org credentials
- ApiResponse apiResponse = this.org().app(clientSetup.getAppName()).getResource(false)
+ ApiResponse apiResponse = this.org().app( clientSetup.getAppName() ).getTarget( false )
.queryParam("grant_type", "client_credentials")
.queryParam("client_id", orgCredentials.getClientId())
- .queryParam("client_secret", orgCredentials.getClientSecret())
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ .queryParam( "client_secret", orgCredentials.getClientSecret() )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
.get(ApiResponse.class);
//assert that a valid response is returned without error
assertNotNull(apiResponse);
@@ -82,12 +83,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
Credentials appCredentials = getAppCredentials();
//retrieve the app using only the org credentials
- ApiResponse apiResponse = this.app().getResource(false)
+ ApiResponse apiResponse = this.app().getTarget( false )
.queryParam("grant_type", "client_credentials")
.queryParam("client_id", appCredentials.getClientId())
.queryParam("client_secret", appCredentials.getClientSecret())
+ .request()
.accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
.get(ApiResponse.class);
//assert that a valid response is returned without error
assertNotNull(apiResponse);
@@ -104,13 +105,13 @@ public class ApplicationResourceIT extends AbstractRestIT {
Credentials appCredentials = getAppCredentials();
//retrieve the app using only the org credentials
- ApiResponse apiResponse = this.app().collection( "roles" ).getResource( false )
- .queryParam( "grant_type", "client_credentials" )
- .queryParam("client_id", appCredentials.getClientId())
- .queryParam("client_secret", appCredentials.getClientSecret())
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .get(ApiResponse.class);
+ ApiResponse apiResponse = this.app().collection( "roles" ).getTarget( false )
+ .queryParam( "grant_type", "client_credentials" )
+ .queryParam("client_id", appCredentials.getClientId())
+ .queryParam("client_secret", appCredentials.getClientSecret())
+ .request()
+ .accept(MediaType.APPLICATION_JSON)
+ .get(ApiResponse.class);
//assert that a valid response is returned without error
assertNotNull(apiResponse);
assertNull(apiResponse.getError());
@@ -207,12 +208,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
Credentials orgCredentials = getOrgCredentials();
//retrieve the users collection without setting the "Accept" header
- WebResource.Builder builder = this.app().collection("users").getResource(false)
+ Invocation.Builder builder = this.app().collection( "users" ).getTarget( false )
//Add the org credentials to the query
- .queryParam("grant_type", "client_credentials")
- .queryParam("client_id", orgCredentials.getClientId())
- .queryParam("client_secret", orgCredentials.getClientSecret())
- .type(MediaType.APPLICATION_JSON_TYPE);
+ .queryParam( "grant_type", "client_credentials" )
+ .queryParam("client_id", orgCredentials.getClientId() )
+ .queryParam( "client_secret", orgCredentials.getClientSecret() )
+ .request();
ApiResponse apiResponse = builder.get(ApiResponse.class);
Collection users = new Collection(apiResponse);
@@ -239,15 +240,17 @@ public class ApplicationResourceIT extends AbstractRestIT {
String clientSecret = orgCredentials.getClientSecret();
//retrieve the users collection, setting the "Accept" header to text/html
- WebResource.Builder builder = this.app().collection("users").getResource(false)
+ Invocation.Builder builder = this.app().collection( "users" ).getTarget()
//Add the org credentials to the query
- .queryParam("grant_type", "client_credentials")
- .queryParam("client_id", clientId)
- .queryParam("client_secret", clientSecret)
+ .queryParam( "grant_type", "client_credentials" )
+ .queryParam( "client_id", clientId )
+ .queryParam( "client_secret", clientSecret )
+ .request();
+
+ ApiResponse apiResponse = builder
.accept(MediaType.TEXT_HTML)
- .type(MediaType.APPLICATION_JSON_TYPE);
+ .get(ApiResponse.class);
- ApiResponse apiResponse = builder.get(ApiResponse.class);
Collection users = new Collection(apiResponse);
//make sure that a valid response is returned without error
assertNotNull(users);
@@ -299,12 +302,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
//retrieve the credentials
Credentials orgCredentials = getOrgCredentials();
- ApiResponse apiResponse = this.app().getResource(false)
- .queryParam("grant_type", "client_credentials")
+ ApiResponse apiResponse = this.app().getTarget( false )
+ .queryParam( "grant_type", "client_credentials" )
.queryParam("client_id", orgCredentials.getClientId())
- .queryParam("client_secret", orgCredentials.getClientSecret())
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ .queryParam( "client_secret", orgCredentials.getClientSecret() )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
.get(ApiResponse.class);
// assert that the response returns the correct URI
@@ -317,12 +320,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertEquals(String.format("%s/%s", orgName, appName), application.get("name"));
//retrieve the application's roles collection
- apiResponse = this.app().collection("roles").getResource(false)
- .queryParam("grant_type", "client_credentials")
+ apiResponse = this.app().collection( "roles" ).getTarget( false )
+ .queryParam( "grant_type", "client_credentials" )
.queryParam("client_id", orgCredentials.getClientId())
- .queryParam("client_secret", orgCredentials.getClientSecret())
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ .queryParam( "client_secret", orgCredentials.getClientSecret() )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
.get(ApiResponse.class);
Collection roles = new Collection(apiResponse);
//assert that we have the correct number of default roles
@@ -372,11 +375,11 @@ public class ApplicationResourceIT extends AbstractRestIT {
String orgName = clientSetup.getOrganizationName().toLowerCase();
String appName = clientSetup.getAppName().toLowerCase();
- ApiResponse apiResponse = resource().path(String.format("/%s/%s", orgName, appName))
- .queryParam("access_token", this.getAdminToken().getAccessToken())
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .delete(ApiResponse.class);
+ ApiResponse apiResponse = target().path( String.format( "/%s/%s", orgName, appName ) )
+ .queryParam( "access_token", this.getAdminToken().getAccessToken() )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
+ .delete( ApiResponse.class );
assertNotNull(apiResponse.getError());
}
@@ -406,14 +409,14 @@ public class ApplicationResourceIT extends AbstractRestIT {
try {
//POST the updated TTL, anticipating an exception
- resource().path(String.format("/%s/%s/token", orgName, appName))
+ target().path(String.format("/%s/%s/token", orgName, appName))
+ .request()
.accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .post(ApiResponse.class, entity);
+ .post( javax.ws.rs.client.Entity.entity(entity, MediaType.APPLICATION_JSON_TYPE ), ApiResponse.class);
fail("This should cause an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
assertEquals(
- String.valueOf(Status.BAD_REQUEST.getStatusCode()),
+ String.valueOf( Response.Status.BAD_REQUEST.getStatusCode()),
String.valueOf(uie.getResponse().getStatus()));
}
}
@@ -440,13 +443,13 @@ public class ApplicationResourceIT extends AbstractRestIT {
refreshIndex();
//Retrieve an authentication token for the user, setting the TTL
- Token apiResponse = resource().path(String.format("/%s/%s/token", orgName, appName))
+ Token apiResponse = target().path( String.format( "/%s/%s/token", orgName, appName ) )
.queryParam("grant_type", "password")
.queryParam("username", username)
.queryParam("password", "password")
- .queryParam("ttl", String.valueOf(ttl))
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ .queryParam( "ttl", String.valueOf( ttl ) )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
.get(Token.class);
//Set a start time so we can calculate then the token should expire
@@ -477,8 +480,8 @@ public class ApplicationResourceIT extends AbstractRestIT {
this.app().collection("users").entity(entity).get(
new QueryParameters().addParam("access_token", token), false);
fail("The expired token should cause an exception");
- } catch (UniformInterfaceException uie) {
- assertEquals(Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
+ } catch (ResponseProcessingException uie) {
+ assertEquals( Response.Status.UNAUTHORIZED.getStatusCode(), uie.getResponse().getStatus());
}
}
@@ -506,20 +509,20 @@ public class ApplicationResourceIT extends AbstractRestIT {
try {
//Retrieve a token for the new user, setting the TTL to an invalid value
- resource().path(String.format("/%s/%s/token", orgName, appName))
- .queryParam("grant_type", "password")
+ target().path( String.format( "/%s/%s/token", orgName, appName ) )
+ .queryParam( "grant_type", "password" )
.queryParam("username", username)
.queryParam("password", "password")
.queryParam("ttl", "derp")
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .get(ApiResponse.class);
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
+ .get( ApiResponse.class );
fail("The invalid TTL should cause an exception");
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//TODO should this be handled and returned as a Status.BAD_REQUEST?
//Status.INTERNAL_SERVER_ERROR is thrown because Jersey throws a NumberFormatException
- assertEquals(Status.INTERNAL_SERVER_ERROR, uie.getResponse().getClientResponseStatus());
+ assertEquals( Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), uie.getResponse().getStatus());
}
}
@@ -543,12 +546,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertNotNull(entity);
refreshIndex();
//Retrieve an authentication token for the user
- Token tokenResponse = this.app().getResource(false).path("token")
- .queryParam("grant_type", "password")
- .queryParam("username", username)
+ Token tokenResponse = this.app().getTarget( false ).path( "token" )
+ .queryParam( "grant_type", "password" )
+ .queryParam( "username", username )
.queryParam("password", "password")
+ .request()
.accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE )
.get( Token.class );
String token = tokenResponse.getAccessToken();
@@ -559,19 +562,21 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertEquals(604800, expires_in);
//Set the default TTL of the application to a date far in the future
- this.app().getResource(false)
- .queryParam("access_token", token)
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .put(Token.class, new MapUtils.HashMapBuilder<String, String>().map("accesstokenttl", "31536000000"));
+ final MapUtils.HashMapBuilder<String, String> map =
+ new MapUtils.HashMapBuilder<String, String>().map( "accesstokenttl", "31536000000" );
+ this.app().getTarget( false )
+ .queryParam( "access_token", token )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
+ .put( javax.ws.rs.client.Entity.entity( map, MediaType.APPLICATION_JSON_TYPE ), Token.class );
//Create a new token for the user
- tokenResponse = this.app().token().getResource(false)
+ tokenResponse = this.app().token().getTarget( false )
.queryParam("grant_type", "password")
.queryParam("username", username)
- .queryParam("password", "password")
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ .queryParam( "password", "password" )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
.get(Token.class);
//assert that the new token has the new default TTL
@@ -587,15 +592,17 @@ public class ApplicationResourceIT extends AbstractRestIT {
public void authorizationCodeWithWrongCredentials() throws Exception {
//Create form input with bogus credentials
Form payload = new Form();
- payload.add("username", "wrong_user");
- payload.add("password", "wrong_password");
- payload.add("response_type", "code");
- payload.add("scope", "none");
- payload.add("redirect_uri", "http://www.my_test.com");
+ payload.param( "username", "wrong_user" );
+ payload.param( "password", "wrong_password" );
+ payload.param( "response_type", "code" );
+ payload.param( "scope", "none" );
+ payload.param( "redirect_uri", "http://www.my_test.com" );
//POST the form to the authorization endpoint
- String apiResponse = clientSetup.getRestClient().management().authorize().getResource()
- .type( MediaType.APPLICATION_FORM_URLENCODED_TYPE ).accept(MediaType.TEXT_HTML).post(String.class, payload);
+ String apiResponse = clientSetup.getRestClient().management().authorize().getTarget()
+ .request()
+ .accept( MediaType.TEXT_HTML )
+ .post( javax.ws.rs.client.Entity.form( payload ), String.class );
//Assert that an appropriate error message is returned
assertTrue(apiResponse.contains("Username or password do not match"));
@@ -609,11 +616,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
//we have authorize response only with username/password - client_id/secret not considered
public void authorizeWithInvalidClientIdRaisesError() throws Exception {
//GET the application authorization endpoint using bogus client credentials
- String apiResponse = clientSetup.getRestClient().management().authorize().getResource(true)
- .queryParam("response_type", "code")
+ String apiResponse = clientSetup.getRestClient().management().authorize().getTarget( true )
+ .queryParam( "response_type", "code" )
.queryParam("client_id", "invalid_client_id")
.queryParam("redirect_uri", "http://www.my_test.com")
- .accept(MediaType.TEXT_HTML)
+ .request()
+ .accept( MediaType.TEXT_HTML )
.get(String.class);
//Assert that an appropriate error message is returned
//assertTrue(apiResponse.contains("Unable to authenticate (OAuth). Invalid client_id."));
@@ -630,22 +638,25 @@ public class ApplicationResourceIT extends AbstractRestIT {
//Create form input with valid credentials
Form payload = new Form();
- payload.add("response_type", "code");
- payload.add("grant_type", "client_credentials");
- payload.add("client_id", orgCredentials.getClientId());
- payload.add("client_secret", orgCredentials.getClientSecret());
- payload.add("scope", "none");
- payload.add("redirect_uri", "http://www.my_test.com");
+ payload.param( "response_type", "code" );
+ payload.param( "grant_type", "client_credentials" );
+ payload.param( "client_id", orgCredentials.getClientId() );
+ payload.param( "client_secret", orgCredentials.getClientSecret() );
+ payload.param( "scope", "none" );
+ payload.param( "redirect_uri", "http://www.my_test.com" );
//Set the client to not follow the initial redirect returned by the stack
- client().setFollowRedirects(false);
try {
//POST the form to the authorization endpoint
clientSetup.getRestClient().management().authorize()
- .getResource().accept(MediaType.TEXT_HTML).post(String.class, payload);
- } catch (UniformInterfaceException uie) {
- assertEquals(String.valueOf(Status.TEMPORARY_REDIRECT.getStatusCode()), uie.getResponse().getStatus());
+ .getTarget()
+ .property( ClientProperties.FOLLOW_REDIRECTS, Boolean.TRUE )
+ .request()
+ .accept( MediaType.TEXT_HTML )
+ .post( javax.ws.rs.client.Entity.form( payload ), String.class );
+ } catch (ResponseProcessingException uie) {
+ assertEquals(String.valueOf( Response.Status.TEMPORARY_REDIRECT.getStatusCode()), uie.getResponse().getStatus());
}
}
@@ -667,12 +678,12 @@ public class ApplicationResourceIT extends AbstractRestIT {
Map<String, String> map = new HashMap<>(1);
map.put("grant_type", "client_credentials");
//GET the token endpoint, adding the basic auth header
- Token apiResponse = clientSetup.getRestClient().management().token().getResource(false)
+ Token apiResponse = clientSetup.getRestClient().management().token().getTarget( false )
//add the auth header
- .header("Authorization", "Basic " + token)
+ .request()
+ .header( "Authorization", "Basic " + token )
.accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .post(Token.class, map);
+ .post( javax.ws.rs.client.Entity.entity(map, MediaType.APPLICATION_JSON_TYPE), Token.class );
//Assert that a valid token with a valid TTL is returned
assertNotNull("A valid response was returned.", apiResponse);
@@ -697,12 +708,13 @@ public class ApplicationResourceIT extends AbstractRestIT {
.post(Token.class,new Token("client_credentials", clientId, clientSecret));
//GET the token endpoint, adding authorization header
- Token apiResponse = this.app().token().getResource(false)
+ Token apiResponse = this.app().token().getTarget( false )
//add the auth header
- .header("Authorization", "Bearer " + token.getAccessToken())
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .post(Token.class, hashMap("grant_type", "client_credentials"));
+ .request()
+ .header( "Authorization", "Bearer " + token.getAccessToken() )
+ .accept( MediaType.APPLICATION_JSON )
+ .post(javax.ws.rs.client.Entity.entity(
+ hashMap( "grant_type", "client_credentials" ), MediaType.APPLICATION_JSON_TYPE ), Token.class );
//Assert that a valid token with a valid TTL is returned
assertNotNull("A valid response was returned.", apiResponse);
@@ -723,15 +735,14 @@ public class ApplicationResourceIT extends AbstractRestIT {
//Create form input
Form payload = new Form();
- payload.add("grant_type", "client_credentials");
- payload.add("client_id", clientId);
- payload.add("client_secret", clientSecret);
+ payload.param( "grant_type", "client_credentials" );
+ payload.param( "client_id", clientId );
+ payload.param("client_secret", clientSecret);
//POST the form to the application token endpoint
- Token apiResponse = this.app().token().getResource(false)
+ Token apiResponse = this.app().token().getTarget( false).request()
.accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_FORM_URLENCODED_TYPE)
- .post(Token.class, payload);
+ .post( javax.ws.rs.client.Entity.form(payload), Token.class);
//Assert that a valid token with a valid TTL is returned
assertNotNull("It has access_token.", apiResponse.getAccessToken());
@@ -754,11 +765,11 @@ public class ApplicationResourceIT extends AbstractRestIT {
String token = Base64.encodeToString(clientCredentials.getBytes());
//POST the form to the application token endpoint along with the payload
- Token apiResponse = this.app().token().getResource(false)
- .header("Authorization", "Basic " + token)
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .post(Token.class, hashMap("grant_type", "client_credentials"));
+ Token apiResponse = this.app().token().getTarget( false ).request()
+ .header( "Authorization", "Basic " + token )
+ .accept( MediaType.APPLICATION_JSON )
+ .post(javax.ws.rs.client.Entity.entity(
+ hashMap("grant_type", "client_credentials"), MediaType.APPLICATION_JSON_TYPE), Token.class);
//Assert that a valid token with a valid TTL is returned
assertNotNull("It has access_token.", apiResponse.getAccessToken());
@@ -775,18 +786,18 @@ public class ApplicationResourceIT extends AbstractRestIT {
try {
//GET the APM endpoint
- String response = resource().path(String.format("/%s/%s/apm/apigeeMobileConfig", orgName, appName))
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
+ String response = target().path( String.format( "/%s/%s/apm/apigeeMobileConfig", orgName, appName ) )
+ .request()
+ .accept( MediaType.APPLICATION_JSON )
.get(String.class);
//Parse the response
JsonNode node = mapper.readTree(response);
//if things are kosher then JSON should have value for instaOpsApplicationId
assertTrue("it's valid json for APM", node.has("instaOpsApplicationId"));
- } catch (UniformInterfaceException uie) {
+ } catch (ResponseProcessingException uie) {
//Validate that APM config exists
- assertNotEquals("APM Config API exists", Status.NOT_FOUND,
+ assertNotEquals("APM Config API exists", Response.Status.NOT_FOUND,
uie.getResponse().getStatus()); //i.e It should not be "Not Found"
}
}
@@ -813,7 +824,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertEquals(604800, ttl);
//retrieve the users collection for the application using the new token
- ApiResponse response = this.app().collection("users").getResource(true, token).get(ApiResponse.class);
+ ApiResponse response = this.app().collection("users").getTarget(true, token ).request().get(ApiResponse.class);
//assert that we did not receive an error
assertNull(response.getError());
}
@@ -840,7 +851,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertEquals(604800, ttl);
//retrieve the users collection for the application using the new token
- ApiResponse response = this.app().collection("users").getResource(true, token).get(ApiResponse.class);
+ ApiResponse response = this.app().collection("users").getTarget( true, token ).request().get( ApiResponse.class);
//assert that we did not receive an error
assertNull(response.getError());
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
index 79a6957..92705b2 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
@@ -17,19 +17,16 @@
package org.apache.usergrid.rest.applications.assets;
-import com.sun.jersey.multipart.FormDataMultiPart;
+import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.io.IOUtils;
-
-import org.apache.usergrid.rest.applications.ServiceResource;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.services.assets.data.AssetUtils;
-
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,8 +38,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import net.jcip.annotations.NotThreadSafe;
-
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USERGRID_BINARY_UPLOADER;
import static org.apache.usergrid.utils.MapUtils.hashMap;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
index 9cf719b..72d45de 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
@@ -17,51 +17,30 @@
package org.apache.usergrid.rest.applications.assets;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.blobstore.BlobStoreContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-
+import com.amazonaws.SDKGlobalConfiguration;
+import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.io.IOUtils;
-
-import org.apache.usergrid.cassandra.SpringResource;
-import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.rest.applications.assets.aws.NoAWSCredsRule;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.services.assets.data.AssetUtils;
-import org.apache.usergrid.services.assets.data.BinaryStore;
import org.apache.usergrid.services.exceptions.AwsPropertiesNotFoundException;
-import org.apache.usergrid.setup.ConcurrentProcessSingleton;
-
-import com.amazonaws.SDKGlobalConfiguration;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.multipart.FormDataMultiPart;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+import org.junit.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import net.jcip.annotations.NotThreadSafe;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USERGRID_BINARY_UPLOADER;
import static org.apache.usergrid.utils.MapUtils.hashMap;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@NotThreadSafe
@@ -116,7 +95,7 @@ public class AwsAssetResourceIT extends AbstractRestIT {
}catch ( AwsPropertiesNotFoundException e ){
fail("Shouldn't interrupt runtime if access key isnt found.");
}
- catch( UniformInterfaceException uie){
+ catch( ResponseProcessingException uie){
assertEquals(500,uie.getResponse().getStatus());
}
finally{
@@ -150,7 +129,7 @@ public class AwsAssetResourceIT extends AbstractRestIT {
}catch ( AwsPropertiesNotFoundException e ){
fail("Shouldn't interrupt runtime if access key isnt found.");
}
- catch( UniformInterfaceException uie){
+ catch( ResponseProcessingException uie){
assertEquals( 500, uie.getResponse().getStatus() );
}
finally{
@@ -192,7 +171,7 @@ public class AwsAssetResourceIT extends AbstractRestIT {
}catch ( AwsPropertiesNotFoundException e ){
fail("Shouldn't interrupt runtime if access key isnt found.");
}
- catch( UniformInterfaceException uie){
+ catch( ResponseProcessingException uie){
assertEquals( 500, uie.getResponse().getStatus() );
}
finally{
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/aws/NoAWSCredsRule.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/aws/NoAWSCredsRule.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/aws/NoAWSCredsRule.java
index 5f7779e..1dd00ff 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/aws/NoAWSCredsRule.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/aws/NoAWSCredsRule.java
@@ -20,9 +20,10 @@
package org.apache.usergrid.rest.applications.assets.aws;
-import java.util.Map;
-import java.util.Properties;
-
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.SDKGlobalConfiguration;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.services.exceptions.AwsPropertiesNotFoundException;
import org.junit.Assume;
import org.junit.internal.runners.model.MultipleFailureException;
import org.junit.rules.TestRule;
@@ -30,12 +31,8 @@ import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.springframework.beans.factory.annotation.Autowired;
-import org.apache.usergrid.services.exceptions.AwsPropertiesNotFoundException;
-import org.apache.usergrid.rest.test.resource.AbstractRestIT;
-
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.SDKGlobalConfiguration;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.Map;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/usergrid/blob/0578d987/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index 3dadc5b..b2bab35 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -17,24 +17,20 @@
package org.apache.usergrid.rest.applications.collection;
-import java.io.IOException;
import com.fasterxml.jackson.databind.JsonNode;
-import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.rest.test.resource.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.apache.usergrid.rest.test.resource.model.Collection;
-
-import org.apache.usergrid.rest.test.resource.model.Credentials;
import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.rest.test.resource.model.Token;
-
import org.junit.Ignore;
import org.junit.Test;
-import org.mortbay.jetty.security.Credential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.client.ResponseProcessingException;
+import java.io.IOException;
+
import static org.junit.Assert.*;
@@ -66,9 +62,9 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").get();
fail("Call to bad path exists, but it should not");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
}
@@ -79,9 +75,9 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").post(payload);
fail("Call to bad path exists, but it should not");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
}
@@ -89,9 +85,9 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").entity(entity).put(payload);
fail("Call to bad path exists, but it should not");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
}
@@ -99,9 +95,9 @@ public class CollectionsResourceIT extends AbstractRestIT {
try {
this.clientSetup.getRestClient().org(org).app(app).collection("cities").entity(entity).delete();
fail("Call to bad path exists, but it should not");
- } catch (UniformInterfaceException e) {
+ } catch (ResponseProcessingException e) {
//verify the correct error was returned
- JsonNode node = mapper.readTree( e.getResponse().getEntity( String.class ));
+ JsonNode node = mapper.readTree( e.getResponse().readEntity( String.class ));
assertEquals( "organization_application_not_found", node.get( "error" ).textValue() );
}