diff options
author | gjoranv <gv@verizonmedia.com> | 2022-07-27 00:38:07 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-07-27 00:38:07 +0200 |
commit | 142b8794721fed01606e22b821faebacea031736 (patch) | |
tree | c5c823608e17dcf5eb03469db6c6649b0e519859 /jdisc-security-filters/src/main | |
parent | ba3b5a897289d202a52a25dbba50ed400e979dae (diff) |
Move rule-based-filter config to configdefinitions module/bundle
.. to remove import-package from config-model to jdisc-security-filters.
- Keep the old config def for a while in case it's needed by
hosted Vespa config models.
Diffstat (limited to 'jdisc-security-filters/src/main')
3 files changed, 4 insertions, 9 deletions
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java index dac4d3ee4d6..9fb709126bf 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/RuleBasedRequestFilter.java @@ -6,7 +6,8 @@ import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Response; import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.jdisc.http.filter.security.base.JsonSecurityRequestFilterBase; -import com.yahoo.jdisc.http.filter.security.rule.RuleBasedFilterConfig.Rule.Action; +import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig; +import com.yahoo.vespa.config.jdisc.http.filter.RuleBasedFilterConfig.Rule.Action; import com.yahoo.restapi.Path; import java.net.URI; diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/package-info.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/package-info.java deleted file mode 100644 index 73313c2c86d..00000000000 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/rule/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package com.yahoo.jdisc.http.filter.security.rule; - -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.rule.rule-based-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.rule.rule-based-filter.def index 1d0dcddfc31..d619f5ff735 100644 --- a/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.rule.rule-based-filter.def +++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.rule.rule-based-filter.def @@ -1,4 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# TODO: remove this def when oldest hosted model no longer uses it. + namespace=jdisc.http.filter.security.rule dryrun bool default=false |