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 4268b9d8ffea7..7243e5498a9be 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.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 823717b685c0d..2fe32a729f2a8 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 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 actual = ShardingSphereDatabaseFactory.create( + Map 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 @@ void assertCreateDatabases() throws SQLException { @Test void assertCreateDatabasesWhenConfigUppercaseDatabaseName() throws SQLException { DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(), Collections.emptyList()); - Map actual = ShardingSphereDatabaseFactory.create( + Map 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 0a2928f41f314..34fb5f705ed03 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.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 @@ private static MetaDataContexts createByLocal(final MetaDataPersistService persi final ContextManagerBuilderParameter param, final ComputeNodeInstanceContext instanceContext) throws SQLException { Collection globalRuleConfigs = param.getGlobalRuleConfigs(); ConfigurationProperties props = new ConfigurationProperties(param.getProps()); - Map databases = ShardingSphereDatabaseFactory.create(param.getDatabaseConfigs(), props, instanceContext); + Map 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 @@ private static MetaDataContexts createByRepository(final MetaDataPersistService Collection 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> loadSchemas(final MetaDataPersistService persistService, final Collection 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 8993fba71c0cd..96fc1ad3f4084 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.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.when; @ExtendWith(AutoMockExtension.class) -@StaticMockSettings({ShardingSphereDatabaseFactory.class, GlobalRulesBuilder.class}) +@StaticMockSettings({ShardingSphereDatabasesFactory.class, GlobalRulesBuilder.class}) @MockitoSettings(strictness = Strictness.LENIENT) class MetaDataContextsFactoryTest { @@ -90,7 +90,7 @@ void setUp() { 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())); }