Skip to content

Commit 507e785

Browse files
committed
Fixed use of LocalDateTime.now() in data facade when 'type-mapper-time-ng' is enabled
1 parent 9c0e0c6 commit 507e785

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
### Fixed
9+
10+
- use of LocalDateTime.now() in data facade when 'type-mapper-time-ng' is enabled
11+
812
## [1.8.3] - 2024-11-09
913

1014
### Added

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,12 @@ private void generateHelperClassLoadAllStream() {
204204

205205
private void generateHelperClassInsertColumnHandler( DaogenCatalogField colData, DaogenCatalogField colDataUpdate ) {
206206
if ( colData != null || colDataUpdate != null ) {
207-
this.getWriter().println( TAB_2+"java.sql.Timestamp currentTime = new java.sql.Timestamp( System.currentTimeMillis() );" );
207+
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 ) );
208+
if ( timeNgMode ) {
209+
this.getWriter().println( TAB_2+"java.time.LocalDateTime currentTime = java.time.LocalDateTime.now();" );
210+
} else {
211+
this.getWriter().println( TAB_2+"java.sql.Timestamp currentTime = new java.sql.Timestamp( System.currentTimeMillis() );" );
212+
}
208213
}
209214
if ( colData != null ) {
210215
this.getWriter().println( TAB_2+"// "+DaogenCatalogConstants.GEN_PROP_DEFAULT_COLUMN_TIME_INSERT+" : true - i will set insert time" );
@@ -315,8 +320,13 @@ private void generateHelperClassUpdate( DaogenCatalogField colDataUpdate, Genera
315320
this.getWriter().println( TAB_2+this.getEntityBaseResult()+" result = new "+this.getClassBaseResult()+GENERIC_LIT );
316321
this.getWriter().println( TAB_2+this.getClassDaoHelper()+LT_LIT+this.getEntityModelName()+GT_LIT+DAO_HELPER_LIT+this.getClassDaoHelper()+CONTEXT_GEN_LIT );
317322
if ( colDataUpdate != null ) {
318-
this.getWriter().println( TAB_2+"// "+DaogenCatalogConstants.GEN_PROP_DEFAULT_COLUMN_TIME_UPDATE+" : true - i will set update time" );
319-
this.getWriter().println( TAB_2+MODEL_SET_LIT+GeneratorNameHelper.toClassName( colDataUpdate.getId() )+"( new java.sql.Timestamp( System.currentTimeMillis() ) ); " );
323+
this.getWriter().println( TAB_2+"// "+DaogenCatalogConstants.GEN_PROP_DEFAULT_COLUMN_TIME_UPDATE+" : true - i will set update time" );
324+
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 ) );
325+
if ( timeNgMode ) {
326+
this.getWriter().println( TAB_2+MODEL_SET_LIT+GeneratorNameHelper.toClassName( colDataUpdate.getId() )+"( java.time.LocalDateTime.now() ); " );
327+
} else {
328+
this.getWriter().println( TAB_2+MODEL_SET_LIT+GeneratorNameHelper.toClassName( colDataUpdate.getId() )+"( new java.sql.Timestamp( System.currentTimeMillis() ) ); " );
329+
}
320330
}
321331
this.getWriter().println( TAB_2+"UpdateHelper query = daoHelper.newUpdateHelper( this.getTableName() );" );
322332
for ( DaogenCatalogField field : this.getCurrentEntity() ) {

0 commit comments

Comments
 (0)