Cluster name as argument

MIABIS · Nov 16, 2015 · 45aa03c · 45aa03c
1 parent 36d4518
commit 45aa03c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/src/main/java/org/miabis/converter/cli/ConverterCli.java b/src/main/java/org/miabis/converter/cli/ConverterCli.java
@@ -22,7 +22,8 @@
 public class ConverterCli {
 
 	private static Options options;
-	private static String clustersNodes = "localhost:9300";
+	private static String clusterNodes = "localhost:9300";
+	private static String clusterName = "elasticsearch";
 	private static String delimiter = Util.DELIMITER_TAB;
 
 	public static void main(String[] args) throws ParseException, JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException, JobParametersInvalidException {
@@ -34,11 +35,18 @@ public static void main(String[] args) throws ParseException, JobExecutionAlread
 				.desc("indexes a set of files. If only one file is supplied it asumes is a MIABIS TAB file, else five files must be supplied (sample, biobank, saple collection, study, contact information). The list of files must be separated by a space.")
 				.build();
 
-		Option clustersNodesOpt = Option.builder("c")
+		Option clusterNodesOpt = Option.builder("c")
 				.argName("elastic search cluster")
 				.longOpt("cluster")
 				.hasArg()
-				.desc("with -i: elastic search cluster group. It defaults to "+clustersNodes)
+				.desc("with -i: elastic search cluster group. It defaults to "+clusterNodes)
+				.build();
+
+		Option clusterNameOpt = Option.builder("z")
+				.argName("elastic search cluster name")
+				.longOpt("cname")
+				.hasArg()
+				.desc("with -i: elastic search cluster name. It defaults to "+clusterName)
 				.build();
 
 		Option transformOpt = Option.builder("t")
@@ -77,7 +85,8 @@ public static void main(String[] args) throws ParseException, JobExecutionAlread
 		options = new Options();
 
 		options.addOption(indexOpt);
-		options.addOption(clustersNodesOpt);
+		options.addOption(clusterNodesOpt);
+		options.addOption(clusterNameOpt);
 		options.addOption(helpOpt);
 
 		options.addOption(transformOpt);
@@ -108,9 +117,13 @@ public static void main(String[] args) throws ParseException, JobExecutionAlread
 			}
 
 			//Set Index Name
-			System.setProperty("name", cmd.getOptionValue("n").toLowerCase());
+			System.setProperty("indexname", cmd.getOptionValue("n").toLowerCase());
 
-			clustersNodes = cmd.hasOption("c") ? cmd.getOptionValue('c') : clustersNodes;
+			clusterNodes = cmd.hasOption("c") ? cmd.getOptionValue("c") : clusterNodes;
+			clusterName = cmd.hasOption("z") ? cmd.getOptionValue("z") : clusterName;
+
+			System.out.println(clusterNodes);
+			System.out.println(clusterName);
 
 			String[] files = cmd.getOptionValues("i");
 
@@ -123,7 +136,8 @@ public static void main(String[] args) throws ParseException, JobExecutionAlread
 
 				JobParametersBuilder pb = new JobParametersBuilder();
 				pb.addString("tab.input", "file:" + files[0]);
-				pb.addString("clusters.nodes", clustersNodes);
+				pb.addString("cluster.nodes", clusterNodes);
+				pb.addString("cluster.name", clusterName);
 				pb.addString("columns", Util.COLUMNS);
 
 				jobLauncher.run(job, pb.toJobParameters());
@@ -147,7 +161,8 @@ public static void main(String[] args) throws ParseException, JobExecutionAlread
 				pb.addString("study", "file:" + files[3]);
 				pb.addString("contactInfo", "file:" + files[4]);
 
-				pb.addString("clusters.nodes", clustersNodes);
+				pb.addString("cluster.nodes", clusterNodes);
+				pb.addString("cluster.name", clusterName);
 
 				//Map
 				pb.addString("map", map);

diff --git a/src/main/resources/spring/batch/config/job-csv-db-config.xml b/src/main/resources/spring/batch/config/job-csv-db-config.xml
@@ -161,15 +161,15 @@
 
 	<!-- Bean holding the index name. Hack so spring data can set the index name dinamically. -->
 	<bean id="indexName" class="java.lang.String">
-    	<constructor-arg value="#{systemProperties.name}"/>
+    	<constructor-arg value="#{systemProperties.indexname}"/>
 	</bean>
 
 	<!-- Writer -->
 	<bean id="indexWriter" class="org.miabis.converter.batch.writers.ElasticSearchSampleWriter" scope="step">
 		<constructor-arg>
 			<bean name="elasticsearchTemplate" class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">
 		        <constructor-arg>
-		        	<elasticsearch:transport-client cluster-name="elasticsearch" client-transport-sniff="true" cluster-nodes="#{jobParameters['clusters.nodes']}" />
+		        	<elasticsearch:transport-client cluster-name="#{jobParameters['cluster.name']}" client-transport-sniff="true" cluster-nodes="#{jobParameters['cluster.nodes']}" />
 		        </constructor-arg>
 		    </bean>
 		</constructor-arg>