NOJIRA this is a better way to fix binding between CollectionObjectResource and Relat...

diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
index 1ea0235d9ffcf210478ebab9aa08d19e4c8afbe6..d7791c7b64208abbdc6f861245c5ffae3816179c 100644 (file)
--- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
+++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/CollectionObjectResource.java
@@ -412,7 +412,7 @@ public class CollectionObjectResource
                String predicate = RelationshipType.COLLECTIONOBJECT_INTAKE.value();
                String objectCsid = null;
                RelationResource relationResource = new RelationResource();
-               RelationsCommonList relationsCommonList = (RelationsCommonList)relationResource.getRelationList(queryParams,
+               RelationsCommonList relationsCommonList = relationResource.getRelationList(queryParams,
                                subjectCsid,
                                null, /*subjectType*/
                                predicate,

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
index 6a96f86558b3ada81bb93e28d0f3bb88f59ec47d..46191de2134c2b45e78223698204ddf960f391a9 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
@@ -73,7 +73,7 @@ public class RelationResource extends ResourceBase {
 
        @GET
        @Produces("application/xml")
-       public AbstractCommonList getRelationList(@Context UriInfo ui,
+       public RelationsCommonList getRelationList(@Context UriInfo ui,
                        @QueryParam(IRelationsManager.SUBJECT_QP) String subjectCsid,
                        @QueryParam(IRelationsManager.SUBJECT_TYPE_QP) String subjectType,
                        @QueryParam(IRelationsManager.PREDICATE_QP) String predicate,
@@ -83,7 +83,7 @@ public class RelationResource extends ResourceBase {
                return this.getRelationList(queryParams, subjectCsid, subjectType, predicate, objectCsid, objectType);
        }
 
-    public AbstractCommonList getRelationList(MultivaluedMap<String, String> queryParams, String subjectCsid, String subjectType,
+    public RelationsCommonList getRelationList(MultivaluedMap<String, String> queryParams, String subjectCsid, String subjectType,
                                                                          String predicate, String objectCsid, String objectType) throws WebApplicationException {
         try {
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);
@@ -92,7 +92,7 @@ public class RelationResource extends ResourceBase {
             String relationClause = RelationsUtils.buildWhereClause(subjectCsid, subjectType, predicate, objectCsid, objectType);
             handler.getDocumentFilter().appendWhereClause(relationClause, IQueryManager.SEARCH_QUALIFIER_AND);
 
-            return finish_getList(ctx, handler);
+            return (RelationsCommonList)finish_getList(ctx, handler);
         } catch (Exception e) {
             throw bigReThrow(e, ServiceMessages.LIST_FAILED);
         }