This is an automated email from the ASF dual-hosted git repository.
panjuan 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 6175b8ffd32 Remove deprecated schemaName in YamlRootConfiguration
(#30156)
6175b8ffd32 is described below
commit 6175b8ffd32452da02429ed556af80bd402211ff
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Sat Feb 17 18:18:03 2024 +0800
Remove deprecated schemaName in YamlRootConfiguration (#30156)
---
.../infra/yaml/config/pojo/YamlRootConfiguration.java | 18 ------------------
.../driver/api/yaml/YamlJDBCConfiguration.java | 18 ------------------
.../proxy/backend/config/ProxyConfigurationLoader.java | 3 ---
.../config/yaml/YamlProxyDatabaseConfiguration.java | 2 --
.../ral/queryable/ExportMetaDataExecutorTest.java | 1 -
5 files changed, 42 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/YamlRootConfiguration.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/YamlRootConfiguration.java
index 74fe6818b5e..a974b1b5c2f 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/YamlRootConfiguration.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/config/pojo/YamlRootConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.yaml.config.pojo;
-import com.google.common.base.Strings;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.infra.util.yaml.YamlConfiguration;
@@ -39,14 +38,6 @@ public final class YamlRootConfiguration implements
YamlConfiguration {
private String databaseName;
- /**
- * Schema name.
- *
- * @deprecated Should use databaseName, schemaName will remove in next
version.
- */
- @Deprecated
- private String schemaName;
-
private Map<String, Map<String, Object>> dataSources = new HashMap<>();
private Collection<YamlRuleConfiguration> rules = new LinkedList<>();
@@ -54,13 +45,4 @@ public final class YamlRootConfiguration implements
YamlConfiguration {
private YamlModeConfiguration mode;
private Properties props = new Properties();
-
- /**
- * Get database name.
- *
- * @return database name
- */
- public String getDatabaseName() {
- return Strings.isNullOrEmpty(databaseName) ? schemaName : databaseName;
- }
}
diff --git
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlJDBCConfiguration.java
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlJDBCConfiguration.java
index 146af6feefa..cde0cd35a1d 100644
---
a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlJDBCConfiguration.java
+++
b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlJDBCConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.driver.api.yaml;
-import com.google.common.base.Strings;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
@@ -47,14 +46,6 @@ public final class YamlJDBCConfiguration implements
YamlConfiguration {
private String databaseName;
- /**
- * Schema name.
- *
- * @deprecated Should use databaseName, schemaName will remove in next
version.
- */
- @Deprecated
- private String schemaName;
-
private Map<String, Map<String, Object>> dataSources = new HashMap<>();
private Collection<YamlRuleConfiguration> rules = new LinkedList<>();
@@ -78,13 +69,4 @@ public final class YamlJDBCConfiguration implements
YamlConfiguration {
private YamlGlobalClockRuleConfiguration globalClock;
private YamlSQLFederationRuleConfiguration sqlFederation;
-
- /**
- * Get database name.
- *
- * @return database name
- */
- public String getDatabaseName() {
- return Strings.isNullOrEmpty(databaseName) ? schemaName : databaseName;
- }
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
index 8c587780928..e109e69ecaf 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
@@ -128,9 +128,6 @@ public final class ProxyConfigurationLoader {
if (null == result) {
return Optional.empty();
}
- if (null == result.getDatabaseName()) {
- result.setDatabaseName(result.getSchemaName());
- }
Preconditions.checkNotNull(result.getDatabaseName(), "Property
`databaseName` in file `%s` is required.", yamlFile.getName());
checkDuplicateRule(result.getRules(), yamlFile);
return Optional.of(result);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyDatabaseConfiguration.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyDatabaseConfiguration.java
index ae70adf6756..5a94fda2f95 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyDatabaseConfiguration.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/YamlProxyDatabaseConfiguration.java
@@ -36,8 +36,6 @@ public final class YamlProxyDatabaseConfiguration implements
YamlConfiguration {
private String databaseName;
- private String schemaName;
-
private Map<String, YamlProxyDataSourceConfiguration> dataSources = new
HashMap<>();
private Collection<YamlRuleConfiguration> rules = new LinkedList<>();
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
index a2fc21f0e73..2a1eac2868c 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
@@ -252,7 +252,6 @@ class ExportMetaDataExecutorTest {
private void assertDatabaseConfig(final YamlProxyDatabaseConfiguration
actual, final YamlProxyDatabaseConfiguration expected) {
assertThat(actual.getDatabaseName(), is(expected.getDatabaseName()));
- assertThat(actual.getSchemaName(), is(expected.getSchemaName()));
assertDataSources(actual.getDataSources(), expected.getDataSources());
assertRules(actual.getRules(), expected.getRules());
}
