diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2021-02-18 10:29:17 +0100 |
|---|---|---|
| committer | Morten Tokle <mortent@verizonmedia.com> | 2021-02-18 10:34:07 +0100 |
| commit | 3213321255e28e16645c18b54f8770f640a96258 (patch) | |
| tree | f765590bcd5ffde25141fc6804db6a62b77ede77 /config-model | |
| parent | ea0e765980a4bda89986b1ae8a8e486f34285ac2 (diff) | |
use constant
Diffstat (limited to 'config-model')
2 files changed, 8 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java index 48bf51714ee..9e1407ec93e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/ContainerDocumentApi.java @@ -20,6 +20,8 @@ import java.util.Collections; */ public class ContainerDocumentApi { + public static final String DOCUMENT_V1_PREFIX = "/document/v1"; + private static final int FALLBACK_MAX_POOL_SIZE = 0; // Use fallback based on actual logical core count on host private static final int FALLBACK_CORE_POOL_SIZE = 0; // Use fallback based on actual logical core count on host @@ -39,7 +41,7 @@ public class ContainerDocumentApi { private static void addRestApiHandler(ContainerCluster<?> cluster, Options options) { - var handler = newVespaClientHandler("com.yahoo.document.restapi.resource.DocumentV1ApiHandler", "/document/v1/*", options); + var handler = newVespaClientHandler("com.yahoo.document.restapi.resource.DocumentV1ApiHandler", DOCUMENT_V1_PREFIX + "/*", options); cluster.addComponent(handler); // We need to include a dummy implementation of the previous restapi handler (using the same class name). diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java index 5d755d89fab..8a3c8e7d336 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/BlockFeedGlobalEndpointsFilter.java @@ -9,6 +9,9 @@ import com.yahoo.config.model.api.ContainerEndpoint; import com.yahoo.config.provision.ApplicationId; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.jdisc.http.filter.security.rule.RuleBasedFilterConfig; +import com.yahoo.path.Path; +import com.yahoo.vespa.model.clients.ContainerDocumentApi; +import com.yahoo.vespa.model.container.ContainerCluster; import java.util.List; import java.util.Set; @@ -41,8 +44,8 @@ public class BlockFeedGlobalEndpointsFilter extends Filter implements RuleBasedF .collect(Collectors.toSet()); RuleBasedFilterConfig.Rule.Builder rule = new RuleBasedFilterConfig.Rule.Builder() .hostNames(hostNames) - .pathExpressions("/reserved-for-internal-use/feedapi") - .pathExpressions("/document/v1/{*}") + .pathExpressions(ContainerCluster.RESERVED_URI_PREFIX + "/{*}") + .pathExpressions(ContainerDocumentApi.DOCUMENT_V1_PREFIX + "/{*}") .methods(List.of(PUT, POST, DELETE)) .action(BLOCK) .name("block-feed-global-endpoints") |