This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 ef0f44f7fdd Rename TableContainedFixtureRule (#19677)
ef0f44f7fdd is described below
commit ef0f44f7fdd208b36f728d47054d846e7ea10ce4
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jul 29 14:38:02 2022 +0800
Rename TableContainedFixtureRule (#19677)
---
.../database/schema/builder/GenericSchemaBuilderTest.java | 4 ++--
.../spi/RuleBasedSchemaMetaDataDecoratorFactoryTest.java | 8 ++++----
....java => TableContainedFixtureSchemaMetaDataDecorator.java} | 10 +++++-----
.../{CommonFixtureRule.java => TableContainedFixtureRule.java} | 4 ++--
...abase.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
index c137a78aaa3..ecc8078aa74 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.infra.database.DefaultDatabase;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
-import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.CommonFixtureRule;
+import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.TableContainedFixtureRule;
import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.DataNodeContainedFixtureRule;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.SchemaMetaDataLoaderEngine;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
@@ -65,7 +65,7 @@ public final class GenericSchemaBuilderTest {
@Before
public void setUp() {
- Collection<ShardingSphereRule> rules = Arrays.asList(new
CommonFixtureRule(), new DataNodeContainedFixtureRule());
+ Collection<ShardingSphereRule> rules = Arrays.asList(new
TableContainedFixtureRule(), new DataNodeContainedFixtureRule());
materials = new GenericSchemaBuilderMaterials(databaseType,
databaseType, Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
mock(DataSource.class)), rules, new
ConfigurationProperties(new Properties()), DefaultDatabase.LOGIC_NAME);
schemaMetaDataLoaderEngine =
mockStatic(SchemaMetaDataLoaderEngine.class);
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/spi/RuleBasedSchemaMetaDataDecoratorFactoryTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/spi/RuleBasedSchemaMetaDataDecoratorFactoryTest.java
index 3d62e6aa96d..090dc27bead 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/spi/RuleBasedSchemaMetaDataDecoratorFactoryTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/spi/RuleBasedSchemaMetaDataDecoratorFactoryTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.infra.metadata.database.schema.builder.spi;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecoratorFactory;
-import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.loader.CommonFixtureSchemaMetaDataDecorator;
-import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.CommonFixtureRule;
+import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.loader.TableContainedFixtureSchemaMetaDataDecorator;
+import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.TableContainedFixtureRule;
import org.junit.Test;
import java.util.Collections;
@@ -31,7 +31,7 @@ public final class
RuleBasedSchemaMetaDataDecoratorFactoryTest {
@Test
public void assertGetInstances() {
- CommonFixtureRule rule = new CommonFixtureRule();
-
assertThat(RuleBasedSchemaMetaDataDecoratorFactory.getInstances(Collections.singleton(rule)).get(rule),
instanceOf(CommonFixtureSchemaMetaDataDecorator.class));
+ TableContainedFixtureRule rule = new TableContainedFixtureRule();
+
assertThat(RuleBasedSchemaMetaDataDecoratorFactory.getInstances(Collections.singleton(rule)).get(rule),
instanceOf(TableContainedFixtureSchemaMetaDataDecorator.class));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/loader/CommonFixtureSchemaMetaDataDecorator.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/loader/TableContainedFixtureSchemaMetaDataDecorator.java
similarity index 78%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/loader/CommonFixtureSchemaMetaDataDecorator.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/loader/TableContainedFixtureSchemaMetaDataDecorator.java
index 0b8bf945bcd..4b9552fa825 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/loader/CommonFixtureSchemaMetaDataDecorator.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/loader/TableContainedFixtureSchemaMetaDataDecorator.java
@@ -19,15 +19,15 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.fixture.loader;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterials;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator;
-import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.CommonFixtureRule;
+import
org.apache.shardingsphere.infra.metadata.database.schema.fixture.rule.TableContainedFixtureRule;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
import java.util.Map;
-public final class CommonFixtureSchemaMetaDataDecorator implements
RuleBasedSchemaMetaDataDecorator<CommonFixtureRule> {
+public final class TableContainedFixtureSchemaMetaDataDecorator implements
RuleBasedSchemaMetaDataDecorator<TableContainedFixtureRule> {
@Override
- public Map<String, SchemaMetaData> decorate(final Map<String,
SchemaMetaData> schemaMetaDataMap, final CommonFixtureRule rule, final
GenericSchemaBuilderMaterials materials) {
+ public Map<String, SchemaMetaData> decorate(final Map<String,
SchemaMetaData> schemaMetaDataMap, final TableContainedFixtureRule rule, final
GenericSchemaBuilderMaterials materials) {
return schemaMetaDataMap;
}
@@ -37,7 +37,7 @@ public final class CommonFixtureSchemaMetaDataDecorator
implements RuleBasedSche
}
@Override
- public Class<CommonFixtureRule> getTypeClass() {
- return CommonFixtureRule.class;
+ public Class<TableContainedFixtureRule> getTypeClass() {
+ return TableContainedFixtureRule.class;
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/rule/CommonFixtureRule.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/rule/TableContainedFixtureRule.java
similarity index 90%
rename from
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/rule/CommonFixtureRule.java
rename to
shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/rule/TableContainedFixtureRule.java
index 08b78c2b6c5..4178acbc389 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/rule/CommonFixtureRule.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/fixture/rule/TableContainedFixtureRule.java
@@ -25,7 +25,7 @@ import java.util.Collections;
import static org.mockito.Mockito.mock;
-public final class CommonFixtureRule implements TableContainedRule {
+public final class TableContainedFixtureRule implements TableContainedRule {
@Override
public Collection<String> getTables() {
@@ -39,6 +39,6 @@ public final class CommonFixtureRule implements
TableContainedRule {
@Override
public String getType() {
- return CommonFixtureRule.class.getSimpleName();
+ return TableContainedFixtureRule.class.getSimpleName();
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator
b/shardingsphere-infra/shardingsphere-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator
index 715f78fb9b4..95e186c690e 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.infra.metadata.database.schema.fixture.loader.CommonFixtureSchemaMetaDataDecorator
+org.apache.shardingsphere.infra.metadata.database.schema.fixture.loader.TableContainedFixtureSchemaMetaDataDecorator
org.apache.shardingsphere.infra.metadata.database.schema.fixture.loader.DataNodeContainedFixtureRuleBasedSchemaMetaDataDecorator
