From 977688ee786069279f54bae3a7c1af908d0c1cd4 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Sun, 9 Jan 2011 23:12:09 +0000
Subject: [PATCH] CSPACE-3365: RelationsCommon JAX-B schema type for the
 predicate element should be changed to xs:string instead of being an
 enumerated type.

---
 .../test/CollectionSpaceIntegrationTest.java                | 2 +-
 .../IntegrationTests/test/RelationIntegrationTest.java      | 6 +++---
 .../test/CollectionSpacePerformanceTest.java                | 2 +-
 services/jaxb/src/main/resources/relations_common.xsd       | 3 ++-
 .../services/client/test/RelationServiceTest.java           | 4 ++--
 .../services/relation/nuxeo/RelationValidatorHandler.java   | 3 +++
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java
index 856e3e5c6..08f6eab47 100755
--- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java
+++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java
@@ -116,7 +116,7 @@ public abstract class CollectionSpaceIntegrationTest {
      * @param rt the rt
      */
     void fillRelation(RelationsCommon relation, String documentId1, String documentType1,
-    		String documentId2, String documentType2, RelationshipType rt)
+    		String documentId2, String documentType2, String rt)
     {
         relation.setDocumentId1(documentId1);
         relation.setDocumentType1(documentType1);
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 74ab97e5b..78cde6fe7 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
@@ -113,7 +113,7 @@ public class RelationIntegrationTest extends CollectionSpaceIntegrationTest {
 	    RelationsCommon relation = new RelationsCommon();
 	    fillRelation(relation, collectionObjectCsid, CollectionobjectsCommon.class.getSimpleName(),
 	    		intakeCsid, IntakesCommon.class.getSimpleName(),
-	    		RelationshipType.COLLECTIONOBJECT_INTAKE);
+	    		RelationshipType.COLLECTIONOBJECT_INTAKE.toString());
 	    // Create the part and fill it with the relation object
 	    multipart = new MultipartOutput();
 	    commonPart = multipart.addPart(relation, MediaType.APPLICATION_XML_TYPE);
@@ -132,7 +132,7 @@ public class RelationIntegrationTest extends CollectionSpaceIntegrationTest {
 	    //
 	    // Now try to retrieve the Intake record of the CollectionObject.
 	    //
-	    String predicate = RelationshipType.COLLECTIONOBJECT_INTAKE.value();
+	    String predicate = RelationshipType.COLLECTIONOBJECT_INTAKE.toString();
 	    ClientResponse<RelationsCommonList> resultResponse = relationClient.readList(
 	    		collectionObjectCsid,
 	    		CollectionobjectsCommon.class.getSimpleName(),
@@ -175,7 +175,7 @@ public class RelationIntegrationTest extends CollectionSpaceIntegrationTest {
         	}
         	
         	Assert.assertEquals(resultRelation.getDocumentId1(), collectionObjectCsid);
-        	Assert.assertEquals(resultRelation.getRelationshipType(), RelationshipType.COLLECTIONOBJECT_INTAKE);
+        	Assert.assertEquals(resultRelation.getRelationshipType(), RelationshipType.COLLECTIONOBJECT_INTAKE.toString());
         	Assert.assertEquals(resultRelation.getDocumentId2(), intakeCsid);
             System.out.println();
         	i++;            
diff --git a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java
index b6e161b38..74d161446 100644
--- a/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java
+++ b/services/PerformanceTests/src/test/java/org/collectionspace/services/PerformanceTests/test/CollectionSpacePerformanceTest.java
@@ -126,7 +126,7 @@ public abstract class CollectionSpacePerformanceTest {
         relation.setDocumentId2(documentId2);
         relation.setDocumentType2(documentType2);
         
-        relation.setRelationshipType(rt);
+        relation.setRelationshipType(rt.toString());
     }
 	
 	/**
diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
index ad46d4bc6..58f91f10a 100644
--- a/services/jaxb/src/main/resources/relations_common.xsd
+++ b/services/jaxb/src/main/resources/relations_common.xsd
@@ -29,13 +29,14 @@
                 <xs:element name="documentId2" type="xs:string" minOccurs="1"/>
                 <xs:element name="documentType2" type="xs:string" minOccurs="1"/>
                 <!-- type of relationship between two entities -->
-                <xs:element name="relationshipType" type="rel:RelationshipType" minOccurs="1"/>
+                <xs:element name="relationshipType" type="xs:string" minOccurs="1"/>
                 <xs:element name="predicateDisplayName" type="xs:string" minOccurs="1"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
 
     <!-- enumeration defining the type of relationship between two entities -->
+    <!-- REM: Deprecating this type as it is too restrictive for the "relations_common:relationshipType" field  and will be replaced with "xs:string" -->
     <xs:simpleType name="RelationshipType">
         <xs:restriction base="xs:string">
             <!-- Added for compatibility with current default value -->
diff --git a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
index a12c5f291..04d624db3 100644
--- a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
+++ b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
@@ -851,7 +851,7 @@ public class RelationServiceTest extends AbstractServiceTestImpl {
                 "SubjectType-" + identifier + "-type",
                 "Object-" + identifier,
                 "ObjectType-" + identifier + "-type",
-                RelationshipType.COLLECTIONOBJECT_INTAKE,
+                RelationshipType.COLLECTIONOBJECT_INTAKE.toString(),
                 RelationshipType.COLLECTIONOBJECT_INTAKE + ".displayName");
     }
 
@@ -868,7 +868,7 @@ public class RelationServiceTest extends AbstractServiceTestImpl {
     private void fillRelation(RelationsCommon relation,
             String documentId1, String documentType1,
             String documentId2, String documentType2,
-            RelationshipType rt,
+            String rt,
             String rtDisplayName) {
         relation.setDocumentId1(documentId1);
         relation.setDocumentType1(documentType1);
diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationValidatorHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationValidatorHandler.java
index 01fc0228f..5f2466d6a 100644
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationValidatorHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationValidatorHandler.java
@@ -34,6 +34,9 @@ public class RelationValidatorHandler extends ValidatorHandlerImpl<MultipartInpu
     	try {
 	    	RelationsCommon relationsCommon = (RelationsCommon)getCommonPart();
 	    	assert(relationsCommon != null);
+    		if (logger.isTraceEnabled() == true) {
+    			logger.trace(relationsCommon.toString());
+    		}
 	    	
 	    	assert(relationsCommon.getDocumentId1() != null);
 	    	assert(relationsCommon.getDocumentId1().length() != 0);
-- 
2.47.3