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 16e6b7a9c549174eb372009feecfb963b98fb6d0 Author: RaigorJiang <[email protected]> AuthorDate: Tue Oct 29 23:43:09 2024 +0800 Fix checkstyle, replace * with single class imports --- .../state/datasource/DataSourceStateManager.java | 6 +++++- .../infra/instance/ComputeNodeInstanceContext.java | 6 +++++- .../executor/engine/DriverExecuteExecutor.java | 1 + .../engine/DriverExecuteUpdateExecutor.java | 1 + .../transaction/TransactionPersistService.java | 8 +++++++- .../metadata/persist/MetaDataPersistService.java | 7 ++++++- .../database/DataSourceUnitPersistService.java | 6 +++++- .../database/DatabaseRulePersistService.java | 6 +++++- .../table/TableMetaDataPersistService.java | 6 +++++- .../metadata/table/ViewMetaDataPersistService.java | 6 +++++- .../mode/tuple/RepositoryTupleSwapperEngine.java | 10 +++++++++- .../mode/lock/ResourceLockDefinitionManager.java | 6 +++++- .../TransactionConfigurationManager.java | 6 +++++- .../persist/service/ConsistencyPersistService.java | 7 ++++++- .../mode/metadata/MetaDataContextManager.java | 9 ++++++++- .../mode/metadata/MetaDataContextsFactory.java | 8 +++++++- .../manager/DatabaseRuleConfigurationManager.java | 6 +++++- .../metadata/manager/ResourceSwitchManager.java | 7 ++++++- .../metadata/refresher/MetaDataRefreshEngine.java | 15 +++++++++++++- .../ShardingSphereStatisticsRefreshEngine.java | 6 +++++- .../mode/persist/PersistServiceFacade.java | 8 +++++++- .../persist/service/ComputeNodePersistService.java | 7 ++++++- .../service/ComputeNodePersistServiceTest.java | 4 +++- .../cluster/ClusterContextManagerBuilder.java | 3 ++- .../ShardingSphereDataDispatchEventBuilder.java | 8 +++++++- .../dispatch/DatabaseDataChangedSubscriber.java | 8 +++++++- .../ClusterDispatchEventSubscriberRegistry.java | 13 +++++++++++- .../ClusterMetaDataManagerPersistService.java | 6 +++++- .../cluster/ClusterContextManagerBuilderTest.java | 4 +++- .../dispatch/ComputeNodeStateSubscriberTest.java | 4 +++- ...GlobalRuleConfigurationEventSubscriberTest.java | 4 +++- .../dispatch/MetaDataChangedSubscriberTest.java | 4 +++- .../QualifiedDataSourceSubscriberTest.java | 4 +++- .../dispatch/StorageUnitEventSubscriberTest.java | 4 +++- .../DatabaseMetaDataChangedListenerTest.java | 5 ++++- ...riseClusterDispatchEventSubscriberRegistry.java | 13 +++++++++++- .../cluster/zookeeper/ZookeeperRepository.java | 15 ++++++++++++-- .../SessionConnectionReconnectListenerTest.java | 5 ++++- .../swapper/YamlProxyConfigurationSwapper.java | 6 +++++- .../YamlDatabaseConfigurationImportExecutor.java | 9 +++++++-- .../ProxyDatabaseConnectionManagerTest.java | 23 +++++++++++++++++++--- .../backend/connector/ProxySQLExecutorTest.java | 5 ++++- .../DatabaseAdminQueryBackendHandlerTest.java | 5 ++++- .../ral/QueryableRALBackendHandlerTest.java | 11 ++++++++--- .../FrontDatabaseProtocolTypeFactoryTest.java | 3 ++- .../frontend/state/impl/OKProxyStateTest.java | 5 ++++- .../PostgreSQLCommandExecuteEngineTest.java | 7 ++++--- .../pipeline/core/util/PipelineContextUtils.java | 8 +++++++- 48 files changed, 280 insertions(+), 54 deletions(-) diff --git a/infra/common/src/main/java/com/sphereex/dbplusengine/infra/state/datasource/DataSourceStateManager.java b/infra/common/src/main/java/com/sphereex/dbplusengine/infra/state/datasource/DataSourceStateManager.java index f3413bdcfb5..f85b226c1f8 100644 --- a/infra/common/src/main/java/com/sphereex/dbplusengine/infra/state/datasource/DataSourceStateManager.java +++ b/infra/common/src/main/java/com/sphereex/dbplusengine/infra/state/datasource/DataSourceStateManager.java @@ -31,7 +31,11 @@ import org.apache.shardingsphere.infra.state.datasource.DataSourceState; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java index 58cf7ab1df6..10b9a47e220 100644 --- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java +++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContext.java @@ -31,7 +31,11 @@ import org.apache.shardingsphere.infra.state.instance.InstanceState; import org.apache.shardingsphere.infra.util.eventbus.EventBusContext; import javax.annotation.concurrent.ThreadSafe; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java index 930f99c23ac..a7fc76200c7 100644 --- a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java +++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteExecutor.java @@ -97,6 +97,7 @@ public final class DriverExecuteExecutor { * @param replayCallback statement replay callback * @return execute result * @throws SQLException SQL exception + * @throws LockWaitTimeoutException lock wait timeout exception */ @SuppressWarnings("rawtypes") public boolean execute(final ShardingSphereDatabase database, final QueryContext queryContext, final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine, diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java index 70a823c01ea..ae867c2ff03 100644 --- a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java +++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/engine/DriverExecuteUpdateExecutor.java @@ -85,6 +85,7 @@ public final class DriverExecuteUpdateExecutor { * @param addCallback statement add callback * @return updated row count * @throws SQLException SQL exception + * @throws LockWaitTimeoutException lock wait timeout exception */ @SuppressWarnings("rawtypes") public int executeUpdate(final ShardingSphereDatabase database, final QueryContext queryContext, final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine, diff --git a/kernel/metadata/core/src/main/java/com/sphereex/dbplusengine/metadata/persist/service/transaction/TransactionPersistService.java b/kernel/metadata/core/src/main/java/com/sphereex/dbplusengine/metadata/persist/service/transaction/TransactionPersistService.java index 69c68f4533d..1a0690bf151 100644 --- a/kernel/metadata/core/src/main/java/com/sphereex/dbplusengine/metadata/persist/service/transaction/TransactionPersistService.java +++ b/kernel/metadata/core/src/main/java/com/sphereex/dbplusengine/metadata/persist/service/transaction/TransactionPersistService.java @@ -25,7 +25,13 @@ import org.apache.shardingsphere.metadata.persist.service.config.global.GlobalRu import org.apache.shardingsphere.mode.spi.PersistRepository; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.Properties; /** * Transaction persist service. 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 e9fdc1faff2..91131a34731 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 @@ -42,8 +42,13 @@ import org.apache.shardingsphere.metadata.persist.service.version.MetaDataVersio import org.apache.shardingsphere.mode.spi.PersistRepository; import javax.sql.DataSource; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; +import java.util.Properties; import java.util.stream.Collectors; /** diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java index d6d1769e582..f2657d847a7 100644 --- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java +++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DataSourceUnitPersistService.java @@ -26,7 +26,11 @@ import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSour import org.apache.shardingsphere.metadata.persist.node.metadata.DataSourceMetaDataNode; import org.apache.shardingsphere.mode.spi.PersistRepository; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java index 1574e84ac09..fe4b1bf7720 100644 --- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java +++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/config/database/DatabaseRulePersistService.java @@ -31,7 +31,11 @@ import org.apache.shardingsphere.mode.tuple.RepositoryTuple; import org.apache.shardingsphere.mode.tuple.RepositoryTupleSwapperEngine; import org.apache.shardingsphere.mode.tuple.annotation.RepositoryTupleEntity; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; /** * Database rule persist service. diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistService.java index 7ffef07ef6c..4e7dd91fb18 100644 --- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistService.java +++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableMetaDataPersistService.java @@ -28,7 +28,11 @@ import org.apache.shardingsphere.metadata.persist.node.metadata.TableMetaDataNod import org.apache.shardingsphere.metadata.persist.service.version.MetaDataVersionPersistService; import org.apache.shardingsphere.mode.spi.PersistRepository; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; diff --git a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java index 64a1d2349dc..0071f499c0d 100644 --- a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java +++ b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/ViewMetaDataPersistService.java @@ -28,7 +28,11 @@ import org.apache.shardingsphere.metadata.persist.node.metadata.ViewMetaDataNode import org.apache.shardingsphere.metadata.persist.service.version.MetaDataVersionPersistService; import org.apache.shardingsphere.mode.spi.PersistRepository; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; diff --git a/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/RepositoryTupleSwapperEngine.java b/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/RepositoryTupleSwapperEngine.java index b55a49322be..f90c40f8e01 100644 --- a/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/RepositoryTupleSwapperEngine.java +++ b/mode/api/src/main/java/org/apache/shardingsphere/mode/tuple/RepositoryTupleSwapperEngine.java @@ -39,8 +39,16 @@ import org.apache.shardingsphere.mode.tuple.annotation.RepositoryTupleKeyListNam import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; /** diff --git a/mode/core/src/main/java/com/sphereex/dbplusengine/mode/lock/ResourceLockDefinitionManager.java b/mode/core/src/main/java/com/sphereex/dbplusengine/mode/lock/ResourceLockDefinitionManager.java index 1d0b21f1a72..589155e979b 100644 --- a/mode/core/src/main/java/com/sphereex/dbplusengine/mode/lock/ResourceLockDefinitionManager.java +++ b/mode/core/src/main/java/com/sphereex/dbplusengine/mode/lock/ResourceLockDefinitionManager.java @@ -17,7 +17,11 @@ package com.sphereex.dbplusengine.mode.lock; -import com.sphereex.dbplusengine.infra.exception.lock.*; +import com.sphereex.dbplusengine.infra.exception.lock.DatabaseLockedException; +import com.sphereex.dbplusengine.infra.exception.lock.LockResourceFailedException; +import com.sphereex.dbplusengine.infra.exception.lock.LockWaitTimeoutException; +import com.sphereex.dbplusengine.infra.exception.lock.SchemaLockedException; +import com.sphereex.dbplusengine.infra.exception.lock.TableLockedException; import com.sphereex.dbplusengine.mode.lock.manager.definition.ResourceLockDefinition; import com.sphereex.dbplusengine.mode.lock.manager.definition.ResourceLockDefinitionFactory; import lombok.RequiredArgsConstructor; diff --git a/mode/core/src/main/java/com/sphereex/dbplusengine/mode/metadata/transaction/TransactionConfigurationManager.java b/mode/core/src/main/java/com/sphereex/dbplusengine/mode/metadata/transaction/TransactionConfigurationManager.java index 608e9365d0c..7d99653b528 100644 --- a/mode/core/src/main/java/com/sphereex/dbplusengine/mode/metadata/transaction/TransactionConfigurationManager.java +++ b/mode/core/src/main/java/com/sphereex/dbplusengine/mode/metadata/transaction/TransactionConfigurationManager.java @@ -27,8 +27,12 @@ import org.apache.shardingsphere.metadata.persist.MetaDataPersistService; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; import javax.sql.DataSource; -import java.util.*; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; +import java.util.Properties; import java.util.stream.Collectors; /** diff --git a/mode/core/src/main/java/com/sphereex/dbplusengine/mode/persist/service/ConsistencyPersistService.java b/mode/core/src/main/java/com/sphereex/dbplusengine/mode/persist/service/ConsistencyPersistService.java index 97bccc6fbfb..2ec36ef496b 100644 --- a/mode/core/src/main/java/com/sphereex/dbplusengine/mode/persist/service/ConsistencyPersistService.java +++ b/mode/core/src/main/java/com/sphereex/dbplusengine/mode/persist/service/ConsistencyPersistService.java @@ -22,7 +22,12 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData; import org.apache.shardingsphere.mode.spi.PersistRepository; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; 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 fa4ccfe7433..e854f0bd386 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 @@ -32,7 +32,14 @@ import org.apache.shardingsphere.infra.metadata.database.schema.manager.GenericS import org.apache.shardingsphere.infra.rule.builder.global.GlobalRulesBuilder; import org.apache.shardingsphere.metadata.persist.MetaDataPersistService; import org.apache.shardingsphere.mode.metadata.decorator.RuleConfigurationPersistDecorateEngine; -import org.apache.shardingsphere.mode.metadata.manager.*; +import org.apache.shardingsphere.mode.metadata.manager.DatabaseRuleConfigurationManager; +import org.apache.shardingsphere.mode.metadata.manager.GlobalConfigurationManager; +import org.apache.shardingsphere.mode.metadata.manager.ResourceSwitchManager; +import org.apache.shardingsphere.mode.metadata.manager.RuleItemManager; +import org.apache.shardingsphere.mode.metadata.manager.SchemaMetaDataManager; +import org.apache.shardingsphere.mode.metadata.manager.ShardingSphereDatabaseDataManager; +import org.apache.shardingsphere.mode.metadata.manager.StorageUnitManager; +import org.apache.shardingsphere.mode.metadata.manager.SwitchingResource; import org.apache.shardingsphere.mode.spi.PersistRepository; import java.sql.SQLException; 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 60892a22f62..54e2a54980d 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 @@ -68,8 +68,14 @@ import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration import javax.sql.DataSource; import java.sql.SQLException; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.stream.Collectors; /** diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseRuleConfigurationManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseRuleConfigurationManager.java index 726bce48239..72e3a1f6fb1 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseRuleConfigurationManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/DatabaseRuleConfigurationManager.java @@ -31,7 +31,11 @@ import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory; import org.apache.shardingsphere.mode.spi.PersistRepository; import java.sql.SQLException; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; /** diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceSwitchManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceSwitchManager.java index 676fbf11bd4..03eecd368ed 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceSwitchManager.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceSwitchManager.java @@ -28,7 +28,12 @@ import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUn import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnitNodeMapCreator; import javax.sql.DataSource; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/MetaDataRefreshEngine.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/MetaDataRefreshEngine.java index 334e4f25853..59e623ba918 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/MetaDataRefreshEngine.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/MetaDataRefreshEngine.java @@ -28,7 +28,20 @@ import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUn import org.apache.shardingsphere.infra.route.context.RouteUnit; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService; -import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.*; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.AlterIndexStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.AlterSchemaStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.AlterTableStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.AlterViewStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateIndexStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateSchemaStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateTableStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateViewStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.DDLStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.DropIndexStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.DropSchemaStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.DropTableStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.DropViewStatement; +import org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.RenameTableStatement; import java.sql.SQLException; import java.util.Arrays; diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java index b8c65e2c3b4..7a0740d734a 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java @@ -26,7 +26,11 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable; -import org.apache.shardingsphere.infra.metadata.statistics.*; +import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereDatabaseData; +import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData; +import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereSchemaData; +import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereStatistics; +import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData; import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.infra.yaml.data.swapper.YamlShardingSphereRowDataSwapper; diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java index d15826bab90..9437309f13f 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/PersistServiceFacade.java @@ -24,7 +24,13 @@ import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.metadata.persist.MetaDataPersistService; import org.apache.shardingsphere.mode.metadata.MetaDataContextManager; -import org.apache.shardingsphere.mode.persist.service.*; +import org.apache.shardingsphere.mode.persist.service.ComputeNodePersistService; +import org.apache.shardingsphere.mode.persist.service.ListenerAssistedPersistService; +import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService; +import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder; +import org.apache.shardingsphere.mode.persist.service.ProcessPersistService; +import org.apache.shardingsphere.mode.persist.service.QualifiedDataSourceStatePersistService; +import org.apache.shardingsphere.mode.persist.service.StatePersistService; import org.apache.shardingsphere.mode.spi.PersistRepository; /** diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistService.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistService.java index 6435f429541..34628cd50c5 100644 --- a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistService.java +++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistService.java @@ -35,7 +35,12 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine; import org.apache.shardingsphere.metadata.persist.node.ComputeNode; import org.apache.shardingsphere.mode.spi.PersistRepository; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistServiceTest.java index 8d314967f19..93e5badec49 100644 --- a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistServiceTest.java +++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/ComputeNodePersistServiceTest.java @@ -43,7 +43,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class ComputeNodePersistServiceTest { diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java index de532364a4f..8d4e0dc3d38 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java @@ -73,7 +73,8 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder private void registerOnline(final ComputeNodeInstanceContext computeNodeInstanceContext, final ContextManagerBuilderParameter param, final ContextManager contextManager) { contextManager.getPersistServiceFacade().getComputeNodePersistService().registerOnline(computeNodeInstanceContext.getInstance()); - contextManager.getComputeNodeInstanceContext().getAllClusterInstances().addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllComputeNodeInstances(computeNodeInstanceContext)); + contextManager.getComputeNodeInstanceContext().getAllClusterInstances() + .addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllComputeNodeInstances(computeNodeInstanceContext)); new DataChangedEventListenerRegistry(contextManager, getDatabaseNames(param, contextManager.getPersistServiceFacade().getMetaDataPersistService())).register(); EventSubscriberRegistry eventSubscriberRegistry = new EventSubscriberRegistry(contextManager.getComputeNodeInstanceContext().getEventBusContext()); eventSubscriberRegistry.register(new ClusterDeliverEventSubscriberRegistry(contextManager).getSubscribers()); diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ShardingSphereDataDispatchEventBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ShardingSphereDataDispatchEventBuilder.java index a6c619b7ea1..30bde19a65a 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ShardingSphereDataDispatchEventBuilder.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/builder/ShardingSphereDataDispatchEventBuilder.java @@ -24,7 +24,13 @@ import org.apache.shardingsphere.metadata.persist.node.ShardingSphereDataNode; import org.apache.shardingsphere.mode.event.DataChangedEvent; import org.apache.shardingsphere.mode.event.DataChangedEvent.Type; import org.apache.shardingsphere.mode.event.dispatch.DispatchEvent; -import org.apache.shardingsphere.mode.event.dispatch.metadata.data.*; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.DatabaseDataAddedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.DatabaseDataDeletedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.SchemaDataAddedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.SchemaDataDeletedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.ShardingSphereRowDataChangedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.ShardingSphereRowDataDeletedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.TableDataChangedEvent; import java.util.Arrays; import java.util.Collection; diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java index 4cbb7a6d3c4..2353b7731e7 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/DatabaseDataChangedSubscriber.java @@ -20,7 +20,13 @@ package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch import com.google.common.eventbus.Subscribe; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber; -import org.apache.shardingsphere.mode.event.dispatch.metadata.data.*; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.DatabaseDataAddedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.DatabaseDataDeletedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.SchemaDataAddedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.SchemaDataDeletedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.ShardingSphereRowDataChangedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.ShardingSphereRowDataDeletedEvent; +import org.apache.shardingsphere.mode.event.dispatch.metadata.data.TableDataChangedEvent; import org.apache.shardingsphere.mode.manager.ContextManager; /** diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java index ae542db10bc..befee8ede5f 100644 --- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java +++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/registry/ClusterDispatchEventSubscriberRegistry.java @@ -20,7 +20,18 @@ package org.apache.shardingsphere.mode.manager.cluster.event.subscriber.registry import lombok.Getter; import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber; import org.apache.shardingsphere.mode.manager.ContextManager; -import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.*; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.CacheEvictedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ComputeNodeStateSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.DatabaseDataChangedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.GlobalRuleConfigurationEventSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ListenerAssistedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.MetaDataChangedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.ProcessListChangedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.PropertiesEventSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.QualifiedDataSourceSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.RuleItemChangedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StateChangedSubscriber; +import org.apache.shardingsphere.mode.manager.cluster.event.subscriber.dispatch.StorageUnitEventSubscriber; import java.util.Arrays; import java.util.Collection; 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 94b74a3fcc7..01ce73b3e7f 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 @@ -44,7 +44,11 @@ import org.apache.shardingsphere.mode.spi.PersistRepository; import org.apache.shardingsphere.single.config.SingleRuleConfiguration; import java.sql.SQLException; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import java.util.stream.Collectors; /** diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java index 227cd97a7b9..2a7c169a477 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilderTest.java @@ -41,7 +41,9 @@ import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @SuppressWarnings("resource") class ClusterContextManagerBuilderTest { diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java index 422c954b264..95d8b8ad677 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/ComputeNodeStateSubscriberTest.java @@ -35,7 +35,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class ComputeNodeStateSubscriberTest { diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/GlobalRuleConfigurationEventSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/GlobalRuleConfigurationEventSubscriberTest.java index 8557f6f2cd5..b8192a5d4e1 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/GlobalRuleConfigurationEventSubscriberTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/GlobalRuleConfigurationEventSubscriberTest.java @@ -30,7 +30,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.util.Optional; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class GlobalRuleConfigurationEventSubscriberTest { diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java index 18cd7425f3f..dc4145a5e95 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/MetaDataChangedSubscriberTest.java @@ -38,7 +38,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java index effe92f4ed3..a283ff09ec4 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/QualifiedDataSourceSubscriberTest.java @@ -32,7 +32,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class QualifiedDataSourceSubscriberTest { diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StorageUnitEventSubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StorageUnitEventSubscriberTest.java index 09137bfee12..fb5be00aff0 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StorageUnitEventSubscriberTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/event/subscriber/dispatch/StorageUnitEventSubscriberTest.java @@ -31,7 +31,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class StorageUnitEventSubscriberTest { diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DatabaseMetaDataChangedListenerTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DatabaseMetaDataChangedListenerTest.java index 144aef93484..8b3b6244deb 100644 --- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DatabaseMetaDataChangedListenerTest.java +++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/listener/DatabaseMetaDataChangedListenerTest.java @@ -56,7 +56,10 @@ import java.util.stream.Stream; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/mode/type/cluster/enterprise/src/main/java/com/sphereex/dbplusengine/mode/manager/cluster/enterprise/event/subscriber/registry/EnterpriseClusterDispatchEventSubscriberRegistry.java b/mode/type/cluster/enterprise/src/main/java/com/sphereex/dbplusengine/mode/manager/cluster/enterprise/event/subscriber/registry/EnterpriseClusterDispatchEventSubscriberRegistry.java index f246bb6e04e..ad451ed2b5e 100644 --- a/mode/type/cluster/enterprise/src/main/java/com/sphereex/dbplusengine/mode/manager/cluster/enterprise/event/subscriber/registry/EnterpriseClusterDispatchEventSubscriberRegistry.java +++ b/mode/type/cluster/enterprise/src/main/java/com/sphereex/dbplusengine/mode/manager/cluster/enterprise/event/subscriber/registry/EnterpriseClusterDispatchEventSubscriberRegistry.java @@ -17,7 +17,18 @@ package com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.registry; -import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.*; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.DDLRecoverySubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseComputeNodeStateSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseGlobalRuleConfigurationEventSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseListenerAssistedSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseMetaDataChangedSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterprisePropertiesEventSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseQualifiedDataSourceSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseRuleItemChangedSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseStateChangedSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.EnterpriseStorageUnitEventSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.LockStateChangedSubscriber; +import com.sphereex.dbplusengine.mode.manager.cluster.enterprise.event.subscriber.dispatch.TransactionRecoverySubscriber; import lombok.Getter; import org.apache.shardingsphere.infra.util.eventbus.EventSubscriber; import org.apache.shardingsphere.mode.manager.ContextManager; diff --git a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java index 58a7fbd4a93..56966fce8bf 100644 --- a/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java +++ b/mode/type/cluster/repository/provider/zookeeper/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/ZookeeperRepository.java @@ -53,8 +53,19 @@ import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.data.ACL; import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; /** * Registry repository of ZooKeeper. diff --git a/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionReconnectListenerTest.java b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionReconnectListenerTest.java index 5fdfd90753a..5de18ce49e2 100644 --- a/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionReconnectListenerTest.java +++ b/mode/type/cluster/repository/provider/zookeeper/src/test/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/listener/SessionConnectionReconnectListenerTest.java @@ -33,7 +33,10 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.util.Properties; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class SessionConnectionReconnectListenerTest { diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java index 4a8be7bccf3..31bd892baba 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/yaml/swapper/YamlProxyConfigurationSwapper.java @@ -36,8 +36,12 @@ import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyDatabaseConf import org.apache.shardingsphere.proxy.backend.config.yaml.YamlProxyServerConfiguration; import javax.sql.DataSource; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.Map.Entry; +import java.util.Properties; import java.util.stream.Collectors; /** diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java index c9013d91176..7c8df9943f5 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/YamlDatabaseConfigurationImportExecutor.java @@ -41,7 +41,6 @@ import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUn import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnitNodeMapCreator; import org.apache.shardingsphere.infra.rule.ShardingSphereRule; import org.apache.shardingsphere.infra.rule.builder.database.DatabaseRuleBuilder; -import org.apache.shardingsphere.infra.rule.scope.DatabaseRule; import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader; import org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration; import org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper; @@ -53,8 +52,14 @@ import org.apache.shardingsphere.proxy.backend.config.yaml.swapper.YamlProxyData import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import java.sql.SQLException; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.Map; import java.util.Map.Entry; +import java.util.TreeMap; /** * Yaml database configuration import executor. diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java index 711ef9283b9..99fde0a80a3 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java @@ -64,15 +64,32 @@ import java.lang.reflect.Field; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockConstruction; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java index 7b4d3d1b5c3..765487b3772 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java @@ -76,7 +76,10 @@ import java.util.Collections; import java.util.Optional; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java index c9a20ed292e..e0b2f0f6779 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/DatabaseAdminQueryBackendHandlerTest.java @@ -54,7 +54,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java index 61e263de0cc..03f6b7b711c 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java @@ -38,7 +38,6 @@ import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereIndex; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema; import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable; -import org.apache.shardingsphere.infra.rule.ShardingSphereRule; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.metadata.persist.MetaDataPersistService; @@ -56,11 +55,17 @@ import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Properties; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java index e456d702c2a..ac3f3edba3c 100644 --- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java +++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/protocol/FrontDatabaseProtocolTypeFactoryTest.java @@ -53,7 +53,8 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java index b6a24c179d2..61ec10e2e04 100644 --- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java +++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/OKProxyStateTest.java @@ -54,7 +54,10 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java index 07ac49c3521..e1a1e661e7d 100644 --- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java +++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java @@ -52,14 +52,15 @@ import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; import java.sql.SQLException; -import java.util.Collection; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.Properties; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(AutoMockExtension.class) @StaticMockSettings(ProxyContext.class) diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java index 7902c6e1baa..29abb0fd5e4 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java @@ -75,7 +75,13 @@ import org.mockito.internal.configuration.plugins.Plugins; import javax.sql.DataSource; import java.sql.SQLException; import java.sql.Types; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static org.mockito.Mockito.mock;
