(shardingsphere) branch master updated: Fix sonar issues (#33305)

[zhangliang]

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 70345644665 Fix sonar issues (#33305)
70345644665 is described below

commit 70345644665fe87f0035c1b941fd706e37a4a24a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Oct 18 18:05:49 2024 +0800

    Fix sonar issues (#33305)
---
 .../java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java    | 5 ++---
 .../mode/metadata/manager/GlobalConfigurationManager.java           | 6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git 
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java
 
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java
index 4c873eaad5d..7a111945446 100644
--- 
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java
+++ 
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJob.java
@@ -33,7 +33,6 @@ import 
org.apache.shardingsphere.data.pipeline.cdc.engine.CDCJobRunnerCleaner;
 import org.apache.shardingsphere.data.pipeline.cdc.generator.CDCResponseUtils;
 import org.apache.shardingsphere.data.pipeline.core.context.PipelineContextKey;
 import 
org.apache.shardingsphere.data.pipeline.core.context.PipelineJobItemContext;
-import 
org.apache.shardingsphere.data.pipeline.core.context.TransmissionJobItemContext;
 import 
org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext;
 import org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLine;
 import 
org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLineConvertUtils;
@@ -183,7 +182,7 @@ public final class CDCJob implements PipelineJob {
         Collection<CompletableFuture<?>> futures = new LinkedList<>();
         for (CDCJobItemContext each : jobItemContexts) {
             updateJobItemStatus(each, JobStatus.EXECUTE_INVENTORY_TASK, 
jobItemManager);
-            for (PipelineTask task : ((TransmissionJobItemContext) 
each).getInventoryTasks()) {
+            for (PipelineTask task : each.getInventoryTasks()) {
                 if (task.getTaskProgress().getPosition() instanceof 
IngestFinishedPosition) {
                     continue;
                 }
@@ -204,7 +203,7 @@ public final class CDCJob implements PipelineJob {
                 return;
             }
             updateJobItemStatus(each, JobStatus.EXECUTE_INCREMENTAL_TASK, 
jobItemManager);
-            for (PipelineTask task : ((TransmissionJobItemContext) 
each).getIncrementalTasks()) {
+            for (PipelineTask task : each.getIncrementalTasks()) {
                 if (task.getTaskProgress().getPosition() instanceof 
IngestFinishedPosition) {
                     continue;
                 }
diff --git 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/GlobalConfigurationManager.java
 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/GlobalConfigurationManager.java
index 23544272e0a..ce25753ae7c 100644
--- 
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/GlobalConfigurationManager.java
+++ 
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/GlobalConfigurationManager.java
@@ -36,7 +36,6 @@ import 
org.apache.shardingsphere.transaction.rule.TransactionRule;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -82,10 +81,7 @@ public final class GlobalConfigurationManager {
         if 
(!"transaction".equals(Objects.requireNonNull(yamlRuleConfig.getClass().getAnnotation(RepositoryTupleEntity.class)).value()))
 {
             return;
         }
-        Optional<TransactionRule> transactionRule = 
metaDataContexts.get().getMetaData().getGlobalRuleMetaData().findSingleRule(TransactionRule.class);
-        if (transactionRule.isPresent()) {
-            ((AutoCloseable) transactionRule.get()).close();
-        }
+        
metaDataContexts.get().getMetaData().getGlobalRuleMetaData().findSingleRule(TransactionRule.class).ifPresent(TransactionRule::close);
     }
     
     /**