From fecf9c97785805858d86229a5c3bfdf5458ba1af Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Thu, 21 Jul 2011 21:24:03 +0000 Subject: [PATCH] CSPACE-4172,CSPACE-3332: Revised ObjectExit service to return CommonList format for list results. Needed to remove explicit designations of now-obsolete references to older objectexit-specific list formats in tenant-bindings prototype before the correct root and list item elements were returned, and hence tests expecting CommonList would pass. --- .../tenants/tenant-bindings-proto.xml | 6 --- .../services/client/ObjectExitClient.java | 50 +++++++------------ .../services/client/ObjectExitProxy.java | 28 +---------- .../client/test/ObjectExitServiceTest.java | 40 +++------------ .../src/main/resources/objectexit_common.xsd | 39 --------------- .../services/test/ObjectExitServiceTest.java | 3 -- 6 files changed, 27 insertions(+), 139 deletions(-) diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml index 91f2a8761..3b3fff016 100644 --- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml +++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml @@ -503,12 +503,6 @@ org.collectionspace.services.objectexit.nuxeo.ObjectExitDocumentModelHandler - objectexit - objectexit - exitNumber|currentOwner|uri|csid - org.collectionspace.services.objectexit.ObjectexitCommonList - org.collectionspace.services.objectexit.ObjectexitCommonList$ObjectexitListItem - getObjectexitListItem exitNumber diff --git a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java index 5851400f6..a7b4d132b 100644 --- a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java +++ b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java @@ -16,11 +16,6 @@ */ package org.collectionspace.services.client; -import org.collectionspace.services.jaxb.AbstractCommonList; -import org.collectionspace.services.objectexit.ObjectexitCommonList; - -import org.jboss.resteasy.client.ClientResponse; - /** * ObjectExitClient.java * @@ -28,39 +23,28 @@ import org.jboss.resteasy.client.ClientResponse; * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $ * */ -public class ObjectExitClient extends AbstractPoxServiceClientImpl { - public static final String SERVICE_NAME = "objectexit"; - public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; - public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT; - public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME; +public class ObjectExitClient extends AbstractCommonListPoxServiceClientImpl { - @Override - public String getServiceName() { - return SERVICE_NAME; - } - - @Override + public static final String SERVICE_NAME = "objectexit"; + public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME; + public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT; + public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/"; + public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME; + + @Override + public String getServiceName() { + return SERVICE_NAME; + } + + @Override public String getServicePathComponent() { return SERVICE_PATH_COMPONENT; } - @Override - public Class getProxyClass() { - // TODO Auto-generated method stub - return ObjectExitProxy.class; - } - - /* - * Proxied service calls. - * - */ - - public ClientResponse readList() { - return getProxy().readList(); + @Override + public Class getProxyClass() { + // TODO Auto-generated method stub + return ObjectExitProxy.class; } - public ObjectexitCommonList readList2(){ - ObjectexitCommonList list = readList().getEntity(ObjectexitCommonList.class); - return list; - } } diff --git a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitProxy.java b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitProxy.java index 49189d2af..f9eb9e4ae 100644 --- a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitProxy.java +++ b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitProxy.java @@ -1,38 +1,14 @@ package org.collectionspace.services.client; -import org.jboss.resteasy.client.ClientResponse; import javax.ws.rs.Consumes; -import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.collectionspace.services.client.workflow.WorkflowClient; -import org.collectionspace.services.jaxb.AbstractCommonList; -import org.collectionspace.services.objectexit.ObjectexitCommonList; - /** * @version $Revision: 2108 $ */ -@Path(ObjectExitClient.SERVICE_PATH + "/") +@Path(ObjectExitClient.SERVICE_PATH_PROXY) @Produces({"application/xml"}) @Consumes({"application/xml"}) -public interface ObjectExitProxy extends CollectionSpacePoxProxy { - // List - @GET - ClientResponse readList(); - - @Override - @GET - @Produces({"application/xml"}) - ClientResponse readIncludeDeleted( - @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted); - - @Override - @GET - @Produces({"application/xml"}) - ClientResponse keywordSearchIncludeDeleted( - @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords, - @QueryParam(WorkflowClient.WORKFLOW_QUERY_NONDELETED) String includeDeleted); +public interface ObjectExitProxy extends CollectionSpaceCommonListPoxProxy { } diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java index 0e4dba462..f72ef4bc2 100644 --- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java +++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitServiceTest.java @@ -22,18 +22,15 @@ */ package org.collectionspace.services.client.test; -import java.util.List; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.collectionspace.services.client.CollectionSpaceClient; import org.collectionspace.services.client.ObjectExitClient; -import org.collectionspace.services.client.ObjectExitProxy; import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.jaxb.AbstractCommonList; -import org.collectionspace.services.objectexit.ObjectexitCommonList; import org.collectionspace.services.objectexit.ObjectexitCommon; import org.jboss.resteasy.client.ClientResponse; @@ -75,7 +72,7 @@ public class ObjectExitServiceTest extends AbstractServiceTestImpl { @Override protected AbstractCommonList getAbstractCommonList(ClientResponse response) { - return response.getEntity(ObjectexitCommonList.class); + return response.getEntity(AbstractCommonList.class); } @Override @@ -122,41 +119,20 @@ public class ObjectExitServiceTest extends AbstractServiceTestImpl { logger.debug(testBanner(testName, CLASS_NAME)); setupReadList(); ObjectExitClient client = new ObjectExitClient(); - ClientResponse res = client.readList(); + ClientResponse res = client.readList(); String bar = "\r\n\r\n=================================\r\n\r\n"; System.out.println(bar+" res: "+res); - ObjectexitCommonList list = res.getEntity(); + AbstractCommonList list = res.getEntity(); System.out.println(bar+" list: "+list); assertStatusCode(res, testName); - if (logger.isDebugEnabled()) { - List items = - list.getListItem(); - int i = 0; - for(AbstractCommonList.ListItem item : items){ - logger.debug(testName + ": list-item[" + i + "] " + - item.toString()); - i++; - } - } - - /* - List items = list.getListItem(); - int i = 0; - for(AbstractCommonList.ListItem item : items){ - List elList = item.getAny(); - StringBuilder elementStrings = new StringBuilder(); - for(Element el : elList) { - Node textEl = el.getFirstChild(); - if (textEl != null){ - elementStrings.append("["+el.getNodeName()+":"+textEl.getNodeValue()+"] "); - } - } - System.out.println("\r\n\r\n\r\n~~~~~~~~~~~~~~~~~~~~~~~~~~~"+testName + ": list-item[" + i + "]: "+elementStrings.toString()); - i++; + // Optionally output additional data about list members for debugging. + boolean iterateThroughList = true; + if(iterateThroughList && logger.isDebugEnabled()){ + ListItemsInAbstractCommonList(list, logger, testName); } - */ + } @Override diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd index 75fce1400..c82c14a5c 100644 --- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd +++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd @@ -50,44 +50,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/objectexit/service/src/test/java/org/collectionspace/services/test/ObjectExitServiceTest.java b/services/objectexit/service/src/test/java/org/collectionspace/services/test/ObjectExitServiceTest.java index bec77cb2c..4b254c184 100644 --- a/services/objectexit/service/src/test/java/org/collectionspace/services/test/ObjectExitServiceTest.java +++ b/services/objectexit/service/src/test/java/org/collectionspace/services/test/ObjectExitServiceTest.java @@ -1,8 +1,5 @@ package org.collectionspace.services.test; -//import org.collectionspace.services.objectexit.ObjectExit; -//import org.collectionspace.services.objectexit.ObjectexitList; - /** * Placeholder for server-side testing of Loan Out service code. * -- 2.47.3