From 0999044bdb3671a7adb17637953239e1e4c72d48 Mon Sep 17 00:00:00 2001 From: heliang <3596006474@qq.com> Date: Thu, 11 Apr 2024 19:16:41 +0800 Subject: [PATCH 1/3] [Feature] Move Mesh Rule Router to SPI Extensions --- .../parser/model/ConditionMatch.java | 4 +-- .../configurator/parser/model/ParamMatch.java | 2 +- .../mesh/MeshScopeModelInitializer.java | 4 +-- .../mesh/route/MeshAppRuleListener.java | 12 +++---- .../model}/mesh/route/MeshEnvListener.java | 2 +- .../mesh/route/MeshEnvListenerFactory.java | 2 +- .../model}/mesh/route/MeshRuleCache.java | 14 ++++---- .../model}/mesh/route/MeshRuleConstants.java | 2 +- .../model}/mesh/route/MeshRuleManager.java | 6 ++-- .../model}/mesh/route/MeshRuleRouter.java | 36 +++++++++---------- .../mesh/route/StandardMeshRuleRouter.java | 6 ++-- .../route/StandardMeshRuleRouterFactory.java | 2 +- .../parser/model}/mesh/rule/BaseRule.java | 2 +- .../model}/mesh/rule/VsDestinationGroup.java | 6 ++-- .../destination/ConnectionPoolSettings.java | 2 +- .../rule/destination/DestinationRule.java | 4 +-- .../rule/destination/DestinationRuleSpec.java | 2 +- .../model}/mesh/rule/destination/Subset.java | 2 +- .../mesh/rule/destination/TCPSettings.java | 2 +- .../mesh/rule/destination/TcpKeepalive.java | 2 +- .../mesh/rule/destination/TrafficPolicy.java | 4 +-- .../loadbalance/ConsistentHashLB.java | 2 +- .../loadbalance/LoadBalancerSettings.java | 2 +- .../destination/loadbalance/SimpleLB.java | 2 +- .../virtualservice/DubboMatchRequest.java | 10 +++--- .../mesh/rule/virtualservice/DubboRoute.java | 4 +-- .../rule/virtualservice/DubboRouteDetail.java | 4 +-- .../virtualservice/VirtualServiceRule.java | 4 +-- .../virtualservice/VirtualServiceSpec.java | 2 +- .../destination/DubboDestination.java | 2 +- .../destination/DubboRouteDestination.java | 2 +- .../virtualservice/match/AddressMatch.java | 2 +- .../rule/virtualservice/match/BoolMatch.java | 2 +- .../virtualservice/match/DoubleMatch.java | 2 +- .../match/DoubleRangeMatch.java | 2 +- .../match/DubboAttachmentMatch.java | 4 +-- .../virtualservice/match/DubboMethodArg.java | 2 +- .../match/DubboMethodMatch.java | 2 +- .../virtualservice/match/ListBoolMatch.java | 2 +- .../virtualservice/match/ListDoubleMatch.java | 2 +- .../virtualservice/match/ListStringMatch.java | 2 +- .../virtualservice/match/StringMatch.java | 2 +- .../model}/mesh/util/MeshRuleDispatcher.java | 2 +- .../model}/mesh/util/MeshRuleListener.java | 2 +- .../mesh/util/TracingContextProvider.java | 2 +- .../cluster/router/tag/model/ParamMatch.java | 2 +- .../override/OverrideConfiguratorTest.java | 2 +- .../mesh/route/MeshAppRuleListenerTest.java | 9 +++-- .../parser}/mesh/route/MeshRuleCacheTest.java | 11 +++--- .../mesh/route/MeshRuleManagerTest.java | 8 +++-- .../mesh/route/MeshRuleRouterTest.java | 6 ++-- .../StandardMeshRuleRouterFactoryTest.java | 4 ++- .../mesh/rule/DestinationRuleTest.java | 14 ++++---- .../mesh/rule/VirtualServiceRuleTest.java | 8 ++--- .../virtualservice/DubboMatchRequestTest.java | 11 +++--- .../virtualservice/match/BoolMatchTest.java | 4 ++- .../virtualservice/match/DoubleMatchTest.java | 5 ++- .../match/DubboAttachmentMatchTest.java | 6 ++-- .../match/DubboMethodMatchTest.java | 9 ++++- .../match/ListBoolMatchTest.java | 5 ++- .../match/ListDoubleMatchTest.java | 5 ++- .../match/ListStringMatchTest.java | 5 ++- .../virtualservice/match/StringMatchTest.java | 4 ++- .../mesh/util/MeshRuleDispatcherTest.java | 5 ++- dubbo-distribution/dubbo-all-shaded/pom.xml | 4 +-- dubbo-distribution/dubbo-all/pom.xml | 4 +-- 66 files changed, 176 insertions(+), 137 deletions(-) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/MeshScopeModelInitializer.java (90%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshAppRuleListener.java (91%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshEnvListener.java (94%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshEnvListenerFactory.java (92%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshRuleCache.java (91%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshRuleConstants.java (94%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshRuleManager.java (94%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/MeshRuleRouter.java (88%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/StandardMeshRuleRouter.java (84%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/route/StandardMeshRuleRouterFactory.java (94%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/BaseRule.java (95%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/VsDestinationGroup.java (86%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/ConnectionPoolSettings.java (90%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/DestinationRule.java (87%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/DestinationRuleSpec.java (95%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/Subset.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/TCPSettings.java (91%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/TcpKeepalive.java (91%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/TrafficPolicy.java (85%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/loadbalance/ConsistentHashLB.java (89%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/loadbalance/LoadBalancerSettings.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/destination/loadbalance/SimpleLB.java (90%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/DubboMatchRequest.java (86%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/DubboRoute.java (89%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/DubboRouteDetail.java (88%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/VirtualServiceRule.java (87%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/VirtualServiceSpec.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/destination/DubboDestination.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/destination/DubboRouteDestination.java (92%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/AddressMatch.java (97%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/BoolMatch.java (92%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/DoubleMatch.java (94%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/DoubleRangeMatch.java (94%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/DubboAttachmentMatch.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/DubboMethodArg.java (96%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/DubboMethodMatch.java (97%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/ListBoolMatch.java (92%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/ListDoubleMatch.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/ListStringMatch.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/rule/virtualservice/match/StringMatch.java (96%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/util/MeshRuleDispatcher.java (98%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/util/MeshRuleListener.java (93%) rename dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser/model}/mesh/util/TracingContextProvider.java (94%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/route/MeshAppRuleListenerTest.java (96%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/route/MeshRuleCacheTest.java (89%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/route/MeshRuleManagerTest.java (95%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/route/MeshRuleRouterTest.java (98%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/route/StandardMeshRuleRouterFactoryTest.java (82%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/DestinationRuleTest.java (86%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/VirtualServiceRuleTest.java (91%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/DubboMatchRequestTest.java (90%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/BoolMatchTest.java (87%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/DoubleMatchTest.java (90%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java (95%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/DubboMethodMatchTest.java (86%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/ListBoolMatchTest.java (84%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/ListDoubleMatchTest.java (84%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/ListStringMatchTest.java (84%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/rule/virtualservice/match/StringMatchTest.java (93%) rename dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/{router => configurator/parser}/mesh/util/MeshRuleDispatcherTest.java (96%) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java index 853a6ae8df..0b6e6a3d7b 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java @@ -17,8 +17,8 @@ package org.apache.dubbo.rpc.cluster.configurator.parser.model; import org.apache.dubbo.common.URL; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.AddressMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.ListStringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.AddressMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.ListStringMatch; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java index ad6dae436f..6c4049d079 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java @@ -17,7 +17,7 @@ package org.apache.dubbo.rpc.cluster.configurator.parser.model; import org.apache.dubbo.common.URL; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; public class ParamMatch { private String key; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/MeshScopeModelInitializer.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/MeshScopeModelInitializer.java similarity index 90% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/MeshScopeModelInitializer.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/MeshScopeModelInitializer.java index 6753f9b8e4..2963f8a9c3 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/MeshScopeModelInitializer.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/MeshScopeModelInitializer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh; import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; -import org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleManager; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleManager; import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.FrameworkModel; import org.apache.dubbo.rpc.model.ModuleModel; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListener.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshAppRuleListener.java similarity index 91% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListener.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshAppRuleListener.java index ef70b7806f..a88d84b83f 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListener.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshAppRuleListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.config.configcenter.ConfigChangeType; import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent; @@ -22,8 +22,8 @@ import org.apache.dubbo.common.config.configcenter.ConfigurationListener; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.CollectionUtils; -import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleDispatcher; -import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleDispatcher; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; import java.text.MessageFormat; import java.util.HashMap; @@ -38,9 +38,9 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.representer.Representer; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_FAILED_RECEIVE_RULE; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.METADATA_KEY; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.NAME_KEY; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.STANDARD_ROUTER_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.METADATA_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.NAME_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.STANDARD_ROUTER_KEY; public class MeshAppRuleListener implements ConfigurationListener { diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListener.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListener.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListener.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListener.java index 4c70ec2675..dfc52e4ddd 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListener.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; /** * Mesh Rule Listener diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListenerFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListenerFactory.java similarity index 92% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListenerFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListenerFactory.java index 5299506caf..15801196ab 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListenerFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListenerFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.extension.SPI; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCache.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java similarity index 91% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCache.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java index a53e47280a..a819d57ab7 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCache.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.rpc.Invoker; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.VsDestinationGroup; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRuleSpec; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.Subset; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRuleSpec; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.VsDestinationGroup; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.Subset; import org.apache.dubbo.rpc.cluster.router.state.BitList; import java.util.Collections; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.INVALID_APP_NAME; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.INVALID_APP_NAME; public class MeshRuleCache { private final List appList; @@ -146,7 +146,7 @@ public class MeshRuleCache { Collections.emptyList(), Collections.emptyMap(), Collections.emptyMap(), BitList.emptyList()); } - protected static boolean isLabelMatch(URL url, String protocolServiceKey, Map inputMap) { + public static boolean isLabelMatch(URL url, String protocolServiceKey, Map inputMap) { if (inputMap == null || inputMap.size() == 0) { return true; } diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleConstants.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleConstants.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleConstants.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleConstants.java index 281a5099f6..125723932b 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleConstants.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; public class MeshRuleConstants { public static final String INVALID_APP_NAME = "unknown"; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java index 99a6656cb8..9c780f55a4 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.config.configcenter.DynamicConfiguration; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository; -import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; import org.apache.dubbo.rpc.model.ModuleModel; import java.util.Objects; @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_FAILED_RECEIVE_RULE; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.MESH_RULE_DATA_ID_SUFFIX; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.MESH_RULE_DATA_ID_SUFFIX; public class MeshRuleManager { diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java similarity index 88% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouter.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java index 06d43e9432..70fadeb94e 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; @@ -26,19 +26,19 @@ import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboMatchRequest; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboRoute; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboRouteDetail; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.VirtualServiceRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.VirtualServiceSpec; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination.DubboDestination; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination.DubboRouteDestination; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; import org.apache.dubbo.rpc.cluster.router.RouterSnapshotNode; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.VsDestinationGroup; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.DubboMatchRequest; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.DubboRoute; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.DubboRouteDetail; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.VirtualServiceRule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.VirtualServiceSpec; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.destination.DubboDestination; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.destination.DubboRouteDestination; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener; -import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.VsDestinationGroup; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; import org.apache.dubbo.rpc.cluster.router.state.AbstractStateRouter; import org.apache.dubbo.rpc.cluster.router.state.BitList; @@ -52,10 +52,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ThreadLocalRandom; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CLUSTER_FAILED_RECEIVE_RULE; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.DESTINATION_RULE_KEY; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.INVALID_APP_NAME; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.KIND_KEY; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.VIRTUAL_SERVICE_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.DESTINATION_RULE_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.INVALID_APP_NAME; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.KIND_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.VIRTUAL_SERVICE_KEY; public abstract class MeshRuleRouter extends AbstractStateRouter implements MeshRuleListener { @@ -80,7 +80,7 @@ public abstract class MeshRuleRouter extends AbstractStateRouter implement } @Override - protected BitList> doRoute( + public BitList> doRoute( BitList> invokers, URL url, Invocation invocation, diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouter.java similarity index 84% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouter.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouter.java index 5f891a6690..2d506bad0a 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouter.java @@ -14,12 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.URL; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.STANDARD_ROUTER_KEY; - public class StandardMeshRuleRouter extends MeshRuleRouter { public StandardMeshRuleRouter(URL url) { @@ -28,6 +26,6 @@ public class StandardMeshRuleRouter extends MeshRuleRouter { @Override public String ruleSuffix() { - return STANDARD_ROUTER_KEY; + return MeshRuleConstants.STANDARD_ROUTER_KEY; } } diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouterFactory.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouterFactory.java index 6c407bbb09..660132e797 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouterFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.extension.Activate; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/BaseRule.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/BaseRule.java similarity index 95% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/BaseRule.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/BaseRule.java index 232467384b..6fc855a103 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/BaseRule.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/BaseRule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule; import java.util.Map; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/VsDestinationGroup.java similarity index 86% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/VsDestinationGroup.java index 3bb18c5437..4576aee953 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/VsDestinationGroup.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.VirtualServiceRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.VirtualServiceRule; import java.util.LinkedList; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/ConnectionPoolSettings.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/ConnectionPoolSettings.java similarity index 90% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/ConnectionPoolSettings.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/ConnectionPoolSettings.java index 8fadc9bcde..114611fc39 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/ConnectionPoolSettings.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/ConnectionPoolSettings.java @@ -14,6 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; public class ConnectionPoolSettings {} diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRule.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRule.java similarity index 87% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRule.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRule.java index b78caae766..f29b6510b0 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRule.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRule.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.BaseRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.BaseRule; public class DestinationRule extends BaseRule { private DestinationRuleSpec spec; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRuleSpec.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRuleSpec.java similarity index 95% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRuleSpec.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRuleSpec.java index ee9efd9121..e937523663 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRuleSpec.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRuleSpec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/Subset.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/Subset.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/Subset.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/Subset.java index dd0a995450..745d6114f3 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/Subset.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/Subset.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; import java.util.Map; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TCPSettings.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TCPSettings.java similarity index 91% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TCPSettings.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TCPSettings.java index 9e1e12a737..de0a0012d3 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TCPSettings.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TCPSettings.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; public class TCPSettings { private int maxConnections; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TcpKeepalive.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TcpKeepalive.java similarity index 91% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TcpKeepalive.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TcpKeepalive.java index 5887f1c726..08c929bf44 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TcpKeepalive.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TcpKeepalive.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; public class TcpKeepalive { private int probes; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TrafficPolicy.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TrafficPolicy.java similarity index 85% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TrafficPolicy.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TrafficPolicy.java index 402ff63a51..827f2781a4 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TrafficPolicy.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TrafficPolicy.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.loadbalance.LoadBalancerSettings; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.loadbalance.LoadBalancerSettings; public class TrafficPolicy { private LoadBalancerSettings loadBalancer; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/ConsistentHashLB.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/ConsistentHashLB.java similarity index 89% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/ConsistentHashLB.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/ConsistentHashLB.java index 95ad44e91e..9b8372f98b 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/ConsistentHashLB.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/ConsistentHashLB.java @@ -14,6 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.loadbalance; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.loadbalance; public class ConsistentHashLB {} diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/LoadBalancerSettings.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/LoadBalancerSettings.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/LoadBalancerSettings.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/LoadBalancerSettings.java index 1be425328a..aa30f5694e 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/LoadBalancerSettings.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/LoadBalancerSettings.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.loadbalance; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.loadbalance; public class LoadBalancerSettings { private SimpleLB simple; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/SimpleLB.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/SimpleLB.java similarity index 90% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/SimpleLB.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/SimpleLB.java index 8039408411..c860064b7a 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/SimpleLB.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/SimpleLB.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.loadbalance; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.loadbalance; public enum SimpleLB { ROUND_ROBIN, diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequest.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboMatchRequest.java similarity index 86% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequest.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboMatchRequest.java index 11ab9beb77..d79b1db186 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequest.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboMatchRequest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice; import org.apache.dubbo.rpc.Invocation; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.DubboAttachmentMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.DubboMethodMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboAttachmentMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboMethodMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; import java.util.Map; import java.util.Set; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRoute.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRoute.java similarity index 89% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRoute.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRoute.java index 530abcb006..259d8e240d 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRoute.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRoute.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRouteDetail.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRouteDetail.java similarity index 88% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRouteDetail.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRouteDetail.java index cad8c0f700..0d8c5b037e 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRouteDetail.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRouteDetail.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.destination.DubboRouteDestination; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination.DubboRouteDestination; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceRule.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceRule.java similarity index 87% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceRule.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceRule.java index 76c6204b0b..dfe4ec8fa1 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceRule.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceRule.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.BaseRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.BaseRule; public class VirtualServiceRule extends BaseRule { private VirtualServiceSpec spec; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceSpec.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceSpec.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceSpec.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceSpec.java index 69f13e9614..1dc54f8859 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceSpec.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceSpec.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboDestination.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboDestination.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboDestination.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboDestination.java index a3945e0f36..6047a95b9b 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboDestination.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboDestination.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination; public class DubboDestination { private String host; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboRouteDestination.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboRouteDestination.java similarity index 92% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboRouteDestination.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboRouteDestination.java index 3f0179a109..cfc888b5f1 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboRouteDestination.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboRouteDestination.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.destination; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination; public class DubboRouteDestination { private DubboDestination destination; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/AddressMatch.java similarity index 97% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/AddressMatch.java index 834a519496..95b83c639a 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/AddressMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/BoolMatch.java similarity index 92% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/BoolMatch.java index b185cf488e..2bc5d374ae 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/BoolMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; public class BoolMatch { private Boolean exact; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleMatch.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleMatch.java index b3fd223b89..e7c77d3e8c 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; public class DoubleMatch { private Double exact; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleRangeMatch.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleRangeMatch.java index 6deccf479a..30d6fc1d54 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleRangeMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; public class DoubleRangeMatch { private Double start; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboAttachmentMatch.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboAttachmentMatch.java index 083df7cb5c..70a9f8c6b2 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboAttachmentMatch.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import org.apache.dubbo.rpc.Invocation; -import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; import java.util.Map; import java.util.Set; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodArg.java similarity index 96% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodArg.java index 3095e509df..7bc52bdcdb 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodArg.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; public class DubboMethodArg { private int index; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodMatch.java similarity index 97% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodMatch.java index e724e9f10c..77974cf7cd 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.support.RpcUtils; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListBoolMatch.java similarity index 92% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListBoolMatch.java index 940d9a8b1f..c46dd28c4c 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListBoolMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListDoubleMatch.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListDoubleMatch.java index d1599521d9..8484056d76 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListDoubleMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListStringMatch.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListStringMatch.java index 4c555780e6..ab5111bb85 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListStringMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import java.util.List; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/StringMatch.java similarity index 96% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/StringMatch.java index 3a2a85b5fd..ed02fd5276 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/StringMatch.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match; import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleDispatcher.java similarity index 98% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleDispatcher.java index 9592b776c7..b02ba626d7 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleDispatcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.util; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleListener.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleListener.java similarity index 93% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleListener.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleListener.java index 17f102babf..e9842ce37a 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleListener.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.util; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util; import java.util.List; import java.util.Map; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/TracingContextProvider.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/TracingContextProvider.java similarity index 94% rename from dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/TracingContextProvider.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/TracingContextProvider.java index d9fd8c1e0a..2a15c0c3f4 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/TracingContextProvider.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/TracingContextProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.util; +package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util; import org.apache.dubbo.common.extension.ExtensionScope; import org.apache.dubbo.common.extension.SPI; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/model/ParamMatch.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/model/ParamMatch.java index bab1284436..e71d93cfef 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/model/ParamMatch.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/model/ParamMatch.java @@ -16,7 +16,7 @@ */ package org.apache.dubbo.rpc.cluster.router.tag.model; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; public class ParamMatch { private String key; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java index f85155852d..7ffd6dc8b8 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java @@ -22,7 +22,7 @@ import org.apache.dubbo.rpc.cluster.configurator.absent.AbsentConfigurator; import org.apache.dubbo.rpc.cluster.configurator.consts.UrlConstant; import org.apache.dubbo.rpc.cluster.configurator.parser.model.ConditionMatch; import org.apache.dubbo.rpc.cluster.configurator.parser.model.ParamMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; import java.util.Arrays; import java.util.HashMap; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListenerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshAppRuleListenerTest.java similarity index 96% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListenerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshAppRuleListenerTest.java index 07724fb9fb..e708630577 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListenerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshAppRuleListenerTest.java @@ -14,13 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.route; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.configcenter.ConfigChangeType; import org.apache.dubbo.common.config.configcenter.ConfigChangedEvent; import org.apache.dubbo.common.config.configcenter.DynamicConfiguration; -import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshAppRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.StandardMeshRuleRouter; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; import java.util.List; import java.util.Map; @@ -34,7 +37,7 @@ import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.MESH_RULE_DATA_ID_SUFFIX; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.MESH_RULE_DATA_ID_SUFFIX; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCacheTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleCacheTest.java similarity index 89% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCacheTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleCacheTest.java index 76409a9f90..6d9f0e4b74 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCacheTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleCacheTest.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.route; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.rpc.Invoker; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.VsDestinationGroup; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRuleSpec; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.Subset; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleCache; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.VsDestinationGroup; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRuleSpec; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.Subset; import org.apache.dubbo.rpc.cluster.router.state.BitList; import java.util.Arrays; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java similarity index 95% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java index b81b96706a..ce2bc950c4 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java @@ -14,11 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.route; import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshAppRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleManager; import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository; -import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.ModuleModel; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouterTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleRouterTest.java similarity index 98% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouterTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleRouterTest.java index 2cf9da4cf2..fea03fff2f 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouterTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleRouterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.route; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; @@ -23,7 +23,9 @@ import org.apache.dubbo.common.utils.Holder; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcInvocation; -import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleManager; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.StandardMeshRuleRouter; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; import org.apache.dubbo.rpc.cluster.router.state.BitList; import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.ModuleModel; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactoryTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/StandardMeshRuleRouterFactoryTest.java similarity index 82% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactoryTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/StandardMeshRuleRouterFactoryTest.java index c134325a1c..dee9d4f090 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactoryTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/StandardMeshRuleRouterFactoryTest.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.route; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.route; import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.StandardMeshRuleRouter; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.StandardMeshRuleRouterFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/DestinationRuleTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/DestinationRuleTest.java similarity index 86% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/DestinationRuleTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/DestinationRuleTest.java index 4dd045156e..0da4d76642 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/DestinationRuleTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/DestinationRuleTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.loadbalance.SimpleLB; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.VirtualServiceRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.loadbalance.SimpleLB; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.VirtualServiceRule; import java.util.Map; import org.junit.jupiter.api.Test; import org.yaml.snakeyaml.Yaml; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.DESTINATION_RULE_KEY; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.KIND_KEY; -import static org.apache.dubbo.rpc.cluster.router.mesh.route.MeshRuleConstants.VIRTUAL_SERVICE_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.DESTINATION_RULE_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.KIND_KEY; +import static org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleConstants.VIRTUAL_SERVICE_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VirtualServiceRuleTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/VirtualServiceRuleTest.java similarity index 91% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VirtualServiceRuleTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/VirtualServiceRuleTest.java index 0239233002..54ba2b2b88 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VirtualServiceRuleTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/VirtualServiceRuleTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.DubboRoute; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.DubboRouteDetail; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.VirtualServiceRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboRoute; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboRouteDetail; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.VirtualServiceRule; import java.util.List; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequestTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/DubboMatchRequestTest.java similarity index 90% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequestTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/DubboMatchRequestTest.java index 02d512137e..8fc3ec44bc 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequestTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/DubboMatchRequestTest.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice; import org.apache.dubbo.rpc.RpcInvocation; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.DubboAttachmentMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.DubboMethodMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match.StringMatch; -import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboMatchRequest; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboAttachmentMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboMethodMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; import java.util.Collections; import java.util.HashMap; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/BoolMatchTest.java similarity index 87% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/BoolMatchTest.java index fcef780c74..0a020e9e17 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/BoolMatchTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.BoolMatch; import org.junit.jupiter.api.Test; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DoubleMatchTest.java similarity index 90% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DoubleMatchTest.java index 630bb37f85..acc09133c3 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DoubleMatchTest.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DoubleMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DoubleRangeMatch; import org.junit.jupiter.api.Test; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java similarity index 95% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java index bb4042ab9b..94b52d6a7a 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java @@ -14,11 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.RpcInvocation; -import org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboAttachmentMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; import java.util.Collections; import java.util.HashMap; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboMethodMatchTest.java similarity index 86% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboMethodMatchTest.java index ca478c5868..4a8686b681 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboMethodMatchTest.java @@ -14,9 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.BoolMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DoubleMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboMethodArg; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DubboMethodMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.ListDoubleMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.ListStringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListBoolMatchTest.java similarity index 84% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListBoolMatchTest.java index e5edd0f134..0d51d0f390 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListBoolMatchTest.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.BoolMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.ListBoolMatch; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListDoubleMatchTest.java similarity index 84% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListDoubleMatchTest.java index 74176a1e72..0bc0b9677f 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListDoubleMatchTest.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.DoubleMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.ListDoubleMatch; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListStringMatchTest.java similarity index 84% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListStringMatchTest.java index 7c41cb702f..ea01e8bc22 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListStringMatchTest.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.ListStringMatch; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/StringMatchTest.java similarity index 93% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/StringMatchTest.java index fdae04519e..b071850081 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/StringMatchTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.match; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.rule.virtualservice.match; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; import org.junit.jupiter.api.Test; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcherTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/util/MeshRuleDispatcherTest.java similarity index 96% rename from dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcherTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/util/MeshRuleDispatcherTest.java index e37b744990..63a4b52203 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcherTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/util/MeshRuleDispatcherTest.java @@ -14,7 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.rpc.cluster.router.mesh.util; +package org.apache.dubbo.rpc.cluster.configurator.parser.mesh.util; + +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleDispatcher; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; import java.util.HashMap; import java.util.LinkedList; diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml index b059115692..b70b07ecbe 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -844,7 +844,7 @@ META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor - META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory @@ -919,7 +919,7 @@ META-INF/dubbo/internal/org.apache.dubbo.remoting.api.pu.PortUnificationTransporter - META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider META-INF/dubbo/internal/org.apache.dubbo.metadata.rest.ServiceRestMetadataResolver diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index 19fd7dbbfc..13de64131e 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -899,7 +899,7 @@ META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor - META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory @@ -974,7 +974,7 @@ META-INF/dubbo/internal/org.apache.dubbo.remoting.api.pu.PortUnificationTransporter - META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider META-INF/dubbo/internal/org.apache.dubbo.metadata.rest.ServiceRestMetadataResolver From 81f9d029176fe3031fc053ee6547a2eb6c0f99e0 Mon Sep 17 00:00:00 2001 From: heliang <3596006474@qq.com> Date: Thu, 11 Apr 2024 19:25:17 +0800 Subject: [PATCH 2/3] [Feature] Move Mesh Rule Router to SPI Extensions --- .../configurator/parser/model/mesh/route/MeshRuleCache.java | 2 +- .../parser/model/mesh/route/MeshRuleManager.java | 2 +- .../parser/model/mesh/route/MeshRuleRouter.java | 6 +++--- .../configurator/parser/mesh/route/MeshRuleManagerTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java index a819d57ab7..71f28ebe55 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java @@ -20,9 +20,9 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.CollectionUtils; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.rpc.Invoker; -import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRuleSpec; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.VsDestinationGroup; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRuleSpec; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.Subset; import org.apache.dubbo.rpc.cluster.router.state.BitList; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java index 9c780f55a4..13d600b0b4 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java @@ -19,8 +19,8 @@ package org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route; import org.apache.dubbo.common.config.configcenter.DynamicConfiguration; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; -import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository; import org.apache.dubbo.rpc.model.ModuleModel; import java.util.Objects; diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java index 70fadeb94e..ba1fce80ca 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java @@ -26,6 +26,8 @@ import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.rpc.Invocation; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.VsDestinationGroup; +import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboMatchRequest; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboRoute; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.DubboRouteDetail; @@ -34,11 +36,9 @@ import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtuals import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination.DubboDestination; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.destination.DubboRouteDestination; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.virtualservice.match.StringMatch; -import org.apache.dubbo.rpc.cluster.router.RouterSnapshotNode; -import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.VsDestinationGroup; -import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.rule.destination.DestinationRule; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider; +import org.apache.dubbo.rpc.cluster.router.RouterSnapshotNode; import org.apache.dubbo.rpc.cluster.router.state.AbstractStateRouter; import org.apache.dubbo.rpc.cluster.router.state.BitList; diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java index ce2bc950c4..0a5f0bf906 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java @@ -21,8 +21,8 @@ import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshApp import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListener; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshRuleManager; -import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository; import org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.MeshRuleListener; +import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository; import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.ModuleModel; From 5ec4cb4ebcf5d58a878ef402203588028611b226 Mon Sep 17 00:00:00 2001 From: heliang <3596006474@qq.com> Date: Thu, 11 Apr 2024 20:28:55 +0800 Subject: [PATCH 3/3] [Feature] Move Mesh Rule Router to SPI Extensions --- dubbo-distribution/dubbo-core-spi/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml index 6ef9c5d928..3a6b75b94b 100644 --- a/dubbo-distribution/dubbo-core-spi/pom.xml +++ b/dubbo-distribution/dubbo-core-spi/pom.xml @@ -460,7 +460,7 @@ META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor - META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory @@ -535,7 +535,7 @@ META-INF/dubbo/internal/org.apache.dubbo.remoting.api.pu.PortUnificationTransporter - META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider META-INF/dubbo/internal/org.apache.dubbo.metadata.rest.ServiceRestMetadataResolver