natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 5ec4cb4ebc into ca1ae1f4b6

This commit is contained in:
heliang666s 2024-06-26 00:57:31 +08:00 committed by GitHub
parent ca1ae1f4b6 5ec4cb4ebc
commit ec35bed7eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
67 changed files with 178 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ConditionMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/ParamMatch.java
View File

@ -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;

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/MeshScopeModelInitializer.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/MeshScopeModelInitializer.java
View File

@ -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;

12
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListener.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshAppRuleListener.java
View File

@ -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 {

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListener.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListener.java
View File

@ -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

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshEnvListenerFactory.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshEnvListenerFactory.java
View File

@ -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;

14
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCache.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleCache.java
View File

@ -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.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.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<T> {
private final List<String> appList;
@ -146,7 +146,7 @@ public class MeshRuleCache<T> {
Collections.emptyList(), Collections.emptyMap(), Collections.emptyMap(), BitList.emptyList());
}
protected static boolean isLabelMatch(URL url, String protocolServiceKey, Map<String, String> inputMap) {
public static boolean isLabelMatch(URL url, String protocolServiceKey, Map<String, String> inputMap) {
if (inputMap == null || inputMap.size() == 0) {
return true;
}

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleConstants.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleConstants.java
View File

@ -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";

6
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManager.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleManager.java
View File

@ -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.configurator.parser.model.mesh.util.MeshRuleListener;
import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository;
import org.apache.dubbo.rpc.cluster.router.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 {

36
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouter.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/MeshRuleRouter.java
View File

@ -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.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;
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.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.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.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<T> extends AbstractStateRouter<T> implements MeshRuleListener {
@ -80,7 +80,7 @@ public abstract class MeshRuleRouter<T> extends AbstractStateRouter<T> implement
}
@Override
protected BitList<Invoker<T>> doRoute(
public BitList<Invoker<T>> doRoute(
BitList<Invoker<T>> invokers,
URL url,
Invocation invocation,

6
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouter.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouter.java
View File

@ -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<T> extends MeshRuleRouter<T> {
public StandardMeshRuleRouter(URL url) {
@ -28,6 +26,6 @@ public class StandardMeshRuleRouter<T> extends MeshRuleRouter<T> {
@Override
public String ruleSuffix() {
return STANDARD_ROUTER_KEY;
return MeshRuleConstants.STANDARD_ROUTER_KEY;
}
}

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactory.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/route/StandardMeshRuleRouterFactory.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/BaseRule.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/BaseRule.java
View File

@ -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;

6
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/VsDestinationGroup.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/ConnectionPoolSettings.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/ConnectionPoolSettings.java
View File

@ -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 {}

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRule.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRule.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/DestinationRuleSpec.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/DestinationRuleSpec.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/Subset.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/Subset.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TCPSettings.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TCPSettings.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TcpKeepalive.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TcpKeepalive.java
View File

@ -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;

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/TrafficPolicy.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/TrafficPolicy.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/ConsistentHashLB.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/ConsistentHashLB.java
View File

@ -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 {}

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/LoadBalancerSettings.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/LoadBalancerSettings.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/destination/loadbalance/SimpleLB.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/destination/loadbalance/SimpleLB.java
View File

@ -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,

10
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequest.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboMatchRequest.java
View File

@ -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;

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRoute.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRoute.java
View File

@ -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;

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboRouteDetail.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/DubboRouteDetail.java
View File

@ -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;

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceRule.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceRule.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/VirtualServiceSpec.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/VirtualServiceSpec.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboDestination.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboDestination.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/destination/DubboRouteDestination.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/destination/DubboRouteDestination.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/AddressMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/AddressMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/BoolMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleRangeMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DoubleRangeMatch.java
View File

@ -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;

4
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboAttachmentMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodArg.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodArg.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/DubboMethodMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListBoolMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListDoubleMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/ListStringMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatch.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/rule/virtualservice/match/StringMatch.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcher.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleDispatcher.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleListener.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/MeshRuleListener.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/util/TracingContextProvider.java → dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/model/mesh/util/TracingContextProvider.java
View File

@ -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;

2
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/model/ParamMatch.java
View File

@ -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;

2
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java
View File

@ -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;

9
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshAppRuleListenerTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshAppRuleListenerTest.java
View File

@ -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;

11
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleCacheTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleCacheTest.java
View File

@ -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;

8
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleManagerTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleManagerTest.java
View File

@ -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.configurator.parser.model.mesh.util.MeshRuleListener;
import org.apache.dubbo.rpc.cluster.governance.GovernanceRuleRepository;
import org.apache.dubbo.rpc.cluster.router.mesh.util.MeshRuleListener;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ModuleModel;

6
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/MeshRuleRouterTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/MeshRuleRouterTest.java
View File

@ -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;

4
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/route/StandardMeshRuleRouterFactoryTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/route/StandardMeshRuleRouterFactoryTest.java
View File

@ -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;

14
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/DestinationRuleTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/DestinationRuleTest.java
View File

@ -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;

8
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VirtualServiceRuleTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/VirtualServiceRuleTest.java
View File

@ -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;

11
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/DubboMatchRequestTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/DubboMatchRequestTest.java
View File

@ -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;

4
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/BoolMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/BoolMatchTest.java
View File

@ -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;

5
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DoubleMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DoubleMatchTest.java
View File

@ -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;

6
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboAttachmentMatchTest.java
View File

@ -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;

9
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/DubboMethodMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/DubboMethodMatchTest.java
View File

@ -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;

5
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListBoolMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListBoolMatchTest.java
View File

@ -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;

5
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListDoubleMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListDoubleMatchTest.java
View File

@ -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;

5
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/ListStringMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/ListStringMatchTest.java
View File

@ -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;

4
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/virtualservice/match/StringMatchTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/rule/virtualservice/match/StringMatchTest.java
View File

@ -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;

5
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/mesh/util/MeshRuleDispatcherTest.java → dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/parser/mesh/util/MeshRuleDispatcherTest.java
View File

@ -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;

4
dubbo-distribution/dubbo-all-shaded/pom.xml
View File

@ -791,7 +791,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory</resource>
@ -869,7 +869,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.api.pu.PortUnificationTransporter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.executor.IsolationExecutorSupportFactory</resource>

4
dubbo-distribution/dubbo-all/pom.xml
View File

@ -839,7 +839,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory</resource>
@ -917,7 +917,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.api.pu.PortUnificationTransporter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.executor.IsolationExecutorSupportFactory</resource>

4
dubbo-distribution/dubbo-core-spi/pom.xml
View File

@ -424,7 +424,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.interceptor.ClusterInterceptor</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.route.MeshEnvListenerFactory</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory</resource>
@ -502,7 +502,7 @@
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.api.pu.PortUnificationTransporter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.util.TracingContextProvider</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.configurator.parser.model.mesh.util.TracingContextProvider</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.executor.IsolationExecutorSupportFactory</resource>