PAHMA-963: Updated merged code from master branch to use new RepositoryInstanceInterface.

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java
index e1810a3e4006784a82947d184806f2f633395faf..a1570e5360187d2d7becd9832b76f17032fcd58b 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/LazyAuthorityRefDocList.java
@@ -12,6 +12,8 @@ import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.repository.RepositoryClient;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthRefConfigInfo;
 import org.collectionspace.services.config.service.ServiceBindingType;
+import org.collectionspace.services.nuxeo.client.java.RepositoryInstanceInterface;
+
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;
 import org.nuxeo.ecm.core.api.impl.DocumentModelListImpl;
@@ -35,7 +37,7 @@ public class LazyAuthorityRefDocList extends DocumentModelListImpl {
        
        private ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx;
        private RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient;
-       private RepositoryInstance repoSession;
+       private RepositoryInstanceInterface repoSession;
        private List<String> serviceTypes;
        private String refName;
        private String refPropName;
@@ -69,7 +71,7 @@ public class LazyAuthorityRefDocList extends DocumentModelListImpl {
        public LazyAuthorityRefDocList(
                ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
                RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,
-               RepositoryInstance repoSession, List<String> serviceTypes,
+               RepositoryInstanceInterface repoSession, List<String> serviceTypes,
                String refName,
                String refPropName,
                Map<String, ServiceBindingType> queriedServiceBindings,

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 7699f7520cbaf91246d88983f85c035736927708..254a63f592ee99b4e90bae08a73ce40ce2d9fa30 100644 (file)
--- 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
@@ -36,8 +36,10 @@ import org.nuxeo.ecm.core.api.model.PropertyException;
 import org.nuxeo.ecm.core.api.model.PropertyNotFoundException;\r
 import org.nuxeo.ecm.core.api.model.impl.primitives.StringProperty;\r
 import org.nuxeo.ecm.core.api.repository.RepositoryInstance;\r
+\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
+\r
 import org.collectionspace.services.client.CollectionSpaceClient;\r
 import org.collectionspace.services.client.IRelationsManager;\r
 import org.collectionspace.services.client.PoxPayloadIn;\r
@@ -475,7 +477,7 @@ public class RefNameServiceUtils {
     private static DocumentModelList findAllAuthorityRefDocs(\r
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
             RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,\r
-            RepositoryInstance repoSession, List<String> serviceTypes,\r
+            RepositoryInstanceInterface repoSession, List<String> serviceTypes,\r
             String refName,\r
             String refPropName,\r
             Map<String, ServiceBindingType> queriedServiceBindings,\r