generator-jhipster 7.1.0 → 7.4.0

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.hibernate_cache.ejs

@@ -0,0 +1,41 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+<&_ } -&>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (relationship.relationshipOneToMany) { _%>
+    @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+  <%_ } _%>
+  <%_ if (relationship.relationshipManyToMany) { _%>
+    @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_persistence.ejs

@@ -0,0 +1,130 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import javax.persistence.*;
+<%_ if ((databaseTypePostgres && fieldsContainTextBlob) || (fieldsContainUUID && (databaseTypeMysql || databaseTypeMariadb))) { _%>
+import org.hibernate.annotations.Type;
+<%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@Entity
+@Table(name = "<%= entityTableName %>")
+<&_ } -&>
+
+<%_ for (const field of fields) { -%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id) { _%>
+    @Id
+    <%_ if (field.jpaGeneratedValue === 'identity') { _%>
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    <%_ } else if (field.jpaGeneratedValue === 'sequence') { _%>
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator")
+    @SequenceGenerator(name = "sequenceGenerator")
+    <%_ } else if (field.jpaGeneratedValue) { _%>
+    @GeneratedValue
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (field.fieldIsEnum) { _%>
+    @Enumerated(EnumType.STRING)
+  <%_ } _%>
+  <%_ if (field.fieldTypeBytes) { _%>
+    @Lob
+    <%_ if (databaseTypePostgres && field.blobContentTypeText) { _%>
+    @Type(type = "org.hibernate.type.TextType")
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (field.fieldTypeTemporal || field.fieldTypeDuration) { _%>
+    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>"<% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %>)
+  <%_ } else if (field.fieldTypeBigDecimal) { _%>
+    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>", precision = 21, scale = 2<% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %>)
+  <%_ } else if (field.fieldTypeUUID && (databaseTypeMysql || databaseTypeMariadb)) { _%>
+    @Type(type = "uuid-char")
+    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>", length = 36<% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %>)
+  <%_ } else { _%>
+    @Column(name = "<%- field.fieldNameAsDatabaseColumn %>"<% if (field.fieldValidate === true) { %><% if (field.fieldValidationMaxLength) { %>, length = <%= field.fieldValidateRulesMaxlength %><% } %><% if (field.fieldValidationRequired) { %>, nullable = false<% } %><% if (field.fieldValidationUnique) { %>, unique = true<% } %><% } %>)
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { -%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Column(
+        name = "<%- field.fieldNameAsDatabaseColumn %>_content_type"
+        <%_ if (field.fieldValidationRequired) { %>, nullable = false<% } _%>
+    )
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { -%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (relationship.relationshipOneToMany) { -%>
+    @OneToMany(mappedBy = "<%= relationship.otherEntityRelationshipName %>")
+  <%_ } else if (relationship.relationshipManyToOne) { -%>
+    @ManyToOne<% if (relationship.relationshipRequired) { %>(optional = false)<% } %>
+      <%_ if (relationship.relationshipValidate) { _%>
+    <%- include('relationship_validators', { relationship }); -%>
+      <%_ } _%>
+  <%_ } else if (relationship.relationshipManyToMany) { -%>
+    @ManyToMany<% if (!relationship.ownerSide) { %>(mappedBy = "<%= relationship.otherEntityRelationshipNamePlural %>")<% } %>
+      <%_ if (relationship.ownerSide) { _%>
+        <%_ if (relationship.relationshipValidate) { _%>
+    <%- include('relationship_validators', { relationship }); -%>
+        <%_ } _%>
+    @JoinTable(name = "<%= relationship.joinTable.name %>",
+               joinColumns = <%= entity.primaryKey.fields.length > 1 ? '{' : '' %>
+                   <%_ entity.primaryKey.fields.forEach((field, idx) => { _%>
+                   <%= idx === 0 ? '' : ',' %>@JoinColumn(name = "<%= `${entityTableName}_${field.columnName}` %>")
+                   <%_ }); _%>
+               <%= entity.primaryKey.fields.length > 1 ? '}' : '' %>,
+               inverseJoinColumns = <%= relationship.otherEntity.primaryKey.fields.length > 1 ? '{' : '' %>
+                   <%_ relationship.otherEntity.primaryKey.fields.forEach((field, idx) => { _%>
+                   <%= idx === 0 ? '' : ',' %>@JoinColumn(name = "<%= `${relationship.columnName}_${field.columnName}` %>"))
+                   <%_ }); _%>
+               <%= relationship.otherEntity.primaryKey.fields.length > 1 ? '}' : '' %>
+      <%_ } _%>
+  <%_ } else { -%>
+      <%_ if (relationship.ignoreOtherSideProperty) { -%>
+    @JsonIgnoreProperties(value = {
+        <%_ relationship.otherEntity.relationships.forEach(otherRelationship => { _%>
+        "<%= otherRelationship.relationshipReferenceField %>",
+        <%_ }); _%>
+    }, allowSetters = true)
+      <%_ } _%>
+      <%_ if (relationship.ownerSide) { -%>
+    @OneToOne<% if (relationship.relationshipRequired) { %>(optional = false)<% } %>
+        <%_ if (relationship.relationshipValidate) { _%>
+    <%- include('relationship_validators', { relationship }); -%>
+        <%_ } _%>
+        <%_ if (relationship.id) { %>
+    @MapsId
+    @JoinColumn(name = "<%= relationship.otherEntity.primaryKey.fields[0].columnName %>")
+        <%_ } else { _%>
+    @JoinColumn(unique = true)
+        <%_ } _%>
+      <%_ } else { _%>
+    @OneToOne(mappedBy = "<%= relationship.otherEntityRelationshipName %>")
+      <%_ } -%>
+  <%_ } -%>
+<&_ } -&>
+<%_ } -%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_validation.ejs

@@ -0,0 +1,51 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+<%_ if (validation) { _%>
+import javax.validation.constraints.*;
+<%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.fieldValidate === true) { -%>
+    <%- include('../common/field_validators', {field, reactive}); -%>
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+  <%_ if (field.fieldValidationRequired) { _%>
+      @NotNull
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+<&_ } -&>
+<%_ } -%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_cassandra.ejs

@@ -0,0 +1,48 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import org.springframework.data.annotation.Id;
+    <%_ if (fieldsContainBlob) { _%>
+import java.nio.ByteBuffer;
+import org.springframework.data.cassandra.core.mapping.Column;
+    <%_ } _%>
+import org.springframework.data.cassandra.core.mapping.Table;
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@Table("<%= entityInstance %>")
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id) { _%>
+    @Id
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { -%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Column("<%- field.fieldNameAsDatabaseColumn %>_content_type")
+<&_ } -&>
+<%_ } -%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_mongodb.ejs

@@ -0,0 +1,82 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+  <%_ if (!embedded) { _%>
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+  <%_ } _%>
+import org.springframework.data.mongodb.core.mapping.Field;
+  <%_ if (relationships.length > 0) { _%>
+import org.springframework.data.mongodb.core.mapping.DBRef;
+  <%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+  <%_ if (!embedded) { _%>
+@Document(collection = "<%= entityTableName %>")
+  <%_ } _%>
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id && !embedded) { _%>
+    @Id
+  <%_ } else { _%>
+    @Field("<%= field.fieldNameUnderscored %>")
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Field("<%= field.fieldNameUnderscored %>_content_type")
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (relationship.relationshipOneToMany) { _%>
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+    @DBRef
+    <%_ } _%>
+    @Field("<%= relationship.relationshipFieldName %>")
+  <%_ } else if (relationship.relationshipManyToOne) { _%>
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+    @DBRef
+    @Field("<%= relationship.relationshipFieldName %>")
+    <%_ } _%>
+
+  <%_ } else if (relationship.relationshipManyToMany) { _%>
+    @DBRef
+    @Field("<%= relationship.relationshipFieldNamePlural %>")
+  <%_ } else { _%>
+    <%_ if (!relationship.otherEntity.embedded) { _%>
+    @DBRef
+        <%_ if (relationship.ownerSide) { _%>
+    @Field("<%= relationship.relationshipFieldName %>")
+        <%_ } _%>
+    <%_ } _%>
+  <%_ } _%>
+
+<&_ } -&>
+<%_ } -%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_neo4j.ejs

@@ -0,0 +1,97 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import org.springframework.data.neo4j.core.schema.GeneratedValue;
+import org.springframework.data.neo4j.core.schema.Id;
+import org.springframework.data.neo4j.core.schema.Node;
+import org.springframework.data.neo4j.core.schema.Property;
+import org.springframework.data.neo4j.core.support.UUIDStringGenerator;
+  <%_ if (relationships.length > 0) { _%>
+import org.springframework.data.neo4j.core.schema.Relationship;
+  <%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@Node
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id && !embedded) { _%>
+    @Id
+    @GeneratedValue(UUIDStringGenerator.class)
+  <%_ } else { _%>
+    @Property("<%=field.fieldNameUnderscored %>")
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Property("<%=field.fieldNameUnderscored %>_content_type")
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { -%>
+  <%_ const relationshipForwardReference = "HAS_" + _.toUpper(_.snakeCase(relationship.relationshipName)); %>
+  <%_ const relationshipBackReference = "HAS_" + _.toUpper(_.snakeCase(relationship.otherEntityRelationshipName)); %>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+    <%_ if (relationship.ownerSide) { _%>
+    @Relationship(value = "<%= relationshipBackReference %>", direction = Relationship.Direction.INCOMING)
+    <%_ } else { _%>
+    @Relationship("<%= relationshipForwardReference %>")
+    <%_ } _%>
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomAddSection) { -&>
+    public <%= persistClass %> add<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+        this.<%= relationship.relationshipFieldNamePlural %>.add(<%= relationship.otherEntityName %>);
+      <%_ if (!relationship.otherEntity.embedded || embedded && relationship.ownerSide) { _%>
+        <%_ if (relationship.otherRelationship) { _%>
+          <%_ if (relationship.otherRelationship.relationshipNamePlural && !relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().add(this);
+          <%_ } _%>
+        <%_ } _%>
+      <%_ } _%>
+        return this;
+    }
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomRemoveSection) { -&>
+    public <%= persistClass %> remove<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+        this.<%= relationship.relationshipFieldNamePlural %>.remove(<%= relationship.otherEntityName %>);
+      <%_ if (!relationship.otherEntity.embedded || (embedded && relationship.ownerSide)) { _%>
+        <%_ if (relationship.otherRelationship) { _%>
+          <%_ if (!relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().remove(this);
+          <%_ } _%>
+        <%_ } _%>
+      <%_ } _%>
+        return this;
+    }
+<&_ } -&>
+<%_ } _%>

package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_reactive.ejs

@@ -0,0 +1,114 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+<&_ } -&>
+
+<&_ if (fragment.annotationSection) { -&>
+@Table("<%= entityTableName %>")
+<&_ } -&>
+
+<%_ for (const field of fields) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.id) { _%>
+    @Id
+  <%_ } _%>
+    @Column("<%- field.fieldNameAsDatabaseColumn %>")
+<&_ } -&>
+  <%_ if (field.fieldTypeBigDecimal) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>CustomSetSection) { -&>
+    public void set<%= field.fieldInJavaBeanMethod %>(<%= field.javaFieldType %> <%= field.fieldName %>) {
+        this.<%= field.fieldName %> = <%= field.fieldName %> != null ? <%= field.fieldName %>.stripTrailingZeros() : null;
+    }
+<&_ } -&>
+  <%_ } _%>
+<%_ } -%>
+
+<%_ for (const field of fields.filter(field => field.fieldWithContentType)) { _%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection) { -&>
+    @Column("<%- field.fieldNameAsDatabaseColumn %>_content_type")
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) { _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection) { -&>
+    @Transient
+<&_ } -&>
+<%_ } -%>
+
+<%_ for (const relationship of relationships) {
+  const reactiveRelationshipWithId = (databaseTypeSql && reactive && !(relationship.relationshipOneToOne &&
+    (!relationship.ownerSide || (relationship.ownerSide && relationship.id))));
+ _%>
+<&_ if (fragment.relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection) { -&>
+  <%_ if (!relationship.collection && reactiveRelationshipWithId) { _%>
+    public void set<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
+        if (this.<%= relationship.relationshipFieldName %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            this.<%= relationship.relationshipFieldName %>.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+      <%_ } else { _%>
+            this.<%= relationship.relationshipFieldName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
+      <%_ } _%>
+        }
+        if (<%= relationship.otherEntityName %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            <%= relationship.otherEntityName %>.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+      <%_ } else { _%>
+            <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+      <%_ } _%>
+        }
+    <%_ } _%>
+        this.<%= relationship.relationshipFieldName %> = <%= relationship.otherEntityName %>;
+        this.<%= relationship.relationshipFieldName %>Id = <%= relationship.otherEntityName %> != null ? <%= relationship.otherEntityName %>.get<%= relationship.otherEntity.primaryKey.nameCapitalized %>() : null;
+    }
+  <%_ } _%>
+<&_ } -&>
+<%_ } _%>
+
+<&_ if (fragment.classAdditionalRelationshipsSection) { -&>
+    <%_ for (const relationship of relationships) { _%>
+      <%_ if (relationship.ownerSide && !relationship.collection && !relationship.id) { _%>
+    @Column("<%= relationship.columnName %>_id")
+    private <%= relationship.otherEntity.primaryKey.type %> <%= relationship.relationshipFieldName %>Id;
+      <%_ } _%>
+    <%_ } _%>
+<&_ } -&>
+
+<&_ if (fragment.classAdditionalRelationshipsMethodsSection) { -&>
+    <%_ for (const relationship of relationships) { _%>
+      <%_ if (relationship.ownerSide && !relationship.collection && !relationship.id) { _%>
+
+    public <%= relationship.otherEntity.primaryKey.type %> get<%= relationship.relationshipNameCapitalized %>Id() {
+        return this.<%= relationship.relationshipFieldName %>Id;
+    }
+
+    public void set<%= relationship.relationshipNameCapitalized %>Id(<%= relationship.otherEntity.primaryKey.type %> <%= relationship.otherEntityName %>) {
+        this.<%= relationship.relationshipFieldName %>Id = <%= relationship.otherEntityName %>;
+    }
+      <%_ } _%>
+    <%_ } _%>
+<&_ } -&>

package/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs

@@ -16,19 +16,26 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.domain.enumeration;
+package <%= entityAbsolutePackage %>.domain.enumeration;
 
+<%_ if (typeof javadoc === 'undefined') { _%>
 /**
  * The <%= enumName %> enumeration.
  */
+<%_ } else { _%>
+<%= javadoc %>
+<%_ } _%>
 public enum <%= enumName %> {
 <%_ if (withoutCustomValues) { _%>
-    <%= enumValues.map(enumValue => enumValue.name).join(', ') %>
+<%= enumValues.map(enumValue => `${enumValue.comment && `\n${enumValue.comment}\n` || ''}    ${enumValue.name}`).join(', ') %>
 <%_ } else {
   enumValues.forEach((enumWithCustomValue, index) => {
-    if (enumWithCustomValue.name === enumWithCustomValue.value) { _%>
+    if (enumWithCustomValue.comment){  _%>
+<%= enumWithCustomValue.comment %>
+  <%_ } 
+  if (enumWithCustomValue.name === enumWithCustomValue.value) { _%>
     <%= enumWithCustomValue.name %><% if (index < enumValues.length - 1) { %>,<% } else { %>;<% } %>
-    <%_ } else { _%>
+  <%_ } else { _%>
     <%= enumWithCustomValue.name %>("<%= enumWithCustomValue.value %>")<% if (index < enumValues.length - 1) { %>,<% } else { %>;<% } %>
     <%_ }
   }); _%>

package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 <%_ if (relationshipsContainEagerLoad) { _%>
 import org.springframework.data.domain.Page;
@@ -37,18 +37,12 @@ import org.springframework.data.mongodb.repository.MongoRepository;
 <%_ if (databaseTypeNeo4j) { _%>
 import org.springframework.data.neo4j.repository.Neo4jRepository;
 <%_ } _%>
-<%_ if (databaseTypeCouchbase) { _%>
-import <%= packageName %>.repository.search.SearchCouchbaseRepository;
-  <%_ if (relationshipsContainEagerLoad) { _%>
-import org.springframework.data.couchbase.core.query.Query;
-  <%_ } _%>
-<%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
 import org.springframework.data.cassandra.repository.CassandraRepository;
 <%_ } _%>
 import org.springframework.stereotype.Repository;
 <%_
-if (databaseTypeSql || databaseTypeMongodb || databaseTypeCouchbase) {
+if (databaseTypeSql || databaseTypeMongodb) {
   let importList = fieldsContainOwnerManyToMany;
   for (r of relationships) {
     if (r.relationshipManyToOne && r.otherEntityUser) {
@@ -75,7 +69,7 @@ import java.util.UUID;
 @SuppressWarnings("unused")
 <%_ } _%>
 @Repository
-public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>JpaRepository<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCassandra) { %>CassandraRepository<% } %><% if (databaseTypeCouchbase) { %>N1qlCouchbaseRepository<% } %><<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %><% if (searchEngineCouchbase) { %>, SearchCouchbaseRepository<<%= persistClass %>, <%= primaryKey.type %>><% } %> {
+public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>JpaRepository<% } %><% if (databaseTypeMongodb) { %>MongoRepository<% } %><% if (databaseTypeNeo4j) { %>Neo4jRepository<% } %><% if (databaseTypeCassandra) { %>CassandraRepository<% } %><<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %> {
   <%_
   for (const relationship of relationships) {
     if (relationship.relationshipManyToOne && relationship.otherEntityUser && databaseTypeSql) { _%>
@@ -107,17 +101,18 @@ public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) {
       } %> where <%= entityInstanceDbSafe %>.id =:id")
     Optional<<%= persistClass %>> findOneWithEagerRelationships(@Param("id") <%= primaryKey.type %> id);
     <%_
-    } else if (databaseTypeMongodb || databaseTypeCouchbase)  { _%>
+    } else if (databaseTypeMongodb)  { _%>
 
-    @Query("<%= (databaseTypeMongodb) ? '{}' : '#{#n1ql.selectEntity} WHERE #{#n1ql.filter}' %>")
+    @Query("{}")
     Page<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable);
 
-    @Query("<%= (databaseTypeMongodb) ? '{}' : '#{#n1ql.selectEntity} WHERE #{#n1ql.filter}' %>")
+    @Query("{}")
     List<<%= persistClass %>> findAllWithEagerRelationships();
 
-    @Query("<%- (databaseTypeMongodb) ? "{'id': ?0}" : "#{#n1ql.selectEntity} USE KEYS $1 WHERE #{#n1ql.filter}" %>")
+    @Query("{'id': ?0}")
     Optional<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
     <%_
     }
-  } _%>
+  }
+  _%>
 }