From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 3 Jul 2012 21:11:00 +0000 (-0700)
Subject: CSPACE-4406: Now including authorities in default refobjs requests
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=42eb0c7fedc108adb115ebd22a44388b492e5f58;p=tmp%2Fjakarta-migration.git

CSPACE-4406: Now including authorities in default refobjs requests
---

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
index fcee903af..567fa0580 100644
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
@@ -796,7 +796,7 @@ public abstract class AuthorityResource<AuthCommon, AuthItemHandler>
 
             List<String> serviceTypes = queryParams.remove(ServiceBindingUtils.SERVICE_TYPE_PROP);
             if(serviceTypes == null || serviceTypes.isEmpty()) {
-            	serviceTypes = ServiceBindingUtils.getCommonServiceTypes();
+            	serviceTypes = ServiceBindingUtils.getCommonServiceTypes(true); //CSPACE-5359: Should now include objects, procedures, and authorities
             }
             
             // Note that we have to create the service context for the Items, not the main service
diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
index 4070c845e..8b3577c80 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
@@ -197,10 +197,12 @@ public class ServiceBindingUtils {
     private static ArrayList<String> commonServiceTypes = null;
     private static ArrayList<String> commonProcedureServiceTypes = null;
    
-    public static ArrayList<String> getCommonServiceTypes() {
+    public static ArrayList<String> getCommonServiceTypes(boolean includeAuthorities) {
     	if(commonServiceTypes == null) {
     		commonServiceTypes = new ArrayList<String>();
-				// Problematic at this point:	commonServiceTypes.add(SERVICE_TYPE_AUTHORITY);
+    		if (includeAuthorities == true) {
+    			commonServiceTypes.add(SERVICE_TYPE_AUTHORITY); // REM - CSPACE-5359: Added back authorities to resolve this issue.
+    		}
     		commonServiceTypes.add(SERVICE_TYPE_OBJECT);
     		commonServiceTypes.add(SERVICE_TYPE_PROCEDURE);
     	}
diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
index 0a4ccfec9..87c2bbb43 100644
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
@@ -82,6 +82,8 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
 
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
     
+    private final static boolean EXCLUDE_AUTHORITIES = false;
+    
     @Override
     public String getServiceName(){
         return ServiceGroupClient.SERVICE_NAME;
@@ -170,7 +172,7 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
             // We need to get all the procedures, authorities, and objects.
 	        ArrayList<String> groupsList = null;  
 	        if("common".equalsIgnoreCase(groupname)) {
-	        	groupsList = ServiceBindingUtils.getCommonServiceTypes();
+	        	groupsList = ServiceBindingUtils.getCommonServiceTypes(false); // CSPACE-5359: Excluding Authority type to stay backward compat with v2.4
 	        } else {
 	        	groupsList = new ArrayList<String>();
 	        	groupsList.add(groupname);
@@ -226,7 +228,7 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
 	        				createDocumentHandler(ctx);
 	        ArrayList<String> groupsList = null;  
 	        if("common".equalsIgnoreCase(serviceGroupName)) {
-	        	groupsList = ServiceBindingUtils.getCommonServiceTypes();
+	        	groupsList = ServiceBindingUtils.getCommonServiceTypes(); //CSPACE-5359: Exclude authorities to remain backward compat with v2.4
 	        } else {
 	        	groupsList = new ArrayList<String>();
 	        	groupsList.add(serviceGroupName);