diff --git a/shardingsphere-governance/shardingsphere-governance-core/pom.xml b/shardingsphere-governance/shardingsphere-governance-core/pom.xml index 84d2fc36d13052e66cf214e0ada7cf19e1365ca7..08d9c5adf55c9ae7bd6724239ac8d02123fe6e2e 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/pom.xml +++ b/shardingsphere-governance/shardingsphere-governance-core/pom.xml @@ -32,7 +32,7 @@ shardingsphere-governance-core-config shardingsphere-governance-core-registry shardingsphere-governance-core-metadata - shardingsphere-governance-core-schema + shardingsphere-governance-core-context shardingsphere-governance-core-facade diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/pom.xml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/pom.xml similarity index 83% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/pom.xml rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/pom.xml index 0b549ee639e7063adf136d791e5573b76f5a2b8d..d71916df041ecea76ef608dac2fb8393e8e2fe5a 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/pom.xml +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/pom.xml @@ -21,13 +21,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - shardingsphere-governance-core org.apache.shardingsphere + shardingsphere-governance-core 5.0.0-RC1-SNAPSHOT - shardingsphere-governance-core-schema + shardingsphere-governance-core-context ${project.artifactId} - + org.apache.shardingsphere @@ -51,17 +51,9 @@ - org.apache.commons - commons-dbcp2 - - - com.h2database - h2 - - - com.zaxxer - HikariCP - compile + org.apache.shardingsphere + shardingsphere-test + ${project.version} diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java similarity index 95% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java index 6050ddd9cb106176ce86d865d187dd8545212598..666aec965d5279ff442f8c4136757034b2b0f8db 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContexts.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContexts.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.schema; +package org.apache.shardingsphere.governance.context.schema; import com.google.common.collect.Maps; import com.google.common.eventbus.Subscribe; @@ -235,10 +235,10 @@ public final class GovernanceSchemaContexts implements SchemaContexts { * Renew data source configuration. * * @param event data source changed event. - * @throws Exception exception + * @throws SQLException SQL exception */ @Subscribe - public synchronized void renew(final DataSourceChangedEvent event) throws Exception { + public synchronized void renew(final DataSourceChangedEvent event) throws SQLException { String schemaName = event.getSchemaName(); Map newSchemaContexts = new HashMap<>(schemaContexts.getSchemaContexts()); newSchemaContexts.remove(schemaName); @@ -299,20 +299,20 @@ public final class GovernanceSchemaContexts implements SchemaContexts { return new ShardingSphereSchema(oldShardingSphereSchema.getConfigurations(), oldShardingSphereSchema.getRules(), oldShardingSphereSchema.getDataSources(), metaData); } - private SchemaContext getChangedSchemaContext(final SchemaContext oldSchemaContext, final Collection configurations) throws SQLException { + private SchemaContext getChangedSchemaContext(final SchemaContext oldSchemaContext, final Collection ruleConfigs) throws SQLException { ShardingSphereSchema oldSchema = oldSchemaContext.getSchema(); SchemaContextsBuilder builder = new SchemaContextsBuilder(schemaContexts.getDatabaseType(), Collections.singletonMap(oldSchemaContext.getName(), oldSchema.getDataSources()), - Collections.singletonMap(oldSchemaContext.getName(), configurations), schemaContexts.getAuthentication(), schemaContexts.getProps().getProps()); + Collections.singletonMap(oldSchemaContext.getName(), ruleConfigs), schemaContexts.getAuthentication(), schemaContexts.getProps().getProps()); return builder.build().getSchemaContexts().values().iterator().next(); } - private SchemaContext getChangedSchemaContext(final SchemaContext oldSchemaContext, final Map newDataSources) throws SQLException { - Collection deletedDataSources = getDeletedDataSources(oldSchemaContext, newDataSources); - Map modifiedDataSources = getModifiedDataSources(oldSchemaContext, newDataSources); + private SchemaContext getChangedSchemaContext(final SchemaContext oldSchemaContext, final Map newDataSourceConfigs) throws SQLException { + Collection deletedDataSources = getDeletedDataSources(oldSchemaContext, newDataSourceConfigs); + Map modifiedDataSources = getModifiedDataSources(oldSchemaContext, newDataSourceConfigs); oldSchemaContext.getSchema().closeDataSources(deletedDataSources); oldSchemaContext.getSchema().closeDataSources(modifiedDataSources.keySet()); Map> dataSourcesMap = Collections.singletonMap(oldSchemaContext.getName(), - getNewDataSources(oldSchemaContext.getSchema().getDataSources(), getAddedDataSources(oldSchemaContext, newDataSources), modifiedDataSources, deletedDataSources)); + getNewDataSources(oldSchemaContext.getSchema().getDataSources(), getAddedDataSources(oldSchemaContext, newDataSourceConfigs), modifiedDataSources, deletedDataSources)); return new SchemaContextsBuilder(schemaContexts.getDatabaseType(), dataSourcesMap, Collections.singletonMap(oldSchemaContext.getName(), oldSchemaContext.getSchema().getConfigurations()), schemaContexts.getAuthentication(), schemaContexts.getProps().getProps()).build().getSchemaContexts().get(oldSchemaContext.getName()); @@ -328,15 +328,14 @@ public final class GovernanceSchemaContexts implements SchemaContexts { return result; } - private Collection getDeletedDataSources(final SchemaContext oldSchemaContext, final Map newDataSources) { + private Collection getDeletedDataSources(final SchemaContext oldSchemaContext, final Map newDataSourceConfigs) { Collection result = new LinkedList<>(oldSchemaContext.getSchema().getDataSources().keySet()); - result.removeAll(newDataSources.keySet()); + result.removeAll(newDataSourceConfigs.keySet()); return result; } - private Map getAddedDataSources(final SchemaContext oldSchemaContext, final Map newDataSources) { - Map newDataSourceConfigs = Maps.filterKeys(newDataSources, each -> !oldSchemaContext.getSchema().getDataSources().containsKey(each)); - return DataSourceConverter.getDataSourceMap(newDataSourceConfigs); + private Map getAddedDataSources(final SchemaContext oldSchemaContext, final Map newDataSourceConfigs) { + return DataSourceConverter.getDataSourceMap(Maps.filterKeys(newDataSourceConfigs, each -> !oldSchemaContext.getSchema().getDataSources().containsKey(each))); } private Map getModifiedDataSources(final SchemaContext oldSchemaContext, final Map newDataSourceConfigs) { diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/transaction/GovernanceTransactionContexts.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java similarity index 97% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/transaction/GovernanceTransactionContexts.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java index e229a966c147017da34c90b958db69d65a322574..528236805df3a68ef3942e3423e140df83fe2a24 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/main/java/org/apache/shardingsphere/governance/core/transaction/GovernanceTransactionContexts.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/main/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContexts.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.transaction; +package org.apache.shardingsphere.governance.context.transaction; import com.google.common.eventbus.Subscribe; import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangeCompletedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java similarity index 91% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java index 13169bd20dacccf2b4a15be81a7760cf527f4cb7..c8c27d0cbe792ed3237acb9391952934dd689e87 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/schema/GovernanceSchemaContextsTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/schema/GovernanceSchemaContextsTest.java @@ -15,10 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.schema; +package org.apache.shardingsphere.governance.context.schema; import lombok.SneakyThrows; -import org.apache.commons.dbcp2.BasicDataSource; 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; @@ -39,11 +38,13 @@ import org.apache.shardingsphere.infra.context.SchemaContext; import org.apache.shardingsphere.infra.context.impl.StandardSchemaContexts; import org.apache.shardingsphere.infra.context.runtime.RuntimeContext; import org.apache.shardingsphere.infra.context.schema.ShardingSphereSchema; -import org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType; +import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData; +import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.metadata.schema.RuleSchemaMetaData; import org.apache.shardingsphere.infra.rule.event.RuleChangedEvent; import org.apache.shardingsphere.masterslave.rule.MasterSlaveRule; +import org.apache.shardingsphere.test.MockedDataSource; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,6 +73,9 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public final class GovernanceSchemaContextsTest { + @Mock + private DatabaseType databaseType; + @Mock private GovernanceFacade governanceFacade; @@ -95,14 +99,15 @@ public final class GovernanceSchemaContextsTest { @Before public void setUp() { + when(databaseType.getName()).thenReturn("H2"); + when(databaseType.getDataSourceMetaData(any(), any())).thenReturn(mock(DataSourceMetaData.class)); when(governanceFacade.getRegistryCenter()).thenReturn(registryCenter); when(registryCenter.loadDisabledDataSources("schema")).thenReturn(Collections.singletonList("schema.ds_1")); when(governanceFacade.getMetaDataCenter()).thenReturn(metaDataCenter); - governanceSchemaContexts = new GovernanceSchemaContexts( - new StandardSchemaContexts(getSchemaContextMap(), authentication, configurationProperties, new H2DatabaseType()), governanceFacade); + governanceSchemaContexts = new GovernanceSchemaContexts(new StandardSchemaContexts(getSchemaContextMap(), authentication, configurationProperties, databaseType), governanceFacade); } - @SneakyThrows(Exception.class) + @SneakyThrows private Map getSchemaContextMap() { ShardingSphereSchema shardingSphereSchema = mock(ShardingSphereSchema.class); ShardingSphereMetaData shardingSphereMetaData = mock(ShardingSphereMetaData.class); @@ -146,7 +151,7 @@ public final class GovernanceSchemaContextsTest { } @Test - @SneakyThrows(Exception.class) + @SneakyThrows public void assertSchemaAdd() { SchemaAddedEvent event = new SchemaAddedEvent("schema_add", getDataSourceConfigurations(), new LinkedList<>()); governanceSchemaContexts.renew(event); @@ -154,11 +159,7 @@ public final class GovernanceSchemaContextsTest { } private Map getDataSourceConfigurations() { - BasicDataSource dataSource = new BasicDataSource(); - dataSource.setDriverClassName("org.h2.Driver"); - dataSource.setUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"); - dataSource.setUsername("sa"); - dataSource.setPassword(""); + MockedDataSource dataSource = new MockedDataSource(); Map result = new LinkedHashMap<>(3, 1); result.put("ds_m", DataSourceConfiguration.getDataSourceConfiguration(dataSource)); result.put("ds_0", DataSourceConfiguration.getDataSourceConfiguration(dataSource)); @@ -206,7 +207,7 @@ public final class GovernanceSchemaContextsTest { } @Test - @SneakyThrows(Exception.class) + @SneakyThrows public void assertRuleConfigurationsChanged() { assertThat(governanceSchemaContexts.getSchemaContexts().get("schema"), is(schemaContext)); RuleConfigurationsChangedEvent event = new RuleConfigurationsChangedEvent("schema", new LinkedList<>()); @@ -222,7 +223,7 @@ public final class GovernanceSchemaContextsTest { } @Test - @SneakyThrows(Exception.class) + @SneakyThrows public void assertDataSourceChanged() { DataSourceChangedEvent event = new DataSourceChangedEvent("schema", getChangedDataSourceConfigurations()); governanceSchemaContexts.renew(event); @@ -230,11 +231,7 @@ public final class GovernanceSchemaContextsTest { } private Map getChangedDataSourceConfigurations() { - BasicDataSource dataSource = new BasicDataSource(); - dataSource.setDriverClassName("org.h2.Driver"); - dataSource.setUrl("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"); - dataSource.setUsername("sa"); - dataSource.setPassword(""); + MockedDataSource dataSource = new MockedDataSource(); Map result = new LinkedHashMap<>(3, 1); result.put("ds_m", DataSourceConfiguration.getDataSourceConfiguration(dataSource)); result.put("ds_1", DataSourceConfiguration.getDataSourceConfiguration(dataSource)); diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/transaction/GovernanceTransactionContextsTest.java b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java similarity index 97% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/transaction/GovernanceTransactionContextsTest.java rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java index 2608db0046b6146a1dcdc39411847614a9f0ce94..1825ce0639876c4e9f388b9c10a682610e9a891b 100644 --- a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/java/org/apache/shardingsphere/governance/core/transaction/GovernanceTransactionContextsTest.java +++ b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/java/org/apache/shardingsphere/governance/context/transaction/GovernanceTransactionContextsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.governance.core.transaction; +package org.apache.shardingsphere.governance.context.transaction; import lombok.SneakyThrows; import org.apache.shardingsphere.governance.core.common.event.datasource.DataSourceChangeCompletedEvent; diff --git a/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/resources/logback-test.xml b/shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/resources/logback-test.xml similarity index 100% rename from shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-schema/src/test/resources/logback-test.xml rename to shardingsphere-governance/shardingsphere-governance-core/shardingsphere-governance-core-context/src/test/resources/logback-test.xml diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetas.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetas.java index ef85ebe07a1f00226b0d088a0d264fa14a3e330d..671b4486ced6b25f3fb6705fb7ed40e3f1001188 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetas.java +++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetas.java @@ -36,12 +36,12 @@ public final class DataSourceMetas { private final Map dataSourceMetaDataMap; - public DataSourceMetas(final DatabaseType databaseType, final Map databaseAccessConfigurationMap) { - dataSourceMetaDataMap = getDataSourceMetaDataMap(databaseType, databaseAccessConfigurationMap); + public DataSourceMetas(final DatabaseType databaseType, final Map databaseAccessConfigMap) { + dataSourceMetaDataMap = getDataSourceMetaDataMap(databaseType, databaseAccessConfigMap); } - private Map getDataSourceMetaDataMap(final DatabaseType databaseType, final Map databaseAccessConfigurationMap) { - return databaseAccessConfigurationMap.entrySet().stream() + private Map getDataSourceMetaDataMap(final DatabaseType databaseType, final Map databaseAccessConfigMap) { + return databaseAccessConfigMap.entrySet().stream() .collect(Collectors.toMap(Entry::getKey, entry -> databaseType.getDataSourceMetaData(entry.getValue().getUrl(), entry.getValue().getUsername()))); } diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml b/shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml index a1284d752f8c3475ac4197899ecc4d1bbc89545e..372d345c0452b7e4c0c763acd75c815769cc908e 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml @@ -44,7 +44,7 @@ org.apache.shardingsphere - shardingsphere-governance-core-schema + shardingsphere-governance-core-context ${project.parent.version} diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java index 88dbd43d96e3badb2acfb8909b1d2c0b74a85cec..28d8e4c9920782ea723d1820a6fedb05ad264900 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSource.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConne import org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationDataSource; import org.apache.shardingsphere.governance.core.config.ConfigCenter; import org.apache.shardingsphere.governance.core.facade.GovernanceFacade; -import org.apache.shardingsphere.governance.core.schema.GovernanceSchemaContexts; +import org.apache.shardingsphere.governance.context.schema.GovernanceSchemaContexts; import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration; import org.apache.shardingsphere.infra.auth.Authentication; import org.apache.shardingsphere.infra.config.RuleConfiguration; 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 9205d30b5abdacfc4456f2da7e87a53dd2789bc0..f6ae206f2d4d26b29e68e7d61d1951361dbfac09 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 @@ -26,7 +26,7 @@ import org.apache.shardingsphere.governance.core.common.event.props.PropertiesCh import org.apache.shardingsphere.governance.core.common.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.core.schema.GovernanceSchemaContexts; +import org.apache.shardingsphere.governance.context.schema.GovernanceSchemaContexts; import org.apache.shardingsphere.governance.repository.api.config.GovernanceCenterConfiguration; import org.apache.shardingsphere.governance.repository.api.config.GovernanceConfiguration; import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmConfiguration; @@ -113,7 +113,7 @@ public final class GovernanceShardingSphereDataSourceTest { } @Test - public void assertRenewDataSource() throws Exception { + public void assertRenewDataSource() throws SQLException { governanceSchemaContexts.renew(new DataSourceChangedEvent(DefaultSchema.LOGIC_NAME, getDataSourceConfigurations())); assertThat(governanceSchemaContexts.getDefaultSchemaContext().getSchema().getDataSources().size(), is(3)); } diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml index 3a8f726d0040c9702309cf725ab6042236d22530..2bed54162b83853d1826f83e24f4f710da365ad7 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml +++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml @@ -79,7 +79,7 @@ org.apache.shardingsphere - shardingsphere-governance-core-schema + shardingsphere-governance-core-context ${project.parent.version} diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java index 0bfd473acd1a01fb17e90043e0cae7df47d3a84a..c14228d6d38a716ff5635567c875eff8ae3965fc 100644 --- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java +++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java @@ -22,8 +22,8 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLServerInfo; import org.apache.shardingsphere.governance.core.facade.GovernanceFacade; -import org.apache.shardingsphere.governance.core.schema.GovernanceSchemaContexts; -import org.apache.shardingsphere.governance.core.transaction.GovernanceTransactionContexts; +import org.apache.shardingsphere.governance.context.schema.GovernanceSchemaContexts; +import org.apache.shardingsphere.governance.context.transaction.GovernanceTransactionContexts; import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.context.SchemaContext; import org.apache.shardingsphere.infra.context.SchemaContexts;