CSPACE-5943: Restrict results returned by inAuthority value. Minor updates to comments.

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 5f1eeef91c06156897c4f19e350b1a8f010dfe20..ddd4a7708bde17ee5cfbb78190fd4c3f9e8b0a11 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
@@ -690,16 +690,20 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon>
     
     // By convention, the name of the database table that contains
     // repeatable term information group records is derivable from
-    // an XPath base value by removing a suffix and converting to lowercase
+    // an existing XPath base value, by removing a suffix and converting
+    // to lowercase
     protected String getTermGroupTableName() {
         String termInfoGroupListName = getItemTermInfoGroupXPathBase();
         return termInfoGroupListName.substring(0, termInfoGroupListName.lastIndexOf(LIST_SUFFIX)).toLowerCase();
     }
     
     protected String getInAuthorityValue() {
-        // FIXME: Replace this placeholder / stub with actual code
-        // to obtain the relevant inAuthority value
-        return AuthorityResource.PARENT_WILDCARD;
+        String inAuthorityValue = getInAuthority();
+        if (Tools.notBlank(inAuthorityValue)) {
+            return inAuthorityValue;
+        } else {
+            return AuthorityResource.PARENT_WILDCARD;
+        }
     }
     
     @Override

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 ccbed7a5a62cbc53cdaa19f11f013b00c1ab05ba..ea900db807e77f07c25bab6977a022964d6fb1c8 100644 (file)
--- 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
@@ -923,8 +923,8 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
         
         // FIXME: Resolve how to handle the case where the partial term
         // query parameter is included in the request, but has been given an
-        // empty (blank) value. Then implement that here, if current behavior
-        // does not match the required behavior.
+        // empty (blank) value ("...?pt=") Then implement the required
+        // behavior here, if current behavior does not match what is required.
         //
         // (We're currently returning all records in that case.)
        
@@ -967,6 +967,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
         // FIXME: Get this value from an existing constant, if available
         final String USER_SUPPLIED_WILDCARD = "*";
         partialTerm = handleProvidedLeadingWildcard(partialTerm, USER_SUPPLIED_WILDCARD);
+        // Automatically insert a trailing wildcard
         params.add(partialTerm + JDBCTools.SQL_WILDCARD); // Value for replaceable parameter 1 in the query
         
         // Restrict the query to filter out deleted records, if requested