refactor: Moved pool option to commands that require it

build.gradle

@@ -110,7 +110,6 @@ subprojects { subproj ->
             testImplementation 'org.junit.jupiter:junit-jupiter-engine'
             testImplementation 'org.junit.platform:junit-platform-launcher'
             testImplementation 'org.testcontainers:junit-jupiter'
-            testImplementation 'org.slf4j:slf4j-simple'
 	        testImplementation group: 'com.redis', name: 'testcontainers-redis', version: testcontainersRedisVersion
 	    }
 

core/riot-core/src/main/java/com/redis/riot/core/AbstractCallableCommand.java

@@ -0,0 +1,38 @@
+package com.redis.riot.core;
+
+import java.util.concurrent.Callable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+
+@Command
+public abstract class AbstractCallableCommand extends BaseCommand implements Callable<Integer> {
+
+	@Option(names = "--help", usageHelp = true, description = "Show this help message and exit.")
+	private boolean helpRequested;
+
+	protected Logger log;
+
+	@Override
+	public Integer call() throws Exception {
+		if (log == null) {
+			log = LoggerFactory.getLogger(getClass());
+		}
+		execute();
+		return 0;
+	}
+
+	protected abstract void execute() throws Exception;
+
+	public Logger getLog() {
+		return log;
+	}
+
+	public void setLog(Logger log) {
+		this.log = log;
+	}
+
+}

core/riot-core/src/main/java/com/redis/riot/core/AbstractJobCommand.java

@@ -5,6 +5,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.ItemWriteListener;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -36,6 +37,7 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 import com.redis.spring.batch.JobUtils;
 import com.redis.spring.batch.item.AbstractAsyncItemReader;
@@ -47,7 +49,7 @@
 import picocli.CommandLine.Option;
 
 @Command
-public abstract class AbstractJobCommand extends AbstractCommand {
+public abstract class AbstractJobCommand extends AbstractCallableCommand {
 
 	public static final String DEFAULT_JOB_REPOSITORY_NAME = "riot";
 
@@ -96,7 +98,11 @@ protected void execute() throws Exception {
 		JobExecution jobExecution = jobLauncher.run(job(), new JobParameters());
 		if (JobUtils.isFailed(jobExecution.getExitStatus())) {
 			for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
-				if (JobUtils.isFailed(stepExecution.getExitStatus())) {
+				ExitStatus stepExitStatus = stepExecution.getExitStatus();
+				if (JobUtils.isFailed(stepExitStatus)) {
+					if (CollectionUtils.isEmpty(stepExecution.getFailureExceptions())) {
+						throw new JobExecutionException(stepExitStatus.getExitDescription());
+					}
 					throw wrapException(stepExecution.getFailureExceptions());
 				}
 			}

core/riot-core/src/main/java/com/redis/riot/core/BaseCommand.java

@@ -3,12 +3,13 @@
 import java.util.Map;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 
 @Command(usageHelpAutoWidth = true, mixinStandardHelpOptions = true, abbreviateSynopsis = true)
-public abstract class BaseCommand {
+public class BaseCommand {
 
 	static {
 		if (System.getenv().containsKey("RIOT_NO_COLOR")) {
@@ -19,6 +20,9 @@ public abstract class BaseCommand {
 	@Spec
 	protected CommandSpec commandSpec;
 
+	@Mixin
+	LoggingMixin loggingMixin;
+
 	@Option(names = "-D", paramLabel = "<key=value>", description = "Sets a System property.", mapFallbackValue = "", hidden = true)
 	void setProperty(Map<String, String> props) {
 		props.forEach(System::setProperty);