This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 b3224ebdf5b Add @Override for implement method (#25497)
b3224ebdf5b is described below
commit b3224ebdf5b07eecdb53298aa50cb1f483173a86
Author: ChenJiaHao <[email protected]>
AuthorDate: Sat May 6 20:06:38 2023 +0800
Add @Override for implement method (#25497)
---
.../shardingsphere/metadata/persist/MetaDataPersistService.java | 3 +++
.../metadata/persist/NewMetaDataPersistService.java | 3 +++
.../metadata/persist/data/ShardingSphereDataPersistService.java | 2 ++
.../service/config/database/DataSourcePersistService.java | 1 +
.../persist/service/config/global/GlobalRulePersistService.java | 1 +
.../persist/service/database/DatabaseMetaDataPersistService.java | 9 +++++++++
.../service/schema/ShardingSphereTableRowDataPersistService.java | 3 +++
.../persist/service/version/MetaDataVersionPersistService.java | 5 +++++
8 files changed, 27 insertions(+)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
index 3e92ff893a7..ac24302c6e0 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/MetaDataPersistService.java
@@ -80,6 +80,7 @@ public final class MetaDataPersistService implements
MetaDataBasedPersistService
* @param globalRuleConfigs global rule configurations
* @param props properties
*/
+ @Override
public void persistGlobalRuleConfiguration(final
Collection<RuleConfiguration> globalRuleConfigs, final Properties props) {
globalRuleService.persist(globalRuleConfigs);
propsService.persist(props);
@@ -93,6 +94,7 @@ public final class MetaDataPersistService implements
MetaDataBasedPersistService
* @param dataSources data sources
* @param rules rules
*/
+ @Override
public void persistConfigurations(final String databaseName, final
DatabaseConfiguration databaseConfigs,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> rules) {
Map<String, DataSourceProperties> dataSourcePropertiesMap =
getDataSourcePropertiesMap(databaseConfigs.getDataSources());
@@ -119,6 +121,7 @@ public final class MetaDataPersistService implements
MetaDataBasedPersistService
* @param databaseConfigs database configurations
* @return effective data sources
*/
+ @Override
public Map<String, DataSource> getEffectiveDataSources(final String
databaseName, final Map<String, ? extends DatabaseConfiguration>
databaseConfigs) {
Map<String, DataSourceProperties> persistedDataPropsMap =
dataSourceService.load(databaseName);
return databaseConfigs.containsKey(databaseName)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/NewMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/NewMetaDataPersistService.java
index 7589b36f9e1..359f55364af 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/NewMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/NewMetaDataPersistService.java
@@ -82,6 +82,7 @@ public final class NewMetaDataPersistService implements
MetaDataBasedPersistServ
* @param globalRuleConfigs global rule configurations
* @param props properties
*/
+ @Override
public void persistGlobalRuleConfiguration(final
Collection<RuleConfiguration> globalRuleConfigs, final Properties props) {
globalRuleService.persist(globalRuleConfigs);
propsService.persist(props);
@@ -95,6 +96,7 @@ public final class NewMetaDataPersistService implements
MetaDataBasedPersistServ
* @param dataSources data sources
* @param rules rules
*/
+ @Override
public void persistConfigurations(final String databaseName, final
DatabaseConfiguration databaseConfigs,
final Map<String, DataSource>
dataSources, final Collection<ShardingSphereRule> rules) {
Map<String, DataSourceProperties> dataSourcePropertiesMap =
getDataSourcePropertiesMap(databaseConfigs.getDataSources());
@@ -121,6 +123,7 @@ public final class NewMetaDataPersistService implements
MetaDataBasedPersistServ
* @param databaseConfigs database configurations
* @return effective data sources
*/
+ @Override
public Map<String, DataSource> getEffectiveDataSources(final String
databaseName, final Map<String, ? extends DatabaseConfiguration>
databaseConfigs) {
Map<String, DataSourceProperties> persistedDataPropsMap =
dataSourceService.load(databaseName);
return databaseConfigs.containsKey(databaseName)
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
index c6be3491dfb..7481deb8612 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
@@ -57,6 +57,7 @@ public final class ShardingSphereDataPersistService
implements ShardingSphereDat
* @param metaData meta data
* @return ShardingSphere data
*/
+ @Override
public Optional<ShardingSphereData> load(final ShardingSphereMetaData
metaData) {
Collection<String> databaseNames =
repository.getChildrenKeys(ShardingSphereDataNode.getShardingSphereDataNodePath());
if (databaseNames.isEmpty()) {
@@ -101,6 +102,7 @@ public final class ShardingSphereDataPersistService
implements ShardingSphereDat
* @param schemaData schema data
* @param databases databases
*/
+ @Override
public void persist(final String databaseName, final String schemaName,
final ShardingSphereSchemaData schemaData, final Map<String,
ShardingSphereDatabase> databases) {
if (schemaData.getTableData().isEmpty()) {
persistSchema(databaseName, schemaName);
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
index 4dada011424..1f07cfdd0c0 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourcePersistService.java
@@ -98,6 +98,7 @@ public final class DataSourcePersistService implements
DatabaseBasedPersistServi
* @param databaseName database name
* @param toBeAppendedDataSourcePropsMap data source properties map to be
appended
*/
+ @Override
public void append(final String databaseName, final Map<String,
DataSourceProperties> toBeAppendedDataSourcePropsMap) {
Map<String, DataSourceProperties> dataSourceConfigs =
load(databaseName);
dataSourceConfigs.putAll(toBeAppendedDataSourcePropsMap);
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
index b557f572c8a..4bfdcaa3392 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/global/GlobalRulePersistService.java
@@ -58,6 +58,7 @@ public final class GlobalRulePersistService implements
GlobalPersistService<Coll
*
* @return collection of user
*/
+ @Override
public Collection<ShardingSphereUser> loadUsers() {
Optional<AuthorityRuleConfiguration> authorityRuleConfig =
load().stream().filter(each -> each instanceof AuthorityRuleConfiguration)
.map(each -> (AuthorityRuleConfiguration) each).findFirst();
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
index 98ccff85929..d6843448c28 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
@@ -53,6 +53,7 @@ public final class DatabaseMetaDataPersistService implements
DatabaseMetaDataBas
*
* @param databaseName database name
*/
+ @Override
public void addDatabase(final String databaseName) {
repository.persist(DatabaseMetaDataNode.getDatabaseNamePath(databaseName), "");
}
@@ -62,6 +63,7 @@ public final class DatabaseMetaDataPersistService implements
DatabaseMetaDataBas
*
* @param databaseName database name to be deleted
*/
+ @Override
public void dropDatabase(final String databaseName) {
repository.delete(DatabaseMetaDataNode.getDatabaseNamePath(databaseName));
}
@@ -71,6 +73,7 @@ public final class DatabaseMetaDataPersistService implements
DatabaseMetaDataBas
*
* @return all database names
*/
+ @Override
public Collection<String> loadAllDatabaseNames() {
return
repository.getChildrenKeys(DatabaseMetaDataNode.getMetaDataNodePath());
}
@@ -81,6 +84,7 @@ public final class DatabaseMetaDataPersistService implements
DatabaseMetaDataBas
* @param databaseName database name
* @param schemaName schema name
*/
+ @Override
public void addSchema(final String databaseName, final String schemaName) {
repository.persist(DatabaseMetaDataNode.getMetaDataTablesPath(databaseName,
schemaName), "");
}
@@ -91,6 +95,7 @@ public final class DatabaseMetaDataPersistService implements
DatabaseMetaDataBas
* @param databaseName database name
* @param schemaName schema name
*/
+ @Override
public void dropSchema(final String databaseName, final String schemaName)
{
repository.delete(DatabaseMetaDataNode.getMetaDataSchemaPath(databaseName,
schemaName));
}
@@ -102,6 +107,7 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
* @param schemaName schema name
* @param schema schema meta data
*/
+ @Override
public void compareAndPersist(final String databaseName, final String
schemaName, final ShardingSphereSchema schema) {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
addSchema(databaseName, schemaName);
@@ -118,6 +124,7 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
* @param schemaName schema name
* @param schema schema meta data
*/
+ @Override
public void persist(final String databaseName, final String schemaName,
final ShardingSphereSchema schema) {
if (schema.getTables().isEmpty() && schema.getViews().isEmpty()) {
addSchema(databaseName, schemaName);
@@ -132,6 +139,7 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
* @param schemaName schema name
* @param schema schema meta data
*/
+ @Override
public void delete(final String databaseName, final String schemaName,
final ShardingSphereSchema schema) {
schema.getTables().forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
@@ -142,6 +150,7 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
* @param databaseName database name
* @return schema meta data
*/
+ @Override
public Map<String, ShardingSphereSchema> loadSchemas(final String
databaseName) {
Collection<String> schemaNames = loadAllSchemaNames(databaseName);
Map<String, ShardingSphereSchema> result = new
LinkedHashMap<>(schemaNames.size(), 1);
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/ShardingSphereTableRowDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/ShardingSphereTableRowDataPersistService.java
index 3b246bb6049..84367bd2494 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/ShardingSphereTableRowDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/schema/ShardingSphereTableRowDataPersistService.java
@@ -46,6 +46,7 @@ public final class ShardingSphereTableRowDataPersistService
implements TableRowD
* @param tableName table name
* @param rows rows
*/
+ @Override
public void persist(final String databaseName, final String schemaName,
final String tableName, final Collection<YamlShardingSphereRowData> rows) {
if (rows.isEmpty()) {
persistTable(databaseName, schemaName, tableName);
@@ -65,6 +66,7 @@ public final class ShardingSphereTableRowDataPersistService
implements TableRowD
* @param tableName table name
* @param rows rows
*/
+ @Override
public void delete(final String databaseName, final String schemaName,
final String tableName, final Collection<YamlShardingSphereRowData> rows) {
rows.forEach(each ->
repository.delete(ShardingSphereDataNode.getTableRowPath(databaseName,
schemaName, tableName.toLowerCase(), each.getUniqueKey())));
}
@@ -78,6 +80,7 @@ public final class ShardingSphereTableRowDataPersistService
implements TableRowD
* @param table table
* @return ShardingSphere table data
*/
+ @Override
public ShardingSphereTableData load(final String databaseName, final
String schemaName, final String tableName, final ShardingSphereTable table) {
ShardingSphereTableData result = new
ShardingSphereTableData(tableName);
YamlShardingSphereRowDataSwapper swapper = new
YamlShardingSphereRowDataSwapper(new ArrayList<>(table.getColumns()));
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
index f826741ed52..e368cecd34d 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/version/MetaDataVersionPersistService.java
@@ -38,6 +38,7 @@ public final class MetaDataVersionPersistService implements
MetaDataVersionBased
* @param databaseName database name
* @return active database version
*/
+ @Override
public Optional<String> getActiveVersion(final String databaseName) {
return
Optional.ofNullable(repository.getDirectly(DatabaseMetaDataNode.getActiveVersionPath(databaseName)));
}
@@ -49,6 +50,7 @@ public final class MetaDataVersionPersistService implements
MetaDataVersionBased
* @param version version
* @return is active version or not
*/
+ @Override
public boolean isActiveVersion(final String databaseName, final String
version) {
Optional<String> actualVersion = getActiveVersion(databaseName);
return actualVersion.isPresent() &&
actualVersion.get().equals(version);
@@ -60,6 +62,7 @@ public final class MetaDataVersionPersistService implements
MetaDataVersionBased
* @param databaseName database name
* @return new version
*/
+ @Override
public Optional<String> createNewVersion(final String databaseName) {
Optional<String> activeVersion = getActiveVersion(databaseName);
if (!activeVersion.isPresent()) {
@@ -78,6 +81,7 @@ public final class MetaDataVersionPersistService implements
MetaDataVersionBased
* @param databaseName database name
* @param version version
*/
+ @Override
public void persistActiveVersion(final String databaseName, final String
version) {
Optional<String> activeVersion = getActiveVersion(databaseName);
if (activeVersion.isPresent() && !activeVersion.get().equals(version))
{
@@ -91,6 +95,7 @@ public final class MetaDataVersionPersistService implements
MetaDataVersionBased
* @param databaseName database name
* @param version version
*/
+ @Override
public void deleteVersion(final String databaseName, final String version)
{
repository.delete(DatabaseMetaDataNode.getDatabaseVersionPath(databaseName,
version));
}
