CSPACE-5129: Minor changes to support repository session sharing during call to get...

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
index b9979ecb7489173aa133996fdd27a7e9e375a499..30a95a63bd95a2741fc8e787f40147c5815cc2f6 100644 (file)
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
@@ -1212,7 +1212,7 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon>
         queryParams.putSingle(IRelationsManager.SUBJECT_QP, subjectCSID);
         queryParams.putSingle(IRelationsManager.OBJECT_QP, objectCSID);
 
-        RelationResource relationResource = new RelationResource();
+        RelationResource relationResource = new RelationResource(); //is this still acting like a singleton as it should be?
         RelationsCommonList relationsCommonList = relationResource.getList(ctx.getUriInfo());
         return relationsCommonList;
     }

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 1bc19d1a68cfa5490387a0b2c22289cb90fc4930..05c60e2c36158ac5049944336a936b441786d764 100644 (file)
--- 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
@@ -83,8 +83,7 @@ public class RelationResource extends ResourceBase {
                return this.getRelationList(queryParams, subjectCsid, subjectType, predicate, objectCsid, objectType);
        }
 
-    //this is called by collectionobjectresource...so it is still public.
-    public RelationsCommonList getRelationList(MultivaluedMap<String, String> queryParams, String subjectCsid, String subjectType,
+    private RelationsCommonList getRelationList(MultivaluedMap<String, String> queryParams, String subjectCsid, String subjectType,
                                                                          String predicate, String objectCsid, String objectType) throws WebApplicationException {
         try {
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);

diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
index 36901561978033514b9c7bffcc391a7a6d98c022..b59bf2dcad6ff670276341a99567aad8dcc24713 100644 (file)
--- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
+++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyItemDocumentModelHandler.java
@@ -74,7 +74,7 @@ public class VocabularyItemDocumentModelHandler
      */
        @Override
        protected String getPrimaryDisplayName(DocumentModel docModel,
-                       String schema, String complexPropertyName, String fieldName) {
+                       String schema, String complexPropertyName, String fieldName) { // ignore 'complexPropertyName', and 'fieldName' -use VocabularyItem specific alternatives instead.
                String result = null;
 
                try {