Skip to content

Commit c1b392e

Browse files
author
Nicolas Romanetti
committed
upgrade to latest celerio version (4.0.18) + fix date issue.
1 parent 043648f commit c1b392e

File tree

8 files changed

+470
-460
lines changed

8 files changed

+470
-460
lines changed

pack-angular/celerio/pack-angular/src/main/java/config/CustomLocalDateDeserializer.java.p.vm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@ import com.fasterxml.jackson.databind.DeserializationContext;
66
import com.fasterxml.jackson.databind.JsonDeserializer;
77

88
import java.io.IOException;
9+
import java.time.Instant;
910
import java.time.LocalDate;
11+
import java.time.LocalDateTime;
12+
import java.time.ZoneOffset;
1013

1114
public class $output.currentClass extends JsonDeserializer<LocalDate> {
1215

1316
public LocalDate deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException {
1417

1518
if (parser.hasTokenId(JsonTokenId.ID_STRING)) {
1619
String date = parser.getText().trim();
20+
1721
if (date.isEmpty()) {
1822
return null;
1923
}
20-
date = date.substring(0, 10); // yyyy-mm-dd
21-
return LocalDate.parse(date);
24+
25+
return LocalDateTime.ofInstant(Instant.parse(date), ZoneOffset.UTC).toLocalDate();
2226
}
2327

2428
return null;

pack-angular/celerio/pack-angular/src/main/java/config/CustomLocalDateSerializer.java.p.vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public class $output.currentClass extends JsonSerializer<LocalDate> {
1313

1414
@Override
1515
public void serialize(LocalDate date, JsonGenerator jgen, SerializerProvider provider) throws IOException {
16-
jgen.writeString(date != null ? ISO_LOCAL_DATE.format(date) + "T00:00:00.000Z" : null);
16+
jgen.writeString(date != null ? ISO_LOCAL_DATE.format(date) + "T22:00:00.000Z" : null); // 22: as primeng sent it...
1717
}
1818
}

pack-angular/celerio/pack-angular/src/main/java/config/CustomLocalDateTimeDeserializer.java.p.vm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import com.fasterxml.jackson.databind.DeserializationContext;
66
import com.fasterxml.jackson.databind.JsonDeserializer;
77

88
import java.io.IOException;
9+
import java.time.Instant;
910
import java.time.LocalDateTime;
11+
import java.time.ZoneOffset;
1012

1113
public class $output.currentClass extends JsonDeserializer<LocalDateTime> {
1214

13-
private final int length = "yyyy-mm-ddThh:mm:ss".length();
14-
1515
public LocalDateTime deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException {
1616

1717
if (parser.hasTokenId(JsonTokenId.ID_STRING)) {
@@ -21,8 +21,8 @@ public class $output.currentClass extends JsonDeserializer<LocalDateTime> {
2121
return null;
2222
}
2323

24-
date = date.substring(0, length);
25-
return LocalDateTime.parse(date);
24+
return LocalDateTime.ofInstant(Instant.parse(date), ZoneOffset.UTC);
25+
2626
}
2727

2828
return null;

pack-angular/celerio/pack-angular/web/src/app/entities/entity-detail.component.html.e.vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ $output.file("web/src/app/entities/${entity.model.var}/${entity.model.var}-detai
6767
date and time not supported yet
6868
#elseif($attr.isLocalDate())
6969
<p-calendar [(ngModel)]="$valuePath" dateFormat="yy-mm-dd" [ngModelOptions]="{standalone: true}"></p-calendar>
70-
#elseif($attr.isLocalDateTime())
70+
#elseif($attr.isLocalDateTime() || $attr.isInstant())
7171
<p-calendar [(ngModel)]="$valuePath" dateFormat="yy-mm-dd" showTime="true" [ngModelOptions]="{standalone: true}"></p-calendar>
7272
#else
7373
Date type not supported, do it manually and send us the solution!

quickstart-conf/celerio-maven-plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- global date mapping (optional) -->
1919
<dateMappings>
2020
<!-- <dateMapping columnNameRegExp="VERSION" mappedType="M_UTILDATE"/> -->
21-
<dateMapping columnJdbcType="TIMESTAMP" mappedType="M_LOCALDATETIME"/>
21+
<dateMapping columnJdbcType="TIMESTAMP" mappedType="M_INSTANT"/>
2222
<dateMapping columnJdbcType="DATE" mappedType="M_LOCALDATE"/>
2323
</dateMappings>
2424

0 commit comments

Comments
 (0)