generator-jhipster 8.2.0 → 8.2.1

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_stream_template.ejs

@@ -1,50 +0,0 @@
-<%#
- Copyright 2013-2023 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.
--%>
-<%_
-const mapper = entityInstance  + 'Mapper';
-const entityToDtoReference = mapper + '::' + 'toDto'; %>
-        try {
-<%_ if (!viaService) { _%>
-  <%_ if (reactive) { _%>
-            return <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query)<%_ if (dtoMapstruct) { %>
-                .map(<%= entityToDtoReference %>)<%_ } %><%_ if (fromResource) { _%>.collectList()<%_ } _%>;
-  <%_ } else { _%>
-    <%_ if (searchEngineElasticsearch) { _%>
-            return StreamSupport
-                .stream(<%= entityInstance %>SearchRepository.search(query).spliterator(), false)
-    <%_ } else { _%>
-                return <%= entityInstance %>Repository.search(query)<% if (!dtoMapstruct) { %>;<% } else { %>.stream()<% } %>
-    <%_ } _%>
-    <%_ if (dtoMapstruct) { _%>
-                .map(<%= entityToDtoReference %>)
-    <%_ } _%>
-    <%_ if (dtoMapstruct || searchEngineElasticsearch) { _%>
-                .toList();
-    <%_ } _%>
-  <%_ } _%>
-<%_ } else { _%>
-            return <%= entityInstance %>Service.search(query)<% if (reactive && fromResource) { %>.collectList()<% } %>;
-<%_ } _%>
-        } catch (RuntimeException e) {
-    <% if (searchEngineElasticsearch && fromResource) { %>
-            throw ElasticsearchExceptionMapper.mapException(e);
-    <%_ } else { _%>
-            throw e;
-    <% } %>
-        }

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/_partials_entity_/search_template.ejs

@@ -1,57 +0,0 @@
-<%#
- Copyright 2013-2023 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.
--%>
-<%_
-  const instanceType = restClass;
-  const instanceName = restInstance;
-  const listOrFlux = reactive ? 'Flux' : 'List';
-  const mapper = entityInstance + 'Mapper';
-  const entityToDtoReference = mapper + '::' + 'toDto';
-  const entityListToDtoListReference = mapper + '.' + 'toDto';
-if (paginationNo) { %>
-    public <% if (reactive) { %>Mono<<% } %>List<<%= instanceType %>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam("query") String query) {
-        log.debug("REST request to search <%= entityClassPlural %> for query {}", query);<%- include('search_stream_template', {viaService: viaService, fromResource: true}); -%>
-<% } else { %>
-    public <% if (reactive) { %>Mono<<% } %>ResponseEntity<<%= listOrFlux %><<%= instanceType %>>><% if (reactive) { %>><% } %> search<%= entityClassPlural %>(@RequestParam("query") String query, @org.springdoc.core.annotations.ParameterObject Pageable pageable<% if (reactive) { %>, ServerHttpRequest request<% } %>) {
-        log.debug("REST request to search for a page of <%= entityClassPlural %> for query {}", query);
-  <%_ if (reactive) { _%>
-        return <%= entityInstance %><%= viaService ?
-                'Service.' + (searchEngineElasticsearch ? 'searchCount' : 'countAll') :
-                (searchEngineElasticsearch ? 'Search' : '') + 'Repository.count' %>()
-            .map(total -> new PageImpl<>(new ArrayList<>(), pageable, total))
-            .map(page -> PaginationUtil.generatePaginationHttpHeaders(ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders()), page))
-            .map(headers -> ResponseEntity.ok().headers(headers).body(<%= entityInstance %><%= viaService ? 'Service' : (searchEngineElasticsearch ? 'Search' : '') + 'Repository' %>.search(query, pageable)<% if (!viaService && dtoMapstruct) { %>.map(<%= entityToDtoReference %>)<% } %>));
-  <%_ } else { _%>
-        try {
-    <%_ if (viaService) { _%>
-            Page<<%= instanceType %>> page = <%= entityInstance %>Service.search(query, pageable);
-    <%_ } else { _%>
-            Page<<%= persistClass %>> page = <%= entityInstance %><% if (searchEngineElasticsearch) { %>Search<% } %>Repository.search(query, pageable);
-    <%_ } _%>
-            HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(<% if (reactive) { %>ForwardedHeaderUtils.adaptFromForwardedHeaders(request.getURI(), request.getHeaders())<% } else { %>ServletUriComponentsBuilder.fromCurrentRequest()<% } %>, page);
-            return ResponseEntity.ok().headers(headers).body(<% if (!viaService && dtoMapstruct) { %><%= entityListToDtoListReference %>(<% } %>page.getContent()<% if (!viaService && dtoMapstruct) { %>)<% } %>);
-        } catch (RuntimeException e) {
-    <% if (searchEngineElasticsearch) { %>
-            throw ElasticsearchExceptionMapper.mapException(e);
-    <%_ } else { _%>
-            throw new RuntimeException(e);
-    <% } %>
-        }
-  <%_ } _%>
-<% } -%>
-    }

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository.java.ejs

@@ -1,131 +0,0 @@
-<%#
- Copyright 2013-2023 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 (implementsEagerLoadApis) { _%>
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-<%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-import org.springframework.data.jpa.repository.*;
-  <%_ if (implementsEagerLoadApis) { _%>
-import org.springframework.data.repository.query.Param;
-  <%_ } _%>
-<%_ } _%>
-<%_ if (databaseTypeMongodb) { _%>
-import org.springframework.data.mongodb.repository.Query;
-import org.springframework.data.mongodb.repository.MongoRepository;
-<%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-import org.springframework.data.neo4j.repository.Neo4jRepository;
-<%_ } _%>
-<%_ if (databaseTypeCassandra) { _%>
-import org.springframework.data.cassandra.repository.CassandraRepository;
-<%_ } _%>
-import org.springframework.stereotype.Repository;
-<%_ if (databaseTypeSql || databaseTypeMongodb) { _%>
-  <%_ if (implementsEagerLoadApis || relationships.some(r => r.relationshipManyToOne && r.otherEntityUser)) { _%>
-import java.util.List;
-  <%_ } _%>
-  <%_ if (implementsEagerLoadApis) { _%>
-import java.util.Optional;
-  <%_ } _%>
-<%_ } _%>
-<%_ if (primaryKey.typeUUID) { _%>
-
-import java.util.UUID;
-<%_ } _%>
-
-/**
- * <%= springDataDescription %> repository for the <%= persistClass %> entity.
-<%_ if (containsBagRelationships && databaseTypeSql) { _%>
- *
- * When extending this class, extend <%= entityClass %>RepositoryWithBagRelationships too.
- * For more information refer to https://github.com/jhipster/generator-jhipster/issues/17990.
-<%_ } _%>
- */
-<%_ if (!implementsEagerLoadApis) { _%>
-@SuppressWarnings("unused")
-<%_ } _%>
-@Repository
-public interface <%= entityClass %>Repository extends <% if (containsBagRelationships && databaseTypeSql) { %><%= entityClass %>RepositoryWithBagRelationships, <% } %><% 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) { _%>
-
-    @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %> where <%= entityInstanceDbSafe %>.<%= relationship.relationshipFieldName %>.login = ?#{authentication.name}")
-    List<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>IsCurrentUser();
-  <%_ } _%>
-<%_ } _%>
-<%_ if (implementsEagerLoadApis) { _%>
-  <%_ if (databaseTypeSql) { _%>
-
-    <%_ const containsToOneEagerRelationship = relationships.some(relationship => relationship.relationshipEagerLoad && !relationship.bagRelationship); _%>
-    default Optional<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> <%= primaryKey.name %>) {
-        return <% if (containsBagRelationships) { %>this.fetchBagRelationships(<% } %>
-            this.<% if (containsToOneEagerRelationship) { %>findOneWithToOneRelationships<% } else { %>findById<% } %>(<%= primaryKey.name %>)
-    <%  if (containsBagRelationships) { %>)<% } %>;
-    }
-
-    default List<<%= persistClass %>> findAllWithEagerRelationships() {
-        return <% if (containsBagRelationships) { %>this.fetchBagRelationships(<% } %>
-            this.<% if (containsToOneEagerRelationship) { %>findAllWithToOneRelationships<% } else { %>findAll<% } %>()
-    <%  if (containsBagRelationships) { %>)<% } %>;
-    }
-
-    default Page<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable) {
-        return <% if (containsBagRelationships) { %>this.fetchBagRelationships(<% } %>
-            this.<% if (containsToOneEagerRelationship) { %>findAllWithToOneRelationships<% } else { %>findAll<% } %>(pageable)
-    <%  if (containsBagRelationships) { %>)<% } %>;
-    }
-    <%_ if (containsToOneEagerRelationship) { _%>
-
-    @Query(value = "select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %><%
-      for (const relationship of relationships) {
-        if (relationship.relationshipEagerLoad && !relationship.bagRelationship) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
-      } %>",
-        countQuery = "select count(<%= entityInstanceDbSafe %>) from <%= persistClass %> <%= entityInstanceDbSafe %>")
-    Page<<%= persistClass %>> findAllWithToOneRelationships(Pageable pageable);
-
-    @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %><%
-      for (const relationship of relationships) {
-        if (relationship.relationshipEagerLoad && !relationship.bagRelationship) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
-      } %>")
-    List<<%= persistClass %>> findAllWithToOneRelationships();
-
-    @Query("select <%= entityInstanceDbSafe %> from <%= persistClass %> <%= entityInstanceDbSafe %><%
-      for (const relationship of relationships) {
-        if (relationship.relationshipEagerLoad && !relationship.bagRelationship) { %> left join fetch <%= entityInstanceDbSafe %>.<%= relationship.reference.name %><% }
-      } %> where <%= entityInstanceDbSafe %>.id =:id")
-    Optional<<%= persistClass %>> findOneWithToOneRelationships(@Param("id") <%= primaryKey.type %> id);
-    <%_ } _%>
-  <%_ } else if (databaseTypeMongodb) { _%>
-
-    @Query("{}")
-    Page<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable);
-
-    @Query("{}")
-    List<<%= persistClass %>> findAllWithEagerRelationships();
-
-    @Query("{'id': ?0}")
-    Optional<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
-  <%_ } _%>
-<%_ } _%>
-}

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/repository/_entityClass_Repository_reactive.java.ejs

@@ -1,168 +0,0 @@
-<%#
- Copyright 2013-2023 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 (jpaMetamodelFiltering && reactive) {  _%>
-import <%= entityAbsolutePackage %>.domain.criteria.<%= entityClass %>Criteria;
-<%_ }  _%>
-<%_ if (databaseTypeCassandra) { _%>
-import org.springframework.data.cassandra.repository.ReactiveCassandraRepository;
-<%_ } _%>
-<%_ if (databaseTypeNeo4j) { _%>
-import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository;
-import org.springframework.data.neo4j.repository.query.Query;
-<%_ } _%>
-<%_ if (!paginationNo || implementsEagerLoadApis || databaseTypeSql) { _%>
-import org.springframework.data.domain.Pageable;
-<%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import org.springframework.data.relational.core.query.Criteria;
-<%_ } _%>
-<%_ if (databaseTypeMongodb) { _%>
-  <%_ if (implementsEagerLoadApis) { _%>
-import org.springframework.data.mongodb.repository.Query;
-  <%_ } _%>
-import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
-<%_ } _%>
-import org.springframework.stereotype.Repository;
-<%_ if (databaseTypeSql || !paginationNo || implementsEagerLoadApis) { _%>
-import reactor.core.publisher.Flux;
-<%_ } _%>
-<%_ if (implementsEagerLoadApis || databaseTypeSql) { _%>
-import reactor.core.publisher.Mono;
-<%_ } _%>
-<%_ if (primaryKey.typeUUID) { _%>
-
-import java.util.UUID;
-<%_ } _%>
-
-/**
- * <%= springDataDescription %> repository for the <%= persistClass %> entity.
- */
-@SuppressWarnings("unused")
-@Repository
-public interface <%= entityClass %>Repository extends <% if (databaseTypeSql) { %>ReactiveCrud<% } if (databaseTypeMongodb) { %>ReactiveMongo<% } if (databaseTypeNeo4j) { %>ReactiveNeo4j<% } if (databaseTypeCassandra) { %>ReactiveCassandra<% } %>Repository<<%= persistClass %>, <%= primaryKey.type %>><% if (databaseTypeSql) { %>, <%= entityClass %>RepositoryInternal<% } %> {
-
-<%_ if (!paginationNo) { _%>
-    Flux<<%= persistClass %>> findAllBy(Pageable pageable);
-<%_ } _%>
-<%_ if (implementsEagerLoadApis) { _%>
-  <%_ if (databaseTypeMongodb) { _%>
-
-    @Query("<%= (databaseTypeMongodb) ? '{}' : '#{#n1ql.selectEntity} WHERE #{#n1ql.filter}' %>")
-    Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable);
-
-    @Query("<%= (databaseTypeMongodb) ? '{}' : '#{#n1ql.selectEntity} WHERE #{#n1ql.filter}' %>")
-    Flux<<%= persistClass %>> findAllWithEagerRelationships();
-
-    @Query("<%- (databaseTypeMongodb) ? "{'id': ?0}" : "#{#n1ql.selectEntity} USE KEYS $1 WHERE #{#n1ql.filter}" %>")
-    Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
-  <%_ } _%>
-  <%_ if (databaseTypeNeo4j) { _%>
-    @Query("MATCH (n:<%= persistClass %>)<-[]-(m) RETURN n,m")
-    Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable pageable);
-
-    @Query("MATCH (n:<%= persistClass %>)<-[]-(m) RETURN n,m")
-    Flux<<%= persistClass %>> findAllWithEagerRelationships();
-
-    @Query("MATCH (e:<%= persistClass %> {id: $id}) RETURN e")
-    Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
-  <%_ } _%>
-<%_ } _%>
-<%_ if (databaseTypeSql) { _%>
-  <%_ if (implementsEagerLoadApis) { _%>
-
-    @Override
-    Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
-
-    @Override
-    Flux<<%= persistClass %>> findAllWithEagerRelationships();
-
-    @Override
-    Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
-
-  <%_ } _%>
-
-  <%_ for (const relationship of relationships) {
-    let relationshipName = relationship.relationshipName;
-    let ownerSide = relationship.ownerSide; _%>
-    <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
-
-    @Query("SELECT * FROM <%= entityTableName %> entity WHERE entity.<%= relationship.joinColumnNames[0] %> = :id")
-    Flux<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>(<%= primaryKey.type %> id);
-
-    @Query("SELECT * FROM <%= entityTableName %> entity WHERE entity.<%= relationship.joinColumnNames[0] %> IS NULL")
-    Flux<<%= persistClass %>> findAllWhere<%= relationship.relationshipNameCapitalized %>IsNull();
-    <%_ } else if (relationship.shouldWriteJoinTable) { _%>
-
-    @Query("SELECT entity.* FROM <%= entityTableName %> entity JOIN <%= relationship.joinTable.name %> joinTable ON entity.<%= primaryKey.fields[0].columnName %> = joinTable.<%= relationship.joinColumnNames[0] %> WHERE joinTable.<%= relationship.joinColumnNames[0] %> = :id")
-    Flux<<%= persistClass %>> findBy<%= relationship.relationshipNameCapitalized %>(<%= primaryKey.type %> id);
-    <%_ } else if (relationship.relationshipOneToOne && !ownerSide) {
-        let otherEntityRelationshipName = relationship.otherEntityRelationshipName;
-        let otherEntityTableName = relationship.otherEntityTableName;
-      _%>
-
-    @Query("SELECT * FROM <%= entityTableName %> entity WHERE entity.<%= primaryKey.fields[0].columnName  %> not in (select <%= relationship.joinColumnNames[0]%> from <%= otherEntityTableName %>)")
-    Flux<<%= persistClass %>> findAllWhere<%= relationship.relationshipNameCapitalized %>IsNull();
-    <%_ } _%>
-  <%_ } _%>
-
-    @Override
-    <S extends <%= persistClass %>> Mono<S> save(S entity);
-
-    @Override
-    Flux<<%= persistClass %>> findAll();
-
-    @Override
-    Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id);
-
-    @Override
-    Mono<Void> deleteById(<%= primaryKey.type %> id);
-}
-
-interface <%= entityClass %>RepositoryInternal {
-    <S extends <%= persistClass %>> Mono<S> save(S entity);
-
-    Flux<<%= persistClass %>> findAllBy(Pageable pageable);
-
-    Flux<<%= persistClass %>> findAll();
-
-    Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id);
-    // this is not supported at the moment because of https://github.com/jhipster/generator-jhipster/issues/18269
-    // Flux<<%= persistClass %>> findAllBy(Pageable pageable, Criteria criteria);
-<%_ if (jpaMetamodelFiltering && reactive) {  _%>
-    Flux<<%= persistClass %>> findByCriteria(<%= entityClass %>Criteria criteria, Pageable pageable);
-
-    Mono<Long> countByCriteria(<%= entityClass %>Criteria criteria);
-<%_ }  _%>
-  <%_ if (implementsEagerLoadApis) { _%>
-
-    Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id);
-
-    Flux<<%= persistClass %>> findAllWithEagerRelationships();
-
-    Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page);
-
-    Mono<Void> deleteById(<%= primaryKey.type %> id);
-  <%_ } _%>
-<%_ } _%>
-}

package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs

@@ -1,155 +0,0 @@
-<%#
- Copyright 2013-2023 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 %>.service;
-
-<%_
-const serviceClassName = entityClass + 'QueryService';
-const instanceType = restClass;
-const instanceName = restInstance;
-const mapper = entityInstance  + 'Mapper';
-const dtoToEntity = mapper + '.'+ 'toEntity';
-const entityToDto = mapper + '.'+ 'toDto';
-const entityListToDto = mapper + '.' + 'toDto';
-const entityToDtoReference = mapper + '::'+ 'toDto';
-const repository = entityInstance  + 'Repository';
-const criteria = entityClass + 'Criteria';
-_%>
-import java.util.List;
-
-import jakarta.persistence.criteria.JoinType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import tech.jhipster.service.QueryService;
-
-import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
-import <%= entityAbsolutePackage %>.domain.*; // for static metamodels
-import <%= entityAbsolutePackage %>.repository.<%= entityClass %>Repository;
-<%_ if (searchEngineElasticsearch) { _%>
-import <%= entityAbsolutePackage %>.repository.search.<%= entityClass %>SearchRepository;
-<%_ } _%>
-import <%= entityAbsolutePackage %>.service.criteria.<%= entityClass %>Criteria;
-<%_ if (dtoMapstruct) { _%>
-import <%= entityAbsolutePackage %>.service.dto.<%= dtoClass %>;
-import <%= entityAbsolutePackage %>.service.mapper.<%= entityClass %>Mapper;
-<%_ } _%>
-
-/**
- * Service for executing complex queries for {@link <%= persistClass %>} entities in the database.
- * The main input is a {@link <%= entityClass %>Criteria} which gets converted to {@link Specification},
- * in a way that all the filters must apply.
- * It returns a {@link List} of {@link <%= instanceType %>} or a {@link Page} of {@link <%= instanceType %>} which fulfills the criteria.
- */
-@Service
-<%_ if (databaseTypeSql) { _%>
-@Transactional(readOnly = true)
-<%_ } _%>
-public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
-
-    private final Logger log = LoggerFactory.getLogger(<%= serviceClassName %>.class);
-<%- include('../_partials_entity_/inject_template', {viaService: false, constructorName: serviceClassName, queryService: false, isUsingMapsId: false, mapsIdAssoc: null, isController: false}); -%>
-
-    /**
-     * Return a {@link List} of {@link <%= instanceType %>} which matches the criteria from the database.
-     * @param criteria The object which holds all the filters, which the entities should match.
-     * @return the matching entities.
-     */
-    @Transactional(readOnly = true)
-    public List<<%= instanceType %>> findByCriteria(<%= criteria %> criteria) {
-        log.debug("find by criteria : {}", criteria);
-        final Specification<<%= persistClass %>> specification = createSpecification(criteria);
-<%_ if (dtoMapstruct) { _%>
-        return <%= entityListToDto %>(<%= repository %>.findAll(specification));
-<%_ } else { _%>
-        return <%= repository %>.findAll(specification);
-<%_ } _%>
-    }
-
-    /**
-     * Return a {@link Page} of {@link <%= instanceType %>} which matches the criteria from the database.
-     * @param criteria The object which holds all the filters, which the entities should match.
-     * @param page The page, which should be returned.
-     * @return the matching entities.
-     */
-    @Transactional(readOnly = true)
-    public Page<<%= instanceType %>> findByCriteria(<%= criteria %> criteria, Pageable page) {
-        log.debug("find by criteria : {}, page: {}", criteria, page);
-        final Specification<<%= persistClass %>> specification = createSpecification(criteria);
-<%_ if (dtoMapstruct) { _%>
-        return <%= repository %>.findAll(specification, page)
-            .map(<%= entityToDtoReference %>);
-<%_ } else { _%>
-        return <%= repository %>.findAll(specification, page);
-<%_ } _%>
-    }
-
-    /**
-     * Return the number of matching entities in the database.
-     * @param criteria The object which holds all the filters, which the entities should match.
-     * @return the number of matching entities.
-     */
-    @Transactional(readOnly = true)
-    public long countByCriteria(<%= criteria %> criteria) {
-        log.debug("count by criteria : {}", criteria);
-        final Specification<<%= persistClass %>> specification = createSpecification(criteria);
-        return <%= repository %>.count(specification);
-    }
-
-    /**
-     * Function to convert {@link <%= criteria %>} to a {@link Specification}
-     * @param criteria The object which holds all the filters, which the entities should match.
-     * @return the matching {@link Specification} of the entity.
-     */
-    protected Specification<<%= persistClass %>> createSpecification(<%= criteria %> criteria) {
-        Specification<<%= persistClass %>> specification = Specification.where(null);
-        if (criteria != null) {
-            // This has to be called first, because the distinct method returns null
-            if (criteria.getDistinct() != null) {
-                specification = specification.and(distinct(criteria.getDistinct()));
-            }
-            if (criteria.get<%= primaryKey.nameCapitalized %>() != null) {
-                specification = specification.and(<%= this.getSpecificationBuilder(primaryKey.type) %>(criteria.get<%= primaryKey.nameCapitalized %>(), <%= persistClass %>_.<%= primaryKey.name %>));
-            }
-<%_
-fields.forEach((field) => {
-  if (field.id || field.transient) return;
-  if (field.filterableField) { _%>
-            if (criteria.get<%= field.fieldInJavaBeanMethod %>() != null) {
-                specification = specification.and(<%= this.getSpecificationBuilder(field.fieldType) %>(criteria.get<%= field.fieldInJavaBeanMethod %>(), <%= persistClass %>_.<%= field.fieldName %>));
-            }
-  <%_ }
-});
-
-relationships.forEach((relationship) => {
-  const metamodelFieldName = (relationship.relationshipManyToMany || relationship.relationshipOneToMany) ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName; _%>
-if (criteria.get<%= relationship.relationshipNameCapitalized %>Id() != null) {
-    specification = specification.and(buildSpecification(criteria.get<%= relationship.relationshipNameCapitalized %>Id(),
-        root -> root.join(<%= persistClass %>_.<%= metamodelFieldName %>, JoinType.LEFT).get(<%= relationship.otherEntity.persistClass %>_.<%= relationship.otherEntity.primaryKey.name %>)));
-}
-<%_ }); /* forEach */ _%>
-        }
-        return specification;
-    }
-}