This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 646d4d83b1f Remove useless generic type of LockContext (#34119)
646d4d83b1f is described below
commit 646d4d83b1f4ff82b737269c7367d3f2ae8a83d8
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Dec 22 13:26:37 2024 +0800
Remove useless generic type of LockContext (#34119)
* Remove useless generic type of LockContext
* Remove useless generic type of LockContext
---
.../shardingsphere/infra/instance/ComputeNodeInstanceContext.java | 6 +++---
.../java/org/apache/shardingsphere/infra/lock/LockContext.java | 8 +++-----
.../infra/instance/ComputeNodeInstanceContextTest.java | 2 +-
.../scenario/migration/preparer/MigrationJobPreparer.java | 1 -
.../globalclock/executor/GlobalClockTransactionHook.java | 2 --
.../globalclock/executor/GlobalClockTransactionHookTest.java | 4 ----
.../apache/shardingsphere/transaction/spi/TransactionHook.java | 2 --
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 2 +-
.../mode/manager/cluster/lock/ClusterLockContext.java | 2 +-
.../mode/manager/standalone/lock/StandaloneLockContext.java | 2 +-
.../handler/distsql/ral/updatable/LockClusterExecutor.java | 1 -
.../handler/distsql/ral/updatable/UnlockClusterExecutor.java | 1 -
12 files changed, 10 insertions(+), 23 deletions(-)
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 c1cbcd2d877..a3d8cb81b6e 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
@@ -49,7 +49,7 @@ public final class ComputeNodeInstanceContext {
private final AtomicReference<WorkerIdGenerator> workerIdGenerator;
@Getter(AccessLevel.NONE)
- private final AtomicReference<LockContext<?>> lockContext;
+ private final AtomicReference<LockContext> lockContext;
private final ClusterInstanceRegistry clusterInstanceRegistry;
@@ -68,7 +68,7 @@ public final class ComputeNodeInstanceContext {
* @param workerIdGenerator worker id generator
* @param lockContext lock context
*/
- public void init(final WorkerIdGenerator workerIdGenerator, final
LockContext<?> lockContext) {
+ public void init(final WorkerIdGenerator workerIdGenerator, final
LockContext lockContext) {
this.workerIdGenerator.set(workerIdGenerator);
this.lockContext.set(lockContext);
}
@@ -148,7 +148,7 @@ public final class ComputeNodeInstanceContext {
*
* @return lock context
*/
- public LockContext<?> getLockContext() {
+ public LockContext getLockContext() {
return Optional.ofNullable(lockContext.get()).orElseThrow(() -> new
IllegalStateException("Lock context is not initialized."));
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
index a74f1411e3c..eb39e3b60f0 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/lock/LockContext.java
@@ -19,10 +19,8 @@ package org.apache.shardingsphere.infra.lock;
/**
* Lock context.
- *
- * @param <T> type of lock definition
*/
-public interface LockContext<T extends LockDefinition> {
+public interface LockContext {
/**
* Try Lock.
@@ -31,12 +29,12 @@ public interface LockContext<T extends LockDefinition> {
* @param timeoutMillis timeout milliseconds
* @return is locked or not
*/
- boolean tryLock(T lockDefinition, long timeoutMillis);
+ boolean tryLock(LockDefinition lockDefinition, long timeoutMillis);
/**
* Unlock.
*
* @param lockDefinition lock definition
*/
- void unlock(T lockDefinition);
+ void unlock(LockDefinition lockDefinition);
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
index 9d757c3e220..e0c39e3b0b5 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/instance/ComputeNodeInstanceContextTest.java
@@ -42,7 +42,7 @@ class ComputeNodeInstanceContextTest {
void assertInit() {
ComputeNodeInstanceContext context = new
ComputeNodeInstanceContext(new
ComputeNodeInstance(mock(InstanceMetaData.class)),
mock(ModeConfiguration.class), new EventBusContext());
WorkerIdGenerator workerIdGenerator = mock(WorkerIdGenerator.class);
- LockContext<?> lockContext = mock(LockContext.class);
+ LockContext lockContext = mock(LockContext.class);
context.init(workerIdGenerator, lockContext);
context.generateWorkerId(new Properties());
verify(workerIdGenerator).generate(new Properties());
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
index 3f07a53380f..e8d29bf89e2 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/preparer/MigrationJobPreparer.java
@@ -110,7 +110,6 @@ public final class MigrationJobPreparer implements
PipelineJobPreparer<Migration
jobItemContext.getJobId(), jobItemContext.getShardingItem(),
jobItemContext.getInventoryTasks(), jobItemContext.getIncrementalTasks());
}
- @SuppressWarnings({"unchecked", "rawtypes"})
private void prepareAndCheckTargetWithLock(final MigrationJobItemContext
jobItemContext) throws SQLException {
MigrationJobConfiguration jobConfig = jobItemContext.getJobConfig();
String jobId = jobConfig.getJobId();
diff --git
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
index 295d2f1beb8..abe1f6436c5 100644
---
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
+++
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHook.java
@@ -80,7 +80,6 @@ public final class GlobalClockTransactionHook implements
TransactionHook<GlobalC
}
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
public void beforeCommit(final GlobalClockRule rule, final DatabaseType
databaseType, final Collection<Connection> connections, final
TransactionConnectionContext transactionContext,
final LockContext lockContext) throws
SQLException {
if (!rule.getConfiguration().isEnabled()) {
@@ -98,7 +97,6 @@ public final class GlobalClockTransactionHook implements
TransactionHook<GlobalC
}
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
public void afterCommit(final GlobalClockRule rule, final DatabaseType
databaseType, final Collection<Connection> connections, final
TransactionConnectionContext transactionContext,
final LockContext lockContext) {
Optional<GlobalClockProvider> globalClockProvider =
rule.getGlobalClockProvider();
diff --git
a/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHookTest.java
b/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHookTest.java
index 1a5a16c0486..6e092cfd2bf 100644
---
a/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHookTest.java
+++
b/kernel/global-clock/core/src/test/java/org/apache/shardingsphere/globalclock/executor/GlobalClockTransactionHookTest.java
@@ -145,7 +145,6 @@ class GlobalClockTransactionHookTest {
verify(globalClockTransactionExecutor).sendSnapshotTimestamp(Collections.emptyList(),
10L);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
@Test
void assertBeforeCommitWhenDisabledGlobalClockRule() throws SQLException {
LockContext lockContext = mock(LockContext.class);
@@ -153,7 +152,6 @@ class GlobalClockTransactionHookTest {
verify(lockContext, times(0)).tryLock(any(), anyLong());
}
- @SuppressWarnings("rawtypes")
@Test
void assertBeforeCommitWhenTryLockFailed() throws SQLException {
when(rule.getConfiguration().isEnabled()).thenReturn(true);
@@ -162,7 +160,6 @@ class GlobalClockTransactionHookTest {
verify(globalClockTransactionExecutor,
times(0)).sendCommitTimestamp(any(), anyLong());
}
- @SuppressWarnings({"rawtypes", "unchecked"})
@Test
void assertBeforeCommitWhenGlobalClockTransactionExecutorAbsent() throws
SQLException {
when(rule.getConfiguration().isEnabled()).thenReturn(true);
@@ -173,7 +170,6 @@ class GlobalClockTransactionHookTest {
verify(globalClockTransactionExecutor,
times(0)).sendCommitTimestamp(any(), anyLong());
}
- @SuppressWarnings({"rawtypes", "unchecked"})
@Test
void assertBeforeCommit() throws SQLException {
when(rule.getConfiguration().isEnabled()).thenReturn(true);
diff --git
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHook.java
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHook.java
index 656a4821397..a02673b8d27 100644
---
a/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHook.java
+++
b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/spi/TransactionHook.java
@@ -89,7 +89,6 @@ public interface TransactionHook<T extends
ShardingSphereRule> extends OrderedSP
* @param lockContext lock context
* @throws SQLException SQL exception
*/
- @SuppressWarnings("rawtypes")
void beforeCommit(T rule, DatabaseType databaseType,
Collection<Connection> connections, TransactionConnectionContext
transactionContext, LockContext lockContext) throws SQLException;
/**
@@ -102,7 +101,6 @@ public interface TransactionHook<T extends
ShardingSphereRule> extends OrderedSP
* @param lockContext lock context
* @throws SQLException SQL exception
*/
- @SuppressWarnings("rawtypes")
void afterCommit(T rule, DatabaseType databaseType, Collection<Connection>
connections, TransactionConnectionContext transactionContext, LockContext
lockContext) throws SQLException;
/**
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 becc43ad29f..cdca1a7fdab 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
@@ -59,7 +59,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
ClusterPersistRepositoryConfiguration config =
(ClusterPersistRepositoryConfiguration) modeConfig.getRepository();
ComputeNodeInstanceContext computeNodeInstanceContext = new
ComputeNodeInstanceContext(new ComputeNodeInstance(param.getInstanceMetaData(),
param.getLabels()), modeConfig, eventBusContext);
ClusterPersistRepository repository =
getClusterPersistRepository(config, computeNodeInstanceContext);
- LockContext<?> lockContext = new ClusterLockContext(new
GlobalLockPersistService(repository));
+ LockContext lockContext = new ClusterLockContext(new
GlobalLockPersistService(repository));
computeNodeInstanceContext.init(new
ClusterWorkerIdGenerator(repository, param.getInstanceMetaData().getId()),
lockContext);
MetaDataPersistService metaDataPersistService = new
MetaDataPersistService(repository);
MetaDataContexts metaDataContexts =
MetaDataContextsFactory.create(metaDataPersistService, param,
computeNodeInstanceContext);
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
index 10e978989b8..7bac7d79e61 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/lock/ClusterLockContext.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
* Cluster lock context.
*/
@RequiredArgsConstructor
-public final class ClusterLockContext implements LockContext<LockDefinition> {
+public final class ClusterLockContext implements LockContext {
private final LockPersistService<GlobalLockDefinition>
globalLockPersistService;
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
index 6b5e5a603df..45580b850ad 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/lock/StandaloneLockContext.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.lock.LockDefinition;
/**
* Standalone lock context.
*/
-public final class StandaloneLockContext implements
LockContext<LockDefinition> {
+public final class StandaloneLockContext implements LockContext {
@Override
public boolean tryLock(final LockDefinition lockDefinition, final long
timeoutMillis) {
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
index 075b9ada226..7316f5405c5 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LockClusterExecutor.java
@@ -39,7 +39,6 @@ import
org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;
public final class LockClusterExecutor implements
DistSQLUpdateExecutor<LockClusterStatement> {
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
public void executeUpdate(final LockClusterStatement sqlStatement, final
ContextManager contextManager) {
checkState(contextManager);
checkAlgorithm(sqlStatement);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
index 318311e4dc2..a32b2e650fd 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlockClusterExecutor.java
@@ -35,7 +35,6 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
public final class UnlockClusterExecutor implements
DistSQLUpdateExecutor<UnlockClusterStatement> {
@Override
- @SuppressWarnings({"unchecked", "rawtypes"})
public void executeUpdate(final UnlockClusterStatement sqlStatement, final
ContextManager contextManager) {
checkState(contextManager);
LockContext lockContext =
contextManager.getComputeNodeInstanceContext().getLockContext();
