Support for DateFormat

Author: fugerit79

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- support for date format
+
 ### Changed
 
 - commons-lang3-version set to 3.18.0

README.md

@@ -21,7 +21,7 @@ Tool export query in CSV and XLS / XLSX format
 <query-catalog-config>
 
 	<query-catalog id="main-catalog">
-		<query id="Q001" sql="SELECT * FROM  test_export" outputFormat="csv" csvSeparator=";" outputFile="target/catalog_test_001.csv"/>
+		<query id="Q001" sql="SELECT * FROM  test_export" outputFormat="csv" csvSeparator=";" outputFile="target/catalog_test_001.csv" dateFormat="yyyy-MM-dd HH:mm:ss"/>
 		<query id="Q002" sql="SELECT * FROM  test_export" outputFormat="csv" outputFile="target/catalog_test_002.csv"/>
 		<query id="Q003" sql="SELECT * FROM  test_export" outputFormat="html" outputFile="target/catalog_test_003.html" createPath="1"/>
 		<query id="Q004" sql="SELECT * FROM  test_export" outputFormat="xls" outputFile="target/catalog_test_004.xls" xlsResize="1" tryColumnType="1"/>

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

@@ -31,5 +31,7 @@ public class QueryConfig extends BasicIdConfigType {
 	@Getter @Setter private String createPath;
 
 	@Getter @Setter private String tryColumnType;
+
+	@Getter @Setter private String dateFormat;
 
 }

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

@@ -75,6 +75,9 @@ public static void handle( Connection conn, QueryConfig queryConfig ) throws IOE
 			if ( StringUtils.isNotEmpty( queryConfig.getXlsTemplate() ) ) {
 				params.setProperty( QueryExportFacade.ARG_XLS_TEMPLATE , queryConfig.getXlsTemplate() );
 			}
+			if ( StringUtils.isNotEmpty( queryConfig.getDateFormat() ) ) {
+				params.setProperty( QueryExportFacade.ARG_DATE_FORMAT , queryConfig.getDateFormat() );
+			}
 			boolean createPath = BooleanUtils.isTrue( queryConfig.getCreatePath() );
 			if ( createPath ) {
 				log.info( "create path {} : {}", file, file.getParentFile().mkdirs() );

src/main/java/org/fugerit/java/query/export/facade/QueryExportFacade.java

@@ -9,6 +9,7 @@
 import org.fugerit.java.core.util.collection.ListMapStringKey;
 import org.fugerit.java.query.export.meta.BasicMetaRSE;
 import org.fugerit.java.query.export.meta.BasicMetaResult;
+import org.fugerit.java.query.export.meta.BasicObjectFormat;
 import org.fugerit.java.query.export.meta.MetaResult;
 
 import lombok.extern.slf4j.Slf4j;
@@ -33,10 +34,11 @@ private QueryExportFacade() {}
 
 	public static final String ARG_XLS_RESIZE_DEFAULT = "false";
 
+	public static final String ARG_DATE_FORMAT = "date-format";
+
 	public static boolean registerHandler( String type ) {
 		boolean ok = false;
 		try {
-
 			QueryExportHandler handler = (QueryExportHandler)ClassHelper.newInstance( type );
 			setGet( null, handler );
 			ok = true;
@@ -72,7 +74,9 @@ public static int export( QueryExportConfig config ) {
 			try (Statement stm = config.getConn().createStatement();
 				 ResultSet rs = stm.executeQuery( config.getQuery() ) ) {
 				log.info( "sql : {}", config.getQuery() );
-				MetaResult meta = new BasicMetaResult( BasicMetaRSE.newInstanceAllToString( rs.getMetaData(), config.getObjectFormat() ) , rs );
+				BasicObjectFormat objectFormat = BasicObjectFormat.withDateFormat(
+						config.getParams().getProperty( ARG_DATE_FORMAT ), config.getObjectFormat() );
+				MetaResult meta = new BasicMetaResult( BasicMetaRSE.newInstanceAllToString( rs.getMetaData(), objectFormat ) , rs );
 				export( config, meta );
 				int count = meta.close();
 				log.info( "record count {}", count );

src/main/java/org/fugerit/java/query/export/meta/BasicObjectFormat.java

@@ -1,5 +1,8 @@
 package org.fugerit.java.query.export.meta;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 public class BasicObjectFormat {
 
 	public String format( Object current ) {
@@ -9,5 +12,22 @@ public String format( Object current ) {
 		}
 		return value;
 	}
-	
+
+	public static BasicObjectFormat withDateFormat( final String dateFormat, BasicObjectFormat objectFormat ) {
+		if ( dateFormat != null ) {
+			return new BasicObjectFormat() {
+				@Override
+				public String format(Object current) {
+					if ( current instanceof Date) {
+						SimpleDateFormat sdf = new SimpleDateFormat( dateFormat );
+						return sdf.format( (Date)current );
+					}
+					return super.format(current);
+				}
+			};
+		} else {
+			return objectFormat;
+		}
+	}
+
 }

src/test/resources/sample/query-catalog-sample.xml

@@ -1,7 +1,7 @@
 <query-catalog-config>
 
 	<query-catalog id="sample-catalog">
-		<query id="Q001" sql="SELECT * FROM  test_export" outputFormat="csv" csvSeparator=";" outputFile="target/catalog_test_001.csv"/>
+		<query id="Q001" sql="SELECT * FROM  test_export" outputFormat="csv" csvSeparator=";" outputFile="target/catalog_test_001.csv" dateFormat="yyyy-MM-dd HH:mm:ss"/>
 		<query id="Q002" sql="SELECT * FROM  test_export" outputFormat="csv" outputFile="target/catalog_test_002.csv"/>
 		<query id="Q003" sql="SELECT * FROM  test_export" outputFormat="html" outputFile="target/catalog_test_003.html" createPath="1"/>
 		<query id="Q004" sql="SELECT * FROM  test_export" outputFormat="xls" outputFile="target/catalog_test_004.xls" xlsResize="1" tryColumnType="1"/>