This is an automated email from the ASF dual-hosted git repository.
menghaoranss 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 7568693e8ee Remove DefaultIdentifierCasePolicyProvider and related
tests (#39118)
7568693e8ee is described below
commit 7568693e8ee02637a47d3cca8acbf449797932e5
Author: Haoran Meng <[email protected]>
AuthorDate: Wed Jul 15 11:23:00 2026 +0800
Remove DefaultIdentifierCasePolicyProvider and related tests (#39118)
---
.../identifier/IdentifierCasePolicyFactory.java | 19 --------
.../IdentifierCasePolicyFactoryTest.java | 23 ---------
.../DefaultIdentifierCasePolicyProvider.java | 44 ------------------
...etadata.identifier.IdentifierCasePolicyProvider | 18 --------
.../DefaultIdentifierCasePolicyProviderTest.java | 54 ----------------------
5 files changed, 158 deletions(-)
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactory.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactory.java
index 948fe57396c..5c0cb1c216f 100644
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactory.java
+++
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactory.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.database.connector.core.metadata.identifier;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.IdentifierPatternType;
import java.util.Locale;
import java.util.function.UnaryOperator;
@@ -86,24 +85,6 @@ public final class IdentifierCasePolicyFactory {
return newQuotedInsensitivePolicySet();
}
- /**
- * Create dialect default policy set.
- *
- * @param identifierPatternType identifier pattern type
- * @return dialect default policy set
- */
- public static IdentifierCasePolicySet newDialectDefaultPolicySet(final
IdentifierPatternType identifierPatternType) {
- switch (identifierPatternType) {
- case LOWER_CASE:
- return newLowerCasePolicySet();
- case UPPER_CASE:
- return newUpperCasePolicySet();
- case KEEP_ORIGIN:
- default:
- return newInsensitivePolicySet();
- }
- }
-
private static String toLowerCase(final String value) {
return value.toLowerCase(Locale.ENGLISH);
}
diff --git
a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactoryTest.java
b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactoryTest.java
index 165bcf960a9..d31aef19e49 100644
---
a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactoryTest.java
+++
b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/metadata/identifier/IdentifierCasePolicyFactoryTest.java
@@ -18,13 +18,7 @@
package org.apache.shardingsphere.database.connector.core.metadata.identifier;
import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.QuoteCharacter;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.IdentifierPatternType;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.util.stream.Stream;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -77,21 +71,4 @@ class IdentifierCasePolicyFactoryTest {
assertThat(actual.getLookupMode(QuoteCharacter.NONE),
is(LookupMode.NORMALIZED));
assertTrue(actual.matches("t_mask", "T_MASK",
QuoteCharacter.BACK_QUOTE));
}
-
- @ParameterizedTest(name = "{0}")
- @MethodSource("newDialectDefaultPolicySetArguments")
- void assertNewDialectDefaultPolicySet(final String name, final
IdentifierPatternType identifierPatternType, final LookupMode
expectedQuotedLookupMode, final LookupMode expectedUnquotedLookupMode,
- final String storedName, final
String actualIdentifier, final boolean expected) {
- IdentifierCasePolicy actual =
IdentifierCasePolicyFactory.newDialectDefaultPolicySet(identifierPatternType).getPolicy(IdentifierScope.TABLE);
- assertThat(actual.getLookupMode(QuoteCharacter.QUOTE),
is(expectedQuotedLookupMode));
- assertThat(actual.getLookupMode(QuoteCharacter.NONE),
is(expectedUnquotedLookupMode));
- assertThat(actual.matches(storedName, actualIdentifier,
QuoteCharacter.NONE), is(expected));
- }
-
- private static Stream<Arguments> newDialectDefaultPolicySetArguments() {
- return Stream.of(
- Arguments.of("lower_case", IdentifierPatternType.LOWER_CASE,
LookupMode.EXACT, LookupMode.NORMALIZED, "foo", "FOO", true),
- Arguments.of("upper_case", IdentifierPatternType.UPPER_CASE,
LookupMode.EXACT, LookupMode.NORMALIZED, "FOO", "foo", true),
- Arguments.of("keep_origin", IdentifierPatternType.KEEP_ORIGIN,
LookupMode.EXACT, LookupMode.NORMALIZED, "Foo", "FOO", true));
- }
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/DefaultIdentifierCasePolicyProvider.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/DefaultIdentifierCasePolicyProvider.java
deleted file mode 100644
index 81eef1af5ed..00000000000
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/DefaultIdentifierCasePolicyProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.infra.metadata.identifier;
-
-import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProvider;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProviderContext;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicySet;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyFactory;
-import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
-
-import java.util.Optional;
-
-/**
- * Default provider of identifier case rules.
- */
-public final class DefaultIdentifierCasePolicyProvider implements
IdentifierCasePolicyProvider {
-
- @Override
- public Optional<IdentifierCasePolicySet> provide(final
IdentifierCasePolicyProviderContext context) {
- DialectDatabaseMetaData dialectDatabaseMetaData =
DatabaseTypedSPILoader.getService(DialectDatabaseMetaData.class,
context.getDatabaseType());
- return
Optional.of(IdentifierCasePolicyFactory.newDialectDefaultPolicySet(dialectDatabaseMetaData.getIdentifierPatternType()));
- }
-
- @Override
- public boolean isDefault() {
- return true;
- }
-}
diff --git
a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProvider
b/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProvider
deleted file mode 100644
index 06c04b6f396..00000000000
---
a/infra/common/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProvider
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.infra.metadata.identifier.DefaultIdentifierCasePolicyProvider
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/DefaultIdentifierCasePolicyProviderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/DefaultIdentifierCasePolicyProviderTest.java
deleted file mode 100644
index 66ac530a95b..00000000000
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/DefaultIdentifierCasePolicyProviderTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.infra.metadata.identifier;
-
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.QuoteCharacter;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicy;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProvider;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierCasePolicyProviderContext;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierScope;
-import
org.apache.shardingsphere.database.connector.core.metadata.identifier.LookupMode;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isA;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class DefaultIdentifierCasePolicyProviderTest {
-
- @Test
- void assertIsDefault() {
- IdentifierCasePolicyProvider actual =
TypedSPILoader.getService(IdentifierCasePolicyProvider.class, null);
- assertThat(actual, isA(DefaultIdentifierCasePolicyProvider.class));
- assertTrue(actual.isDefault());
- }
-
- @Test
- void assertProvideSQL92PolicySet() {
- IdentifierCasePolicyProvider actual =
TypedSPILoader.getService(IdentifierCasePolicyProvider.class, null);
- IdentifierCasePolicy actualPolicy =
- actual.provide(new
IdentifierCasePolicyProviderContext(TypedSPILoader.getService(DatabaseType.class,
"SQL92"), null))
-
.orElseThrow(AssertionError::new).getPolicy(IdentifierScope.TABLE);
- assertThat(actualPolicy.getLookupMode(QuoteCharacter.NONE),
is(LookupMode.NORMALIZED));
- assertTrue(actualPolicy.matches("foo", "FOO", QuoteCharacter.NONE));
- assertThat(actualPolicy.getLookupMode(QuoteCharacter.BACK_QUOTE),
is(LookupMode.EXACT));
- }
-}
