This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 dac4e29a7e5 Rename ModeRuleFixture (#28565)
dac4e29a7e5 is described below
commit dac4e29a7e52673e2f6bb8129256f3e02c9c76b3
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Sep 24 16:36:47 2023 +0800
Rename ModeRuleFixture (#28565)
* Refactor ShardingSphereMetaData
* Refactor MetaDataVersion
* Rename ModeRuleFixture
---
.../infra/metadata/ShardingSphereMetaData.java | 4 ++--
.../infra/metadata/version/MetaDataVersion.java | 2 +-
...ibutedRuleBuilder.java => ModeRuleBuilderFixture.java} | 15 ++++++---------
...nfiguration.java => ModeRuleConfigurationFixture.java} | 9 +--------
.../{FixtureDatabaseRule.java => ModeRuleFixture.java} | 5 +----
.../shardingsphere/mode/manager/ContextManagerTest.java | 4 ++--
...sphere.infra.rule.builder.database.DatabaseRuleBuilder | 2 +-
7 files changed, 14 insertions(+), 27 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
index edc56a025b2..6e96d54075d 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereMetaData.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.infra.rule.identifier.type.ResourceHeldRule;
import
org.apache.shardingsphere.infra.rule.identifier.type.StaticDataSourceContainedRule;
import java.util.Collections;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
@@ -51,7 +51,7 @@ public final class ShardingSphereMetaData {
private final TemporaryConfigurationProperties temporaryProps;
public ShardingSphereMetaData() {
- this(new LinkedHashMap<>(), new
ResourceMetaData(Collections.emptyMap()), new
RuleMetaData(Collections.emptyList()), new ConfigurationProperties(new
Properties()));
+ this(new HashMap<>(), new ResourceMetaData(Collections.emptyMap()),
new RuleMetaData(Collections.emptyList()), new ConfigurationProperties(new
Properties()));
}
public ShardingSphereMetaData(final Map<String, ShardingSphereDatabase>
databases, final ResourceMetaData globalResourceMetaData,
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
index da8e1d5f86a..0dfe1c219eb 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
@@ -23,8 +23,8 @@ import lombok.RequiredArgsConstructor;
/**
* Meta data version.
*/
-@Getter
@RequiredArgsConstructor
+@Getter
public final class MetaDataVersion {
private final String key;
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
similarity index 67%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
index 58eb10f9e5f..f6c671eff9f 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleBuilder.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleBuilderFixture.java
@@ -25,15 +25,12 @@ import javax.sql.DataSource;
import java.util.Collection;
import java.util.Map;
-/**
- * Fixture distributed rule builder.
- */
-public final class FixtureDistributedRuleBuilder implements
DatabaseRuleBuilder<FixtureDistributedRuleConfiguration> {
+public final class ModeRuleBuilderFixture implements
DatabaseRuleBuilder<ModeRuleConfigurationFixture> {
@Override
- public FixtureDatabaseRule build(final FixtureDistributedRuleConfiguration
config, final String databaseName, final Map<String, DataSource> dataSources,
- final Collection<ShardingSphereRule>
builtRules, final InstanceContext instanceContext) {
- return new FixtureDatabaseRule();
+ public ModeRuleFixture build(final ModeRuleConfigurationFixture config,
final String databaseName, final Map<String, DataSource> dataSources,
+ final Collection<ShardingSphereRule>
builtRules, final InstanceContext instanceContext) {
+ return new ModeRuleFixture();
}
@Override
@@ -42,7 +39,7 @@ public final class FixtureDistributedRuleBuilder implements
DatabaseRuleBuilder<
}
@Override
- public Class<FixtureDistributedRuleConfiguration> getTypeClass() {
- return FixtureDistributedRuleConfiguration.class;
+ public Class<ModeRuleConfigurationFixture> getTypeClass() {
+ return ModeRuleConfigurationFixture.class;
}
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleConfiguration.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleConfigurationFixture.java
similarity index 79%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleConfiguration.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleConfigurationFixture.java
index 786b15a1ed7..72f1237bb98 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDistributedRuleConfiguration.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleConfigurationFixture.java
@@ -17,14 +17,7 @@
package org.apache.shardingsphere.mode.fixture;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.config.rule.function.DistributedRuleConfiguration;
-/**
- * Fixture distributed rule configuration.
- */
-@RequiredArgsConstructor
-@Getter
-public final class FixtureDistributedRuleConfiguration implements
DistributedRuleConfiguration {
+public final class ModeRuleConfigurationFixture implements
DistributedRuleConfiguration {
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDatabaseRule.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
similarity index 92%
rename from
mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDatabaseRule.java
rename to
mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
index 9529c462968..ef6df314d6a 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/FixtureDatabaseRule.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/fixture/ModeRuleFixture.java
@@ -22,10 +22,7 @@ import
org.apache.shardingsphere.infra.rule.identifier.scope.DatabaseRule;
import static org.mockito.Mockito.mock;
-/**
- * Fixture database rule.
- */
-public final class FixtureDatabaseRule implements DatabaseRule {
+public final class ModeRuleFixture implements DatabaseRule {
@Override
public RuleConfiguration getConfiguration() {
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index f1ef8afd9b1..1b22de022e0 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -43,7 +43,7 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import
org.apache.shardingsphere.metadata.persist.service.database.DatabaseMetaDataPersistService;
-import
org.apache.shardingsphere.mode.fixture.FixtureDistributedRuleConfiguration;
+import org.apache.shardingsphere.mode.fixture.ModeRuleConfigurationFixture;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
@@ -230,7 +230,7 @@ class ContextManagerTest {
when(metaDataContexts.getMetaData().getDatabase("foo_db")).thenReturn(database);
when(metaDataContexts.getMetaData().getGlobalRuleMetaData()).thenReturn(new
RuleMetaData(Collections.emptyList()));
when(metaDataContexts.getPersistService()).thenReturn(mock(MetaDataPersistService.class,
RETURNS_DEEP_STUBS));
-
contextManager.getConfigurationContextManager().alterRuleConfiguration("foo_db",
Collections.singleton(new FixtureDistributedRuleConfiguration()));
+
contextManager.getConfigurationContextManager().alterRuleConfiguration("foo_db",
Collections.singleton(new ModeRuleConfigurationFixture()));
assertThat(contextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getRuleMetaData().getConfigurations().size(),
is(1));
}
diff --git
a/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder
b/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder
index 9dc06203712..8eec9aef593 100644
---
a/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder
+++
b/mode/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.mode.fixture.FixtureDistributedRuleBuilder
+org.apache.shardingsphere.mode.fixture.ModeRuleBuilderFixture
