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 2024/06/20 15:06:06 UTC

(shardingsphere) branch master updated: Move package of GlobalClockRuleConfiguration (#31787)

This is an automated email from the ASF dual-hosted git repository.

zhangliang 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 69527d8cd83 Move package of GlobalClockRuleConfiguration (#31787)
69527d8cd83 is described below

commit 69527d8cd83ee0d65e8069512384075b574ce64d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 20 23:05:59 2024 +0800

    Move package of GlobalClockRuleConfiguration (#31787)
---
 .../globalclock/{api => }/config/GlobalClockRuleConfiguration.java    | 2 +-
 .../org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java   | 4 ++--
 .../rule/builder/DefaultGlobalClockRuleConfigurationBuilder.java      | 2 +-
 .../globalclock/rule/builder/GlobalClockRuleBuilder.java              | 2 +-
 .../globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java     | 2 +-
 .../yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java         | 2 +-
 .../distsql/handler/query/ShowGlobalClockRuleExecutor.java            | 2 +-
 .../distsql/handler/update/AlterGlobalClockRuleExecutor.java          | 2 +-
 .../distsql/handler/query/ShowGlobalClockRuleExecutorTest.java        | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kernel/global-clock/api/src/main/java/org/apache/shardingsphere/globalclock/api/config/GlobalClockRuleConfiguration.java b/kernel/global-clock/api/src/main/java/org/apache/shardingsphere/globalclock/config/GlobalClockRuleConfiguration.java
similarity index 95%
rename from kernel/global-clock/api/src/main/java/org/apache/shardingsphere/globalclock/api/config/GlobalClockRuleConfiguration.java
rename to kernel/global-clock/api/src/main/java/org/apache/shardingsphere/globalclock/config/GlobalClockRuleConfiguration.java
index cc2f09a0ac1..6f2b4d3db2a 100644
--- a/kernel/global-clock/api/src/main/java/org/apache/shardingsphere/globalclock/api/config/GlobalClockRuleConfiguration.java
+++ b/kernel/global-clock/api/src/main/java/org/apache/shardingsphere/globalclock/config/GlobalClockRuleConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.globalclock.api.config;
+package org.apache.shardingsphere.globalclock.config;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
index a95c915b7f7..50c6ade0063 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/GlobalClockRule.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.globalclock.rule;
 
 import lombok.Getter;
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.provider.GlobalClockProvider;
 import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -37,9 +37,9 @@ import java.util.Properties;
 /**
  * Global clock rule.
  */
+@Getter
 public final class GlobalClockRule implements GlobalRule {
     
-    @Getter
     private final GlobalClockRuleConfiguration configuration;
     
     public GlobalClockRule(final GlobalClockRuleConfiguration ruleConfig, final Map<String, ShardingSphereDatabase> databases) {
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/DefaultGlobalClockRuleConfigurationBuilder.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/DefaultGlobalClockRuleConfigurationBuilder.java
index a77077e93b6..587a99cfd41 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/DefaultGlobalClockRuleConfigurationBuilder.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/DefaultGlobalClockRuleConfigurationBuilder.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.globalclock.rule.builder;
 
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.rule.constant.GlobalClockOrder;
 import org.apache.shardingsphere.infra.rule.builder.global.DefaultGlobalRuleConfigurationBuilder;
 
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/GlobalClockRuleBuilder.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/GlobalClockRuleBuilder.java
index 5bb9db31c16..f490549210a 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/GlobalClockRuleBuilder.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/rule/builder/GlobalClockRuleBuilder.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.globalclock.rule.builder;
 
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
 import org.apache.shardingsphere.globalclock.rule.constant.GlobalClockOrder;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
index 4c640a45f24..01591fa1dc4 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.globalclock.yaml.config;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlGlobalRuleConfiguration;
 import org.apache.shardingsphere.mode.tuple.annotation.RepositoryTupleEntity;
 
diff --git a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
index 2cfc0757df6..67e11b565da 100644
--- a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
+++ b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.globalclock.yaml.swapper;
 
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.rule.constant.GlobalClockOrder;
 import org.apache.shardingsphere.globalclock.yaml.config.YamlGlobalClockRuleConfiguration;
 import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
index cc9e77a3b7e..c506deaa23e 100644
--- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
+++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.globalclock.distsql.handler.query;
 import lombok.Setter;
 import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorRuleAware;
 import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
 import org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement;
 import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java
index fe4e13de37c..62c5b2e573f 100644
--- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java
+++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleExecutor.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.globalclock.distsql.handler.update;
 
 import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
 import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement;
 
diff --git a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
index 8b69bc65e69..66e8611b51e 100644
--- a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
+++ b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.globalclock.distsql.handler.query;
 
 import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
 import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecuteEngine;
-import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration;
+import org.apache.shardingsphere.globalclock.config.GlobalClockRuleConfiguration;
 import org.apache.shardingsphere.globalclock.rule.GlobalClockRule;
 import org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement;
 import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;