From: Richard Millet <richard.millet@berkeley.edu>
Date: Sat, 9 Apr 2011 22:36:22 +0000 (+0000)
Subject: CSPACE-3780: Fixed break in RelationResource's search method that was introduced... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=160fd79fb92f06d94019bb842ac30a84d4d048bf;p=tmp%2Fjakarta-migration.git

CSPACE-3780: Fixed break in RelationResource's search method that was introduced when its parent class was switch to the new ResourceBase class.
---

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 ad5e85598..d71772c40 100755
--- 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 e4cf97ed2..c6a43e101 100644
--- 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. =====================================
 
 	@GET
-	public AbstractCommonList getList(@Context UriInfo ui,
-			@QueryParam(IQueryManager.SEARCH_TYPE_KEYWORDS_KW) String keywords) {
+	public AbstractCommonList getList(@Context UriInfo ui) {
 		MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
+		String keywords = queryParams.getFirst(IQueryManager.SEARCH_TYPE_KEYWORDS_KW);
 		if (keywords != null) {
 			return search(queryParams, keywords);
 		} else {
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 46191de21..c9cfb4f2c 100644
--- 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);
 	}