diff --git a/docs/document/content/features/governance/management/config-center.cn.md b/docs/document/content/features/governance/management/config-center.cn.md index d63c6e1489bd038a4d2a3f9a0d9cd6de02e24a59..23ac1256d07af92860d57d05c0bdd2961c3a146a 100644 --- a/docs/document/content/features/governance/management/config-center.cn.md +++ b/docs/document/content/features/governance/management/config-center.cn.md @@ -49,7 +49,7 @@ sql.show: true 多个数据库连接池的集合，不同数据库连接池属性自适配（例如：DBCP，C3P0，Druid, HikariCP）。 ```yaml -ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: com.zaxxer.hikari.HikariDataSource props: url: jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false @@ -61,7 +61,7 @@ ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSou minPoolSize: 1 username: root maxLifetimeMilliseconds: 1800000 -ds_1: !!org.apache.shardingsphere.governance.core.common.yaml.configYamlDataSourceConfiguration +ds_1: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: com.zaxxer.hikari.HikariDataSource props: url: jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false diff --git a/docs/document/content/features/governance/management/config-center.en.md b/docs/document/content/features/governance/management/config-center.en.md index 50bc3a380ac7b4941dad1287894089ff46a37d0c..7eac7c8149d956ab92c5bee33c01ec70b608814f 100644 --- a/docs/document/content/features/governance/management/config-center.en.md +++ b/docs/document/content/features/governance/management/config-center.en.md @@ -49,7 +49,7 @@ sql.show: true A collection of multiple database connection pools, whose properties (e.g. DBCP, C3P0, Druid and HikariCP) are configured by users themselves. ```yaml -ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: com.zaxxer.hikari.HikariDataSource props: url: jdbc:mysql://127.0.0.1:3306/demo_ds_0?serverTimezone=UTC&useSSL=false @@ -61,7 +61,7 @@ ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSou minPoolSize: 1 username: root maxLifetimeMilliseconds: 1800000 -ds_1: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_1: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: com.zaxxer.hikari.HikariDataSource props: url: jdbc:mysql://127.0.0.1:3306/demo_ds_1?serverTimezone=UTC&useSSL=false diff --git a/docs/document/content/quick-start/shardingsphere-scaling-quick-start.cn.md b/docs/document/content/quick-start/shardingsphere-scaling-quick-start.cn.md index 3a0b3304a7dfac27556bf2fb9de0acf8bc9d1d88..dd40aa47524d7747f6444bd8411d868d9f7b601b 100644 --- a/docs/document/content/quick-start/shardingsphere-scaling-quick-start.cn.md +++ b/docs/document/content/quick-start/shardingsphere-scaling-quick-start.cn.md @@ -33,7 +33,7 @@ curl -X POST \ -H 'content-type: application/json' \ -d '{ "ruleConfiguration": { - "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\'keyGenerateStrategy + "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\'keyGenerateStrategy ``` 更多管理接口详情请参见[使用手册](/cn/user-manual/shardingsphere-scaling/usage/)。 diff --git a/docs/document/content/quick-start/shardingsphere-scaling-quick-start.en.md b/docs/document/content/quick-start/shardingsphere-scaling-quick-start.en.md index f1e410f190bb57b162e1f9844a1be7666b4969bb..2645137c8c002a2d9c5d9deeb4eb171bd8dd4d73 100644 --- a/docs/document/content/quick-start/shardingsphere-scaling-quick-start.en.md +++ b/docs/document/content/quick-start/shardingsphere-scaling-quick-start.en.md @@ -33,7 +33,7 @@ curl -X POST \ -H 'content-type: application/json' \ -d '{ "ruleConfiguration": { - "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\'keyGenerateStrategy + "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\'keyGenerateStrategy ``` Please refer to [Configuration Manual](/en/user-manual/shardingsphere-scaling/usage/) for more details. diff --git a/docs/document/content/user-manual/shardingsphere-scaling/usage.cn.md b/docs/document/content/user-manual/shardingsphere-scaling/usage.cn.md index e29dc2f6c73e6faebf8bc8f4ef46d6e801ec1df3..20f197ddf619bb500729ad254e845e05969f20c4 100644 --- a/docs/document/content/user-manual/shardingsphere-scaling/usage.cn.md +++ b/docs/document/content/user-manual/shardingsphere-scaling/usage.cn.md @@ -72,7 +72,7 @@ curl -X POST \ -H 'content-type: application/json' \ -d '{ "ruleConfiguration": { - "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\''\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", + "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\''\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", "sourceRule": "defaultDatabaseStrategy:\n inline:\n algorithmExpression: ds_${user_id % 2}\n shardingColumn: user_id\ntables:\n t1:\n actualDataNodes: ds_0.t1\n keyGenerateStrategy:\n column: order_id\n type: SNOWFLAKE\n logicTable: t1\n tableStrategy:\n inline:\n algorithmExpression: t1\n shardingColumn: order_id\n t2:\n actualDataNodes: ds_0.t2\n keyGenerateStrategy:\n column: order_item_id\n type: SNOWFLAKE\n logicTable: t2\n tableStrategy:\n inline:\n algorithmExpression: t2\n shardingColumn: order_id\n", "destinationDataSources": { "name": "dt_0", diff --git a/docs/document/content/user-manual/shardingsphere-scaling/usage.en.md b/docs/document/content/user-manual/shardingsphere-scaling/usage.en.md index 99373af149b374e5c4627946891b5d9525d02203..5475becd6fd6508953574f8960acaf81c59160ec 100644 --- a/docs/document/content/user-manual/shardingsphere-scaling/usage.en.md +++ b/docs/document/content/user-manual/shardingsphere-scaling/usage.en.md @@ -72,7 +72,7 @@ curl -X POST \ -H 'content-type: application/json' \ -d '{ "ruleConfiguration": { - "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\''\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", + "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '\''123456'\''\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", "sourceRule": "defaultDatabaseStrategy:\n inline:\n algorithmExpression: ds_${user_id % 2}\n shardingColumn: user_id\ntables:\n t1:\n actualDataNodes: ds_0.t1\n keyGenerateStrategy:\n column: order_id\n type: SNOWFLAKE\n logicTable: t1\n tableStrategy:\n inline:\n algorithmExpression: t1\n shardingColumn: order_id\n t2:\n actualDataNodes: ds_0.t2\n keyGenerateStrategy:\n column: order_item_id\n type: SNOWFLAKE\n logicTable: t2\n tableStrategy:\n inline:\n algorithmExpression: t2\n shardingColumn: order_id\n", "destinationDataSources": { "name": "dt_0", diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/GovernanceEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEvent.java similarity index 93% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/GovernanceEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEvent.java index b6a7340f081f2a86ce2eadc3c5e2fe9b6d3a7d27..03b01d6fd95a85f9effd801b3019a09587bc258a 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/GovernanceEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/GovernanceEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event; +package org.apache.shardingsphere.governance.core.event; /** * Governance event. diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/auth/AuthenticationChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/auth/AuthenticationChangedEvent.java similarity index 88% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/auth/AuthenticationChangedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/auth/AuthenticationChangedEvent.java index cef1e9c7a211226e22c02d48e3ab7c8aa08f3854..4a4a08b4bf5212e484986397f30e8906b7fe27e6 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/auth/AuthenticationChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/auth/AuthenticationChangedEvent.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.auth; +package org.apache.shardingsphere.governance.core.event.auth; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.infra.auth.Authentication; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; /** * Authentication changed event. diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/datasource/DataSourceChangeCompletedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/datasource/DataSourceChangeCompletedEvent.java similarity index 89% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/datasource/DataSourceChangeCompletedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/datasource/DataSourceChangeCompletedEvent.java index b1f20c08f7a62b6724a14a494456247db8f08c68..bc9ff6847736f6b0c55bf634692084a43a5e7797 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/datasource/DataSourceChangeCompletedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/datasource/DataSourceChangeCompletedEvent.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.datasource; +package org.apache.shardingsphere.governance.core.event.datasource; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.infra.database.type.DatabaseType; import javax.sql.DataSource; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/datasource/DataSourceChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/datasource/DataSourceChangedEvent.java similarity index 88% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/datasource/DataSourceChangedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/datasource/DataSourceChangedEvent.java index b494c857f5b62e252457e630a90daa99853634dc..91c0f39bf336a867228a46c3c4f6cd71be3c1b17 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/datasource/DataSourceChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/datasource/DataSourceChangedEvent.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.datasource; +package org.apache.shardingsphere.governance.core.event.datasource; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; import java.util.Map; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/props/PropertiesChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/props/PropertiesChangedEvent.java similarity index 87% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/props/PropertiesChangedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/props/PropertiesChangedEvent.java index 9c1404a46b05ab682025cdadd7706c653e7a8bf3..510eeec901673378b12a39fc77f981252cd028cc 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/props/PropertiesChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/props/PropertiesChangedEvent.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.props; +package org.apache.shardingsphere.governance.core.event.props; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import java.util.Properties; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/rule/RuleConfigurationsChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/rule/RuleConfigurationsChangedEvent.java similarity index 89% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/rule/RuleConfigurationsChangedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/rule/RuleConfigurationsChangedEvent.java index 01a51610b6b5449508b8a6637ae172f0b64b43b0..4181c192c0d2d414a06f08c3396cfb58fa0fa53b 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/rule/RuleConfigurationsChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/rule/RuleConfigurationsChangedEvent.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.rule; +package org.apache.shardingsphere.governance.core.event.rule; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.infra.config.RuleConfiguration; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; import java.util.Collection; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/schema/SchemaAddedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/schema/SchemaAddedEvent.java similarity index 90% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/schema/SchemaAddedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/schema/SchemaAddedEvent.java index 8393031616b74a8776534864278ad558d7fb8fd6..282869d6b728e5830dd713b909e2d168781c1245 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/schema/SchemaAddedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/schema/SchemaAddedEvent.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.schema; +package org.apache.shardingsphere.governance.core.event.schema; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration; import org.apache.shardingsphere.infra.config.RuleConfiguration; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; import java.util.Collection; import java.util.Map; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/schema/SchemaDeletedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/schema/SchemaDeletedEvent.java similarity index 87% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/schema/SchemaDeletedEvent.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/schema/SchemaDeletedEvent.java index e1df12d916e78793c102261db710c59db4d4b75b..f09efec3379c29f948fea397ad3a1cf5b56bca4c 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/event/schema/SchemaDeletedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/event/schema/SchemaDeletedEvent.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.event.schema; +package org.apache.shardingsphere.governance.core.event.schema; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; /** * Schema deleted event. diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/listener/GovernanceListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/GovernanceListener.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/listener/GovernanceListener.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/GovernanceListener.java index bf269be85ffc659e26c0b513fba82dd5d0c998bf..01221ca703d43b0aa4c56935eea4b4d5a783c944 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/listener/GovernanceListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/GovernanceListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.listener; +package org.apache.shardingsphere.governance.core.listener; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/listener/PostGovernanceRepositoryEventListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/listener/PostGovernanceRepositoryEventListener.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java index 325684bace19b6c8f91b22da028c9e5365683d89..d8bd3adc3d6f22c9e9e084c27c0525603f18b444 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/listener/PostGovernanceRepositoryEventListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListener.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.listener; +package org.apache.shardingsphere.governance.core.listener; import lombok.RequiredArgsConstructor; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.governance.repository.api.GovernanceRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus; import java.util.Arrays; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/utils/IpUtils.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/utils/IpUtils.java similarity index 97% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/utils/IpUtils.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/utils/IpUtils.java index f1e3ed38bdaa1d5236e131677e2799e97d68c9a6..e29bf79beda9c6ea8b934576050b4ec681ef333c 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/utils/IpUtils.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/utils/IpUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.utils; +package org.apache.shardingsphere.governance.core.utils; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlDataSourceConfiguration.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfiguration.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlDataSourceConfiguration.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfiguration.java index 8d798496f18de48db524ac5a7513ccb0b9828ad1..6c541159fab520df5737eb7855c66261b135b2e1 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlDataSourceConfiguration.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlDataSourceConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.config; +package org.apache.shardingsphere.governance.core.yaml.config; import lombok.Getter; import lombok.Setter; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlGovernanceCenterConfiguration.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlGovernanceCenterConfiguration.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlGovernanceCenterConfiguration.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlGovernanceCenterConfiguration.java index 0eab4fea1d6d11534bc12ac1e8f28ab42401a55e..8a1016260a23234c43f52690956ca11d7da566a6 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlGovernanceCenterConfiguration.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlGovernanceCenterConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.config; +package org.apache.shardingsphere.governance.core.yaml.config; import lombok.Getter; import lombok.Setter; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlGovernanceConfiguration.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlGovernanceConfiguration.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlGovernanceConfiguration.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlGovernanceConfiguration.java index be25cf4ebcf1d68458a50f1b334d9193ca0cb00a..b9736cb7c112f5922c2145863ca7e43fa414f5c8 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/config/YamlGovernanceConfiguration.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/config/YamlGovernanceConfiguration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.config; +package org.apache.shardingsphere.governance.core.yaml.config; import lombok.Getter; import lombok.Setter; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/DataSourceConfigurationYamlSwapper.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java similarity index 91% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/DataSourceConfigurationYamlSwapper.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java index ae073c80c297fdea4d373bbfa91c55af016a6e6c..f51e323c4b09c51228ecb9b02290d61993b05b21 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/DataSourceConfigurationYamlSwapper.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapper.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.swapper; +package org.apache.shardingsphere.governance.core.yaml.swapper; +import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration; import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration; import org.apache.shardingsphere.infra.yaml.swapper.YamlSwapper; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration; /** * Data source configuration YAML swapper. diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceCenterConfigurationYamlSwapper.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapper.java similarity index 91% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceCenterConfigurationYamlSwapper.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapper.java index 30f969e7a13a371e4c477e2f4740ac942058676a..330d60c9eab052ed64d125ef7c9bad426353fdec 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceCenterConfigurationYamlSwapper.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapper.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.swapper; +package org.apache.shardingsphere.governance.core.yaml.swapper; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration; import org.apache.shardingsphere.infra.yaml.swapper.YamlSwapper; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceConfigurationYamlSwapper.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceConfigurationYamlSwapper.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java index 6c31d0003fd10201278452efb0696de52f94dae8..72df9528642b0a7201ad15c6043274160659fb28 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceConfigurationYamlSwapper.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapper.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.swapper; +package org.apache.shardingsphere.governance.core.yaml.swapper; import org.apache.shardingsphere.infra.yaml.swapper.YamlSwapper; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/listener/PostGovernanceRepositoryEventListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListenerTest.java similarity index 96% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/listener/PostGovernanceRepositoryEventListenerTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListenerTest.java index 2066dabded12efb69080e165ee10a1906bd1f5a5..e9065bab18bb545649cd32c01ded642250d495ed 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/listener/PostGovernanceRepositoryEventListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/listener/PostGovernanceRepositoryEventListenerTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.listener; +package org.apache.shardingsphere.governance.core.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.governance.repository.api.GovernanceRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/utils/IpUtilsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/utils/IpUtilsTest.java similarity index 93% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/utils/IpUtilsTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/utils/IpUtilsTest.java index 38cf7540724e82354eaef7ee6752b22feaa23548..ded43d57df9c626f5542c35222f7f3ab12041c7e 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/utils/IpUtilsTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/utils/IpUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.utils; +package org.apache.shardingsphere.governance.core.utils; import org.junit.Test; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java similarity index 94% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java index dbe23ac3852294a34efda25d2f38bfb90052684a..ad9786a41d5195552fea3ce78b81d5caa76c1d11 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/DataSourceConfigurationYamlSwapperTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.swapper; +package org.apache.shardingsphere.governance.core.yaml.swapper; +import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration; import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java similarity index 93% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java index a97d152d5e396497b52b0ca34140de2b9d3f8590..b0ff5b0365004bb1297aafa6f6bca1e130483b1c 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceCenterConfigurationYamlSwapperTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.swapper; +package org.apache.shardingsphere.governance.core.yaml.swapper; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration; import org.junit.Test; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java similarity index 96% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java index d253f7a5c26b508216cc208d473108c625435bc1..ba8a86b4101425cdf6bf4ece0909aca2528309eb 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/common/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-common/src/test/java/org/apache/shardingsphere/governance/core/yaml/swapper/GovernanceConfigurationYamlSwapperTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.common.yaml.swapper; +package org.apache.shardingsphere.governance.core.yaml.swapper; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration; import org.junit.Test; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java index 029edfb9b9d2c89b5a9e51cadc63f94b3acf8adc..fde736b8769eb4dbe39f0139240db878fe0f907e 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/ConfigCenter.java @@ -24,8 +24,8 @@ import com.google.common.base.Strings; import com.google.common.eventbus.Subscribe; import org.apache.shardingsphere.encrypt.algorithm.config.AlgorithmProvidedEncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.DataSourceConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.swapper.DataSourceConfigurationYamlSwapper; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; import org.apache.shardingsphere.infra.auth.Authentication; import org.apache.shardingsphere.infra.auth.yaml.config.YamlAuthenticationConfiguration; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListener.java index aa2c14545b7c75cae82e30585a7798965224fdc0..04dee76df799f9d9a28291d1f24883c7d7f942fc 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListener.java @@ -20,9 +20,9 @@ package org.apache.shardingsphere.governance.core.config.listener; import org.apache.shardingsphere.infra.auth.yaml.config.YamlAuthenticationConfiguration; import org.apache.shardingsphere.infra.auth.yaml.swapper.AuthenticationYamlSwapper; import org.apache.shardingsphere.infra.yaml.engine.YamlEngine; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.event.auth.AuthenticationChangedEvent; -import org.apache.shardingsphere.governance.core.common.listener.PostGovernanceRepositoryEventListener; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.auth.AuthenticationChangedEvent; +import org.apache.shardingsphere.governance.core.listener.PostGovernanceRepositoryEventListener; import org.apache.shardingsphere.governance.core.config.ConfigCenterNode; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListener.java index 7ddd2edd8165e0641e7daf8020123542392d8f21..02becd3db42ef8526c719b34c783344b3a5be9e9 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListener.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.governance.core.config.listener; import org.apache.shardingsphere.infra.yaml.engine.YamlEngine; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.event.props.PropertiesChangedEvent; -import org.apache.shardingsphere.governance.core.common.listener.PostGovernanceRepositoryEventListener; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.props.PropertiesChangedEvent; +import org.apache.shardingsphere.governance.core.listener.PostGovernanceRepositoryEventListener; import org.apache.shardingsphere.governance.core.config.ConfigCenterNode; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java index 03d37f3b10b4627b0390555cb60d6941f5b8e189..e5c1e1cbe03ce2112b4bc5933fe213faa2727996 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/main/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListener.java @@ -20,14 +20,14 @@ package org.apache.shardingsphere.governance.core.config.listener; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import org.apache.commons.collections4.SetUtils; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.rule.RuleConfigurationsChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaAddedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaDeletedEvent; -import org.apache.shardingsphere.governance.core.common.listener.PostGovernanceRepositoryEventListener; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.DataSourceConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangedEvent; +import org.apache.shardingsphere.governance.core.event.rule.RuleConfigurationsChangedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaAddedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaDeletedEvent; +import org.apache.shardingsphere.governance.core.listener.PostGovernanceRepositoryEventListener; +import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.swapper.DataSourceConfigurationYamlSwapper; import org.apache.shardingsphere.governance.core.config.ConfigCenter; import org.apache.shardingsphere.governance.core.config.ConfigCenterNode; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListenerTest.java index f4cac5740f20d1da7473b614955c88e11864bfd2..a5ccdf9a4c31336461d918d6b2ee5502265bf2f9 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/AuthenticationChangedListenerTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.governance.core.config.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.event.auth.AuthenticationChangedEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.auth.AuthenticationChangedEvent; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListenerTest.java index 4f4499ea82dbae4f71e680697653236063a6003d..4a896ebbd2f3572ce8f329705e804484f78dbb26 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/PropertiesChangedListenerTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.governance.core.config.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.event.props.PropertiesChangedEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.props.PropertiesChangedEvent; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java index e73880b09b771243a8f0c289acd3deda204cd89d..fb70d10836b0ab8ab73367d986677732f75df23d 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/java/org/apache/shardingsphere/governance/core/config/listener/SchemaChangedListenerTest.java @@ -22,11 +22,11 @@ import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.infra.config.RuleConfiguration; import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration; import org.apache.shardingsphere.masterslave.api.config.MasterSlaveRuleConfiguration; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.event.rule.RuleConfigurationsChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaAddedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaDeletedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangedEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.rule.RuleConfigurationsChangedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaAddedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaDeletedEvent; import org.apache.shardingsphere.governance.repository.api.ConfigurationRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.ChangedType; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source-init-sql.yaml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source-init-sql.yaml index 141cc8674c63c00ce7b328e610d85f7655c06cbd..7fcdef9086d1d4e45be5e50f0c5408d576080572 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source-init-sql.yaml +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source-init-sql.yaml @@ -15,7 +15,7 @@ # limitations under the License. # -ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: driverClassName: com.mysql.jdbc.Driver @@ -25,7 +25,7 @@ ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSou connectionInitSqls: - set names utf8mb4; - set names utf8; -ds_1: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_1: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: driverClassName: com.mysql.jdbc.Driver diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source.yaml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source.yaml index d73c2191366e01245fdb149d27ba53d2a0a97e90..a7b3751f3d33d54cf8dbd880cf88c97f9279ce12 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source.yaml +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/configCenter/data-source.yaml @@ -15,14 +15,14 @@ # limitations under the License. # -ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: driverClassName: com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/ds_0 username: root password: root -ds_1: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_1: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: driverClassName: com.mysql.jdbc.Driver diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/data-source.yaml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/data-source.yaml index 522c3b12a5c5dde8b9974ab0bc34430cde7a3c5e..4af0dfb99acda7edc5521c5e285c679438654474 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/data-source.yaml +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-config/src/test/resources/yaml/data-source.yaml @@ -15,7 +15,7 @@ # limitations under the License. # -master_ds: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +master_ds: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: com.zaxxer.hikari.HikariDataSource props: diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java index 666aec965d5279ff442f8c4136757034b2b0f8db..b11d68de37adfde8be33b0c8848bc79330ff2d79 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java @@ -19,13 +19,13 @@ package org.apache.shardingsphere.governance.context.schema; import com.google.common.collect.Maps; import com.google.common.eventbus.Subscribe; -import org.apache.shardingsphere.governance.core.common.event.auth.AuthenticationChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangeCompletedEvent; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.props.PropertiesChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.rule.RuleConfigurationsChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaAddedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaDeletedEvent; +import org.apache.shardingsphere.governance.core.event.auth.AuthenticationChangedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangeCompletedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangedEvent; +import org.apache.shardingsphere.governance.core.event.props.PropertiesChangedEvent; +import org.apache.shardingsphere.governance.core.event.rule.RuleConfigurationsChangedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaAddedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaDeletedEvent; import org.apache.shardingsphere.governance.core.facade.GovernanceFacade; import org.apache.shardingsphere.governance.core.metadata.event.MetaDataChangedEvent; import org.apache.shardingsphere.governance.core.registry.event.CircuitStateChangedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java index 528236805df3a68ef3942e3423e140df83fe2a24..670fdade513b9c65c193cfdfe92d50ee5b716fee 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.governance.context.transaction; import com.google.common.eventbus.Subscribe; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangeCompletedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangeCompletedEvent; import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus; import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine; import org.apache.shardingsphere.transaction.context.TransactionContexts; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java index c8c27d0cbe792ed3237acb9391952934dd689e87..8bcc29e7a7933e25f0d24af78ed3a0766dfc18df 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java @@ -18,12 +18,12 @@ package org.apache.shardingsphere.governance.context.schema; import lombok.SneakyThrows; -import org.apache.shardingsphere.governance.core.common.event.auth.AuthenticationChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.props.PropertiesChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.rule.RuleConfigurationsChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaAddedEvent; -import org.apache.shardingsphere.governance.core.common.event.schema.SchemaDeletedEvent; +import org.apache.shardingsphere.governance.core.event.auth.AuthenticationChangedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangedEvent; +import org.apache.shardingsphere.governance.core.event.props.PropertiesChangedEvent; +import org.apache.shardingsphere.governance.core.event.rule.RuleConfigurationsChangedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaAddedEvent; +import org.apache.shardingsphere.governance.core.event.schema.SchemaDeletedEvent; import org.apache.shardingsphere.governance.core.facade.GovernanceFacade; import org.apache.shardingsphere.governance.core.metadata.MetaDataCenter; import org.apache.shardingsphere.governance.core.metadata.event.MetaDataChangedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java index 1825ce0639876c4e9f388b9c10a682610e9a891b..8684f6a98905ada4fbfc5f046c11ba499fd2a81b 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.governance.context.transaction; import lombok.SneakyThrows; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangeCompletedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangeCompletedEvent; import org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine; import org.apache.shardingsphere.transaction.context.TransactionContexts; import org.junit.Test; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/event/MetaDataChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/event/MetaDataChangedEvent.java index 594cd12222d3b34133471f9c1dd5363a7f3a9dbc..74cef3b113e685123509391ddbc008cc47b66e5d 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/event/MetaDataChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/event/MetaDataChangedEvent.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.metadata.event; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData; import java.util.Collection; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListener.java index 01c0e70342fe83841e622d3a8b8a6a498a01c0d3..1eb88cf324abd0f327ba82a3981c9e1d5bda36a5 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/main/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListener.java @@ -20,8 +20,8 @@ package org.apache.shardingsphere.governance.core.metadata.listener; import org.apache.shardingsphere.governance.core.metadata.event.MetaDataChangedEvent; import org.apache.shardingsphere.governance.repository.api.GovernanceRepository; import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.listener.PostGovernanceRepositoryEventListener; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.listener.PostGovernanceRepositoryEventListener; import org.apache.shardingsphere.governance.core.metadata.yaml.RuleSchemaMetaDataYamlSwapper; import org.apache.shardingsphere.governance.core.metadata.MetaDataCenterNode; import org.apache.shardingsphere.governance.core.metadata.yaml.YamlRuleSchemaMetaData; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/test/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/test/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListenerTest.java index 5b6f2adb9a91e6d924cb5a12a0d423f168575707..32ea6e46ee4812499eecd7c391d0967558231afe 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/test/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-metadata/src/test/java/org/apache/shardingsphere/governance/core/metadata/listener/MetaDataChangedListenerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.governance.core.metadata.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.governance.core.metadata.MetaDataJson; import org.apache.shardingsphere.governance.core.metadata.event.MetaDataChangedEvent; import org.apache.shardingsphere.governance.repository.api.GovernanceRepository; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/CircuitStateChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/CircuitStateChangedEvent.java index a340a80862e4bb5d0b4c9c0d4c5ee9d3e1ae7c6e..1518fa9d81db08390588677bfd3c7bb514618d5d 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/CircuitStateChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/CircuitStateChangedEvent.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry.event; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; /** * Circuit state event. diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/DisabledStateChangedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/DisabledStateChangedEvent.java index 38757672a4773616694e1e73a2dd882baf369060..b3605208e36fce95c16651540520ca53842fd09e 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/DisabledStateChangedEvent.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/event/DisabledStateChangedEvent.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.governance.core.registry.event; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema; /** diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java index 5043a41ac38b2a6b10bc13205cb41347d4790005..f038ffbb95254b463e2a6f72cd428577a178ef23 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/instance/GovernanceInstance.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.governance.core.registry.instance; import com.google.common.base.Joiner; -import org.apache.shardingsphere.governance.core.common.utils.IpUtils; +import org.apache.shardingsphere.governance.core.utils.IpUtils; import java.lang.management.ManagementFactory; import java.util.UUID; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListener.java index cb624df954babf0b938655f8c58cd35b14fa3d0f..1858edf732d9e5471ddde9b4fb6e392decb50b87 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.governance.core.registry.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.listener.PostGovernanceRepositoryEventListener; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.listener.PostGovernanceRepositoryEventListener; import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode; import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus; import org.apache.shardingsphere.governance.core.registry.event.DisabledStateChangedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListener.java index 58a016dba7e785c2d4f5569057db2924185735f1..5da89f0e100c44238c0924df0dbdcc0e76551d1f 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListener.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListener.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.governance.core.registry.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; -import org.apache.shardingsphere.governance.core.common.listener.PostGovernanceRepositoryEventListener; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.listener.PostGovernanceRepositoryEventListener; import org.apache.shardingsphere.governance.core.registry.RegistryCenterNode; import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus; import org.apache.shardingsphere.governance.core.registry.event.CircuitStateChangedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java index 727cc55441061efef6fd0439d096bcbf01a902a4..bf987463a34c644bb70259ee9cd4824e0c8a9b4a 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/DataSourceStateChangedListenerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.governance.core.registry.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.governance.core.registry.event.DisabledStateChangedEvent; import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema; import org.apache.shardingsphere.governance.repository.api.RegistryRepository; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListenerTest.java index ecb13cccff22175a6ad8a4cc377fef9cbca5d03c..a3d40f9f164b34d960fbe1cd92533c60187db78f 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListenerTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-registry/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/InstanceStateChangedListenerTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.governance.core.registry.listener; -import org.apache.shardingsphere.governance.core.common.event.GovernanceEvent; +import org.apache.shardingsphere.governance.core.event.GovernanceEvent; import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus; import org.apache.shardingsphere.governance.core.registry.event.CircuitStateChangedEvent; import org.apache.shardingsphere.governance.repository.api.RegistryRepository; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/api/yaml/YamlGovernanceShardingSphereDataSourceFactory.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/api/yaml/YamlGovernanceShardingSphereDataSourceFactory.java index f2049759be86f24315eb84e97710535dd891cf50..53d0a4f5a152b12c90537ffa38f09baa16a9ab57 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/api/yaml/YamlGovernanceShardingSphereDataSourceFactory.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/api/yaml/YamlGovernanceShardingSphereDataSourceFactory.java @@ -22,7 +22,7 @@ import lombok.NoArgsConstructor; import org.apache.shardingsphere.driver.governance.internal.datasource.GovernanceShardingSphereDataSource; import org.apache.shardingsphere.driver.governance.internal.util.YamlGovernanceRepositoryConfigurationSwapperUtil; import org.apache.shardingsphere.driver.governance.internal.yaml.YamlGovernanceRootRuleConfigurations; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.apache.shardingsphere.infra.config.RuleConfiguration; import org.apache.shardingsphere.infra.yaml.engine.YamlEngine; import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/YamlGovernanceRepositoryConfigurationSwapperUtil.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/YamlGovernanceRepositoryConfigurationSwapperUtil.java index 0fb896f870a1c1cee889f993ffe2c0f84b85fdec..9ed0b020a8479064124f55de6930e1ed7bc1e47b 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/YamlGovernanceRepositoryConfigurationSwapperUtil.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/util/YamlGovernanceRepositoryConfigurationSwapperUtil.java @@ -20,8 +20,8 @@ package org.apache.shardingsphere.driver.governance.internal.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.GovernanceCenterConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.swapper.GovernanceCenterConfigurationYamlSwapper; /** * YAML governance configuration swapper utility. diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/yaml/YamlGovernanceRootRuleConfigurations.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/yaml/YamlGovernanceRootRuleConfigurations.java index 306a923ceb5f20abd80e73101a876797ef50aa4b..9113cd77df7b758b93a7716c63d1c411a8101360 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/yaml/YamlGovernanceRootRuleConfigurations.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/yaml/YamlGovernanceRootRuleConfigurations.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.governance.internal.yaml; import lombok.Getter; import lombok.Setter; import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; /** * YAML root rule configurations for governance. diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java index f6ae206f2d4d26b29e68e7d61d1951361dbfac09..9ccb4cd5075e873c7b63ea6456c6279b1caa5282 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java @@ -21,9 +21,9 @@ import com.google.common.collect.ImmutableMap; import org.apache.commons.dbcp2.BasicDataSource; import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory; import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource; -import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.props.PropertiesChangedEvent; -import org.apache.shardingsphere.governance.core.common.event.rule.RuleConfigurationsChangedEvent; +import org.apache.shardingsphere.governance.core.event.datasource.DataSourceChangedEvent; +import org.apache.shardingsphere.governance.core.event.props.PropertiesChangedEvent; +import org.apache.shardingsphere.governance.core.event.rule.RuleConfigurationsChangedEvent; import org.apache.shardingsphere.governance.core.registry.event.DisabledStateChangedEvent; import org.apache.shardingsphere.governance.core.registry.schema.GovernanceSchema; import org.apache.shardingsphere.governance.context.schema.GovernanceSchemaContexts; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java index 7a765fa3a6eb438bd1c25d4055d508dbd2ba6a18..d239c3d9cee3d408e6cf7e1491febbc9c6ce8fff 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/util/YamlInstanceConfigurationSwapperUtilTest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.driver.governance.internal.util; import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.junit.Test; import java.util.Properties; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java index 05f92fd266c1eb0246a9a8669320f7468e39be8d..646c6ab649785ccb2848d256918064b72dc920f6 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/GovernanceSpringBootConfiguration.java @@ -21,7 +21,7 @@ import com.google.common.base.Preconditions; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.driver.governance.internal.datasource.GovernanceShardingSphereDataSource; import org.apache.shardingsphere.infra.config.RuleConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.GovernanceCenterConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.yaml.swapper.GovernanceCenterConfigurationYamlSwapper; import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration; import org.apache.shardingsphere.spring.boot.datasource.DataSourceMapSetter; import org.apache.shardingsphere.spring.boot.governance.common.GovernanceSpringBootRootConfiguration; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/common/GovernanceSpringBootRootConfiguration.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/common/GovernanceSpringBootRootConfiguration.java index def34310c9d4fa4d9f37b1448ee5250807d8a44f..c9812404e174144080f1c3e15de8fe2efd8e20cb 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/common/GovernanceSpringBootRootConfiguration.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/governance/common/GovernanceSpringBootRootConfiguration.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.spring.boot.governance.common; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.Properties; diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 8f2844018d4e4467419a75d0067d5d11de2f9905..72db793f9c6c12e47a2803f5d49a64153bf91371 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -77,7 +77,7 @@ }, { "name": "spring.shardingsphere.governance", - "type": "java.util.Map", + "type": "java.util.Map", "sourceType": "org.apache.shardingsphere.spring.boot.governance.common.GovernanceSpringBootRootConfiguration", "description": "Customize ShardingSphere governance instance." }, diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml index 809e88331319ad1f79ca8a967226f4745259a292..892f41eaabf39f676c404db221449b04858f1c7e 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/data-source.yaml @@ -15,7 +15,7 @@ # limitations under the License. # -dataSource: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +dataSource: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/masterslave-databases.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/masterslave-databases.yaml index 7168d8c58a736e3776e05c136a868c6d6210243d..8f2821331ca63971a85a6af0564a6ec1803ad317 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/masterslave-databases.yaml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/masterslave-databases.yaml @@ -15,21 +15,21 @@ # limitations under the License. # -ds_master: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_master: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:ds_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL maxTotal: 16 password: username: sa -ds_slave_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_slave_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:demo_ds_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL maxTotal: 16 password: username: sa -ds_slave_1: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_slave_1: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:demo_ds_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml index c240e65ddc035baa9d3dda24f488860ffd4282ce..b190c9a3e7d33ed7e9959d1ddf8c07f2733e0f48 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-boot-starter/src/test/resources/yaml/sharding-databases.yaml @@ -15,21 +15,21 @@ # limitations under the License. # -ds: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL maxTotal: 16 password: '' username: sa -ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL maxTotal: 16 password: '' username: sa -ds_1: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration +ds_1: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource props: url: jdbc:h2:mem:ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/governance/GovernanceBootstrap.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/governance/GovernanceBootstrap.java index fa886b16ccd0c512eeb26eb1176dee52d53b2c33..2c5bfbdfbfeed0a079a95fb4d7d5a133befcb8f1 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/governance/GovernanceBootstrap.java +++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/governance/GovernanceBootstrap.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration import org.apache.shardingsphere.infra.config.RuleConfiguration; import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine; import org.apache.shardingsphere.infra.context.schema.DataSourceParameter; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.GovernanceConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.yaml.swapper.GovernanceConfigurationYamlSwapper; import org.apache.shardingsphere.governance.core.facade.GovernanceFacade; import org.apache.shardingsphere.proxy.config.ProxyConfiguration; import org.apache.shardingsphere.proxy.config.YamlProxyConfiguration; diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java index 383a8f3d60bc89369aab19c88b4061841549f402..c5f606fb40c690156c75658bc24e4731e75b1987 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java +++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/yaml/YamlProxyServerConfiguration.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.config.yaml; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.apache.shardingsphere.infra.auth.yaml.config.YamlAuthenticationConfiguration; import org.apache.shardingsphere.infra.yaml.config.YamlConfiguration; diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java index 2e6a9290048824349eac8136d25fce17dbef874a..e26850f30b38e97cb2797587de735c4e35b54101 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java +++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/yaml/swapper/YamlProxyConfigurationSwapperTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.proxy.config.yaml.swapper; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceConfiguration; import org.apache.shardingsphere.infra.auth.Authentication; import org.apache.shardingsphere.infra.auth.ProxyUser; import org.apache.shardingsphere.infra.auth.yaml.config.YamlAuthenticationConfiguration; diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java index 38f87da2de3c7c890462ed76f59c344be39a5b8d..770564e7f1bee448dc4f7d62a1420a35cb4b81a6 100644 --- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java +++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java @@ -27,7 +27,7 @@ import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; import io.netty.util.CharsetUtil; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration; import org.apache.shardingsphere.scaling.core.config.ScalingConfiguration; import org.apache.shardingsphere.scaling.core.config.ScalingContext; import org.apache.shardingsphere.scaling.core.config.ServerConfiguration; diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/config.json b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/config.json index 92ff0d7f9c5aab284bf861a646267115f2a39fd8..54fd7058e88d911fe1b898d815124bd4efb5dcba 100644 --- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/config.json +++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/resources/config.json @@ -17,7 +17,7 @@ { "ruleConfiguration": { - "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '123456'\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", + "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '123456'\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", "sourceRule": "defaultDatabaseStrategy:\n standard:\n shardingAlgorithmName: inline\n shardingColumn: user_id\ntables:\n t1:\n actualDataNodes: ds_0.t1\n keyGenerateStrategy:\n column: order_id\n logicTable: t1\n tableStrategy:\n standard:\n shardingAlgorithmName: inline\n shardingColumn: order_id\n t2:\n actualDataNodes: ds_0.t2\n keyGenerateStrategy:\n column: order_item_id\n logicTable: t2\n tableStrategy:\n standard:\n shardingAlgorithmName: inline\n shardingColumn: order_id", "destinationDataSources": { "name": "dt_0", diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java index 2f5164d71b8f7a2e2220dac0db43c27506e3d523..255c1bb18da96ecbd01faa6f01a9362600a9178f 100644 --- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java +++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.scaling.core.config; import lombok.Getter; import lombok.Setter; import org.apache.shardingsphere.infra.yaml.config.YamlConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; /** * Global server configuration. diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumeBreakPointManager.java index fe5d1410858ea1af80dbe1bd34a236d4f643fa15..1698be945197caff6909430b6067a52583e0dbcf 100644 --- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumeBreakPointManager.java +++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumeBreakPointManager.java @@ -19,8 +19,8 @@ package org.apache.shardingsphere.scaling.core.job.position.resume; import com.google.common.base.Strings; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlGovernanceCenterConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.GovernanceCenterConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.yaml.config.YamlGovernanceCenterConfiguration; +import org.apache.shardingsphere.governance.core.yaml.swapper.GovernanceCenterConfigurationYamlSwapper; import org.apache.shardingsphere.governance.repository.zookeeper.CuratorZookeeperRepository; import org.apache.shardingsphere.scaling.core.config.ScalingContext; diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java index e7d22da4da75ee7eb7a4c6099da59a50f6786538..9d853da8a00ef55f65151e2f7f6609bd62a476ac 100644 --- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java +++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/utils/ConfigurationYamlConverter.java @@ -23,8 +23,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration; import org.apache.shardingsphere.infra.yaml.engine.YamlEngine; -import org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration; -import org.apache.shardingsphere.governance.core.common.yaml.swapper.DataSourceConfigurationYamlSwapper; +import org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration; +import org.apache.shardingsphere.governance.core.yaml.swapper.DataSourceConfigurationYamlSwapper; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.yaml.config.YamlShardingRuleConfiguration; import org.apache.shardingsphere.sharding.yaml.swapper.ShardingRuleConfigurationYamlSwapper; diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config.json b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config.json index ef933ef15978da6a6676156d68f120a7515a5a6c..833d5bbf4ffa2f26c7b3fcfd781ee5d6b5e86556 100644 --- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config.json +++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/resources/config.json @@ -17,7 +17,7 @@ { "ruleConfiguration": { - "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.common.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '123456'\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", + "sourceDatasource": "ds_0: !!org.apache.shardingsphere.governance.core.yaml.config.YamlDataSourceConfiguration\n dataSourceClassName: com.zaxxer.hikari.HikariDataSource\n props:\n jdbcUrl: jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useSSL=false\n username: root\n password: '123456'\n connectionTimeout: 30000\n idleTimeout: 60000\n maxLifetime: 1800000\n maxPoolSize: 50\n minPoolSize: 1\n maintenanceIntervalMilliseconds: 30000\n readOnly: false\n", "sourceRule": "defaultDatabaseStrategy:\n standard:\n shardingAlgorithmName: inline\n shardingColumn: user_id\ntables:\n t1:\n actualDataNodes: ds_0.t1\n keyGenerateStrategy:\n column: order_id\n logicTable: t1\n tableStrategy:\n standard:\n shardingAlgorithmName: inline\n shardingColumn: order_id\n t2:\n actualDataNodes: ds_0.t2\n keyGenerateStrategy:\n column: order_item_id\n logicTable: t2\n tableStrategy:\n standard:\n shardingAlgorithmName: inline\n shardingColumn: order_id", "destinationDataSources": { "name": "dt_0",