This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new f05cfe2e222 Rename ShardingSphereDatabasesFactory (#34394)
f05cfe2e222 is described below
commit f05cfe2e22298cefa512a3ee95829784e9d39149
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 19 00:08:12 2025 +0800
Rename ShardingSphereDatabasesFactory (#34394)
---
...hereDatabaseFactory.java => ShardingSphereDatabasesFactory.java} | 4 ++--
...baseFactoryTest.java => ShardingSphereDatabasesFactoryTest.java} | 6 +++---
.../shardingsphere/mode/metadata/MetaDataContextsFactory.java | 6 +++---
.../shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactory.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactory.java
similarity index 98%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactory.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactory.java
index 4268b9d8ffe..7243e5498a9 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactory.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactory.java
@@ -36,10 +36,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
- * ShardingSphere database factory.
+ * ShardingSphere databases factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingSphereDatabaseFactory {
+public final class ShardingSphereDatabasesFactory {
/**
* Create databases.
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactoryTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactoryTest.java
similarity index 96%
rename from
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactoryTest.java
rename to
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactoryTest.java
index 823717b685c..2fe32a729f2 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabaseFactoryTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactoryTest.java
@@ -31,12 +31,12 @@ import java.util.Properties;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
-class ShardingSphereDatabaseFactoryTest {
+class ShardingSphereDatabasesFactoryTest {
@Test
void assertCreateDatabases() throws SQLException {
DatabaseConfiguration databaseConfig = new
DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(),
Collections.emptyList());
- Map<String, ShardingSphereDatabase> actual =
ShardingSphereDatabaseFactory.create(
+ Map<String, ShardingSphereDatabase> actual =
ShardingSphereDatabasesFactory.create(
Collections.singletonMap("foo_db", databaseConfig), new
ConfigurationProperties(new Properties()),
mock(ComputeNodeInstanceContext.class));
assertTrue(actual.containsKey("foo_db"));
assertTrue(actual.get("foo_db").getResourceMetaData().getStorageUnits().isEmpty());
@@ -45,7 +45,7 @@ class ShardingSphereDatabaseFactoryTest {
@Test
void assertCreateDatabasesWhenConfigUppercaseDatabaseName() throws
SQLException {
DatabaseConfiguration databaseConfig = new
DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(),
Collections.emptyList());
- Map<String, ShardingSphereDatabase> actual =
ShardingSphereDatabaseFactory.create(
+ Map<String, ShardingSphereDatabase> actual =
ShardingSphereDatabasesFactory.create(
Collections.singletonMap("FOO_DB", databaseConfig), new
ConfigurationProperties(new Properties()),
mock(ComputeNodeInstanceContext.class));
assertTrue(actual.containsKey("foo_db"));
assertTrue(actual.get("foo_db").getResourceMetaData().getStorageUnits().isEmpty());
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index 0a2928f41f3..34fb5f705ed 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -43,7 +43,7 @@ import
org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereSchemaD
import
org.apache.shardingsphere.infra.metadata.statistics.builder.ShardingSphereStatisticsFactory;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabaseFactory;
+import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabasesFactory;
import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
@@ -83,7 +83,7 @@ public final class MetaDataContextsFactory {
final
ContextManagerBuilderParameter param, final ComputeNodeInstanceContext
instanceContext) throws SQLException {
Collection<RuleConfiguration> globalRuleConfigs =
param.getGlobalRuleConfigs();
ConfigurationProperties props = new
ConfigurationProperties(param.getProps());
- Map<String, ShardingSphereDatabase> databases =
ShardingSphereDatabaseFactory.create(param.getDatabaseConfigs(), props,
instanceContext);
+ Map<String, ShardingSphereDatabase> databases =
ShardingSphereDatabasesFactory.create(param.getDatabaseConfigs(), props,
instanceContext);
MetaDataContexts result = newMetaDataContexts(persistService, param,
globalRuleConfigs, databases, props);
persistDatabaseConfigurations(result, param, persistService);
persistMetaData(result, persistService);
@@ -96,7 +96,7 @@ public final class MetaDataContextsFactory {
Collection<RuleConfiguration> globalRuleConfigs =
persistService.getGlobalRuleService().load();
ConfigurationProperties props = new
ConfigurationProperties(persistService.getPropsService().load());
return newMetaDataContexts(persistService, param, globalRuleConfigs,
- ShardingSphereDatabaseFactory.create(effectiveDatabaseConfigs,
loadSchemas(persistService, effectiveDatabaseConfigs.keySet()), props,
instanceContext), props);
+
ShardingSphereDatabasesFactory.create(effectiveDatabaseConfigs,
loadSchemas(persistService, effectiveDatabaseConfigs.keySet()), props,
instanceContext), props);
}
private static Map<String, Collection<ShardingSphereSchema>>
loadSchemas(final MetaDataPersistService persistService, final
Collection<String> databaseNames) {
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
index 8993fba71c0..96fc1ad3f40 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactoryTest.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.infra.instance.metadata.jdbc.JDBCInstanceMetaDa
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabaseFactory;
+import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabasesFactory;
import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.config.database.DatabaseRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.config.global.GlobalRulePersistService;
@@ -63,7 +63,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
-@StaticMockSettings({ShardingSphereDatabaseFactory.class,
GlobalRulesBuilder.class})
+@StaticMockSettings({ShardingSphereDatabasesFactory.class,
GlobalRulesBuilder.class})
@MockitoSettings(strictness = Strictness.LENIENT)
class MetaDataContextsFactoryTest {
@@ -90,7 +90,7 @@ class MetaDataContextsFactoryTest {
when(database.getName()).thenReturn("foo_db");
when(database.getProtocolType()).thenReturn(databaseType);
when(database.getRuleMetaData().getRules()).thenReturn(Collections.emptyList());
- when(ShardingSphereDatabaseFactory.create(anyMap(), anyMap(), any(),
any())).thenReturn(new HashMap<>(Collections.singletonMap("foo_db", database)));
+ when(ShardingSphereDatabasesFactory.create(anyMap(), anyMap(), any(),
any())).thenReturn(new HashMap<>(Collections.singletonMap("foo_db", database)));
when(GlobalRulesBuilder.buildRules(anyCollection(), anyCollection(),
any(ConfigurationProperties.class))).thenReturn(Collections.singleton(new
MockedRule()));
}
