CSPACE-5728: Revert change to AbstractMultiPartCollectionSpaceResourceImpl.java;...

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
index 8bc0bce3e43ba293b2912af8650c93ca3bd95255..41483843858ee18598e50a45a8ca249788800acf 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
@@ -605,6 +605,7 @@
         only at your peril.  Use ONLY during development. - ADR 2013-01-10\r
     -->\r
     \r
+    <!--\r
     <testGroup ID="invocationModeNoContext" autoDeletePOSTS="true">\r
         \r
         <test ID="createBatchRecord">\r
@@ -725,6 +726,7 @@
         </test>\r
         \r
     </testGroup>\r
+    -->\r
     \r
 </xmlReplay>\r
 \r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
index 75bf77a5710f591e4870d5de236e2681f6802ec8..726b1420d8557805d355be61340bd0145233ae3f 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractMultiPartCollectionSpaceResourceImpl.java
@@ -176,15 +176,6 @@ public abstract class AbstractMultiPartCollectionSpaceResourceImpl extends Abstr
     public byte[] getWorkflow(\r
                @Context UriInfo uriInfo,\r
             @PathParam("csid") String csid) {\r
-        return getWorkflow(uriInfo, csid, null);\r
-        \r
-    }\r
-    \r
-    // Added to expose this functionality to batch jobs via the ResourceMap\r
-    // of ResourceBase classes.\r
-    //\r
-    // Argument 'params' is unused, and exists only to avoid duplicating method signatures.\r
-    public byte[] getWorkflow(UriInfo uriInfo, String csid, String params) {\r
         PoxPayloadOut result = null;\r
 \r
         try {\r