From 0375e9fe2cef8bc9cd37eb865d8428f9586522e3 Mon Sep 17 00:00:00 2001 From: Sassine El-Asmar Date: Fri, 15 Apr 2022 16:08:36 -0300 Subject: [PATCH] fix: import .class deserialize object --- .../builder/function/ImportBeanFunction.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sqlschema2java-core/src/main/java/dev/sassine/api/structure/export/builder/function/ImportBeanFunction.java b/sqlschema2java-core/src/main/java/dev/sassine/api/structure/export/builder/function/ImportBeanFunction.java index 6cdbe52..042d043 100644 --- a/sqlschema2java-core/src/main/java/dev/sassine/api/structure/export/builder/function/ImportBeanFunction.java +++ b/sqlschema2java-core/src/main/java/dev/sassine/api/structure/export/builder/function/ImportBeanFunction.java @@ -23,6 +23,9 @@ public class ImportBeanFunction { + private static final String TIME_DESERIALIZER = "LocalTimeDeserializer.class"; + private static final String DATE_DESERIALIZER = "LocalDateDeserializer.class"; + private static final String DATE_TIME_DESERIALIZER = "LocalDateTimeDeserializer.class"; private static final String PARAM_USING = "using"; private static final String FORMAT_IMPORT_ENTITY_PACKAGE = "%s.domain.%sEntity"; @@ -39,20 +42,21 @@ public static void importJavaTime(UnitSourceGenerator gen, FieldModel fieldModel public static void importJavaTimeAndJSONDeserialize(VariableSourceGenerator field, UnitSourceGenerator gen, FieldModel fieldModel) { if (TYPE_LOCAL_DATE_TIME.equals(fieldModel.getType())) { - field.addAnnotation(AnnotationSourceGenerator.create(JsonDeserialize.class).addParameter(PARAM_USING, - VariableSourceGenerator - .create(TypeDeclarationSourceGenerator.create(LocalDateTimeDeserializer.class)))); gen.addImport(LocalDateTime.class); + gen.addImport(LocalDateTimeDeserializer.class); + field.addAnnotation(AnnotationSourceGenerator.create(JsonDeserialize.class).addParameter(PARAM_USING, + VariableSourceGenerator.create(TypeDeclarationSourceGenerator.create(DATE_TIME_DESERIALIZER)))); } else if (TYPE_LOCAL_DATE.equals(fieldModel.getType())) { gen.addImport(LocalDate.class); + gen.addImport(LocalDateDeserializer.class); field.addAnnotation(AnnotationSourceGenerator.create(JsonDeserialize.class).addParameter(PARAM_USING, - VariableSourceGenerator - .create(TypeDeclarationSourceGenerator.create(LocalDateDeserializer.class)))); + VariableSourceGenerator.create(TypeDeclarationSourceGenerator.create(DATE_DESERIALIZER)))); } else if (TYPE_LOCAL_TIME.equals(fieldModel.getType())) { gen.addImport(LocalTime.class); + gen.addImport(LocalTimeDeserializer.class); field.addAnnotation(AnnotationSourceGenerator.create(JsonDeserialize.class).addParameter(PARAM_USING, - VariableSourceGenerator - .create(TypeDeclarationSourceGenerator.create(LocalTimeDeserializer.class)))); + VariableSourceGenerator.create(TypeDeclarationSourceGenerator.create(TIME_DESERIALIZER)))); + } } }