Skip to content

Release/1.0.0 beta1 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sassine merged 5 commits into from
Apr 15, 2022
Merged

Release/1.0.0 beta1 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90958ed
Feature: adding default value Date/Time
Sassine Apr 15, 2022
07260ea
Merge pull request #8 from Sassine/feature/default-value-entity
Sassine Apr 15, 2022
0375e9f
fix: import .class deserialize object
Sassine Apr 15, 2022
c5a6462
Merge pull request #9 from Sassine/feature/LocalTime-Deserialize
Sassine Apr 15, 2022
d3ca1fa
Merge pull request #10 from Sassine/develop
Sassine Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...re/src/main/java/dev/sassine/api/structure/export/builder/factory/impl/EntityFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@

import static dev.sassine.api.structure.export.builder.function.ImportBeanFunction.importJavaTime;
import static dev.sassine.api.structure.export.builder.function.StoreClassFuncation.store;
import static dev.sassine.api.structure.type.TypeConverter.TYPE_LOCAL_DATE;
import static dev.sassine.api.structure.type.TypeConverter.TYPE_LOCAL_DATE_TIME;
import static dev.sassine.api.structure.type.TypeConverter.TYPE_LOCAL_TIME;
import static java.lang.String.format;
import static java.lang.reflect.Modifier.PRIVATE;
import static java.lang.reflect.Modifier.PUBLIC;
import static java.util.Objects.nonNull;
import static java.util.Optional.ofNullable;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.logging.log4j.LogManager.getLogger;

import java.util.Map;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
Expand Down Expand Up @@ -42,6 +48,11 @@ public class EntityFactory implements Factory {
private static final String PARAM_NULLABLE = "nullable";
private static final String PARAM_NAME = "name";

Map<String, String> defaultValueLocal = Map.of(
TYPE_LOCAL_DATE, "LocalDate.now()",
TYPE_LOCAL_TIME, "LocalTime.now()",
TYPE_LOCAL_DATE_TIME, "LocalDateTime.now()");

@Override
public void execute(EntityModel entityModel, boolean isAutoGenerated, String nameClass, String packageName) {
log.debug("ClassName: ({}) - PackageName: ({}) ", nameClass, packageName);
Expand All @@ -66,6 +77,8 @@ public void execute(EntityModel entityModel, boolean isAutoGenerated, String nam

private void setDefaultValue(VariableSourceGenerator field, FieldModel fieldModel) {
if(isNotBlank(fieldModel.getDefaultValue())) {
var value = defaultValueLocal.get(fieldModel.getType());
if(nonNull(value)) field.setValue(defaultValueLocal.get(fieldModel.getType()));
field.addAnnotation(AnnotationSourceGenerator.create(ColumnDefault.class).addParameter("value",
VariableSourceGenerator.create(format(FORMAT_STRING_FIELDS, fieldModel.getDefaultValue()))));
}
Expand Down
18 changes: 11 additions & 7 deletions ...e/src/main/java/dev/sassine/api/structure/export/builder/function/ImportBeanFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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))));

}
}
}