CSPACE-4468,CSPACE-4470: Added constants for new style fields in Relation records.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
index 73e2fe88ed7444a2cb55682db4fba9bd57aebab2..83128dcece957a140ef49bdff666512b6819e041 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
@@ -57,10 +57,13 @@ public interface RelationJAXBSchema {
        /** The Constant RELATIONSHIP_TYPE_DISPLAYNAME. */\r
        final static String RELATIONSHIP_TYPE_DISPLAYNAME = "predicateDisplayName";\r
 \r
-    final static String subjectUri = "subjectUri";\r
-\r
-    final static String objectUri = "objectUri";\r
+    final static String SUBJECT_URI = "subjectUri";\r
+    final static String SUBJECT_CSID = "subjectCsid";\r
+    final static String SUBJECT_REFNAME = "subjectRefName";\r
 \r
+    final static String OBJECT_URI = "objectUri";\r
+    final static String OBJECT_CSID = "objectCsid";\r
+    final static String OBJECT_REFNAME = "objectRefName";\r
 }\r
 \r
 \r

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index c869640190f6a099dec5c1dc811b7cf88efbec29..fcf9b7958b46f5bcfbc6f810df89d0a6e0f7ccf0 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
@@ -174,7 +174,7 @@ public class RelationDocumentModelHandler
         //Object o1 =  docModel.getProperty(ctx.getCommonPartLabel(), "subject");
         //Object o2 =  docModel.getProperty(ctx.getCommonPartLabel(), "object");
 
-        String subjectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.subjectUri);
+        String subjectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.SUBJECT_URI);
         subject.setUri(subjectUri);
         relationListItem.setSubject(subject);
 
@@ -182,7 +182,7 @@ public class RelationDocumentModelHandler
         String documentType2 = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.DOCUMENT_TYPE_2);
         RelationsDocListItem object = createRelationsDocListItem(ctx, sbt, objectCsid, tReader, documentType2);
 
-        String objectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.objectUri);
+        String objectUri = (String) docModel.getProperty(ctx.getCommonPartLabel(), RelationJAXBSchema.OBJECT_URI);
         object.setUri(objectUri);
         relationListItem.setObject(object);