CSPACE-332: Fixing bug that had id and url fields swapped on RelationListItem results.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationUtilsNuxeoImpl.java b/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationUtilsNuxeoImpl.java
index 1294ff6d036305df5ab0cfdfaecbd3f04609d0ac..6e4d794e1e13eb7b99e9d35cf14d0a5f91b3793a 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationUtilsNuxeoImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/nuxeo/RelationUtilsNuxeoImpl.java
@@ -118,7 +118,7 @@ public class RelationUtilsNuxeoImpl implements RelationUtils {
                relation.setDocumentId2((String) valueObject);\r
 \r
                valueObject = relDocModel.getProperty(REL_NUXEO_SCHEMA_NAME, xpathRoot\r
-                               + RelationJAXBSchema.DOCUMENT_TYPE_1);\r
+                               + RelationJAXBSchema.DOCUMENT_TYPE_2);\r
                relation.setDocumentType2((String) valueObject);\r
 \r
                valueObject = relDocModel.getProperty(REL_NUXEO_SCHEMA_NAME, xpathRoot\r
@@ -146,9 +146,9 @@ public class RelationUtilsNuxeoImpl implements RelationUtils {
                throws DocumentException {\r
 \r
                try {\r
-                       relationListItem.setUri(\r
-                                       relDocModel.getId());\r
                        relationListItem.setCsid(\r
+                                       relDocModel.getId());\r
+                       relationListItem.setUri(\r
                                        getRelURL(CS_RELATION_SERVICE_NAME, relDocModel.getId()));\r
                } catch (Exception e) {\r
                        if (logger.isDebugEnabled()) {\r