inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
131463 cturlica: REPO-1416: Allow Discovery to be disabled - implement
      - implemented changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:51:41 +00:00
parent ed96d6387c
commit 4417a239b3
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/public-rest-context.xml
View File

@@ -869,6 +869,7 @@
<property name="quickShareService" ref="QuickShareService" /> <property name="quickShareService" ref="QuickShareService" />
<property name="moduleService" ref="ModuleService" /> <property name="moduleService" ref="ModuleService" />
<property name="assistant" ref="apiAssistant" /> <property name="assistant" ref="apiAssistant" />
<property name="enabled" value="${system.api.discovery.enabled}" />
</bean> </bean>
<!-- OpenCMIS --> <!-- OpenCMIS -->

19
source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.rest.api.model.RepositoryInfo;
import org.alfresco.rest.api.model.RepositoryInfo.LicenseInfo; import org.alfresco.rest.api.model.RepositoryInfo.LicenseInfo;
import org.alfresco.rest.api.model.RepositoryInfo.StatusInfo; import org.alfresco.rest.api.model.RepositoryInfo.StatusInfo;
import org.alfresco.rest.api.model.RepositoryInfo.VersionInfo; import org.alfresco.rest.api.model.RepositoryInfo.VersionInfo;
import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
import org.alfresco.rest.framework.jacksonextensions.JacksonHelper; import org.alfresco.rest.framework.jacksonextensions.JacksonHelper;
import org.alfresco.rest.framework.tools.ApiAssistant; import org.alfresco.rest.framework.tools.ApiAssistant;
import org.alfresco.rest.framework.tools.RecognizedParamsExtractor; import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
@@ -65,6 +66,9 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
private ModuleService moduleService; private ModuleService moduleService;
private ApiAssistant assistant; private ApiAssistant assistant;
private boolean enabled = true;
private final static String DISABLED = "Not Implemented";
public void setDescriptorService(DescriptorService descriptorService) public void setDescriptorService(DescriptorService descriptorService)
{ {
this.descriptorService = descriptorService; this.descriptorService = descriptorService;
@@ -111,6 +115,8 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
{ {
try try
{ {
checkEnabled();
DiscoveryDetails discoveryDetails = new DiscoveryDetails(getRepositoryInfo()); DiscoveryDetails discoveryDetails = new DiscoveryDetails(getRepositoryInfo());
// Write response // Write response
setResponse(webScriptResponse, DEFAULT_SUCCESS); setResponse(webScriptResponse, DEFAULT_SUCCESS);
@@ -165,4 +171,17 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
objectMapper.writeValue(generator, obj); objectMapper.writeValue(generator, obj);
}); });
} }
public void setEnabled(boolean enabled)
{
this.enabled = enabled;
}
private void checkEnabled()
{
if (!enabled)
{
throw new DisabledServiceException(DISABLED);
}
}
} }