Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Feature/default value entity #8

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 2 commits into from
Apr 15, 2022
Merged

Feature/default value entity #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b583aa
version: 1.0.0-beta1
Sassine Apr 15, 2022
90958ed
Feature: adding default value Date/Time
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
2 changes: 1 addition & 1 deletion 2 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>sqlschema2java</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
<name>sqlschema2java</name>
<packaging>pom</packaging>
<groupId>dev.sassine.api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion 2 sqlschema2java-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>dev.sassine.api</groupId>
<artifactId>sqlschema2java-core</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.0-beta1</version>
<name>sqlschema2java-core</name>

<description>Auto generate Class DTO, Entity and Repository from SQL Query. </description>
Expand Down
23 changes: 23 additions & 0 deletions 23 ...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,12 +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 All @@ -20,6 +27,7 @@
import org.burningwave.core.classes.TypeDeclarationSourceGenerator;
import org.burningwave.core.classes.UnitSourceGenerator;
import org.burningwave.core.classes.VariableSourceGenerator;
import org.hibernate.annotations.ColumnDefault;

import dev.sassine.api.structure.export.builder.factory.Factory;
import dev.sassine.api.structure.model.java.EntityModel;
Expand All @@ -40,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 @@ -51,6 +64,7 @@ public void execute(EntityModel entityModel, boolean isAutoGenerated, String nam
entityModel.getFields().forEach(fieldModel -> {
VariableSourceGenerator field = this.buildField(fieldModel);
importJavaTime(gen, fieldModel);
this.setDefaultValue(field,fieldModel);
this.generateEntityPK(isAutoGenerated, fieldModel, field, entityModel);
log.debug("Generated EntityPK");
clEntity.addField(field);
Expand All @@ -61,6 +75,15 @@ public void execute(EntityModel entityModel, boolean isAutoGenerated, String nam
log.debug("ClassEntity ({}) stored", nameClass);
}

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()))));
}
}

private ClassSourceGenerator buildClassSource(EntityModel entityModel, String nameClass) {
return ClassSourceGenerator
.create(TypeDeclarationSourceGenerator.create(format(FORMAT_ENTITY_CLASSNAME, nameClass)))
Expand Down
4 changes: 2 additions & 2 deletions 4 sqlschema2java-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sasine.api</groupId>
<artifactId>sqlschema2java-example</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0-beta1</version>
<packaging>pom</packaging>

<developers>
Expand Down Expand Up @@ -33,7 +33,7 @@
<plugin>
<groupId>dev.sassine.api</groupId>
<artifactId>sqlschema2java-maven-plugin</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.0-beta1</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions 4 sqlschema2java-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sassine.api</groupId>
<artifactId>sqlschema2java-maven-plugin</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.0-beta1</version>
<name>sqlschema2java-maven-plugin</name>
<packaging>maven-plugin</packaging>

Expand Down Expand Up @@ -81,7 +81,7 @@
</reporting>

<properties>
<sqlschema2java-core.version>1.0.1-SNAPSHOT</sqlschema2java-core.version>
<sqlschema2java-core.version>1.0.0-beta1</sqlschema2java-core.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven-plugin-api.version>3.6.2</maven-plugin-api.version>
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.