CSPACE-3780: Fixed break in RelationResource's search method that was introduced...

diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java
index ad5e855982ce964c6632dea9362f928bfd87d0de..d71772c40d8f5c136f2a73041756fd59289bddfc 100755 (executable)
--- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java
+++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/RelationIntegrationTest.java
@@ -73,13 +73,6 @@ public class RelationIntegrationTest extends CollectionSpaceIntegrationTest {
        
        @Test
        public void relateCollectionObjectToIntake() {
-               if (true) return; //false positive -see 'FIXME' below
-               //
-               // FIXME: REM - This test is failing because the relationClient.readList (aka search) is returning more than 1 matching
-               // relation.  There should only be one.
-               //
-               
-               
                //
                // First create a CollectionObject
                //
@@ -194,7 +187,7 @@ public class RelationIntegrationTest extends CollectionSpaceIntegrationTest {
         }
        }
        
-//     @Test
+       @Test
        public void relateCollectionObjectsToIntake() {
                relateCollectionObjectsToIntake(OBJECTS_TO_INTAKE);
        }

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
index e4cf97ed2dfdfafbdd66b82a73ae88a1bbb8abca..c6a43e101f83368d20182b961c0441a44c338068 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
@@ -242,9 +242,9 @@ extends AbstractMultiPartCollectionSpaceResourceImpl {
     //======================= GET without csid. List, search, etc. =====================================\r
 \r
        @GET\r
-       public AbstractCommonList getList(@Context UriInfo ui,\r
-                       @QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords) {\r
+       public AbstractCommonList getList(@Context UriInfo ui) {\r
                MultivaluedMap<String, String> queryParams = ui.getQueryParameters();\r
+               String keywords = queryParams.getFirst(IQueryManager.SEARCH_TYPE_KEYWORDS_KW);\r
                if (keywords != null) {\r
                        return search(queryParams, keywords);\r
                } else {\r

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 46191de2134c2b45e78223698204ddf960f391a9..c9cfb4f2c278c3f5d7a174f1e5e86b740a35bf45 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
@@ -71,15 +71,18 @@ public class RelationResource extends ResourceBase {
        return RelationsCommon.class;
     }
 
+       @Override
        @GET
        @Produces("application/xml")
-       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,
-                       @QueryParam(IRelationsManager.OBJECT_QP) String objectCsid,
-                       @QueryParam(IRelationsManager.OBJECT_TYPE_QP) String objectType) {
+       public RelationsCommonList getList(@Context UriInfo ui) {
                MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
+
+               String subjectCsid = queryParams.getFirst(IRelationsManager.SUBJECT_QP);
+               String subjectType = queryParams.getFirst(IRelationsManager.SUBJECT_TYPE_QP);
+               String predicate = queryParams.getFirst(IRelationsManager.PREDICATE_QP);
+               String objectCsid = queryParams.getFirst(IRelationsManager.OBJECT_QP);
+               String objectType = queryParams.getFirst(IRelationsManager.OBJECT_TYPE_QP);
+
                return this.getRelationList(queryParams, subjectCsid, subjectType, predicate, objectCsid, objectType);
        }