refactored import and export packages

Author: jruaux

pom.xml

@@ -77,12 +77,6 @@
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
 		</dependency>
-		<!-- Test -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>info.picocli</groupId>
 			<artifactId>picocli</artifactId>
@@ -103,14 +97,37 @@
 			<artifactId>javafaker</artifactId>
 			<version>0.18</version>
 		</dependency>
+		<!-- Test -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>mysql</groupId> -->
+		<!-- <artifactId>mysql-connector-java</artifactId> -->
+		<!-- </dependency> -->
 	</dependencies>
 
 	<build>
 		<plugins>
+			<!-- <plugin> -->
+			<!-- <groupId>org.asciidoctor</groupId> -->
+			<!-- <artifactId>asciidoctor-maven-plugin</artifactId> -->
+			<!-- <version>1.5.8</version> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>output-html</id> -->
+			<!-- <phase>generate-resources</phase> -->
+			<!-- <goals> -->
+			<!-- <goal>process-asciidoc</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- <configuration> -->
+			<!-- <sourceDirectory>${basedir}</sourceDirectory> -->
+			<!-- </configuration> -->
+			<!-- </plugin> -->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>

src/main/java/com/redislabs/riot/RiotApplication.java

@@ -1,101 +1,30 @@
 package com.redislabs.riot;
 
-import java.net.InetAddress;
 import java.util.List;
 import java.util.Locale;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import com.redislabs.riot.cli.Export;
-import com.redislabs.riot.cli.Import;
-import com.redislabs.riot.redis.RedisConnectionBuilder;
+import com.redislabs.riot.cli.RootCommand;
 
-import io.lettuce.core.RedisURI;
-import lombok.Getter;
 import picocli.CommandLine;
-import picocli.CommandLine.Command;
 import picocli.CommandLine.DefaultExceptionHandler;
-import picocli.CommandLine.Option;
 import picocli.CommandLine.RunLast;
-import redis.clients.jedis.Protocol;
 
 @SpringBootApplication
-@Command(name = "riot", subcommands = { Export.class, Import.class })
-public class RiotApplication extends BaseCommand implements CommandLineRunner {
+public class RiotApplication implements CommandLineRunner {
+
+	private RootCommand riot = new RootCommand();
 
 	public static void main(String[] args) {
 		SpringApplication.run(RiotApplication.class, args);
 	}
 
-	public static final String DEFAULT_HOST = "localhost";
-
-	public enum RedisDriver {
-		Jedis, Lettuce
-	}
-
-	/**
-	 * Just to avoid picocli complain in Eclipse console
-	 */
-	@Option(names = "--spring.output.ansi.enabled", hidden = true)
-	private String ansiEnabled;
-
-	@Option(names = "--driver", description = "Redis driver: ${COMPLETION-CANDIDATES}. (default: ${DEFAULT-VALUE})")
-	@Getter
-	private RedisDriver driver = RedisDriver.Jedis;
-	@Option(names = "--host", description = "Redis server host. (default: localhost).")
-	private InetAddress host;
-	@Option(names = "--port", description = "Redis server port. (default: ${DEFAULT-VALUE}).")
-	private int port = RedisURI.DEFAULT_REDIS_PORT;
-	@Option(names = "--command-timeout", description = "Redis command timeout in seconds for synchronous command execution (default: ${DEFAULT-VALUE}).")
-	private long commandTimeout = RedisURI.DEFAULT_TIMEOUT;
-	@Option(names = "--connection-timeout", description = "Redis connect timeout in milliseconds. (default: ${DEFAULT-VALUE}).")
-	private int connectionTimeout = Protocol.DEFAULT_TIMEOUT;
-	@Option(names = "--socket-timeout", description = "Redis socket timeout in milliseconds. (default: ${DEFAULT-VALUE}).")
-	private int socketTimeout = Protocol.DEFAULT_TIMEOUT;
-	@Option(names = "--password", description = "Redis database password.", interactive = true)
-	private String password;
-	@Option(names = "--max-idle", description = "Maximum number of idle connections in the pool. Use a negative value to indicate an unlimited number of idle connections. (default: ${DEFAULT-VALUE}).")
-	private int maxIdle = 8;
-	@Option(names = "--min-idle", description = "Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive. (default: ${DEFAULT-VALUE}).")
-	private int minIdle = 0;
-	@Option(names = "--max-total", description = "Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit. (default: ${DEFAULT-VALUE})")
-	private int maxTotal = 8;
-	@Option(names = "--max-wait", description = "Maximum amount of time in milliseconds a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely (default).")
-	private long maxWait = -1L;
-	@Option(names = "--database", description = "Redis database number. Databases are only available for Redis Standalone and Redis Master/Slave. (default: ${DEFAULT-VALUE}).")
-	private int database = 0;
-	@Option(names = "--client-name", description = "Redis client name.")
-	private String clientName;
-
-	public RedisConnectionBuilder redisConnectionBuilder() {
-		RedisConnectionBuilder builder = new RedisConnectionBuilder();
-		builder.setClientName(clientName);
-		builder.setCommandTimeout(commandTimeout);
-		builder.setConnectionTimeout(connectionTimeout);
-		builder.setDatabase(database);
-		builder.setHost(getHostname());
-		builder.setMaxTotal(maxTotal);
-		builder.setMaxIdle(maxIdle);
-		builder.setMaxWait(maxWait);
-		builder.setMinIdle(minIdle);
-		builder.setPassword(password);
-		builder.setPort(port);
-		builder.setSocketTimeout(socketTimeout);
-		return builder;
-	}
-
-	private String getHostname() {
-		if (host != null) {
-			return host.getHostName();
-		}
-		return DEFAULT_HOST;
-	}
-
 	@Override
 	public void run(String... args) {
-		CommandLine commandLine = new CommandLine(this);
+		CommandLine commandLine = new CommandLine(riot);
 		commandLine.registerConverter(Locale.class, s -> new Locale.Builder().setLanguageTag(s).build());
 		commandLine.setCaseInsensitiveEnumValuesAllowed(true);
 		RunLast handler = new RunLast();

src/main/java/com/redislabs/riot/BaseCommand.java renamed to src/main/java/com/redislabs/riot/cli/AbstractCommand.java

@@ -1,13 +1,13 @@
-package com.redislabs.riot;
+package com.redislabs.riot.cli;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 
 @Command(mixinStandardHelpOptions = true)
-public class BaseCommand implements Runnable {
+public abstract class AbstractCommand implements Runnable {
 
 	@Override
-	public void run() { 
+	public void run() {
 		new CommandLine(this).usage(System.out);
 	}
 }

src/main/java/com/redislabs/riot/cli/CommandsBuilder.java

@@ -1,7 +1,6 @@
 
 package com.redislabs.riot.cli;
 
-import com.redislabs.riot.RiotApplication.RedisDriver;
 import com.redislabs.riot.redis.writer.JedisCommands;
 import com.redislabs.riot.redis.writer.LettuceCommands;
 import com.redislabs.riot.redis.writer.RedisCommands;
@@ -13,7 +12,7 @@ public class CommandsBuilder {
 	@Setter
 	private RedisDriver driver;
 
-	protected RedisCommands build() {
+	public RedisCommands build() {
 		switch (driver) {
 		case Lettuce:
 			return lettuceCommands();

src/main/java/com/redislabs/riot/cli/DelimitedFileImport.java

@@ -20,8 +20,6 @@
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import com.redislabs.riot.BaseCommand;
-import com.redislabs.riot.RiotApplication;
 import com.redislabs.riot.batch.JobBuilder;
 
 import lombok.Getter;
@@ -30,11 +28,11 @@
 import picocli.CommandLine.ParentCommand;
 
 @Command
-public class JobCommand<I, O> extends BaseCommand {
+public class JobCommand<I, O> extends AbstractCommand {
 
 	@ParentCommand
 	@Getter
-	private RiotApplication parent;
+	private RootCommand parent;
 
 	private NumberFormat numberFormat = NumberFormat.getIntegerInstance();