1.1.3

Author: fugerit79

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Mars (Fugerit DAOGEN A.P.I.)",
 	"name": "Mars",
-	"version" : "1.1.2",
-	"date" : "25/08/2023",
+	"version" : "1.1.3",
+	"date" : "27/08/2023",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,6 +1,10 @@
-1.1.2 (2023-08-25) 
+1.1.3 (2023-08-27) 
 ------------------
-+ [fix] [fj-daogen] fix indentation of column constants in FacadeImplDataGenerator
++ [fix] [fj-daogen-base] fix to overrideProperties handling in DaogeFacade.generate(InputStream, Properties)
+
+1.1.2 (2023-08-25) 
+------------------
++ [fix] [fj-daogen-base] fix indentation of column constants in FacadeImplDataGenerator
 
 1.1.1 (2023-08-25) 
 ------------------

fj-daogen-base/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
 	</parent>
 
 	<name>fj-daogen-base</name>

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/config/DaogenCatalogConfig.java

@@ -55,7 +55,11 @@ public String getGeneralProp( String key ) {
 	}
 
 	public static DaogenCatalogConfig loadConfig( InputStream input ) throws ConfigException {
-		return loadConfig( input, DaogenCatalogConfig.class );
+		return loadConfig(input, DaogenCatalogConfig.class, null);
+	}
+	
+	public static DaogenCatalogConfig loadConfig( InputStream input, Properties overrideProperties ) throws ConfigException {
+		return loadConfig( input, DaogenCatalogConfig.class, overrideProperties );
 	}
 
 	private static void loadGeneratorCatalog( DaogenCatalogConfig config, Class<?> c ) throws ConfigException {
@@ -81,9 +85,26 @@ private static void loadGeneratorCatalog( DaogenCatalogConfig config, Class<?> c
 	}
 
 	public static DaogenCatalogConfig loadConfig( InputStream input, Class<?> c ) throws ConfigException {
+		return loadConfig(input, c, null);
+	}
+	
+	public static DaogenCatalogConfig loadConfig( InputStream input, Class<?> c, Properties overrideProperties ) throws ConfigException {
 		DaogenCatalogConfig config = new DaogenCatalogConfig();
 		try {
 			load( input , config );
+			// override properties START
+			if ( overrideProperties != null ) {
+				config.getLogger().info( "override properties -> {}", overrideProperties );
+				for ( Object k : overrideProperties.keySet() ) {
+					String key = k.toString();
+					String value = overrideProperties.getProperty(key);
+					config.getLogger().info( "ovverride {} -> {}", key, value );
+					config.getGeneralProps().setProperty(key, value);
+				}
+				config.getGeneralProps().keySet().stream().sorted().forEach( 
+						k -> config.getLogger().info( "prop key : {} value : {}", k, config.getGeneralProps().getProperty( k.toString() ) ) );
+			}
+			// override properties END
 			// class config
 			String classConfigPath = config.getGeneralProps().getProperty( DaogenCatalogConstants.GEN_PROP_CLASS_CONFIG, DaogenCatalogConstants.GEN_PROP_CLASS_CONFIG_DEFAULT );
 			try ( InputStream is = StreamHelper.resolveStream( classConfigPath, null, c ) ) {

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/config/DaogenFacade.java

@@ -78,18 +78,7 @@ private static void generate( DaogenCatalogConfig daogenConfig, DaogenGeneratorC
 
 	public static void generate( InputStream fis, Properties overrideProperties ) throws ConfigException {
 		try {
-			DaogenCatalogConfig daogenConfig = DaogenCatalogConfig.loadConfig( fis );
-			if ( overrideProperties != null ) {
-				log.info( "override properties -> {}", overrideProperties );
-				for ( Object k : overrideProperties.keySet() ) {
-					String key = k.toString();
-					String value = overrideProperties.getProperty(key);
-					log.info( "ovverride {} -> {}", key, value );
-					daogenConfig.getGeneralProps().setProperty(key, value);
-				}
-				daogenConfig.getGeneralProps().keySet().stream().sorted().forEach( 
-						k -> log.info( "prop key : {} value : {}", k, daogenConfig.getGeneralProps().getProperty( k.toString() ) ) );
-			}
+			DaogenCatalogConfig daogenConfig = DaogenCatalogConfig.loadConfig( fis, overrideProperties );
 			for ( DaogenGeneratorCatalog generatorCatalog : daogenConfig.getGeneratorCatalogs() ) {
 				generate(daogenConfig, generatorCatalog);
 			}

fj-daogen-maven-plugin/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
 	</parent>
 
 	<packaging>maven-plugin</packaging>

fj-daogen-sample/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
 	</parent>
 
 	<name>fj-daogen-sample</name>

fj-daogen-tool/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-daogen</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3</version>
 	</parent>
 
 	<name>fj-daogen-tool</name>

pom.xml

@@ -11,7 +11,7 @@
 
 	<artifactId>fj-daogen</artifactId>
 
-	<version>1.1.2</version>
+	<version>1.1.3</version>
 	<packaging>pom</packaging>
 
 	<name>fj-daogen</name>