From 65053c2c7a59529ddba9aeb6d0fbf584f1a9048e Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Mon, 17 Oct 2016 09:13:21 +0000 Subject: [PATCH] REPO-1416: Allow Discovery to be disabled - implement - implemented changes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/public-rest-context.xml | 1 + .../api/discovery/DiscoveryApiWebscript.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml index 4d3b6227ea..eb58a57945 100644 --- a/config/alfresco/public-rest-context.xml +++ b/config/alfresco/public-rest-context.xml @@ -869,6 +869,7 @@ + diff --git a/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java b/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java index e9b0921e95..62a4b49717 100644 --- a/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java +++ b/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java @@ -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.StatusInfo; 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.tools.ApiAssistant; import org.alfresco.rest.framework.tools.RecognizedParamsExtractor; @@ -65,6 +66,9 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz private ModuleService moduleService; private ApiAssistant assistant; + private boolean enabled = true; + private final static String DISABLED = "Not Implemented"; + public void setDescriptorService(DescriptorService descriptorService) { this.descriptorService = descriptorService; @@ -111,6 +115,8 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz { try { + checkEnabled(); + DiscoveryDetails discoveryDetails = new DiscoveryDetails(getRepositoryInfo()); // Write response setResponse(webScriptResponse, DEFAULT_SUCCESS); @@ -165,4 +171,17 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz objectMapper.writeValue(generator, obj); }); } + + public void setEnabled(boolean enabled) + { + this.enabled = enabled; + } + + private void checkEnabled() + { + if (!enabled) + { + throw new DisabledServiceException(DISABLED); + } + } }