From 1a80d1c8632b5654d80832462a32161ce87fc0d8 Mon Sep 17 00:00:00 2001 From: remillet Date: Tue, 11 Aug 2015 10:08:38 -0700 Subject: [PATCH] CSPACE-6770: All tests for CollectionObject passing. --- .../test/CitationAuthorityServiceTest.java | 9 ++- .../services/client/AuthorityClient.java | 36 +++++------ .../services/client/AuthorityClientImpl.java | 38 ++++++------ .../services/client/AuthorityProxy.java | 26 ++++---- .../services/client/CollectionSpaceProxy.java | 2 +- .../test/AbstractAuthorityServiceTest.java | 62 ++++++++++--------- .../client/test/AbstractServiceTestImpl.java | 18 +++--- .../test/CollectionObjectAuthRefsTest.java | 4 +- .../test/ConceptAuthorityServiceTest.java | 9 ++- .../client/AuthorityWithContactsClient.java | 40 ++++++------ .../AuthorityWithContactsClientImpl.java | 40 ++++++------ .../client/AuthorityWithContactsProxy.java | 40 ++++++------ .../client/test/PersonAuthRefDocsTest.java | 16 +++-- .../test/LocationAuthorityServiceTest.java | 4 +- .../client/OrgAuthorityClientUtils.java | 11 ++-- .../client/test/OrgAuthorityAuthRefsTest.java | 5 +- .../client/test/OrgAuthorityServiceTest.java | 35 +++++------ .../client/PersonAuthorityClientUtils.java | 4 +- .../test/PersonAuthoritySearchTest.java | 6 +- .../test/PersonAuthorityServicePerfTest.java | 6 +- .../test/PersonAuthorityServiceTest.java | 48 +++++++------- .../test/PlaceAuthorityServiceTest.java | 4 +- .../test/TaxonomyAuthorityServiceTest.java | 4 +- .../client/test/WorkAuthorityServiceTest.java | 4 +- 24 files changed, 233 insertions(+), 238 deletions(-) diff --git a/services/citation/client/src/test/java/org/collectionspace/services/client/test/CitationAuthorityServiceTest.java b/services/citation/client/src/test/java/org/collectionspace/services/client/test/CitationAuthorityServiceTest.java index 98f99d3f2..827e74ab2 100644 --- a/services/citation/client/src/test/java/org/collectionspace/services/client/test/CitationAuthorityServiceTest.java +++ b/services/citation/client/src/test/java/org/collectionspace/services/client/test/CitationAuthorityServiceTest.java @@ -23,6 +23,9 @@ package org.collectionspace.services.client.test; import java.util.List; import java.util.Map; + +import javax.ws.rs.core.Response; + import org.collectionspace.services.CitationJAXBSchema; import org.collectionspace.services.citation.CitationTermGroup; import org.collectionspace.services.citation.CitationTermGroupList; @@ -168,7 +171,7 @@ public class CitationAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (shortId != null) { @@ -179,9 +182,9 @@ public class CitationAuthorityServiceTest extends AbstractAuthorityServiceTest items = list.getListItem(); diff --git a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java index 85596a5ce..f492bdd9c 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClient.java @@ -37,16 +37,16 @@ public interface AuthorityClient Response readItem(String vcsid, String csid); //(R)ead Item - ClientResponse readItem(String vcsid, String csid, Boolean includeDeleted); + Response readItem(String vcsid, String csid, Boolean includeDeleted); //(U)pdate Item - ClientResponse updateItem(String vcsid, String csid, PoxPayloadOut poxPayloadOut); + Response updateItem(String vcsid, String csid, PoxPayloadOut poxPayloadOut); //(D)elete Item Response deleteItem(String vcsid, String csid); // Get a list of objects that - ClientResponse getReferencingObjects( + Response getReferencingObjects( String parentcsid, String itemcsid); /** @@ -58,15 +58,15 @@ public interface AuthorityClient * @return * @see org.collectionspace.services.client.IntakeProxy#getAuthorityRefs(java.lang.String) */ - public ClientResponse getItemAuthorityRefs(String parentcsid, String itemcsid); + public Response getItemAuthorityRefs(String parentcsid, String itemcsid); /* * */ - ClientResponse readByName(String name); + Response readByName(String name); - ClientResponse readByName(String name, Boolean includeDeleted); + Response readByName(String name, Boolean includeDeleted); /* * Item subresource methods @@ -79,9 +79,9 @@ public interface AuthorityClient * @param shortId the shortIdentifier * @return the client response */ - public ClientResponse readNamedItem(String vcsid, String shortId); + public Response readNamedItem(String vcsid, String shortId); - public ClientResponse readNamedItem(String vcsid, String shortId, Boolean includeDeleted); + public Response readNamedItem(String vcsid, String shortId, Boolean includeDeleted); /** * Read item in Named Authority. @@ -90,9 +90,9 @@ public interface AuthorityClient * @param csid the csid * @return the client response */ - public ClientResponse readItemInNamedAuthority(String authShortId, String csid); + public Response readItemInNamedAuthority(String authShortId, String csid); - public ClientResponse readItemInNamedAuthority(String authShortId, String csid, Boolean includeDeleted); + public Response readItemInNamedAuthority(String authShortId, String csid, Boolean includeDeleted); /** * Read named item in Named Authority. @@ -101,9 +101,9 @@ public interface AuthorityClient * @param itemShortId the shortIdentifier for the item * @return the client response */ - public ClientResponse readNamedItemInNamedAuthority(String authShortId, String itemShortId); + public Response readNamedItemInNamedAuthority(String authShortId, String itemShortId); - public ClientResponse readNamedItemInNamedAuthority(String authShortId, String itemShortId, Boolean includeDeleted); + public Response readNamedItemInNamedAuthority(String authShortId, String itemShortId, Boolean includeDeleted); /** * Read item list, filtering by partial term match, or keywords. Only one of @@ -117,9 +117,9 @@ public interface AuthorityClient * which will filter list results to return only matched resources. * @return the client response */ - public ClientResponse readItemList(String inAuthority, String partialTerm, String keywords); + public Response readItemList(String inAuthority, String partialTerm, String keywords); - public ClientResponse readItemList(String inAuthority, String partialTerm, String keywords, Boolean includeDeleted); + public Response readItemList(String inAuthority, String partialTerm, String keywords, Boolean includeDeleted); /** * Read item list for named vocabulary, filtering by partial term match, or keywords. Only one of @@ -133,10 +133,10 @@ public interface AuthorityClient * which will filter list results to return only matched resources. * @return the client response */ - public ClientResponse readItemListForNamedAuthority(String specifier, + public Response readItemListForNamedAuthority(String specifier, String partialTerm, String keywords); - public ClientResponse readItemListForNamedAuthority(String specifier, + public Response readItemListForNamedAuthority(String specifier, String partialTerm, String keywords, Boolean includeDeleted); @@ -145,7 +145,7 @@ public interface AuthorityClient * Workflow related methods */ - public ClientResponse readItemWorkflow(String vcsid, String csid); + public Response readItemWorkflow(String vcsid, String csid); - public ClientResponse updateItemWorkflowWithTransition(String vcsid, String csid, String workflowTransition); + public Response updateItemWorkflowWithTransition(String vcsid, String csid, String workflowTransition); } diff --git a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java index d8e1d3de7..2024c7110 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AuthorityClientImpl.java @@ -32,13 +32,13 @@ public abstract class AuthorityClientImpl readItem(String vcsid, String csid, Boolean includeDeleted) { + public Response readItem(String vcsid, String csid, Boolean includeDeleted) { return getProxy().readItem(vcsid, csid, includeDeleted.toString()); } //(U)pdate Item @Override - public ClientResponse updateItem(String vcsid, String csid, PoxPayloadOut poxPayloadOut) { + public Response updateItem(String vcsid, String csid, PoxPayloadOut poxPayloadOut) { return getProxy().updateItem(vcsid, csid, poxPayloadOut.getBytes()); } @@ -49,7 +49,7 @@ public abstract class AuthorityClientImpl getReferencingObjects( + public Response getReferencingObjects( // ClientResponse String parentcsid, String itemcsid) { return getProxy().getReferencingObjects(parentcsid, itemcsid, Boolean.TRUE.toString()); @@ -63,7 +63,7 @@ public abstract class AuthorityClientImpl getItemAuthorityRefs(String parentcsid, String csid) { + public Response getItemAuthorityRefs(String parentcsid, String csid) { return getProxy().getItemAuthorityRefs(parentcsid, csid); } @@ -72,12 +72,12 @@ public abstract class AuthorityClientImpl readByName(String name) { + public Response readByName(String name) { return getProxy().readByName(name, INCLUDE_DELETE_TRUE); } @Override - public ClientResponse readByName(String name, Boolean includeDeleted) { + public Response readByName(String name, Boolean includeDeleted) { return getProxy().readByName(name, includeDeleted.toString()); } @@ -93,12 +93,12 @@ public abstract class AuthorityClientImpl readNamedItem(String vcsid, String shortId) { + public Response readNamedItem(String vcsid, String shortId) { return getProxy().readNamedItem(vcsid, shortId, INCLUDE_DELETE_TRUE); } @Override - public ClientResponse readNamedItem(String vcsid, String shortId, Boolean includeDeleted) { + public Response readNamedItem(String vcsid, String shortId, Boolean includeDeleted) { return getProxy().readNamedItem(vcsid, shortId, includeDeleted.toString()); } @@ -110,12 +110,12 @@ public abstract class AuthorityClientImpl readItemInNamedAuthority(String authShortId, String csid) { + public Response readItemInNamedAuthority(String authShortId, String csid) { return getProxy().readItemInNamedAuthority(authShortId, csid, INCLUDE_DELETE_TRUE); } @Override - public ClientResponse readItemInNamedAuthority(String authShortId, String csid, Boolean includeDeleted) { + public Response readItemInNamedAuthority(String authShortId, String csid, Boolean includeDeleted) { return getProxy().readItemInNamedAuthority(authShortId, csid, includeDeleted.toString()); } @@ -127,12 +127,12 @@ public abstract class AuthorityClientImpl readNamedItemInNamedAuthority(String authShortId, String itemShortId) { + public Response readNamedItemInNamedAuthority(String authShortId, String itemShortId) { return getProxy().readNamedItemInNamedAuthority(authShortId, itemShortId, INCLUDE_DELETE_TRUE); } @Override - public ClientResponse readNamedItemInNamedAuthority(String authShortId, String itemShortId, Boolean includeDeleted) { + public Response readNamedItemInNamedAuthority(String authShortId, String itemShortId, Boolean includeDeleted) { return getProxy().readNamedItemInNamedAuthority(authShortId, itemShortId, includeDeleted.toString()); } @@ -149,14 +149,12 @@ public abstract class AuthorityClientImpl - readItemList(String inAuthority, String partialTerm, String keywords) { + public Response readItemList(String inAuthority, String partialTerm, String keywords) { return getProxy().readItemList(inAuthority, partialTerm, keywords, INCLUDE_DELETE_TRUE); } @Override - public ClientResponse - readItemList(String inAuthority, String partialTerm, String keywords, Boolean includeDeleted) { + public Response readItemList(String inAuthority, String partialTerm, String keywords, Boolean includeDeleted) { return getProxy().readItemList(inAuthority, partialTerm, keywords, includeDeleted.toString()); } @@ -174,13 +172,13 @@ public abstract class AuthorityClientImpl readItemListForNamedAuthority( + public Response readItemListForNamedAuthority( String specifier, String partialTerm, String keywords) { return getProxy().readItemListForNamedAuthority(specifier, partialTerm, keywords, INCLUDE_DELETE_TRUE); } @Override - public ClientResponse readItemListForNamedAuthority( + public Response readItemListForNamedAuthority( String specifier, String partialTerm, String keywords, @@ -193,12 +191,12 @@ public abstract class AuthorityClientImpl readItemWorkflow(String vcsid, String csid) { + public Response readItemWorkflow(String vcsid, String csid) { return getProxy().readItemWorkflow(vcsid, csid); } @Override - public ClientResponse updateItemWorkflowWithTransition(String vcsid, String csid, String workflowTransition) { + public Response updateItemWorkflowWithTransition(String vcsid, String csid, String workflowTransition) { return getProxy().updateItemWorkflowWithTransition(vcsid, csid, workflowTransition); } diff --git a/services/client/src/main/java/org/collectionspace/services/client/AuthorityProxy.java b/services/client/src/main/java/org/collectionspace/services/client/AuthorityProxy.java index 0d9ccdf12..f541478d2 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/AuthorityProxy.java +++ b/services/client/src/main/java/org/collectionspace/services/client/AuthorityProxy.java @@ -30,19 +30,19 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { //(C)reate Item @POST @Path("/{vcsid}/items/") - ClientResponse createItem(@PathParam("vcsid") String vcsid, byte[] xmlPayload); + Response createItem(@PathParam("vcsid") String vcsid, byte[] xmlPayload); //(R)ead Item @GET @Path("/{vcsid}/items/{csid}") - ClientResponse readItem(@PathParam("vcsid") String vcsid, + Response readItem(@PathParam("vcsid") String vcsid, @PathParam("csid") String csid, @QueryParam(WorkflowClient.WORKFLOWSTATE_QUERY) String workflowState); //(U)pdate Item @PUT @Path("/{vcsid}/items/{csid}") - ClientResponse updateItem(@PathParam("vcsid") String vcsid, @PathParam("csid") String csid, byte[] xmlPayload); + Response updateItem(@PathParam("vcsid") String vcsid, @PathParam("csid") String csid, byte[] xmlPayload); //(D)elete Item @DELETE @@ -61,7 +61,7 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { @GET @Path("{csid}/items/{itemcsid}/refObjs") @Produces("application/xml") - ClientResponse getReferencingObjects( + Response getReferencingObjects( // ClientResponse @PathParam("csid") String parentcsid, @PathParam("itemcsid") String itemcsid, @QueryParam(WorkflowClient.WORKFLOWSTATE_QUERY) String workflowState); @@ -70,7 +70,7 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { @GET @Produces({"application/xml"}) @Path("/{parentcsid}/items/{itemcsid}/authorityrefs/") - public ClientResponse getItemAuthorityRefs( + public Response getItemAuthorityRefs( // public ClientResponse @PathParam("parentcsid") String parentcsid, @PathParam("itemcsid") String itemcsid); @@ -81,7 +81,7 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { //(R)ead by name @GET @Path("/urn:cspace:name({name})") - ClientResponse readByName(@PathParam("name") String name, + Response readByName(@PathParam("name") String name, @QueryParam(WorkflowClient.WORKFLOWSTATE_QUERY) String workflowState); /* @@ -91,21 +91,21 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { //(R)ead Named Item @GET @Path("/{vcsid}/items/urn:cspace:name({specifier})") - ClientResponse readNamedItem(@PathParam("vcsid") String vcsid, + Response readNamedItem(@PathParam("vcsid") String vcsid, @PathParam("specifier") String specifier, @QueryParam(WorkflowClient.WORKFLOWSTATE_QUERY) String workflowState); //(R)ead Item In Named Authority @GET @Path("/urn:cspace:name({specifier})/items/{csid}") - ClientResponse readItemInNamedAuthority(@PathParam("specifier") String specifier, + Response readItemInNamedAuthority(@PathParam("specifier") String specifier, @PathParam("csid") String csid, @QueryParam(WorkflowClient.WORKFLOWSTATE_QUERY) String workflowState); //(R)ead Named Item In Named Authority @GET @Path("/urn:cspace:name({specifier})/items/urn:cspace:name({itemspecifier})") - ClientResponse readNamedItemInNamedAuthority(@PathParam("specifier") String specifier, + Response readNamedItemInNamedAuthority(@PathParam("specifier") String specifier, @PathParam("itemspecifier") String itemspecifier, @QueryParam(WorkflowClient.WORKFLOWSTATE_QUERY) String workflowState); @@ -117,7 +117,7 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { @GET @Produces({"application/xml"}) @Path("/{csid}/items/") - ClientResponse readItemList( + Response readItemList( @PathParam("csid") String vcsid, @QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm, @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords, @@ -127,7 +127,7 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { @GET @Produces({"application/xml"}) @Path("/urn:cspace:name({specifier})/items/") - ClientResponse readItemListForNamedAuthority( + Response readItemListForNamedAuthority( // ClientResponse @PathParam("specifier") String specifier, @QueryParam (IQueryManager.SEARCH_TYPE_PARTIALTERM) String partialTerm, @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords, @@ -143,13 +143,13 @@ public interface AuthorityProxy extends CollectionSpaceCommonListPoxProxy { @Produces({"application/xml"}) @Consumes({"application/xml"}) @Path("/{vcsid}/items/{csid}" + WorkflowClient.SERVICE_PATH) - ClientResponse readItemWorkflow(@PathParam("vcsid") String vcsid, + Response readItemWorkflow(@PathParam("vcsid") String vcsid, @PathParam("csid") String csid); //(U)pdate Item workflow @PUT @Path("/{vcsid}/items/{csid}" + WorkflowClient.SERVICE_PATH + "/{transition}") - ClientResponse updateItemWorkflowWithTransition( + Response updateItemWorkflowWithTransition( @PathParam("vcsid") String vcsid, @PathParam("csid") String csid, @PathParam("transition") String transition); diff --git a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceProxy.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceProxy.java index 6fa4eebd9..e3d48c2f0 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceProxy.java +++ b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceProxy.java @@ -56,7 +56,7 @@ public interface CollectionSpaceProxy { @GET @Produces({"application/xml"}) @Path("/{csid}/authorityrefs/") - ClientResponse getAuthorityRefs(@PathParam("csid") String csid); + Response getAuthorityRefs(@PathParam("csid") String csid); //ClientResponse @GET @Produces({"application/xml"}) diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java index 7bd15d44c..a47dca1dc 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractAuthorityServiceTest.java @@ -228,8 +228,9 @@ public abstract class AbstractAuthorityServiceTest client = (AuthorityClientImpl)this.getClientInstance(); - ClientResponse res = client.readByName(getKnowResourceIdentifier()); + AuthorityClientImpl client = + (AuthorityClientImpl)this.getClientInstance(); + Response res = client.readByName(getKnowResourceIdentifier()); try { int statusCode = res.getStatus(); @@ -362,7 +363,7 @@ public abstract class AbstractAuthorityServiceTest client = (AuthorityClientImpl)this.getClientInstance(); - ClientResponse res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (shortId != null) { @@ -370,29 +371,33 @@ public abstract class AbstractAuthorityServiceTest client = (AuthorityClientImpl)this.getClientInstance(); PoxPayloadOut multipart = createNonExistenceItemInstance(client.getItemCommonPartName(), NON_EXISTENT_ID); - ClientResponse res = - client.updateItem(knownResourceId, NON_EXISTENT_ID, multipart); + Response res = client.updateItem(knownResourceId, NON_EXISTENT_ID, multipart); try { int statusCode = res.getStatus(); @@ -545,7 +549,7 @@ public abstract class AbstractAuthorityServiceTest res = client.readItemList(parentCsid, + Response res = client.readItemList(parentCsid, null, /* partial terms */ null, /* keywords */ includeDeleted); try { assertStatusCode(res, testName); - AbstractCommonList list = res.getEntity(); + AbstractCommonList list = res.readEntity(AbstractCommonList.class); result = list.getTotalItems(); } finally { if (res != null) { @@ -1146,7 +1146,7 @@ public abstract class AbstractServiceTestImpl res = client.readItem(parentCsid, csid, Boolean.FALSE); + Response res = client.readItem(parentCsid, csid, Boolean.FALSE); try { int result = res.getStatus(); Assert.assertEquals(result, STATUS_NOT_FOUND); @@ -1167,18 +1167,18 @@ public abstract class AbstractServiceTestImpl res = client.readItemWorkflow(parentCsid, itemCsid); + Response res = client.readItemWorkflow(parentCsid, itemCsid); WorkflowCommon workflowCommons = null; try { assertStatusCode(res, testName); logger.debug("Got object to update life cycle state with ID: " + itemCsid); - PoxPayloadIn input = new PoxPayloadIn(res.getEntity()); + PoxPayloadIn input = new PoxPayloadIn(res.readEntity(String.class)); workflowCommons = (WorkflowCommon) extractPart(input, WorkflowClient.SERVICE_COMMONPART_NAME, WorkflowCommon.class); Assert.assertNotNull(workflowCommons); logger.debug("Current workflow state:" + objectAsXmlString(workflowCommons, WorkflowCommon.class)); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } // @@ -1199,7 +1199,7 @@ public abstract class AbstractServiceTestImpl res = null; + Response res = null; if(vcsid!= null) { res = client.readItemList(vcsid, null, null); } else if(shortId!= null) { @@ -183,9 +186,9 @@ public class ConceptAuthorityServiceTest extends AbstractAuthorityServiceTest items = list.getListItem(); diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java index c927d5dba..55b87c584 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClient.java @@ -20,7 +20,7 @@ public interface AuthorityWithContactsClient createContact(String parentcsid, + public Response createContact(String parentcsid, String itemcsid, PoxPayloadOut xmlPayload); /** @@ -31,7 +31,7 @@ public interface AuthorityWithContactsClient createContactForNamedItem( + public Response createContactForNamedItem( String parentcsid, String itemspecifier, PoxPayloadOut xmlPayload); @@ -44,7 +44,7 @@ public interface AuthorityWithContactsClient createContactForItemInNamedAuthority( + public Response createContactForItemInNamedAuthority( String parentspecifier, String itemcsid, PoxPayloadOut xmlPayload); @@ -57,7 +57,7 @@ public interface AuthorityWithContactsClient createContactForNamedItemInNamedAuthority( + public Response createContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, PoxPayloadOut xmlPayload); @@ -70,7 +70,7 @@ public interface AuthorityWithContactsClient readContact(String parentcsid, + public Response readContact(String parentcsid, String itemcsid, String csid); /** @@ -81,7 +81,7 @@ public interface AuthorityWithContactsClient readContactForNamedItem( + public Response readContactForNamedItem( String parentcsid, String itemspecifier, String csid); @@ -94,7 +94,7 @@ public interface AuthorityWithContactsClient readContactInNamedAuthority( + public Response readContactInNamedAuthority( String parentspecifier, String itemcsid, String csid); @@ -107,7 +107,7 @@ public interface AuthorityWithContactsClient readContactForNamedItemInNamedAuthority( + public Response readContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, String csid); @@ -120,7 +120,7 @@ public interface AuthorityWithContactsClient readContactList(String parentcsid, + public Response readContactList(String parentcsid, String itemcsid); /** @@ -130,7 +130,7 @@ public interface AuthorityWithContactsClient readContactListForNamedItem( + public Response readContactListForNamedItem( String parentcsid, String itemspecifier); @@ -141,7 +141,7 @@ public interface AuthorityWithContactsClient readContactListForItemInNamedAuthority( + public Response readContactListForItemInNamedAuthority( String parentspecifier, String itemcsid); @@ -152,7 +152,7 @@ public interface AuthorityWithContactsClient readContactListForNamedItemInNamedAuthority( + public Response readContactListForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier); @@ -165,7 +165,7 @@ public interface AuthorityWithContactsClient updateContact(String parentcsid, + public Response updateContact(String parentcsid, String itemcsid, String csid, PoxPayloadOut xmlPayload); /** @@ -177,7 +177,7 @@ public interface AuthorityWithContactsClient updateContactForNamedItem( + public Response updateContactForNamedItem( String parentcsid, String itemspecifier, String csid, @@ -192,7 +192,7 @@ public interface AuthorityWithContactsClient updateContactInNamedAuthority( + public Response updateContactInNamedAuthority( String parentspecifier, String itemcsid, String csid, @@ -207,7 +207,7 @@ public interface AuthorityWithContactsClient updateContactForNamedItemInNamedAuthority( + public Response updateContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, String csid, @@ -221,7 +221,7 @@ public interface AuthorityWithContactsClient deleteContact(String parentcsid, + public Response deleteContact(String parentcsid, String itemcsid, String csid); /** @@ -232,7 +232,7 @@ public interface AuthorityWithContactsClient deleteContactForNamedItem( + public Response deleteContactForNamedItem( String parentcsid, String itemspecifier, String csid); @@ -245,7 +245,7 @@ public interface AuthorityWithContactsClient deleteContactInNamedAuthority( + public Response deleteContactInNamedAuthority( String parentspecifier, String itemcsid, String csid); @@ -258,7 +258,7 @@ public interface AuthorityWithContactsClient deleteContactForNamedItemInNamedAuthority( + public Response deleteContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, String csid); diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java index c90004b99..46b01c68a 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsClientImpl.java @@ -15,7 +15,7 @@ public abstract class AuthorityWithContactsClientImpl { @Override - public ClientResponse createContact(String parentcsid, + public Response createContact(String parentcsid, String itemcsid, PoxPayloadOut xmlPayload) { return getProxy().createContact(parentcsid, itemcsid, xmlPayload.getBytes()); } @@ -29,7 +29,7 @@ public abstract class AuthorityWithContactsClientImpl createContactForNamedItem( + public Response createContactForNamedItem( String parentcsid, String itemspecifier, PoxPayloadOut xmlPayload) { @@ -44,7 +44,7 @@ public abstract class AuthorityWithContactsClientImpl createContactForItemInNamedAuthority( + public Response createContactForItemInNamedAuthority( String parentspecifier, String itemcsid, PoxPayloadOut xmlPayload) { @@ -60,7 +60,7 @@ public abstract class AuthorityWithContactsClientImpl createContactForNamedItemInNamedAuthority( + public Response createContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, PoxPayloadOut xmlPayload) { @@ -77,7 +77,7 @@ public abstract class AuthorityWithContactsClientImpl readContact(String parentcsid, + public Response readContact(String parentcsid, String itemcsid, String csid) { return getProxy().readContact(parentcsid, itemcsid, csid); } @@ -91,7 +91,7 @@ public abstract class AuthorityWithContactsClientImpl readContactForNamedItem( + public Response readContactForNamedItem( String parentcsid, String itemspecifier, String csid){ @@ -107,7 +107,7 @@ public abstract class AuthorityWithContactsClientImpl readContactInNamedAuthority( + public Response readContactInNamedAuthority( String parentspecifier, String itemcsid, String csid){ @@ -123,7 +123,7 @@ public abstract class AuthorityWithContactsClientImpl readContactForNamedItemInNamedAuthority( + public Response readContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, String csid){ @@ -139,7 +139,7 @@ public abstract class AuthorityWithContactsClientImpl readContactList(String parentcsid, + public Response readContactList(String parentcsid, String itemcsid) { return getProxy().readContactList(parentcsid, itemcsid); } @@ -152,7 +152,7 @@ public abstract class AuthorityWithContactsClientImpl readContactListForNamedItem( + public Response readContactListForNamedItem( String parentcsid, String itemspecifier){ return getProxy().readContactList(parentcsid, itemspecifier); @@ -166,7 +166,7 @@ public abstract class AuthorityWithContactsClientImpl readContactListForItemInNamedAuthority( + public Response readContactListForItemInNamedAuthority( String parentspecifier, String itemcsid){ return getProxy().readContactList(parentspecifier, itemcsid); @@ -180,7 +180,7 @@ public abstract class AuthorityWithContactsClientImpl readContactListForNamedItemInNamedAuthority( + public Response readContactListForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier){ return getProxy().readContactList(parentspecifier, itemspecifier); @@ -196,7 +196,7 @@ public abstract class AuthorityWithContactsClientImpl updateContact(String parentcsid, + public Response updateContact(String parentcsid, String itemcsid, String csid, PoxPayloadOut xmlPayload) { return getProxy().updateContact(parentcsid, itemcsid, csid, xmlPayload.getBytes()); } @@ -211,7 +211,7 @@ public abstract class AuthorityWithContactsClientImpl updateContactForNamedItem( + public Response updateContactForNamedItem( String parentcsid, String itemspecifier, String csid, @@ -229,7 +229,7 @@ public abstract class AuthorityWithContactsClientImpl updateContactInNamedAuthority( + public Response updateContactInNamedAuthority( String parentspecifier, String itemcsid, String csid, @@ -247,7 +247,7 @@ public abstract class AuthorityWithContactsClientImpl updateContactForNamedItemInNamedAuthority( + public Response updateContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, String csid, @@ -265,7 +265,7 @@ public abstract class AuthorityWithContactsClientImpl deleteContact(String parentcsid, + public Response deleteContact(String parentcsid, String itemcsid, String csid) { return getProxy().deleteContact(parentcsid, itemcsid, csid); @@ -280,7 +280,7 @@ public abstract class AuthorityWithContactsClientImpl deleteContactForNamedItem( + public Response deleteContactForNamedItem( String parentcsid, String itemspecifier, String csid) { @@ -297,7 +297,7 @@ public abstract class AuthorityWithContactsClientImpl deleteContactInNamedAuthority( + public Response deleteContactInNamedAuthority( String parentspecifier, String itemcsid, String csid) { @@ -314,7 +314,7 @@ public abstract class AuthorityWithContactsClientImpl deleteContactForNamedItemInNamedAuthority( + public Response deleteContactForNamedItemInNamedAuthority( String parentspecifier, String itemspecifier, String csid) { diff --git a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsProxy.java b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsProxy.java index 98e8eec05..89db736db 100644 --- a/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsProxy.java +++ b/services/contact/client/src/main/java/org/collectionspace/services/client/AuthorityWithContactsProxy.java @@ -20,52 +20,52 @@ public interface AuthorityWithContactsProxy extends AuthorityProxy { @GET @Produces({"application/xml"}) @Path("/{parentcsid}/items/{itemcsid}/contacts/") - public ClientResponse readContactList( + public Response readContactList( @PathParam("parentcsid") String parentcsid, @PathParam("itemcsid") String itemcsid); @GET @Produces({"application/xml"}) @Path("/{parentcsid}/items/urn:cspace:name({itemspecifier})/contacts/") - ClientResponse readContactListForNamedItem( + Response readContactListForNamedItem( @PathParam("parentcsid") String parentcsid, @PathParam("itemspecifier") String itemspecifier); @GET @Produces({"application/xml"}) @Path("/urn:cspace:name({parentspecifier})/items/{itemcsid}/contacts/") - ClientResponse readContactListForItemInNamedAuthority( + Response readContactListForItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemcsid") String itemcsid); @GET @Produces({"application/xml"}) @Path("/urn:cspace:name({parentspecifier})/items/urn:cspace:name({itemspecifier})/contacts/") - ClientResponse readContactListForNamedItemInNamedAuthority( + Response readContactListForNamedItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemspecifier") String itemspecifier); //(C)reate Contact @POST @Path("/{parentcsid}/items/{itemcsid}/contacts/") - ClientResponse createContact( + Response createContact( @PathParam("parentcsid") String parentcsid, @PathParam("itemcsid") String itemcsid, byte[] xmlPayload); @POST @Path("/{parentcsid}/items/urn:cspace:name({itemspecifier})/contacts/") - ClientResponse createContactForNamedItem( + Response createContactForNamedItem( @PathParam("parentcsid") String parentcsid, @PathParam("itemspecifier") String itemspecifier, byte[] xmlPayload); @POST @Path("/urn:cspace:name({parentspecifier})/items/{itemcsid}/contacts/") - ClientResponse createContactForItemInNamedAuthority( + Response createContactForItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemcsid") String itemcsid, byte[] xmlPayload); @POST @Path("/urn:cspace:name({parentspecifier})/items/urn:cspace:name({itemspecifier})/contacts/") - ClientResponse createContactForNamedItemInNamedAuthority( + Response createContactForNamedItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemspecifier") String itemspecifier, byte[] xmlPayload); @@ -73,25 +73,25 @@ public interface AuthorityWithContactsProxy extends AuthorityProxy { //(R)ead Contact @GET @Path("/{parentcsid}/items/{itemcsid}/contacts/{csid}") - ClientResponse readContact( + Response readContact( @PathParam("parentcsid") String parentcsid, @PathParam("itemcsid") String itemcsid, @PathParam("csid") String csid); @GET @Path("/{parentcsid}/items/urn:cspace:name({itemspecifier})/contacts/{csid}") - ClientResponse readContactForNamedItem( + Response readContactForNamedItem( @PathParam("parentcsid") String parentcsid, @PathParam("itemspecifier") String itemspecifier, @PathParam("csid") String csid); @GET @Path("/urn:cspace:name({parentspecifier})/items/{itemcsid}/contacts/{csid}") - ClientResponse readContactInNamedAuthority( + Response readContactInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemcsid") String itemcsid, @PathParam("csid") String csid); @GET @Path("/urn:cspace:name({parentspecifier})/items/urn:cspace:name({itemspecifier})/contacts/{csid}") - ClientResponse readContactForNamedItemInNamedAuthority( + Response readContactForNamedItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemspecifier") String itemspecifier, @PathParam("csid") String csid); @@ -99,28 +99,28 @@ public interface AuthorityWithContactsProxy extends AuthorityProxy { //(U)pdate Contact @PUT @Path("/{parentcsid}/items/{itemcsid}/contacts/{csid}") - ClientResponse updateContact( + Response updateContact( @PathParam("parentcsid") String parentcsid, @PathParam("itemcsid") String itemcsid, @PathParam("csid") String csid, byte[] xmlPayload); @PUT @Path("/{parentcsid}/items/urn:cspace:name({itemspecifier})/contacts/{csid}") - ClientResponse updateContactForNamedItem( + Response updateContactForNamedItem( @PathParam("parentcsid") String parentcsid, @PathParam("itemspecifier") String itemspecifier, @PathParam("csid") String csid, byte[] xmlPayload); @PUT @Path("/urn:cspace:name({parentspecifier})/items/{itemcsid}/contacts/{csid}") - ClientResponse updateContactInNamedAuthority( + Response updateContactInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemcsid") String itemcsid, @PathParam("csid") String csid, byte[] xmlPayload); @PUT @Path("/urn:cspace:name({parentspecifier})/items/urn:cspace:name({itemspecifier})/contacts/{csid}") - ClientResponse updateContactForNamedItemInNamedAuthority( + Response updateContactForNamedItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemspecifier") String itemspecifier, @PathParam("csid") String csid, @@ -129,27 +129,27 @@ public interface AuthorityWithContactsProxy extends AuthorityProxy { //(D)elete Contact @DELETE @Path("/{parentcsid}/items/{itemcsid}/contacts/{csid}") - ClientResponse deleteContact( + Response deleteContact( @PathParam("parentcsid") String parentcsid, @PathParam("itemcsid") String itemcsid, @PathParam("csid") String csid); @DELETE @Path("/{parentcsid}/items/urn:cspace:name({itemspecifier})/contacts/{csid}") - ClientResponse deleteContactForNamedItem( + Response deleteContactForNamedItem( @PathParam("parentcsid") String parentcsid, @PathParam("itemspecifier") String itemspecifier, @PathParam("csid") String csid); @DELETE @Path("/urn:cspace:name({parentspecifier})/items/{itemcsid}/contacts/{csid}") - ClientResponse deleteContactInNamedAuthority( + Response deleteContactInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemcsid") String itemcsid, @PathParam("csid") String csid); @DELETE @Path("/urn:cspace:name({parentspecifier})/items/urn:cspace:name({itemspecifier})/contacts/{csid}") - ClientResponse deleteContactForNamedItemInNamedAuthority( + Response deleteContactForNamedItemInNamedAuthority( @PathParam("parentspecifier") String parentspecifier, @PathParam("itemspecifier") String itemspecifier, @PathParam("csid") String csid); diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java index f041f85a0..270db3e91 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java @@ -265,12 +265,11 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { // Get the auth ref docs and check them PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); - ClientResponse res = - personAuthClient.getReferencingObjects(personAuthCSID, currentOwnerPersonCSID); + Response res = personAuthClient.getReferencingObjects(personAuthCSID, currentOwnerPersonCSID); AuthorityRefDocList list = null; try { assertStatusCode(res, testName); - list = res.getEntity(); + list = res.readEntity(AuthorityRefDocList.class); } finally { if (res != null) { res.close(); @@ -309,10 +308,10 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { res = personAuthClient.getReferencingObjects(personAuthCSID, depositorPersonCSID); try { assertStatusCode(res, testName); - list = res.getEntity(); + list = res.readEntity(AuthorityRefDocList.class); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } @@ -357,15 +356,14 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { // Single scalar field PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); - ClientResponse res = - personAuthClient.getReferencingObjects(personAuthCSID, insurerPersonCSID); + Response res = personAuthClient.getReferencingObjects(personAuthCSID, insurerPersonCSID); AuthorityRefDocList list = null; try { assertStatusCode(res, testName); - list = res.getEntity(); + list = res.readEntity(AuthorityRefDocList.class); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } diff --git a/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java b/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java index 896f9bcda..f45f064a1 100644 --- a/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java +++ b/services/location/client/src/test/java/org/collectionspace/services/client/test/LocationAuthorityServiceTest.java @@ -243,7 +243,7 @@ public class LocationAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (shortId != null) { @@ -255,7 +255,7 @@ public class LocationAuthorityServiceTest extends AbstractAuthorityServiceTest res2 = - orgAuthClient.getItemAuthorityRefs(knownResourceId, knownItemResourceId); + Response res2 = orgAuthClient.getItemAuthorityRefs(knownResourceId, knownItemResourceId); AuthorityRefList list = null; try { assertStatusCode(res2, testName); - list = res2.getEntity(); + list = res2.readEntity(AuthorityRefList.class); } finally { if (res2 != null) { res2.close(); diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java index cdda42991..b516ac4a8 100644 --- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java +++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java @@ -228,14 +228,13 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.createContact(parentcsid, itemcsid, multipart); + Response res = client.createContact(parentcsid, itemcsid, multipart); try { assertStatusCode(res, testName); newID = OrgAuthorityClientUtils.extractId(res); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } @@ -516,13 +515,12 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContact(knownResourceId, knownItemResourceId, + Response res =client.readContact(knownResourceId, knownItemResourceId, knownContactResourceId); try { assertStatusCode(res, testName); // Check whether we've received a contact. - PoxPayloadIn input = new PoxPayloadIn(res.getEntity()); + PoxPayloadIn input = new PoxPayloadIn(res.readEntity(String.class)); ContactsCommon contact = (ContactsCommon) extractPart(input, new ContactClient().getCommonPartName(), ContactsCommon.class); Assert.assertNotNull(contact); @@ -553,8 +551,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); + Response res = client.readContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); try { int statusCode = res.getStatus(); @@ -606,7 +603,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (name != null) { @@ -618,7 +615,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContactList(parentcsid, itemcsid); + Response res = client.readContactList(parentcsid, itemcsid); AbstractCommonList list = null; try { assertStatusCode(res, testName); - list = res.getEntity(); + list = res.readEntity(AbstractCommonList.class); } finally { if (res != null) { res.close(); @@ -721,8 +717,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContact(knownResourceId, knownItemResourceId, knownContactResourceId); + Response res = client.readContact(knownResourceId, knownItemResourceId, knownContactResourceId); ContactsCommon contact = null; try { assertStatusCode(res, testName); @@ -732,7 +727,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.deleteContact(knownResourceId, knownItemResourceId, knownContactResourceId); + Response res = client.deleteContact(knownResourceId, knownItemResourceId, knownContactResourceId); try { assertStatusCode(res, testName); } finally { @@ -870,8 +864,7 @@ public class OrgAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.deleteContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); + Response res = client.deleteContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); try { assertStatusCode(res, testName); } finally { diff --git a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java index da32fafc7..cb4fb2989 100644 --- a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java +++ b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java @@ -77,7 +77,7 @@ public class PersonAuthorityClientUtils { } //FIXME: remove the following try catch once Aron fixes signatures try { - PoxPayloadIn input = new PoxPayloadIn((String)res.getEntity()); + PoxPayloadIn input = new PoxPayloadIn((String)res.readEntity(String.class)); PersonauthoritiesCommon personAuthority = (PersonauthoritiesCommon) CollectionSpaceClientUtils.extractPart(input, client.getCommonPartName(), PersonauthoritiesCommon.class); @@ -111,7 +111,7 @@ public class PersonAuthorityClientUtils { } //FIXME: remove the following try catch once Aron fixes signatures try { - PoxPayloadIn input = new PoxPayloadIn((String)res.getEntity()); + PoxPayloadIn input = new PoxPayloadIn((String)res.readEntity(String.class)); PersonsCommon person = (PersonsCommon) CollectionSpaceClientUtils.extractPart(input, client.getItemCommonPartName(), PersonsCommon.class); diff --git a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java index e5a5f0c42..1bf6b0581 100644 --- a/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java +++ b/services/person/client/src/test/java/org/collectionspace/services/client/test/PersonAuthoritySearchTest.java @@ -461,7 +461,7 @@ public class PersonAuthoritySearchTest extends BaseServiceTest res = null; + Response res = null; if (authorityCsid != null) { res = client.readItemList(authorityCsid, partialTerm, keywords); } else { @@ -470,10 +470,10 @@ public class PersonAuthoritySearchTest extends BaseServiceTest res = null; + Response res = null; if (authorityCsid != null) { res = client.readItemList(authorityCsid, partialTerm, keywords); } else { @@ -312,10 +312,10 @@ public class PersonAuthorityServicePerfTest extends BaseServiceTest res = - client.createContact(parentcsid, itemcsid, multipart); + Response res = client.createContact(parentcsid, itemcsid, multipart); String newID = null; try { assertStatusCode(res, testName); newID = PersonAuthorityClientUtils.extractId(res); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } @@ -713,16 +712,15 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContact(knownResourceId, knownItemResourceId, + Response res = client.readContact(knownResourceId, knownItemResourceId, knownContactResourceId); try { assertStatusCode(res, testName); // Check whether we've received a contact. - input = new PoxPayloadIn(res.getEntity()); + input = new PoxPayloadIn(res.readEntity(String.class)); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } @@ -752,13 +750,13 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); + Response res = client.readContact(knownResourceId, knownItemResourceId, + NON_EXISTENT_ID); try { assertStatusCode(res, testName); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } } @@ -797,7 +795,7 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (name != null) { @@ -808,10 +806,10 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.readContactList(parentcsid, itemcsid); + Response res = client.readContactList(parentcsid, itemcsid); try { assertStatusCode(res, testName); - list = res.getEntity(); + list = res.readEntity(AbstractCommonList.class); } finally { if (res != null) { - res.releaseConnection(); + res.close(); } } @@ -1074,7 +1071,7 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = client.readContact(knownResourceId, knownItemResourceId, + Response res = client.readContact(knownResourceId, knownItemResourceId, knownContactResourceId); try { assertStatusCode(res, testName); @@ -1084,7 +1081,7 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.deleteContact(knownResourceId, knownItemResourceId, knownContactResourceId); + Response res = client.deleteContact(knownResourceId, knownItemResourceId, + knownContactResourceId); try { assertStatusCode(res, testName); } finally { @@ -1217,8 +1214,7 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.deleteContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); + Response res = client.deleteContact(knownResourceId, knownItemResourceId, NON_EXISTENT_ID); try { assertStatusCode(res, testName); } finally { @@ -1289,8 +1285,8 @@ public class PersonAuthorityServiceTest extends AbstractAuthorityServiceTest res = - client.deleteContact(parentResourceId, itemResourceId, contactResourceId); + Response res = client.deleteContact(parentResourceId, itemResourceId, + contactResourceId); res.close(); } // Clean up item resources. diff --git a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java index f5ee57955..0f922e3b9 100644 --- a/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java +++ b/services/place/client/src/test/java/org/collectionspace/services/client/test/PlaceAuthorityServiceTest.java @@ -248,7 +248,7 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (shortId != null) { @@ -260,7 +260,7 @@ public class PlaceAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (shortId != null) { @@ -276,7 +276,7 @@ public class TaxonomyAuthorityServiceTest extends AbstractAuthorityServiceTest res = null; + Response res = null; if (vcsid != null) { res = client.readItemList(vcsid, null, null); } else if (shortId != null) { @@ -266,7 +266,7 @@ public class WorkAuthorityServiceTest extends AbstractAuthorityServiceTest