Some new feature for maven plugin

0.3.2

Author: daneeldeveloper

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.fugerit.java</groupId>
 	<artifactId>query-export-tool</artifactId>
 
-	<version>0.3.1</version>
+	<version>0.3.2</version>
 	<packaging>jar</packaging>
 
 	<name>query-export-tool</name>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.fugerit.java</groupId>
 			<artifactId>fj-core</artifactId>
-			<version>0.4.6</version>
+			<version>${fj-version}</version>
 		</dependency>
 
 		<!-- java core dependancies -->

src/main/java/org/fugerit/java/query/export/catalog/QueryConfig.java

@@ -0,0 +1,72 @@
+package org.fugerit.java.query.export.catalog;
+
+import org.fugerit.java.core.cfg.xml.BasicIdConfigType;
+
+public class QueryConfig extends BasicIdConfigType {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 40082112689288L;
+
+	private String sql;
+	
+	private String outputFile;
+	
+	private String outputFormat;
+	
+	private String csvSeparator;
+	
+	private String xlsResize;
+	
+	private String createPath;
+
+	public String getSql() {
+		return sql;
+	}
+
+	public void setSql(String sql) {
+		this.sql = sql;
+	}
+
+	public String getOutputFile() {
+		return outputFile;
+	}
+
+	public void setOutputFile(String outputFile) {
+		this.outputFile = outputFile;
+	}
+
+	public String getOutputFormat() {
+		return outputFormat;
+	}
+
+	public void setOutputFormat(String outputFormat) {
+		this.outputFormat = outputFormat;
+	}
+
+	public String getCsvSeparator() {
+		return csvSeparator;
+	}
+
+	public void setCsvSeparator(String csvSeparator) {
+		this.csvSeparator = csvSeparator;
+	}
+
+	public String getXlsResize() {
+		return xlsResize;
+	}
+
+	public void setXlsResize(String xlsResize) {
+		this.xlsResize = xlsResize;
+	}
+
+	public String getCreatePath() {
+		return createPath;
+	}
+
+	public void setCreatePath(String createPath) {
+		this.createPath = createPath;
+	}
+	
+}

src/main/java/org/fugerit/java/query/export/catalog/QueryConfigCatalog.java

@@ -0,0 +1,18 @@
+package org.fugerit.java.query.export.catalog;
+
+import org.fugerit.java.core.cfg.xml.CustomListCatalogConfig;
+import org.fugerit.java.core.util.collection.ListMapStringKey;
+
+public class QueryConfigCatalog extends CustomListCatalogConfig<QueryConfig, ListMapStringKey<QueryConfig>> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4378688201418189400L;
+
+	public QueryConfigCatalog() {
+		super( "query-catalog" , "query" );
+		this.getGeneralProps().setProperty( ATT_TYPE , QueryConfig.class.getName() );
+	}
+	
+}

src/main/java/org/fugerit/java/query/export/facade/format/QueryExportHandlerXLSBase.java

@@ -10,6 +10,7 @@
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.fugerit.java.core.lang.helpers.BooleanUtils;
 import org.fugerit.java.query.export.facade.QueryExportConfig;
 import org.fugerit.java.query.export.facade.QueryExportHandler;
 import org.fugerit.java.query.export.meta.MetaField;
@@ -85,6 +86,9 @@ public int export( QueryExportConfig config, MetaResult meta ) throws Exception
 			addRow( record.fieldIterator() , sheet, index );
 			index++;
 		}
+		if ( BooleanUtils.isTrue( config.getParams().getProperty( ARG_XLS_RESIZE ) ) ) {
+			resizeSheet( sheet );
+		}
 		workbook.write( config.getOutput() );
 		workbook.close();
 		return res;

src/main/java/org/fugerit/java/query/export/tool/QueryExportToolMain.java

@@ -1,5 +1,6 @@
 package org.fugerit.java.query.export.tool;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.sql.Connection;
 import java.util.Properties;
@@ -8,6 +9,8 @@
 import org.fugerit.java.core.db.connect.ConnectionFactory;
 import org.fugerit.java.core.db.connect.ConnectionFactoryImpl;
 import org.fugerit.java.core.io.FileIO;
+import org.fugerit.java.core.lang.helpers.BooleanUtils;
+import org.fugerit.java.core.lang.helpers.StringUtils;
 import org.fugerit.java.core.util.PropsIO;
 import org.fugerit.java.query.export.facade.QueryExportConfig;
 import org.fugerit.java.query.export.facade.QueryExportFacade;
@@ -26,29 +29,42 @@ public class QueryExportToolMain {
 
 	public static final String ARG_CSV_SEPARATOR = "csv-separator";
 
+	public static final String ARG_QUERY_SQL = "query-sql";
+	
+	public static final String ARG_CREATE_PATH = "create-path";
+	public static final String ARG_CREATE_PATH_DEFAULT = BooleanUtils.BOOLEAN_FALSE;
+	
 	protected static final Logger logger = LoggerFactory.getLogger(QueryExportToolMain.class);
 
-	public static void main(String[] args) {
-		Properties params = ArgUtils.getArgs(args);
+	public static void worker(Properties params) {
 		try {
 			logger.info("params: {}", params);
 			String dbConfig = params.getProperty(ARG_DB_CONFIG);
 			String queryFile = params.getProperty(ARG_QUERY_FILE);
+			String querySql = params.getProperty(ARG_QUERY_SQL);
 			String outputFile = params.getProperty(ARG_OUTPUT_FILE);
 			String outputFormat = params.getProperty(ARG_OUTPUT_FORMAT, QueryExportFacade.FORMAT_DEFAULT );
+			String createPath = params.getProperty(ARG_CREATE_PATH, ARG_CREATE_PATH_DEFAULT );
 			logger.info("param : {} = {}", ARG_DB_CONFIG , dbConfig);
 			logger.info("param : {} = {}", ARG_QUERY_FILE , queryFile);
 			logger.info("param : {} = {}", ARG_OUTPUT_FILE , outputFile);
 			logger.info("param : {} = {}", ARG_OUTPUT_FORMAT , outputFormat);
-			if (queryFile == null || outputFile == null) {
-				throw new Exception("Missing required arguments " + ARG_OUTPUT_FILE + ", " + ARG_QUERY_FILE);
+			String sql = querySql;
+			if ( StringUtils.isNotEmpty( queryFile ) ) {
+				sql = FileIO.readString( queryFile );
+			}
+			if ( sql == null || outputFile == null) {
+				throw new Exception("Missing required arguments " + ARG_OUTPUT_FILE + ", " + ARG_QUERY_FILE + " or " + ARG_QUERY_SQL);
 			} else {
 				Properties props = PropsIO.loadFromFile(dbConfig);
 				ConnectionFactory cf = ConnectionFactoryImpl.newInstance(props);
 				Connection conn = cf.getConnection();
-				FileOutputStream fos = new FileOutputStream( outputFile );
+				File output = new File( outputFile );
+				if ( BooleanUtils.isTrue( createPath ) && !output.getParentFile().exists() ) {
+					logger.info( "create-path {} -> {}", output.getParentFile().getCanonicalPath(), output.getParentFile().mkdirs() );
+				}
+				FileOutputStream fos = new FileOutputStream( output );
 				try {
-					String sql = FileIO.readString( queryFile );
 					String csvSeparator = params.getProperty( ARG_CSV_SEPARATOR, "," );
 					QueryExportConfig exportConfig = QueryExportConfig.newConfigCSV( fos, conn, sql, csvSeparator.charAt( 0 ) );
 					exportConfig.setFormat( outputFormat );
@@ -70,4 +86,9 @@ public static void main(String[] args) {
 		}
 	}
 
+	public static void main(String[] args) {
+		Properties params = ArgUtils.getArgs(args);
+		worker(params);
+	}
+	
 }