generator-jhipster 7.1.0 → 7.4.0

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

@@ -0,0 +1,138 @@
+<%#
+ 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.
+-%>
+package <%= entityAbsolutePackage %>.repository;
+
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
+
+<%_ if (relationships.length !== 0 || searchEngineCouchbase) { _%>
+import org.springframework.data.couchbase.repository.Query;
+import org.springframework.data.domain.Pageable;
+import com.couchbase.client.java.query.QueryScanConsistency;
+import org.springframework.data.couchbase.repository.ScanConsistency;
+import static <%= packageName %>.repository.JHipsterCouchbaseRepository.pageableStatement;
+  <%_ if (reactive) { _%>
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+  <%_ } else { _%>
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import java.util.List;
+  <%_ } _%>
+<%_ } _%>
+<%_ if (relationships.length !== 0 && !reactive) { _%>
+import java.util.Optional;
+<%_ } _%>
+<%_ if (searchEngineCouchbase) { _%>
+import static <%= packageName %>.repository.JHipsterCouchbaseRepository.searchQuery;
+<%_ } _%>
+import org.springframework.stereotype.Repository;
+<%_
+let importList = fieldsContainOwnerManyToMany;
+for (r of relationships) {
+  if (r.relationshipManyToOne && r.otherEntityUser) {
+    importList = true;
+  }
+}
+_%>
+<%_ if (primaryKey.typeUUID) { _%>
+import java.util.UUID;
+<%_ } _%>
+
+/**
+ * Spring Data Couchbase repository for the <%= persistClass %> entity.
+ */
+<%_ if (!relationshipsContainEagerLoad) { _%>
+@SuppressWarnings("unused")
+<%_ } _%>
+<%_
+    let optionalOrMono = reactive ? 'Mono' : 'Optional';
+    let listOrFlux = reactive ? 'Flux' : 'List';
+    let pageOrFlux = reactive ? 'Flux' : 'Page';
+_%>
+@Repository
+public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepository<<%= persistClass %>, <%= primaryKey.type %>><% if (jpaMetamodelFiltering) { %>, JpaSpecificationExecutor<<%= persistClass %>><% } %> {
+  <%_
+  if (relationships.length !== 0) { %>
+
+    String SELECT = "SELECT meta(b).id as __id, meta(b).cas as __cas, b.*" + <%
+      for (const relationship of relationships) {
+          if (relationship.collection) {
+            %> ", (SELECT `<%= relationship.relationshipFieldName %>`.*, meta(`<%= relationship.relationshipFieldName %>`).id FROM `<%= relationship.relationshipFieldNamePlural %>` `<%= relationship.relationshipFieldName %>`) as `<%= relationship.relationshipFieldNamePlural %>`"  + <%
+          } else {
+            %> ", (SELECT `<%= relationship.relationshipFieldName %>`.*, meta(`<%= relationship.relationshipFieldName %>`).id)[0] as `<%= relationship.relationshipFieldName %>`" + <%
+          }
+      } %>
+        " FROM #{#n1ql.bucket} b";
+
+    String JOIN = <%
+        relationships.forEach(function (relationship, index) {
+          if (!relationship.collection) { %>
+            " LEFT JOIN #{#n1ql.bucket} `<%= relationship.relationshipFieldName %>` ON KEYS b.`<%= relationship.relationshipFieldName %>`"<%
+          } else { %>
+            " LEFT NEST #{#n1ql.bucket} `<%= relationship.relationshipFieldNamePlural %>` ON KEYS b.`<%= relationship.relationshipFieldNamePlural %>`"<%
+          }
+          if (index < relationships.length - 1) { %>
+            + <%
+          }
+        }); %>;
+
+    default <%= pageOrFlux %><<%= persistClass %>> findAll<% if (reactive) {%>By<% } %>(Pageable pageable) {
+        return
+        <% if (!reactive) { %>new PageImpl<>(<% } %>
+            findAllBy(pageableStatement(pageable, "b"))
+        <% if (!reactive) { %>,
+            pageable,
+            count()
+        )<% } %>;
+    }
+
+    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter} #{[0]}")
+    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <%= listOrFlux %><<%= persistClass %>> findAllBy(String pageableStatement);
+
+    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter}")
+    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <%= listOrFlux %><<%= persistClass %>> findAll();
+
+    @Query(SELECT + " USE KEYS $1" + JOIN)
+    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <%= optionalOrMono %><<%= persistClass %>> findById(String id);<%
+    } _%>
+
+<%_ if (searchEngineCouchbase) { _%>
+  <%_ if (relationships.length === 0) { _%>
+    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter} AND SEARCH(#{#n1ql.bucket}, #{[0]}) #{[1]}")
+  <%_ } else { _%>
+    @Query(SELECT + JOIN + " WHERE b.#{#n1ql.filter} AND SEARCH(b, #{[0]}) #{[1]}")
+  <%_ } _%>
+    <%= listOrFlux %><<%= persistClass %>> search(String queryString, String pageableStatement);
+
+    default <%= listOrFlux %><<%= persistClass %>> search(String queryString) {
+        return search(searchQuery(queryString).toString(), "");
+    }
+
+    default <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable) {
+        return
+            <% if (!reactive) { %>new PageImpl<>(<% } %>
+                search(searchQuery(queryString).toString(), pageableStatement(pageable<% if (relationships.length !== 0) { %>, "b"<% } %>))
+            <% if (!reactive) { %>)<% } %>;
+    }
+<%_ } _%>
+
+}

package/generators/entity-server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/entity.fts.ejs

@@ -8,6 +8,7 @@
             "type_field": "_class"
         },
         "mapping": {
+            "analysis": {},
             "default_analyzer": "standard",
             "default_datetime_parser": "dateTimeOptional",
             "default_field": "_all",
@@ -21,7 +22,7 @@
             "store_dynamic": false,
             "type_field": "_type",
             "types": {
-                "<%= packageName %>.domain.<%= entityClass %>": {
+                "<%= entityAbsolutePackage %>.domain.<%= entityClass %>": {
                     "dynamic": true,
                     "enabled": true
                 }
@@ -29,9 +30,11 @@
         },
         "store": {
             "indexType": "scorch",
-            "kvStoreName": ""
+            "segmentVersion": 15
         }
     },
     "sourceType": "couchbase",
-    "sourceName": "${bucket}"
+    "sourceName": "${bucket}",
+    "uuid": "",
+    "name": "<%= entityClass.toLowerCase() %>"
 }

package/generators/entity-server/templates/partials/save_template.ejs

@@ -22,7 +22,7 @@ const mapper = entityInstance  + 'Mapper';
 const dtoToEntity = mapper + '.' + 'toEntity';
 const entityToDto = mapper + '.' + 'toDto';
 const entityToDtoReference = mapper + '::' + 'toDto';
-const returnPrefix = (returnDirectly && !searchEngine) ? 'return' : instanceType + ' result =';
+const returnPrefix = (returnDirectly && !searchEngineElasticsearch) ? 'return' : instanceType + ' result =';
 let resultEntity;
 let mapsIdEntityInstance;
 let mapsIdRepoInstance;
@@ -56,7 +56,7 @@ if (isUsingMapsId) {
     <%_ } _%>
         <%= returnPrefix %> <%= entityInstance %>Repository.save(<%= persistInstance %>);
   <%_ } _%>
-  <%_ if (searchEngine) { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
         <%= entityInstance %>SearchRepository.save(<%= resultEntity %>);
     <%_ if (returnDirectly) { _%>
         return result;

package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs

@@ -23,9 +23,9 @@ const entityToDtoReference = mapper + '::' + 'toDto'; %>
   <%_ if (!reactive) { _%>
     <%_ if (searchEngineElasticsearch) { _%>
         return StreamSupport
-            .stream(<%= entityInstance %>SearchRepository.search(queryStringQuery(query)).spliterator(), false)
+            .stream(<%= entityInstance %>SearchRepository.search(query).spliterator(), false)
     <%_ } else { _%>
-            return <%= entityInstance %>Repository.search(<%= entityClass %>.PREFIX, query)<% if (!dtoMapstruct) { %>;<% } else { %>.stream()<% } %>
+            return <%= entityInstance %>Repository.search(query)<% if (!dtoMapstruct) { %>;<% } else { %>.stream()<% } %>
     <%_ } _%>
     <%_ if (dtoMapstruct) { _%>
             .map(<%= entityToDtoReference %>)
@@ -34,7 +34,7 @@ const entityToDtoReference = mapper + '::' + 'toDto'; %>
         .collect(Collectors.toList());
     <%_ } _%>
   <%_ } else { _%>
-        return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(<% if (searchEngineCouchbase) { %><%= entityClass %>.PREFIX, <% } %>query)<%_ if (dtoMapstruct) { %>
+        return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query)<%_ if (dtoMapstruct) { %>
             .map(<%= entityToDtoReference %>)<%_ } %><%_ if (fromResource) { _%>.collectList()<%_ } _%>;
     <%_ } _%>
 <%_ } else { _%>

package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs

@@ -33,7 +33,7 @@ if (paginationNo) { %>
     <%_ if (viaService) { _%>
         Page<<%= instanceType %>> page = <%= entityInstance %>Service.search(query, pageable);
     <%_ } else { _%>
-        Page<<%= persistClass %>> page = <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(<% if (searchEngineElasticsearch) { %>queryStringQuery(query)<% } else { %><%= entityClass %>.PREFIX, query<% } %>, pageable);
+        Page<<%= persistClass %>> page = <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query, pageable);
     <%_ } _%>
         HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (!reactive) { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } else { %>UriComponentsBuilder.fromHttpRequest(request)<% } %>, page);
         return ResponseEntity.ok().headers(headers).body(<% if (!viaService && dtoMapstruct) { %><%= entityListToDtoListReference %>(<% } %>page.getContent()<% if (!viaService && dtoMapstruct) { %>)<% } %>);
@@ -43,7 +43,7 @@ if (paginationNo) { %>
                 (searchEngineElasticsearch ? 'Search' : '') + 'Repository.count' %>()
             .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
             .map(page -> PaginationUtil.generatePaginationHttpHeaders(UriComponentsBuilder.fromHttpRequest(request), page))
-            .map(headers -> ResponseEntity.ok().headers(headers).body(<%= entityInstance %><%= viaService ? 'Service' : (searchEngineElasticsearch ? 'Search' : '') + 'Repository' %>.search(<% if (!viaService && searchEngineCouchbase) { %><%= entityClass %>.PREFIX, <% } %>query, pageable)<% if (!viaService && dtoMapstruct) { %>.map(<%= entityToDtoReference %>)<% } %>));
+            .map(headers -> ResponseEntity.ok().headers(headers).body(<%= entityInstance %><%= viaService ? 'Service' : (searchEngineElasticsearch ? 'Search' : '') + 'Repository' %>.search(query, pageable)<% if (!viaService && dtoMapstruct) { %>.map(<%= entityToDtoReference %>)<% } %>));
   <%_ } _%>
 <% } -%>
     }

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

@@ -0,0 +1,375 @@
+<%#
+ 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.
+-%>
+<&_
+ // Register sections and max allowed fragments, 0 for unlimited.
+  fragments.registerSections({
+    importSection: 0,
+    staticImportSection: 0,
+    annotationSection: 0,
+    classStaticFieldsSection: 0,
+    classFieldsSection: 0,
+    classAdditionalFieldsSection: 0,
+    classAdditionalFieldsMethodsSection: 0,
+    classAdditionalRelationshipsSection: 0,
+    classAdditionalRelationshipsMethodsSection: 0,
+<%_ for (const field of fields) { _%>
+    field<%- field.fieldNameCapitalized %>AnnotationSection: 0,
+  <%_ if (field.fieldWithContentType) { _%>
+    field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection: 0,
+  <%_ } _%>
+    field<%- field.fieldNameCapitalized %>CustomSetSection: 1,
+<%_ } _%>
+<%_ for (const relationship of relationships) { _%>
+    relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection: 0,
+    relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection: 1,
+    relationship<%- relationship.relationshipNameCapitalized %>CustomAddSection: 1,
+    relationship<%- relationship.relationshipNameCapitalized %>CustomRemoveSection: 1,
+<%_ } _%>
+  });
+-&>
+package <%= entityAbsolutePackage %>.domain;
+
+<&- fragments.staticImportSection() -&>
+<&- fragments.importSection() -&>
+<%_ if (relationshipsContainOtherSideIgnore) { _%>
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+<%_ } _%>
+<%_ if (!dtoMapstruct && typeof javadoc !== 'undefined') { _%>
+import io.swagger.annotations.ApiModel;
+<%_ } _%>
+<%_ if (!dtoMapstruct && importApiModelProperty) { _%>
+import io.swagger.annotations.ApiModelProperty;
+<%_ } _%>
+
+import java.io.Serializable;
+<%_ if (fieldsContainBigDecimal) { _%>
+import java.math.BigDecimal;
+<%_ } if (fieldsContainInstant) { _%>
+import java.time.Instant;
+<%_ } if (fieldsContainLocalDate) { _%>
+import java.time.LocalDate;
+<%_ } if (fieldsContainZonedDateTime) { _%>
+import java.time.ZonedDateTime;
+<%_ } if (fieldsContainDuration) { _%>
+import java.time.Duration;
+<%_ } if (entityContainsCollectionField) { _%>
+import java.util.HashSet;
+import java.util.Set;
+<%_ } _%>
+<%_ if (fieldsContainUUID) { _%>
+import java.util.UUID;
+<%_ }
+Object.keys(uniqueEnums).forEach(function(element) { _%>
+
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
+<%_ }); _%>
+
+<%_ for (const otherEntity of otherEntities.filter(otherEntity => otherEntity.entityPackage !== entityPackage)) { _%>
+import <%= otherEntity.entityAbsoluteClass %>;
+<%_ } _%>
+
+<%_ if (typeof javadoc === 'undefined') { _%>
+/**
+ * A <%= persistClass %>.
+ */
+<%_ } else { _%>
+<%- formatAsClassJavadoc(javadoc) %>
+  <%_ if (!dtoMapstruct) { _%>
+@ApiModel(description = "<%- formatAsApiDescription(javadoc) %>")
+  <%_ } _%>
+<%_ } _%>
+<&- fragments.annotationSection() -&>
+public class <%= persistClass %> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+<%_ if (!embedded && primaryKey.composite) { _%>
+    @Id
+    private <%= primaryKey.type %> <%= primaryKey.name %>;
+
+<%_ } _%>
+<&- fragments.classStaticFieldsSection() -&>
+<&- fragments.classFieldsSection() -&>
+<%_ for (const field of fields.filter(field => !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
+  <%_ if (typeof field.javadoc !== 'undefined') { _%>
+<%- formatAsFieldJavadoc(field.javadoc) %>
+  <%_ } _%>
+  <%_ if (!dtoMapstruct && typeof field.javadoc !== 'undefined') { _%>
+    @ApiModelProperty(value = "<%- formatAsApiDescription(field.javadoc) %>"<% if (field.fieldValidationRequired) { %>, required = true<% } %>)
+  <%_ } _%>
+<&- fragments.field<%- field.fieldNameCapitalized %>AnnotationSection() -&>
+    private <%= field.javaFieldType %> <%= field.fieldName %>;
+
+  <%_ if (field.fieldWithContentType) { _%>
+<&- fragments.field<%- field.fieldNameCapitalized %>ContentTypeAnnotationSection() -&>
+    private String <%= field.fieldName %>ContentType;
+
+  <%_ } _%>
+<%_ } _%>
+<&- fragments.classAdditionalFieldsSection() -&>
+
+<%_
+// An embedded entity should not reference entities that embed it, unless the other entities are also embedded
+for (relationship of relationships.filter(relationship => !relationship.embedded || relationship.otherEntity.embedded || relationship.ownerSide)) {
+  if (typeof relationship.javadoc !== 'undefined') { _%>
+<%- formatAsFieldJavadoc(relationship.javadoc) %>
+    <%_ if (!dtoMapstruct) { _%>
+    @ApiModelProperty(value = "<%- formatAsApiDescription(relationship.javadoc) %>")
+    <%_ } _%>
+  <%_ } _%>
+<&- fragments.relationship<%- relationship.relationshipNameCapitalized %>AnnotationSection() -&>
+  <%_ if (relationship.relationshipOneToMany) { _%>
+    <%_ if (relationship.ignoreOtherSideProperty) { _%>
+    @JsonIgnoreProperties(value = {
+        <%_ relationship.otherEntity.relationships.forEach(otherRelationship => { _%>
+        "<%= otherRelationship.relationshipReferenceField %>",
+        <%_ }); _%>
+    }, allowSetters = true)
+    <%_ } _%>
+    private Set<<%= relationship.otherEntity.persistClass %>> <%= relationship.relationshipFieldNamePlural %> = new HashSet<>();
+
+  <%_ } else if (relationship.relationshipManyToOne) { _%>
+    <%_ if (relationship.ignoreOtherSideProperty) { _%>
+    @JsonIgnoreProperties(value = {
+      <%_ relationship.otherEntity.relationships.forEach(otherRelationship => { _%>
+        "<%= otherRelationship.relationshipReferenceField %>",
+      <%_ }); _%>
+    }, allowSetters = true)
+    <%_ } _%>
+    private <%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %>;
+
+  <%_ } else if (relationship.relationshipManyToMany) { _%>
+    <%_ if (relationship.ignoreOtherSideProperty) { _%>
+    @JsonIgnoreProperties(value = {
+      <%_ relationship.otherEntity.relationships.forEach(otherRelationship => { _%>
+        "<%= otherRelationship.relationshipReferenceField %>",
+      <%_ }); _%>
+    }, allowSetters = true)
+    <%_ } _%>
+    private Set<<%= relationship.otherEntity.persistClass %>> <%= relationship.relationshipFieldNamePlural %> = new HashSet<>();
+
+  <%_ } else { _%>
+    private <%= relationship.otherEntity.persistClass %> <%= relationship.relationshipFieldName %>;
+  <%_ } _%>
+
+<%_ }; _%>
+<&- fragments.classAdditionalRelationshipsSection() -&>
+    // jhipster-needle-entity-add-field - JHipster will add fields here
+<%_ for (const field of fields.filter(field => !field.transient && (embedded || !field.id || !primaryKey.composite))) { _%>
+
+    public <%= field.javaFieldType %> get<%= field.fieldInJavaBeanMethod %>() {
+        return this.<%= field.fieldName %>;
+    }
+  <%_ if (fluentMethods) { _%>
+
+    public <%= persistClass %> <%= field.fieldName %>(<%= field.javaFieldType %> <%= field.fieldName %>) {
+        this.set<%= field.fieldInJavaBeanMethod %>(<%= field.fieldName %>);
+        return this;
+    }
+  <%_ } _%>
+
+<&- fragments.field<%- field.fieldNameCapitalized %>CustomSetSection() -&>
+<&_ if (!fragments.field<%- field.fieldNameCapitalized %>CustomSetSection()) { -&>
+    public void set<%= field.fieldInJavaBeanMethod %>(<%= field.javaFieldType %> <%= field.fieldName %>) {
+        this.<%= field.fieldName %> = <%= field.fieldName %>;
+    }
+<&_ } -&>
+  <%_ if (field.fieldWithContentType) { _%>
+
+    public String get<%= field.fieldInJavaBeanMethod %>ContentType() {
+        return this.<%= field.fieldName %>ContentType;
+    }
+    <%_ if (fluentMethods) { _%>
+
+    public <%= persistClass %> <%= field.fieldName %>ContentType(String <%= field.fieldName %>ContentType) {
+        this.<%= field.fieldName %>ContentType = <%= field.fieldName %>ContentType;
+        return this;
+    }
+    <%_ } _%>
+
+    public void set<%= field.fieldInJavaBeanMethod %>ContentType(String <%= field.fieldName %>ContentType) {
+        this.<%= field.fieldName %>ContentType = <%= field.fieldName %>ContentType;
+    }
+  <%_ } _%>
+<%_ } _%>
+
+<&- fragments.classAdditionalFieldsMethodsSection('\n\n') -&>
+<%_
+for (const relationship of relationships) {
+  // An embedded entity should not reference entities that embed it, unless the other entities are also embedded
+  if (embedded && !relationship.otherEntity.embedded && !relationship.ownerSide) {
+    continue;
+  }
+_%>
+  <%_ if (relationship.collection) { _%>
+    public Set<<%= relationship.otherEntity.persistClass %>> get<%= relationship.relationshipNameCapitalizedPlural %>() {
+        return this.<%= relationship.relationshipFieldNamePlural %>;
+    }
+
+  <%_ } else { _%>
+    public <%= relationship.otherEntity.persistClass %> get<%= relationship.relationshipNameCapitalized %>() {
+        return this.<%= relationship.relationshipFieldName %>;
+    }
+
+  <%_ } _%>
+<&- fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection() -&>
+<&_ if (!fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomSetSection()) { -&>
+  <%_ if (relationship.collection) { _%>
+    public void set<%= relationship.relationshipNameCapitalizedPlural %>(Set<<%= relationship.otherEntity.persistClass %>> <%= relationship.otherEntityNamePlural %>) {
+    <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%>
+        if (this.<%= relationship.relationshipFieldNamePlural %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            this.<%= relationship.relationshipFieldNamePlural %>.forEach(i -> i.remove<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
+      <%_ } else { _%>
+            this.<%= relationship.relationshipFieldNamePlural %>.forEach(i -> i.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null));
+      <%_ } _%>
+        }
+        if (<%= relationship.otherEntityNamePlural %> != null) {
+      <%_ if (relationship.otherRelationship.reference.collection) { _%>
+            <%= relationship.otherEntityNamePlural %>.forEach(i -> i.add<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
+      <%_ } else { _%>
+            <%= relationship.otherEntityNamePlural %>.forEach(i -> i.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this));
+      <%_ } _%>
+        }
+    <%_ } _%>
+        this.<%= relationship.relationshipFieldNamePlural %> = <%= relationship.otherEntityNamePlural %>;
+    }
+  <%_ } else { _%>
+    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 %>;
+    }
+  <%_ } _%>
+<&_ } -&>
+    <%_ if (fluentMethods) { _%>
+      <%_ if (relationship.collection) { _%>
+
+    public <%= persistClass %> <%= relationship.relationshipFieldNamePlural %>(Set<<%= relationship.otherEntity.persistClass %>> <%= relationship.otherEntityNamePlural %>) {
+        this.set<%= relationship.relationshipNameCapitalizedPlural %>(<%= relationship.otherEntityNamePlural %>);
+        return this;
+    }
+
+<&- fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomAddSection() -&>
+<&_ if (!fragments.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.collection) { _%>
+        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(this);
+          <%_ } else if (relationship.otherRelationship.relationshipNamePlural && !relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().add(this);
+          <%_ } _%>
+        <%_ } _%>
+      <%_ } _%>
+        return this;
+    }
+<&_ } -&>
+
+<&- fragments.relationship<%- relationship.relationshipNameCapitalized %>CustomRemoveSection() -&>
+<&_ if (!fragments.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.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.set<%= relationship.otherRelationship.relationshipNameCapitalized %>(null);
+          <%_ } else if (!relationship.otherEntityUser && relationship.otherRelationship.collection) { _%>
+        <%= relationship.otherEntityName %>.get<%= relationship.otherRelationship.relationshipNameCapitalizedPlural %>().remove(this);
+          <%_ } _%>
+        <%_ } _%>
+      <%_ } _%>
+        return this;
+    }
+<&_ } -&>
+      <%_ } else { _%>
+
+    public <%= persistClass %> <%= relationship.relationshipFieldName %>(<%= relationship.otherEntity.persistClass %> <%= relationship.otherEntityName %>) {
+        this.set<%= relationship.relationshipNameCapitalized %>(<%= relationship.otherEntityName %>);
+        return this;
+    }
+      <%_ } _%>
+    <%_ } _%>
+
+<%_ } _%>
+<&- fragments.classAdditionalRelationshipsMethodsSection() -&>
+    // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof <%= persistClass %>)) {
+            return false;
+        }
+<%_ if (!embedded) { _%>
+        return <%= primaryKey.name %> != null && <%= primaryKey.name %>.equals(((<%= persistClass %>) o).<%= primaryKey.name %>);
+<%_ } else { _%>
+        return false;
+<%_ } _%>
+    }
+
+    @Override
+    public int hashCode() {
+        // see https://vladmihalcea.com/how-to-implement-equals-and-hashcode-using-the-jpa-entity-identifier/
+        return getClass().hashCode();
+    }
+
+    // prettier-ignore
+    @Override
+    public String toString() {
+        return "<%= persistClass %>{" +
+<%_ if (!embedded) { _%>
+            "<%= primaryKey.name %>=" + get<%= primaryKey.nameCapitalized %>() +
+<%_ } _%>
+<%_ for (const field of fields.filter(field => !field.id && !field.transient)) {
+  const isNumeric = field.fieldTypeNumeric; _%>
+            ", <%= field.fieldName %>=<% if (! isNumeric) { %>'<% } %>" + get<%= field.fieldInJavaBeanMethod %>() <% if (! isNumeric) { %>+ "'" <% } %>+
+  <%_ if (field.fieldWithContentType) { _%>
+            ", <%= field.fieldName %>ContentType='" + get<%= field.fieldInJavaBeanMethod %>ContentType() + "'" +
+  <%_ } _%>
+<%_ } _%>
+<%_ for (const relationship of relationships) { _%>
+  <%_ if (relationship.otherEntity.embedded) {
+    if (relationship.relationshipManyToOne) { _%>
+            ", <%= relationship.relationshipFieldNamePlural %>='" + get<%= relationship.relationshipNameCapitalizedPlural %>() + "'" +
+    <%_ } else if (relationship.relationshipOneToOne && relationship.ownerSide) { _%>
+            ", <%= relationship.relationshipFieldName %>='" + get<%= relationship.relationshipNameCapitalized %>() + "'" +
+    <%_ } _%>
+  <%_ } _%>
+<%_ } _%>
+            "}";
+    }
+}

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

@@ -0,0 +1,25 @@
+<%#
+ 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.annotationSection) { -&>
+@org.springframework.data.elasticsearch.annotations.Document(indexName = "<%= entityInstance.toLowerCase() %>")
+<&_ } -&>