refactor: Move data source initialization exception handling outside cli

Author: jruaux

plugins/riot/src/main/java/com/redis/riot/DataSourceArgs.java

@@ -5,8 +5,6 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 
-import com.redis.riot.core.RiotExecutionException;
-
 import lombok.ToString;
 import picocli.CommandLine.Option;
 
@@ -25,18 +23,14 @@ public class DataSourceArgs {
 	@Option(names = "--jdbc-pass", arity = "0..1", interactive = true, description = "Login password of the database.", paramLabel = "<pwd>")
 	private String password;
 
-	public DataSource dataSource() throws RiotExecutionException {
+	public DataSource dataSource() throws Exception {
 		DataSourceProperties properties = new DataSourceProperties();
 		properties.setUrl(url);
 		properties.setDriverClassName(driver);
 		properties.setUsername(username);
 		properties.setPassword(password);
 		properties.setEmbeddedDatabaseConnection(EmbeddedDatabaseConnection.NONE);
-		try {
-			properties.afterPropertiesSet();
-		} catch (Exception e) {
-			throw new RiotExecutionException("Could not initialize datasource", e);
-		}
+		properties.afterPropertiesSet();
 		return properties.initializeDataSourceBuilder().build();
 	}
 

plugins/riot/src/main/java/com/redis/riot/DatabaseExport.java

@@ -40,7 +40,12 @@ protected Job job() throws RiotExecutionException {
 	private JdbcBatchItemWriter<Map<String, Object>> writer() throws RiotExecutionException {
 		Assert.hasLength(sql, "No SQL statement specified");
 		log.info("Creating data source with {}", dataSourceArgs);
-		DataSource dataSource = dataSourceArgs.dataSource();
+		DataSource dataSource;
+		try {
+			dataSource = dataSourceArgs.dataSource();
+		} catch (Exception e) {
+			throw new RiotExecutionException("Could not initialize data source", e);
+		}
 		log.info("Creating JDBC writer with sql=\"{}\" assertUpdates={}", sql, assertUpdates);
 		JdbcBatchItemWriterBuilder<Map<String, Object>> builder = new JdbcBatchItemWriterBuilder<>();
 		builder.itemSqlParameterSourceProvider(NullableSqlParameterSource::new);

plugins/riot/src/main/java/com/redis/riot/DatabaseImport.java

@@ -36,7 +36,12 @@ protected Job job() throws RiotExecutionException {
 	protected JdbcCursorItemReader<Map<String, Object>> reader() throws RiotExecutionException {
 		Assert.hasLength(sql, "No SQL statement specified");
 		log.info("Creating data source with {}", dataSourceArgs);
-		DataSource dataSource = dataSourceArgs.dataSource();
+		DataSource dataSource;
+		try {
+			dataSource = dataSourceArgs.dataSource();
+		} catch (Exception e) {
+			throw new RiotExecutionException("Could not initialize data source", e);
+		}
 		log.info("Creating JDBC reader with sql=\"{}\" {}", sql, readerArgs);
 		JdbcCursorItemReaderBuilder<Map<String, Object>> reader = new JdbcCursorItemReaderBuilder<>();
 		reader.dataSource(dataSource);