Index: src/main/groovy/com/lemanscorp/mqconsumer/config/Resources.groovy =================================================================== diff -u -rec569e4049852209848fca40235c835ff095f9b3 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/config/Resources.groovy (.../Resources.groovy) (revision ec569e4049852209848fca40235c835ff095f9b3) +++ src/main/groovy/com/lemanscorp/mqconsumer/config/Resources.groovy (.../Resources.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -92,11 +92,4 @@ } } } - - @Bean - DateFormat simpleDateFormat() { - DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS") - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Europe/Berlin")) - simpleDateFormat - } } Index: src/main/groovy/com/lemanscorp/mqconsumer/services/AttributeNameService.groovy =================================================================== diff -u -r176022c00ae6a69ff0e5449aa62eb9101a850d93 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/services/AttributeNameService.groovy (.../AttributeNameService.groovy) (revision 176022c00ae6a69ff0e5449aa62eb9101a850d93) +++ src/main/groovy/com/lemanscorp/mqconsumer/services/AttributeNameService.groovy (.../AttributeNameService.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -9,6 +9,9 @@ import org.springframework.stereotype.Service import java.sql.ResultSet +import java.sql.Timestamp +import java.time.ZoneId +import java.time.ZonedDateTime @Slf4j @Service @@ -31,17 +34,18 @@ } private RowMapper attributeNameMapper = { ResultSet rs, row -> + Timestamp now = Timestamp.from(ZonedDateTime.now(ZoneId.of('Europe/Berlin')).toInstant()) new AttributeName ( id: (Integer) rs.getObject("attributeNameId"), attributeName: (String) rs.getObject("attributeName"), attributeDisplayName: (String) rs.getObject("attributeDisplayName"), sourceId: (Integer) rs.getObject("sourceId"), source: (Integer) rs.getObject("source"), - dateCreated: rs.getTimestamp("dateCreated"), + dateCreated: now, createdBy: rs.getString("createdBy"), - lastUpdated: rs.getTimestamp("lastUpdated"), + lastUpdated: now, lastUpdatedBy: rs.getString("lastUpdatedBy"), - dateDeleted: rs.getTimestamp("dateDeleted") ? new Date() : null, + dateDeleted: rs.getTimestamp("dateDeleted") ? now : null, deletedBy: rs.getString("deletedBy"), version: (Integer) rs.getObject("version") ) @@ -63,8 +67,6 @@ attributeDisplayName = :attributeDisplayName, sourceId = :sourceId, source = :source, - dateCreated = :dateCreated, - createdBy = :createdBy, lastUpdated = :lastUpdated, lastUpdatedBy = :lastUpdatedBy, dateDeleted = :dateDeleted, Index: src/main/groovy/com/lemanscorp/mqconsumer/services/AttributeValueService.groovy =================================================================== diff -u -r176022c00ae6a69ff0e5449aa62eb9101a850d93 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/services/AttributeValueService.groovy (.../AttributeValueService.groovy) (revision 176022c00ae6a69ff0e5449aa62eb9101a850d93) +++ src/main/groovy/com/lemanscorp/mqconsumer/services/AttributeValueService.groovy (.../AttributeValueService.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -9,6 +9,9 @@ import org.springframework.stereotype.Service import java.sql.ResultSet +import java.sql.Timestamp +import java.time.ZoneId +import java.time.ZonedDateTime @Slf4j @Service @@ -31,16 +34,17 @@ } private RowMapper attributeValueMapper = { ResultSet rs, row -> + Timestamp now = Timestamp.from(ZonedDateTime.now(ZoneId.of('Europe/Berlin')).toInstant()) new AttributeValue ( id: (Integer) rs.getObject("attributeValueId"), attributeValue: (String) rs.getObject("attributeValue"), sourceId: (Integer) rs.getObject("sourceId"), source: (Integer) rs.getObject("source"), - dateCreated: rs.getTimestamp("dateCreated"), + dateCreated: now, createdBy: rs.getString("createdBy"), - lastUpdated: rs.getTimestamp("lastUpdated"), + lastUpdated: now, lastUpdatedBy: rs.getString("lastUpdatedBy"), - dateDeleted: rs.getTimestamp("dateDeleted") ? new Date() : null, + dateDeleted: rs.getTimestamp("dateDeleted") ? now : null, deletedBy: rs.getString("deletedBy"), version: (Integer) rs.getObject("version") ) @@ -61,8 +65,6 @@ attributeValue = :attributeValue, sourceId = :sourceId, source = :source, - dateCreated = :dateCreated, - createdBy = :createdBy, lastUpdated = :lastUpdated, lastUpdatedBy = :lastUpdatedBy, dateDeleted = :dateDeleted, Index: src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryAttributeService.groovy =================================================================== diff -u -r176022c00ae6a69ff0e5449aa62eb9101a850d93 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryAttributeService.groovy (.../CategoryAttributeService.groovy) (revision 176022c00ae6a69ff0e5449aa62eb9101a850d93) +++ src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryAttributeService.groovy (.../CategoryAttributeService.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -12,6 +12,10 @@ import org.springframework.stereotype.Service import org.springframework.transaction.support.TransactionTemplate +import java.sql.Timestamp +import java.time.ZoneId +import java.time.ZonedDateTime + @Slf4j @Service class CategoryAttributeService { @@ -58,6 +62,7 @@ } private RowMapper categoryAttributeMapper = { ResultSet rs, row -> + Timestamp now = Timestamp.from(ZonedDateTime.now(ZoneId.of('Europe/Berlin')).toInstant()) new CategoryAttribute ( id: (Integer) rs.getObject("categoryAttributeId"), categoryId: (Integer) rs.getObject("categoryId"), @@ -70,11 +75,11 @@ isDropDown: rs.getBoolean("isDropDown"), isHidden: rs.getBoolean("isHidden"), isGroup: rs.getBoolean("isGroup"), - dateCreated: rs.getTimestamp("dateCreated"), + dateCreated: now, createdBy: rs.getString("createdBy"), - lastUpdated: rs.getTimestamp("lastUpdated"), + lastUpdated: now, lastUpdatedBy: rs.getString("lastUpdatedBy"), - dateDeleted: rs.getTimestamp("dateDeleted") ? new Date() : null, + dateDeleted: rs.getTimestamp("dateDeleted") ? now : null, deletedBy: rs.getString("deletedBy"), version: (Integer) rs.getObject("version") ) @@ -106,8 +111,6 @@ sourceId = :sourceId, isRequired = :isRequired, allowMultipleValues = :allowMultipleValues, - dateCreated = :dateCreated, - createdBy = :createdBy, lastUpdated = :lastUpdated, lastUpdatedBy = :lastUpdatedBy, dateDeleted = :dateDeleted, Index: src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryAttributeValueService.groovy =================================================================== diff -u -r176022c00ae6a69ff0e5449aa62eb9101a850d93 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryAttributeValueService.groovy (.../CategoryAttributeValueService.groovy) (revision 176022c00ae6a69ff0e5449aa62eb9101a850d93) +++ src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryAttributeValueService.groovy (.../CategoryAttributeValueService.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -12,6 +12,10 @@ import org.springframework.stereotype.Service import org.springframework.transaction.support.TransactionTemplate +import java.sql.Timestamp +import java.time.ZoneId +import java.time.ZonedDateTime + @Slf4j @Service class CategoryAttributeValueService { @@ -62,18 +66,19 @@ } private RowMapper categoryAttributeValueMapper = { ResultSet rs, row -> + Timestamp now = Timestamp.from(ZonedDateTime.now(ZoneId.of('Europe/Berlin')).toInstant()) new CategoryAttributeValue( id: (Integer) rs.getObject("categoryAttributeValueId"), categoryAttributeId: (Integer) rs.getObject("categoryAttributeId"), attributeValueId: (Integer) rs.getObject("attributeValueId"), sequence: (Integer) rs.getObject("sequence"), source: (Integer) rs.getObject("source"), sourceId: (Integer) rs.getObject("sourceId"), - dateCreated: rs.getTimestamp("dateCreated"), + dateCreated: now, createdBy: rs.getString("createdBy"), - lastUpdated: rs.getTimestamp("lastUpdated"), + lastUpdated: now, lastUpdatedBy: rs.getString("lastUpdatedBy"), - dateDeleted: rs.getTimestamp("dateDeleted") ? new Date() : null, + dateDeleted: rs.getTimestamp("dateDeleted") ? now: null, deletedBy: rs.getString("deletedBy"), version: (Integer) rs.getObject("version") ) @@ -105,8 +110,6 @@ sequence = :sequence, source = :source, sourceId = :sourceId, - dateCreated = :dateCreated, - createdBy = :createdBy, lastUpdated = :lastUpdated, lastUpdatedBy = :lastUpdatedBy, dateDeleted = :dateDeleted, Index: src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryService.groovy =================================================================== diff -u -r88d2c9ae201ba4df47b2ff74922a835ab9063663 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryService.groovy (.../CategoryService.groovy) (revision 88d2c9ae201ba4df47b2ff74922a835ab9063663) +++ src/main/groovy/com/lemanscorp/mqconsumer/services/CategoryService.groovy (.../CategoryService.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -12,9 +12,13 @@ import org.springframework.stereotype.Service import org.springframework.transaction.support.TransactionTemplate +import java.sql.Timestamp +import java.time.ZoneId +import java.time.ZonedDateTime + @Slf4j @Service -class CategoryService extends HelperService { +class CategoryService { @Autowired NamedParameterJdbcTemplate usDigiJdbcTemplate @@ -60,6 +64,7 @@ } private RowMapper categoryMapper = { ResultSet rs, row -> + Timestamp now = Timestamp.from(ZonedDateTime.now(ZoneId.of('Europe/Berlin')).toInstant()) new Category( id: (Integer) rs.getObject("categoryId"), catalogInstanceId: (Integer) rs.getObject("catalogInstanceId"), @@ -73,11 +78,11 @@ source: (Integer) rs.getObject("source"), sourceId: (Integer) rs.getObject("sourceId"), effectiveDate: rs.getTimestamp("effectiveDate"), - dateCreated: formatDate(rs.getTimestamp("dateCreated")), + dateCreated: now, createdBy: rs.getString("createdBy"), - lastUpdated: formatDate(rs.getTimestamp("lastUpdated")), + lastUpdated: now, lastUpdatedBy: rs.getString("lastUpdatedBy"), - dateDeleted: rs.getTimestamp("dateDeleted") ? formatDate(new Date()) : null, + dateDeleted: rs.getTimestamp("dateDeleted") ? now : null, deletedBy: rs.getString("deletedBy"), version: (Integer) rs.getObject("version") ) @@ -111,8 +116,6 @@ source = :source, sourceId = :sourceId, effectiveDate = :effectiveDate, - dateCreated = :dateCreated, - createdBy = :createdBy, lastUpdated = :lastUpdated, lastUpdatedBy = :lastUpdatedBy, dateDeleted = :dateDeleted, Index: src/main/groovy/com/lemanscorp/mqconsumer/services/CategorySubComCodeService.groovy =================================================================== diff -u -r176022c00ae6a69ff0e5449aa62eb9101a850d93 -ra4a3931477b3908e40a03606fa09a5457eff55de --- src/main/groovy/com/lemanscorp/mqconsumer/services/CategorySubComCodeService.groovy (.../CategorySubComCodeService.groovy) (revision 176022c00ae6a69ff0e5449aa62eb9101a850d93) +++ src/main/groovy/com/lemanscorp/mqconsumer/services/CategorySubComCodeService.groovy (.../CategorySubComCodeService.groovy) (revision a4a3931477b3908e40a03606fa09a5457eff55de) @@ -10,6 +10,10 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate import org.springframework.stereotype.Service +import java.sql.Timestamp +import java.time.ZoneId +import java.time.ZonedDateTime + @Slf4j @Service class CategorySubComCodeService { @@ -31,15 +35,16 @@ } private RowMapper categorySubComCodeMapper = { ResultSet rs, row -> + Timestamp now = Timestamp.from(ZonedDateTime.now(ZoneId.of('Europe/Berlin')).toInstant()) new CategorySubComCode( id: (Integer) rs.getObject("categorySubComCodeId"), categoryId: (Integer) rs.getObject("categoryId"), subComCodeId: (Integer) rs.getObject("subComCodeId"), - dateCreated: rs.getTimestamp("dateCreated"), + dateCreated: now, createdBy: rs.getString("createdBy"), - lastUpdated: rs.getTimestamp("lastUpdated"), + lastUpdated: now, lastUpdatedBy: rs.getString("lastUpdatedBy"), - dateDeleted: rs.getTimestamp("dateDeleted") ? new Date() : null, + dateDeleted: rs.getTimestamp("dateDeleted") ? now : null, deletedBy: rs.getString("deletedBy"), version: (Integer) rs.getObject("version") ) @@ -54,8 +59,6 @@ UPDATE SET categoryId = :categoryId, subComCodeId = :subComCodeId, - dateCreated = :dateCreated, - createdBy = :createdBy, lastUpdated = :lastUpdated, lastUpdatedBy = :lastUpdatedBy, dateDeleted = :dateDeleted, Fisheye: Tag a4a3931477b3908e40a03606fa09a5457eff55de refers to a dead (removed) revision in file `src/main/groovy/com/lemanscorp/mqconsumer/services/HelperService.groovy'. Fisheye: No comparison available. Pass `N' to diff?