You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/10 03:31:54 UTC
[shardingsphere] branch master updated: Remove useless ALGORITHM_PROVIDER_ORDER for spring usage (#22780)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 850dd03deb0 Remove useless ALGORITHM_PROVIDER_ORDER for spring usage (#22780)
850dd03deb0 is described below
commit 850dd03deb0df76c6b05032b5cbba4264e95eac9
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Sat Dec 10 11:31:48 2022 +0800
Remove useless ALGORITHM_PROVIDER_ORDER for spring usage (#22780)
* Remove useless ALGORITHM_PROVIDER_ORDER for spring usage
* fix unit test
* fix unit test
---
.../shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java | 5 -----
.../org/apache/shardingsphere/encrypt/constant/EncryptOrder.java | 5 -----
.../readwritesplitting/constant/ReadwriteSplittingOrder.java | 5 -----
.../java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java | 5 -----
.../org/apache/shardingsphere/sharding/constant/ShardingOrder.java | 5 -----
.../sharding/cache/rule/builder/ShardingCacheRuleBuilder.java | 2 +-
.../yaml/swapper/YamlShardingCacheRuleConfigurationSwapper.java | 2 +-
.../sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java | 2 +-
.../yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java | 2 +-
9 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java
index 5ae5fe25d38..f9ec2c6fa79 100644
--- a/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java
+++ b/features/db-discovery/core/src/main/java/org/apache/shardingsphere/dbdiscovery/constant/DatabaseDiscoveryOrder.java
@@ -30,9 +30,4 @@ public final class DatabaseDiscoveryOrder {
* Database discovery order.
*/
public static final int ORDER = 40;
-
- /**
- * Algorithm provider database discovery order.
- */
- public static final int ALGORITHM_PROVIDER_ORDER = ORDER + 1;
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/constant/EncryptOrder.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/constant/EncryptOrder.java
index ce8f2f1e172..649d5d672d4 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/constant/EncryptOrder.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/constant/EncryptOrder.java
@@ -30,9 +30,4 @@ public final class EncryptOrder {
* Encrypt order.
*/
public static final int ORDER = 10;
-
- /**
- * Algorithm provider encrypt order.
- */
- public static final int ALGORITHM_PROVIDER_ORDER = ORDER + 1;
}
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java
index dc0916b3462..112b720cf66 100644
--- a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java
+++ b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/constant/ReadwriteSplittingOrder.java
@@ -30,9 +30,4 @@ public final class ReadwriteSplittingOrder {
* Readwrite-splitting order.
*/
public static final int ORDER = 30;
-
- /**
- * Algorithm provider readwrite-splitting order.
- */
- public static final int ALGORITHM_PROVIDER_ORDER = ORDER + 1;
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java
index a02cf7690aa..3541d474e72 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/constant/ShadowOrder.java
@@ -30,9 +30,4 @@ public final class ShadowOrder {
* Shadow order.
*/
public static final int ORDER = 50;
-
- /**
- * Algorithm provider shadow order.
- */
- public static final int ALGORITHM_PROVIDER_ORDER = ORDER + 1;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
index 22acab09d77..1f101d40fef 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/constant/ShardingOrder.java
@@ -30,9 +30,4 @@ public final class ShardingOrder {
* Sharding order.
*/
public static final int ORDER = -10;
-
- /**
- * Algorithm provider sharding order.
- */
- public static final int ALGORITHM_PROVIDER_ORDER = ORDER + 1;
}
diff --git a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilder.java b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilder.java
index 3ecfc9251ab..c0d5900a0c5 100644
--- a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilder.java
+++ b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilder.java
@@ -45,7 +45,7 @@ public final class ShardingCacheRuleBuilder implements DatabaseRuleBuilder<Shard
@Override
public int getOrder() {
- return ShardingOrder.ALGORITHM_PROVIDER_ORDER + 1;
+ return ShardingOrder.ORDER + 1;
}
@Override
diff --git a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapper.java b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapper.java
index b4fcdd0b085..669cb37eb8c 100644
--- a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapper.java
+++ b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapper.java
@@ -54,6 +54,6 @@ public final class YamlShardingCacheRuleConfigurationSwapper implements YamlRule
@Override
public int getOrder() {
- return ShardingOrder.ALGORITHM_PROVIDER_ORDER + 1;
+ return ShardingOrder.ORDER + 1;
}
}
diff --git a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java
index 7b1ecd77ad3..74f8b11eb22 100644
--- a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java
+++ b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/rule/builder/ShardingCacheRuleBuilderTest.java
@@ -52,7 +52,7 @@ public final class ShardingCacheRuleBuilderTest {
@Test
public void assertGetOrder() {
- assertThat(new ShardingCacheRuleBuilder().getOrder(), is(-8));
+ assertThat(new ShardingCacheRuleBuilder().getOrder(), is(-9));
}
@Test
diff --git a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java
index fa98ed7a35e..fe4558963f8 100644
--- a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java
+++ b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/yaml/swapper/YamlShardingCacheRuleConfigurationSwapperTest.java
@@ -70,6 +70,6 @@ public final class YamlShardingCacheRuleConfigurationSwapperTest {
@Test
public void assertGetOrder() {
- assertThat(new YamlShardingCacheRuleConfigurationSwapper().getOrder(), is(-8));
+ assertThat(new YamlShardingCacheRuleConfigurationSwapper().getOrder(), is(-9));
}
}