From 393bf0a1d40777d57c29e27983ace02c24e0a685 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 20 Sep 2012 16:08:39 -0700
Subject: [PATCH] CSPACE-5504: Added proper update handling for refName updates
 for authority items and structured objects -includes updating refNames in
 relationship records and in collectionspace_core schema.

---
 .../collectionobject-hierarchy-refname.xml    |  1 +
 .../vocabulary/RefNameServiceUtils.java       |  6 +--
 .../nuxeo/client/java/CommonList.java         |  1 +
 .../nuxeo/client/java/DocHandlerBase.java     | 38 ++++++++++++-------
 .../client/java/RepositoryJavaClientImpl.java |  1 -
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy-refname.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy-refname.xml
index 722defb1b..ef53bb79b 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy-refname.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy-refname.xml
@@ -233,6 +233,7 @@
             <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}</uri>
             <filename>collectionobject/hierarchy/7-collectionobject-update-with-parent-child-refnames.xml</filename>
             <vars>
+                <var ID="objectNumber">CSPACE-5518-BlackRook</var>
                 <var ID="distinguishingFeatures">This black rook is nearly intact, save for two tiny fragments.</var>
                 <var ID="currentItemCSID">${CreateBlackRook.CSID}</var>
                 <var ID="currentItemObjectNumber">${CreateBlackRook.objectNumber}</var>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index 67065302f..5268d340d 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -426,10 +426,10 @@ public class RefNameServiceUtils {
                     morePages = false;
                 }
 
-                int nRefsFoundThisPage = processRefObjsDocList(docList, ctx.getTenantId(), oldRefName, queriedServiceBindings, authRefFieldsByService,
+                int nRefsFoundThisPage = processRefObjsDocList(docList, ctx.getTenantId(), oldRefName, queriedServiceBindings, authRefFieldsByService, // Perform the refName updates on the list of document models
                         null, newRefName);
                 if (nRefsFoundThisPage > 0) {
-                    ((RepositoryJavaClientImpl) repoClient).saveDocListWithoutHandlerProcessing(ctx, repoSession, docList, true);
+                    ((RepositoryJavaClientImpl) repoClient).saveDocListWithoutHandlerProcessing(ctx, repoSession, docList, true); // Flush the document model list out to Nuxeo storage
                     nRefsFound += nRefsFoundThisPage;
                 }
 
@@ -556,7 +556,7 @@ public class RefNameServiceUtils {
      * Runs through the list of found docs, processing them. If list is
      * non-null, then processing means gather the info for items. If list is
      * null, and newRefName is non-null, then processing means replacing and
-     * updating. If processing/updating, this must be called in teh context of
+     * updating. If processing/updating, this must be called in the context of
      * an open session, and caller must release Session after calling this.
      *
      */
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java
index 6dde05775..629dfd00c 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/CommonList.java
@@ -121,6 +121,7 @@ public class CommonList extends AbstractCommonList {
 				el.setTextContent((String)value);
 				anyList.add(el);
 			} else if (value instanceof List<?>) {
+				@SuppressWarnings("unchecked") // We expect and assume String values only here
 				List<String> valueList = (List<String>)value;
 				for (String val : valueList) {
 					addItem(anyList, key, val);
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index b8cdda1a5..1064fa4a8 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -228,17 +228,23 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 				DocumentModel docModel = iter.next();
 				String id = NuxeoUtils.getCsid(docModel);
 				item.put(STANDARD_LIST_CSID_FIELD, id);
-		        if(markRtSbj!=null) {
-		            String relationClause = RelationsUtils.buildWhereClause(markRtSbj, null, null, id, null);
-		            String whereClause = relationClause + IQueryManager.SEARCH_QUALIFIER_AND + 
-		            						NuxeoUtils.buildWorkflowNotDeletedWhereClause();
-		            QueryContext queryContext = new QueryContext(sc, whereClause);
-		            queryContext.setDocType(IRelationsManager.DOC_TYPE);
-		            String query = NuxeoUtils.buildNXQLQuery(sc, queryContext);
-		            // Search for 1 relation that matches. 1 is enough to fail the filter
-		            DocumentModelList docList = repoSession.query(query, null, 1, 0, false);
-	            	item.put(STANDARD_LIST_MARK_RT_FIELD, docList.isEmpty()?"false":"true");
-		        }
+				if (markRtSbj != null) {
+					String relationClause = RelationsUtils.buildWhereClause(
+							markRtSbj, null, null, id, null);
+					String whereClause = relationClause
+							+ IQueryManager.SEARCH_QUALIFIER_AND
+							+ NuxeoUtils.buildWorkflowNotDeletedWhereClause();
+					QueryContext queryContext = new QueryContext(sc,
+							whereClause);
+					queryContext.setDocType(IRelationsManager.DOC_TYPE);
+					String query = NuxeoUtils.buildNXQLQuery(sc, queryContext);
+					// Search for 1 relation that matches. 1 is enough to fail
+					// the filter
+					DocumentModelList docList = repoSession.query(query, null,
+							1, 0, false);
+					item.put(STANDARD_LIST_MARK_RT_FIELD,
+							docList.isEmpty() ? "false" : "true");
+				}
 				String uri = getUri(docModel);
 				item.put(STANDARD_LIST_URI_FIELD, uri);
 				item.put(STANDARD_LIST_REFNAME_FIELD, getRefname(docModel));
@@ -246,13 +252,19 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
 						getUpdatedAtAsString(docModel));
 				item.put(STANDARD_LIST_WORKFLOW_FIELD,
 						docModel.getCurrentLifeCycleState());
-	
+
 				for (ListResultField field : resultsFields) {
 					String schema = field.getSchema();
 					if (schema == null || schema.trim().isEmpty()) {
 						schema = commonSchema;
 					}
-					Object value = getStringValue(docModel, schema, field);
+					Object value = getListResultValue(docModel, schema, field);
+					if (value != null && value instanceof String) { // If it is String that is either null or empty, we set our value to null
+						String strValue = (String) value;
+						if (strValue.trim().isEmpty() == true) {
+							value = null; // We found an "empty" string value, so just set the value to null so we don't return anything.
+						}
+					}
 					if (value != null) {
 						item.put(field.getElement(), value);
 					}
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index b68c2ad98..7c186f17d 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -1057,7 +1057,6 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             boolean fSaveSession)
             throws ClientException, DocumentException {
         try {
-            repoSession = getRepositorySession(ctx);
             DocumentModel[] docModelArray = new DocumentModel[docList.size()];
             repoSession.saveDocuments(docList.toArray(docModelArray));
             if (fSaveSession) {
-- 
2.47.3