Fixed use of LocalDateTime.now() in data facade when 'type-mapper-time-ng' is enabled

Author: fugerit79

fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/gen/FacadeImplDataGenerator.java

@@ -311,7 +311,16 @@ private void generateHelperClassDelete(GeneratorKeyHelper primaryKeyHelper) {
 			this.getWriter().println();	
 		}
 	}
-	
+
+	private String dateUpdateType() {
+		boolean timeNgMode = DaogenCatalogConstants.GEN_PROP_TIME_MAPPER_NG_ENABLED.equalsIgnoreCase( this.getDaogenConfig().getGeneralProps().getProperty( DaogenCatalogConstants.GEN_PROP_TIME_MAPPER_NG, DaogenCatalogConstants.GEN_PROP_TIME_MAPPER_NG_DISABLED ) );
+		if ( timeNgMode ) {
+			return "( java.time.LocalDateTime.now() ); ";
+		} else {
+			return "( new java.sql.Timestamp( System.currentTimeMillis() ) ); ";
+		}
+	}
+
 	private void generateHelperClassUpdate( DaogenCatalogField colDataUpdate, GeneratorKeyHelper primaryKeyHelper ) {
 		if ( FacadeGeneratorUtils.isFacadeModeUpdate( this.getCurrentEntity() ) ) {
 			// update by primary key
@@ -321,12 +330,7 @@ private void generateHelperClassUpdate( DaogenCatalogField colDataUpdate, Genera
 			this.getWriter().println( TAB_2+this.getClassDaoHelper()+LT_LIT+this.getEntityModelName()+GT_LIT+DAO_HELPER_LIT+this.getClassDaoHelper()+CONTEXT_GEN_LIT );
 			if ( colDataUpdate != null ) {
 				this.getWriter().println( TAB_2+"//  "+DaogenCatalogConstants.GEN_PROP_DEFAULT_COLUMN_TIME_UPDATE+" : true - i will set update time" );
-				boolean timeNgMode = DaogenCatalogConstants.GEN_PROP_TIME_MAPPER_NG_ENABLED.equalsIgnoreCase( this.getDaogenConfig().getGeneralProps().getProperty( DaogenCatalogConstants.GEN_PROP_TIME_MAPPER_NG, DaogenCatalogConstants.GEN_PROP_TIME_MAPPER_NG_DISABLED ) );
-				if ( timeNgMode ) {
-					this.getWriter().println( TAB_2+MODEL_SET_LIT+GeneratorNameHelper.toClassName( colDataUpdate.getId() )+"( java.time.LocalDateTime.now() ); " );
-				} else {
-					this.getWriter().println( TAB_2+MODEL_SET_LIT+GeneratorNameHelper.toClassName( colDataUpdate.getId() )+"( new java.sql.Timestamp( System.currentTimeMillis() ) ); " );
-				}
+				this.getWriter().println( TAB_2+MODEL_SET_LIT+GeneratorNameHelper.toClassName( colDataUpdate.getId() )+this.dateUpdateType() );
 			}
 			this.getWriter().println( TAB_2+"UpdateHelper query = daoHelper.newUpdateHelper( this.getTableName() );" );
 			for ( DaogenCatalogField field : this.getCurrentEntity() ) {