Client side error handling fixes get two more tests passing.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e070ad55 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e070ad55 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e070ad55 Branch: refs/heads/two-dot-o-dev Commit: e070ad55fe2ca5e5fa9dca95029b501a4389c043 Parents: eb2aa6f Author: Dave Johnson <[email protected]> Authored: Thu Sep 3 17:11:13 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Sep 3 17:11:13 2015 -0400 ---------------------------------------------------------------------- .../rest/management/OrganizationsIT.java | 28 +++++++++------ .../resource/endpoints/mgmt/OrgResource.java | 36 ++++++++------------ 2 files changed, 31 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e070ad55/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 64ad8b0..72a2f8c 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 @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.usergrid.java.client.exception.ClientException; import org.apache.usergrid.rest.test.resource.model.*; import org.junit.Ignore; import org.junit.Test; @@ -100,25 +101,27 @@ public class OrganizationsIT extends AbstractRestIT { @Test public void testCreateDuplicateOrgName() throws Exception { - //Create organization + // Create organization Organization organization = createOrgPayload( "testCreateDuplicateOrgName", null ); - Organization orgCreatedResponse = clientSetup.getRestClient().management().orgs().post( organization ); this.refreshIndex(); assertNotNull( orgCreatedResponse ); - //Ensure that the token from the newly created organization works. + // Ensure that the token from the newly created organization works. Token tokenPayload = new Token( "password", organization.getUsername(), organization.getPassword() ); - Token tokenReturned = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null ); + Token tokenReturned = clientSetup.getRestClient().management().token() + .post( false, Token.class, tokenPayload, null ); this.management().token().setToken(tokenReturned); assertNotNull( tokenReturned ); - //Try to create a organization with the same name as an organization that already exists, ensure that it fails - Organization orgTestDuplicatePayload = - new Organization( organization.getOrganization(), organization.getUsername() + "test", - organization.getEmail() + "test", organization.getName() + "test", - organization.getPassword(), null ); + // Try to create a organization with the same name as an organization that already exists, ensure that it fails + Organization orgTestDuplicatePayload = new Organization( + organization.getOrganization(), + organization.getUsername() + "test", + organization.getEmail() + "test", + organization.getName() + "test", + organization.getPassword(), null ); try { clientSetup.getRestClient().management().orgs().post( orgTestDuplicatePayload ); fail("Should not have been able to create duplicate organization"); @@ -164,7 +167,8 @@ public class OrganizationsIT extends AbstractRestIT { //get token from organization that was created to verify it exists. Token tokenPayload = new Token( "password", organization.getUsername(), organization.getPassword() ); - Token tokenReturned = clientSetup.getRestClient().management().token().post(Token.class, tokenPayload ); + Token tokenReturned = clientSetup.getRestClient().management().token() + .post( Token.class, tokenPayload ); assertNotNull( tokenReturned ); @@ -184,7 +188,9 @@ public class OrganizationsIT extends AbstractRestIT { } //try to get the token from the organization that failed to be created to verify it was not made. - tokenPayload = new Token( "password", organization.getUsername()+"test", organization.getPassword()+"test" ); + tokenPayload = new Token( "password", + organization.getUsername()+"test", + organization.getPassword()+"test" ); Token tokenError = null; try { tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/e070ad55/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 0569ac2..4d7b2f9 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 @@ -18,6 +18,7 @@ package org.apache.usergrid.rest.test.resource.endpoints.mgmt; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.usergrid.java.client.exception.ClientException; 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; @@ -35,6 +36,7 @@ import javax.ws.rs.ClientErrorException; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Form; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.io.IOException; import java.io.StringReader; @@ -102,36 +104,26 @@ public class OrgResource extends NamedResource { public Organization post(Organization organization){ - // use string type so we can log actual response from server - 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 )); - } + ApiResponse apiResponse = getTarget( false ).request() + .accept( MediaType.APPLICATION_JSON ) + .post( Entity.json( organization ), ApiResponse.class ); - ObjectMapper mapper = new ObjectMapper(); - ApiResponse response; - try { - response = mapper.readValue( new StringReader(responseString), ApiResponse.class); - } catch (IOException e) { - throw new RuntimeException("Error parsing response", e); - } - Organization org = new Organization(response); - org.setOwner( response ); + Organization org = new Organization(apiResponse); + org.setOwner( apiResponse ); return org; } - public Organization post(Organization organization, Token token){ - ApiResponse response = getTarget( true, token ).request() + + public Organization post(Organization organization, Token token) { + + ApiResponse apiResponse = getTarget( true, token ).request() .accept( MediaType.APPLICATION_JSON ) .post( Entity.json( organization ), ApiResponse.class ); - Organization org = new Organization(response); - org.setOwner( response ); + + Organization org = new Organization(apiResponse); + org.setOwner( apiResponse ); return org; }
