[shardingsphere] branch master updated: Add default value for ParallelRuntimeStrategy (#22461)

[sunnianjun]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 6e38b507d7b Add default value for ParallelRuntimeStrategy (#22461)
6e38b507d7b is described below

commit 6e38b507d7b0360bd749094a21e13488aa2f6411
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Nov 27 22:26:05 2022 +0800

    Add default value for ParallelRuntimeStrategy (#22461)
---
 .../runner/parallel/ParameterizedParallelRunnerScheduler.java        | 2 +-
 .../test/runner/ShardingSphereParallelTestParameterized.java         | 5 +----
 .../shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java | 3 +--
 .../test/runner/parallel/annotaion/ParallelRuntimeStrategy.java      | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
 
b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
index ad3232cb18d..92eeeffe794 100644
--- 
a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
+++ 
b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
@@ -27,7 +27,7 @@ import 
org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
 /**
  * Parameterized parallel runner scheduler.
  */
-public class ParameterizedParallelRunnerScheduler extends 
ParallelRunnerScheduler {
+public final class ParameterizedParallelRunnerScheduler extends 
ParallelRunnerScheduler {
     
     public ParameterizedParallelRunnerScheduler(final ParallelLevel 
parallelLevel, final ParallelRunnerExecutorFactory<DatabaseType> 
executorFactory) {
         super(parallelLevel, executorFactory);
diff --git 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
index 08677d77cd9..013d4172c23 100644
--- 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
+++ 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.test.runner;
 
 import 
org.apache.shardingsphere.test.runner.parallel.DefaultParallelRunnerExecutorFactory;
 import org.apache.shardingsphere.test.runner.parallel.ParallelRunnerScheduler;
-import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
 import 
org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
 import org.junit.runners.Parameterized;
 
@@ -32,8 +31,6 @@ public final class ShardingSphereParallelTestParameterized 
extends Parameterized
     public ShardingSphereParallelTestParameterized(final Class<?> clazz) 
throws Throwable {
         // CHECKSTYLE:ON
         super(clazz);
-        ParallelRuntimeStrategy parallelRuntimeStrategy = 
clazz.getAnnotation(ParallelRuntimeStrategy.class);
-        ParallelLevel level = null != parallelRuntimeStrategy ? 
parallelRuntimeStrategy.value() : ParallelLevel.DEFAULT;
-        setScheduler(new ParallelRunnerScheduler(level, new 
DefaultParallelRunnerExecutorFactory<>()));
+        setScheduler(new 
ParallelRunnerScheduler(clazz.getAnnotation(ParallelRuntimeStrategy.class).value(),
 new DefaultParallelRunnerExecutorFactory<>()));
     }
 }
diff --git 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
index 70e549907d4..91b050a7386 100644
--- 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
+++ 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
@@ -26,12 +26,11 @@ import org.junit.runners.model.RunnerScheduler;
  * Parallel runner scheduler.
  */
 @RequiredArgsConstructor
+@Getter
 public class ParallelRunnerScheduler implements RunnerScheduler {
     
-    @Getter
     private final ParallelLevel parallelLevel;
     
-    @Getter
     private final ParallelRunnerExecutorFactory executorFactory;
     
     @Override
diff --git 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
index 5e999de9459..6ca3a8c85da 100644
--- 
a/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
+++ 
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
@@ -38,5 +38,5 @@ public @interface ParallelRuntimeStrategy {
      * 
      * @return value parallel level
      */
-    ParallelLevel value();
+    ParallelLevel value() default ParallelLevel.DEFAULT;
 }