CSPACE-4214: Support for field level searches across most services. Includes support...

diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
index cad1a58b71358a9c3b6074aee1f704b19fd60b4c..cc9e01425a946e33887d0a6354de97178ab26b07 100644 (file)
--- a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
+++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
@@ -114,14 +114,14 @@ public class BatchResource extends ResourceBase {
                        @Context UriInfo ui) {
         AbstractCommonList list;
         if (docType != null && !docType.isEmpty() && mode != null && !mode.isEmpty()) {
-            list = search(ui.getQueryParameters(), docType, mode);
+            list = batchSearch(ui.getQueryParameters(), docType, mode);
         } else {
             list = getList(ui);
         }
         return list;
        }
 
-    protected AbstractCommonList search(MultivaluedMap<String, String> queryParams, 
+    private AbstractCommonList batchSearch(MultivaluedMap<String, String> queryParams, 
                                                                                String docType, String mode) {
         try {
             ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);

diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
index 059076801448582fbe2f619bddbec5467dec15b5..9126c7835ade57a8c9f9e6b42beba5632e747bed 100644 (file)
--- a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
+++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
@@ -89,10 +89,10 @@ public class BlobResource extends ResourceBase {
         return (CommonList) getList(csidList);
     }
 
-    @Deprecated
-    protected CommonList search(MultivaluedMap<String,String> queryParams,String keywords) {
-         return (CommonList) super.search(queryParams, keywords);
-    }
+//    @Deprecated
+//    protected CommonList search(MultivaluedMap<String,String> queryParams,String keywords) {
+//         return (CommonList) super.search(queryParams, keywords);
+//    }
     
     private CommonList getDerivativeList(ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,
                String csid) throws Exception {

diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
index b342f7f1efa9de1039a4a35628072535cabc34a9..4363ffaa8e34f0e1be48ea1ba3d958cf0d414659 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTestImpl.java
@@ -803,7 +803,7 @@ public abstract class AbstractServiceTestImpl extends BaseServiceTest implements
     /*
      * Test that searches honor the workflow deleted state.
      */
-//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class)
+    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class)
     public void searchWorkflowDeleted(String testName) throws Exception {
 
         // FIXME: Temporarily avoid running test if client is of an authority service