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("%[email protected]", newUserUuid), "sesame").chainPut("pin", "1234"); + (User) new User(userName, "Ed Anuff", String.format("%[email protected]", 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() ); } }
