This is an automated email from the ASF dual-hosted git repository. jiangmaolin pushed a commit to branch dev-5.5.1 in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
commit 70bf06ca5613d3e78d6195b4d31af4759a9b741a Author: jiangML <[email protected]> AuthorDate: Tue Nov 12 21:12:32 2024 +0800 Fix checkstyle error --- .../rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java | 3 ++- .../shardingsphere/mode/metadata/MetaDataContextManager.java | 4 ++-- .../shardingsphere/mode/metadata/MetaDataContextsFactory.java | 3 ++- .../cluster/persist/ClusterMetaDataManagerPersistService.java | 8 ++++++-- .../ral/queryable/ExportDatabaseConfigurationExecutor.java | 6 ++++-- .../handler/distsql/ral/queryable/ExportMetaDataExecutor.java | 3 ++- .../ral/updatable/ImportDatabaseConfigurationExecutor.java | 4 ++++ .../handler/distsql/ral/updatable/SetDistVariableExecutor.java | 3 ++- 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java index 39727ff24df..2744510a895 100644 --- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java +++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/rdl/rule/engine/global/GlobalRuleDefinitionExecuteEngine.java @@ -80,7 +80,8 @@ public final class GlobalRuleDefinitionExecuteEngine { // SPEX CHANGED: BEGIN RuleConfigurationPersistDecorateEngine ruleConfigPersistDecorateEngine = new RuleConfigurationPersistDecorateEngine(contextManager.getComputeNodeInstanceContext()); @SphereEx(Type.MODIFY) - Collection<RuleConfiguration> decoratedRuleConfigs = ruleConfigPersistDecorateEngine.decorate(Collections.singleton(result), contextManager.getMetaDataContexts().getPasswordEncryptProperties()); + Collection<RuleConfiguration> decoratedRuleConfigs = ruleConfigPersistDecorateEngine.decorate(Collections.singleton(result), + contextManager.getMetaDataContexts().getPasswordEncryptProperties()); return decoratedRuleConfigs.iterator().next(); // SPEX CHANGED: ENG } diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java index 51ebb869b7e..8ccfddff30a 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java @@ -177,8 +177,8 @@ public class MetaDataContextManager { Map<String, ShardingSphereDatabase> changedDatabases = MetaDataContextsFactory .createChangedDatabases(database.getName(), false, switchingResource, ruleConfigs, metaDataContexts.get(), metaDataPersistService, computeNodeInstanceContext); ConfigurationProperties props = new ConfigurationProperties(metaDataPersistService.getPropsService().load()); - RuleMetaData changedGlobalMetaData = new RuleMetaData( - GlobalRulesBuilder.buildRules(ruleConfigPersistDecorateEngine.restore(metaDataPersistService.getGlobalRuleService().load(), metaDataContexts.get().getPasswordEncryptProperties()), changedDatabases, props)); + RuleMetaData changedGlobalMetaData = new RuleMetaData(GlobalRulesBuilder.buildRules(ruleConfigPersistDecorateEngine.restore(metaDataPersistService.getGlobalRuleService().load(), + metaDataContexts.get().getPasswordEncryptProperties()), changedDatabases, props)); MetaDataContexts result = MetaDataContextsFactory.create(metaDataPersistService, new ShardingSphereMetaData(changedDatabases, metaDataContexts.get().getMetaData().getGlobalResourceMetaData(), changedGlobalMetaData, props)); switchingResource.closeStaleDataSources(); diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java index 89be75ad02e..13d96ed876f 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java @@ -367,7 +367,8 @@ public final class MetaDataContextsFactory { final ComputeNodeInstanceContext computeNodeInstanceContext, @SphereEx final Properties passwordEncryptProps) { RuleConfigurationPersistDecorateEngine ruleConfigPersistDecorateEngine = new RuleConfigurationPersistDecorateEngine(computeNodeInstanceContext); // SPEX CHANGED: BEGIN - persistService.persistGlobalRuleConfiguration(ruleConfigPersistDecorateEngine.decorate(metadataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations(), passwordEncryptProps), param.getProps()); + persistService.persistGlobalRuleConfiguration(ruleConfigPersistDecorateEngine.decorate(metadataContexts.getMetaData().getGlobalRuleMetaData().getConfigurations(), + passwordEncryptProps), param.getProps()); // SPEX CHANGED: END for (Entry<String, ? extends DatabaseConfiguration> entry : param.getDatabaseConfigs().entrySet()) { String databaseName = entry.getKey(); diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java index cbe81caa91a..5d5a30b456d 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterMetaDataManagerPersistService.java @@ -49,8 +49,12 @@ import org.apache.shardingsphere.single.config.SingleRuleConfiguration; import javax.sql.DataSource; import java.sql.SQLException; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import java.util.stream.Collectors; /** diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java index 0e4e676aa81..1f35733d481 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java @@ -64,7 +64,8 @@ public final class ExportDatabaseConfigurationExecutor implements DistSQLQueryEx ExportUtils.exportToFile(filePath, exportedData); return Collections.singleton(new LocalDataQueryResultRow(String.format("Successfully exported to: '%s'", filePath))); } - ShardingSpherePreconditions.checkState("json".equalsIgnoreCase(sqlStatement.getExportContentType().get()), () -> new InvalidParameterValueException("type", sqlStatement.getExportContentType().get())); + ShardingSpherePreconditions.checkState("json".equalsIgnoreCase(sqlStatement.getExportContentType().get()), + () -> new InvalidParameterValueException("type", sqlStatement.getExportContentType().get())); ExportUtils.exportToFile(filePath, buildJsonContent(exportedData)); return Collections.singleton(new LocalDataQueryResultRow(String.format("Successfully exported to: '%s'", filePath))); } @@ -74,7 +75,8 @@ public final class ExportDatabaseConfigurationExecutor implements DistSQLQueryEx if (!sqlStatement.getExportContentType().isPresent()) { return Collections.singleton(new LocalDataQueryResultRow(exportedData)); } - ShardingSpherePreconditions.checkState("json".equalsIgnoreCase(sqlStatement.getExportContentType().get()), () -> new InvalidParameterValueException("type", sqlStatement.getExportContentType().get())); + ShardingSpherePreconditions.checkState("json".equalsIgnoreCase(sqlStatement.getExportContentType().get()), + () -> new InvalidParameterValueException("type", sqlStatement.getExportContentType().get())); return Collections.singleton(new LocalDataQueryResultRow(Base64.encodeBase64String(buildJsonContent(exportedData).getBytes()))); } diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java index 1429767f8ca..dcd0c1029e5 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java @@ -80,7 +80,8 @@ public final class ExportMetaDataExecutor implements DistSQLQueryExecutor<Export RuleConfigurationPersistDecorateEngine ruleConfigPersistDecorateEngine = new RuleConfigurationPersistDecorateEngine(ProxyContext.getInstance().getContextManager().getComputeNodeInstanceContext()); @SphereEx(Type.MODIFY) - Collection<RuleConfiguration> ruleConfigs = ruleConfigPersistDecorateEngine.decorate(metaData.getGlobalRuleMetaData().getConfigurations(), proxyContext.getContextManager().getMetaDataContexts().getPasswordEncryptProperties()); + Collection<RuleConfiguration> ruleConfigs = ruleConfigPersistDecorateEngine.decorate(metaData.getGlobalRuleMetaData().getConfigurations(), + proxyContext.getContextManager().getMetaDataContexts().getPasswordEncryptProperties()); exportedMetaData.setRules(generateRulesData(ruleConfigs)); ExportedClusterInfo exportedClusterInfo = new ExportedClusterInfo(); exportedClusterInfo.setMetaData(exportedMetaData); diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java index 24d682cd786..a92c371fd74 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportDatabaseConfigurationExecutor.java @@ -73,14 +73,18 @@ public final class ImportDatabaseConfigurationExecutor implements DistSQLUpdateE enableMetaDataConsistency(contextManager); importDatabase(exportedMetaData); return; + // CHECKSTYLE:OFF } catch (final Exception ignored) { + // CHECKSTYLE:ON } try { YamlProxyDatabaseConfiguration yamlConfig = YamlEngine.unmarshal(file, YamlProxyDatabaseConfiguration.class); enableMetaDataConsistency(contextManager); databaseConfigImportExecutor.importDatabaseConfiguration(yamlConfig); return; + // CHECKSTYLE:OFF } catch (final Exception ignored) { + // CHECKSTYLE:ON } throw new InvalidParameterValueException("File", sqlStatement.getFilePath().get()); } diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutor.java index baebdde4a9b..52e9d454575 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutor.java @@ -123,7 +123,8 @@ public final class SetDistVariableExecutor implements DistSQLUpdateExecutor<SetD private void decorateGlobalRuleConfiguration(final ContextManager contextManager) { RuleConfigurationPersistDecorateEngine ruleConfigPersistDecorateEngine = new RuleConfigurationPersistDecorateEngine(contextManager.getComputeNodeInstanceContext()); @SphereEx(Type.MODIFY) - Collection<RuleConfiguration> globalRuleConfigs = ruleConfigPersistDecorateEngine.decorate(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations(), contextManager.getMetaDataContexts().getPasswordEncryptProperties()); + Collection<RuleConfiguration> globalRuleConfigs = ruleConfigPersistDecorateEngine.decorate(contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getConfigurations(), + contextManager.getMetaDataContexts().getPasswordEncryptProperties()); contextManager.getPersistServiceFacade().getMetaDataPersistService().getGlobalRuleService().persist(globalRuleConfigs); }
