generator-jhipster 7.7.0 → 7.8.0

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs

@@ -220,7 +220,7 @@ _%>
     }
     <%_ for (reference of Object.values(differentRelationships).filter(arr => arr.some(rel => rel.reference.owned && rel.otherEntity.primaryKey)).map(arr => arr[0].reference)) { _%>
 
-    track<%= reference.relationship.otherEntity.entityAngularName %>By<%= reference.relationship.otherEntity.primaryKey.nameCapitalized %>(index: number, item: I<%= reference.relationship.otherEntity.entityAngularName %>): <%= getTypescriptKeyType(reference.relationship.otherEntity.primaryKey.type) %> {
+    track<%= reference.relationship.otherEntity.entityAngularName %>By<%= reference.relationship.otherEntity.primaryKey.nameCapitalized %>(_index: number, item: I<%= reference.relationship.otherEntity.entityAngularName %>): <%= getTypescriptKeyType(reference.relationship.otherEntity.primaryKey.type) %> {
         return item.<%= reference.relationship.otherEntity.primaryKey.name %>!;
     }
     <%_ } _%>

package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs

@@ -24,6 +24,7 @@ const otherEntities = _.uniq(Object.values(differentRelationships).filter(rels =
 const skipCreateTest =
   (
     !cypressBootstrapEntities ||
+    requiredRelationships.some(rel => rel.otherEntity.primaryKey && rel.otherEntity.primaryKey.derived) ||
     requiredRelationships.some(rel => rel.otherEntity.builtInUser || rel.otherEntity === this.entity) ||
     requiredRelationships.map(rel => rel.otherEntity.relationships).flat().some(rel => rel.relationshipRequired) ||
     !entityFakeData

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs

@@ -34,11 +34,11 @@ export const <%= entityReactName %>DeleteDialog = (props: RouteComponentProps<{
     setLoadModal(true);
   }, []);
 
-  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityInstance %>.entity);
-  const updateSuccess = useAppSelector(state => state.<%= entityInstance %>.updateSuccess);
+  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityReactState %>.entity);
+  const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
 
   const handleClose = () => {
-    props.history.push('/<%= entityFileName %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
+    props.history.push('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
   };
 
   useEffect(() => {

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs

@@ -33,13 +33,14 @@ import {
 } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
-import { getEntity } from './<%= entityFileName %>.reducer';
 import { APP_DATE_FORMAT, APP_LOCAL_DATE_FORMAT } from 'app/config/constants';
 <%_ if (fieldsContainDuration) { _%>
 import { DurationFormat } from 'app/shared/DurationFormat';
 <%_ } _%>
 import { useAppDispatch, useAppSelector } from 'app/config/store';
 
+import { getEntity } from './<%= entityFileName %>.reducer';
+
 export const <%= entityReactName %>Detail = (props: RouteComponentProps<{id: string}>) => {
   const dispatch = useAppDispatch();
 
@@ -47,7 +48,7 @@ export const <%= entityReactName %>Detail = (props: RouteComponentProps<{id: str
     dispatch(getEntity(props.match.params.id));
   }, []);
 
-  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityInstance %>.entity);
+  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityReactState %>.entity);
   return (
     <Row>
       <Col md="8">
@@ -152,10 +153,10 @@ _%>
   <%_ } _%>
 <%_ } _%>
           </dl>
-        <Button tag={Link} to="/<%= entityFileName %>" replace color="info" data-cy="entityDetailsBackButton">
+        <Button tag={Link} to="/<%= entityPage %>" replace color="info" data-cy="entityDetailsBackButton">
           <FontAwesomeIcon icon="arrow-left" /> <span className="d-none d-md-inline" ><Translate contentKey="entity.action.back">Back</Translate></span>
         </Button>&nbsp;
-        <Button tag={Link} to={`/<%= entityFileName %>/${<%= entityInstance %>Entity.<%= primaryKey.name %>}/edit`} replace color="primary">
+        <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>Entity.<%= primaryKey.name %>}/edit`} replace color="primary">
           <FontAwesomeIcon icon="pencil-alt" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.edit">Edit</Translate></span>
         </Button>
       </Col>

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs

@@ -43,6 +43,12 @@ import {
 } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
+import { convertDateTimeFromServer, convertDateTimeToServer, displayDefaultDateTime } from 'app/shared/util/date-utils';
+<%_ if (relationships.filter(e => e.relationshipManyToMany) !== undefined) { _%>
+import { mapIdList } from 'app/shared/util/entity-utils';
+<%_ } _%>
+import { useAppDispatch, useAppSelector } from 'app/config/store';
+
 <%_
 let hasRelationshipQuery = false;
 let otherEntityActions = new Set();
@@ -72,7 +78,7 @@ Object.keys(differentRelationships).forEach(key => {
       action: `get${upperFirstCamelCase(uniqueRel.otherEntityNamePlural)}`,
       instance: `${uniqueRel.otherEntityNamePlural}`,
       entity: uniqueRel.otherEntityAngularName,
-      reducer: uniqueRel.otherEntityAngularName === 'User' ? 'userManagement' : uniqueRel.otherEntityName
+      reducer: uniqueRel.otherEntity.builtInUser ? `userManagement.${uniqueRel.otherEntityNamePlural}` : `${uniqueRel.otherEntity.entityReactState}.entities`,
     });
     if (uniqueRel.otherEntityAngularName === 'User') {
 _%>
@@ -90,22 +96,17 @@ import { getEntities as get<%= upperFirstCamelCase(uniqueRel.otherEntityNamePlur
     <%_ } _%>
   <%_ } _%>
 <%_ }); _%>
+import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
+<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
+<%_ enumImports.forEach( (importedPath, importedType) => { _%>
+import { <%- importedType %> } from '<%- importedPath %>';
+<%_ }); _%>
 import {
   getEntity,
   updateEntity,
   createEntity,
   reset
 } from './<%= entityFileName %>.reducer';
-import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
-import { convertDateTimeFromServer, convertDateTimeToServer, displayDefaultDateTime } from 'app/shared/util/date-utils';
-<%_ if (relationships.filter(e => e.relationshipManyToMany) !== undefined) { _%>
-import { mapIdList } from 'app/shared/util/entity-utils';
-<%_ } _%>
-import { useAppDispatch, useAppSelector } from 'app/config/store';
-<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
-<%_ enumImports.forEach( (importedPath, importedType) => { _%>
-import { <%- importedType %> } from '<%- importedPath %>';
-<%_ }); _%>
 
 export const <%= entityReactName %>Update = (props: RouteComponentProps<{id: string}>) => {
   const dispatch = useAppDispatch();
@@ -113,17 +114,17 @@ export const <%= entityReactName %>Update = (props: RouteComponentProps<{id: str
   const [isNew] = useState(!props.match.params || !props.match.params.id);
 
   <%_ otherEntityActions.forEach(val => { _%>
-  const <%= val.instance %> = useAppSelector(state => state.<%= val.reducer %>.<%= val.entity === 'User' ? val.instance : 'entities' %>);
+  const <%= val.instance %> = useAppSelector(state => state.<%= val.reducer %>);
   <%_ }) _%>
-  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityInstance %>.entity);
-  const loading = useAppSelector(state => state.<%= entityInstance %>.loading);
-  const updating = useAppSelector(state => state.<%= entityInstance %>.updating);
-  const updateSuccess = useAppSelector(state => state.<%= entityInstance %>.updateSuccess);
+  const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityReactState %>.entity);
+  const loading = useAppSelector(state => state.<%= entityReactState %>.loading);
+  const updating = useAppSelector(state => state.<%= entityReactState %>.updating);
+  const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
   <%_ enumImports.forEach( (importedPath, importedType) => { _%>
   const <%- _.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
   <%_ }); _%>
   const handleClose = () => {
-    props.history.push('/<%= entityFileName %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
+    props.history.push('/<%= entityPage %>'<%_ if (paginationPagination) { _%> + props.location.search<%_ } _%>);
   }
 
   useEffect(() => {
@@ -383,7 +384,7 @@ _%>
           </ValidatedField>
   <%_ } _%>
 <%_ }) _%>
-          <Button tag={Link} id="cancel-save" data-cy="entityCreateCancelButton" to="/<%= entityFileName %>" replace color="info">
+          <Button tag={Link} id="cancel-save" data-cy="entityCreateCancelButton" to="/<%= entityPage %>" replace color="info">
             <FontAwesomeIcon icon="arrow-left" />&nbsp;
             <span className="d-none d-md-inline" ><Translate contentKey="entity.action.back">Back</Translate></span>
           </Button>

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs

@@ -45,9 +45,9 @@ const initialState: EntityState<I<%= entityReactName %>> = {
   updateSuccess: false
 };
 
-const apiUrl = '<% if (applicationTypeGateway && locals.microserviceName) { %>services/<%= microserviceName.toLowerCase() %>/<% } %>api/<%= entityApiUrl %>';
+const apiUrl = '<%= entityApi %>api/<%= entityApiUrl %>';
 <%_ if (searchEngine) { _%>
-const apiSearchUrl = '<% if (applicationTypeGateway && locals.microserviceName) { %>services/<%= microserviceName.toLowerCase() %>/<% } %>api/_search/<%= entityApiUrl %>';
+const apiSearchUrl = '<%= entityApi %>api/_search/<%= entityApiUrl %>';
 <%_ } _%>
 
 // Actions

package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs

@@ -40,10 +40,17 @@ import {
 } from 'react-jhipster';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
+import { APP_DATE_FORMAT, APP_LOCAL_DATE_FORMAT } from 'app/config/constants';
+<%_ if (!paginationNo) { _%>
+import { ASC, DESC, ITEMS_PER_PAGE, SORT } from 'app/shared/util/pagination.constants';
+import { overridePaginationStateWithQueryParams } from 'app/shared/util/entity-utils';
+<%_ } _%>
+import { useAppDispatch, useAppSelector } from 'app/config/store';
 <%_ if (fieldsContainDuration) { _%>
 import { DurationFormat } from 'app/shared/DurationFormat';
 <%_ } _%>
 
+import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
 import {
 <%_ if (searchEngine) { _%>
   searchEntities,
@@ -53,13 +60,6 @@ import {
   reset,
 <%_ } _%>
 } from './<%= entityFileName %>.reducer';
-import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileName %>.model';
-import { APP_DATE_FORMAT, APP_LOCAL_DATE_FORMAT } from 'app/config/constants';
-<%_ if (!paginationNo) { _%>
-import { ASC, DESC, ITEMS_PER_PAGE, SORT } from 'app/shared/util/pagination.constants';
-import { overridePaginationStateWithQueryParams } from 'app/shared/util/entity-utils';
-<%_ } _%>
-import { useAppDispatch, useAppSelector } from 'app/config/store';
 
 export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>) => {
   const dispatch = useAppDispatch();
@@ -74,15 +74,15 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
   const [sorting, setSorting] = useState(false);
 <%_ } _%>
 
-  const <%= entityInstance %>List = useAppSelector(state => state.<%= entityInstance %>.entities);
-  const loading = useAppSelector(state => state.<%= entityInstance %>.loading);
+  const <%= entityInstance %>List = useAppSelector(state => state.<%= entityReactState %>.entities);
+  const loading = useAppSelector(state => state.<%= entityReactState %>.loading);
   <%_ if (!paginationNo) { _%>
-  const totalItems = useAppSelector(state => state.<%= entityInstance %>.totalItems);
+  const totalItems = useAppSelector(state => state.<%= entityReactState %>.totalItems);
   <%_ } _%>
   <%_ if (paginationInfiniteScroll) { _%>
-  const links = useAppSelector(state => state.<%= entityInstance %>.links);
-  const entity = useAppSelector(state => state.<%= entityInstance %>.entity);
-  const updateSuccess = useAppSelector(state => state.<%= entityInstance %>.updateSuccess);
+  const links = useAppSelector(state => state.<%= entityReactState %>.links);
+  const entity = useAppSelector(state => state.<%= entityReactState %>.entity);
+  const updateSuccess = useAppSelector(state => state.<%= entityReactState %>.updateSuccess);
   <%_ } _%>
 
 <%_ if (paginationPagination || paginationInfiniteScroll || !paginationNo && !paginationInfiniteScroll) { _%>
@@ -293,7 +293,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
             <FontAwesomeIcon icon="sync" spin={loading} /> <Translate contentKey="<%= i18nKeyPrefix %>.home.refreshListLabel">Refresh List</Translate>
           </Button>
 <%_ if (!readOnly) { _%>
-            <Link to={`${match.url}/new`} className="btn btn-primary jh-create-entity" id="jh-create-entity" data-cy="entityCreateButton">
+            <Link to="/<%= entityPage %>/new" className="btn btn-primary jh-create-entity" id="jh-create-entity" data-cy="entityCreateButton">
               <FontAwesomeIcon icon="plus" />&nbsp;
               <Translate contentKey="<%= i18nKeyPrefix %>.home.createLabel">
                 Create new <%= entityClassHumanized %>
@@ -352,7 +352,7 @@ export const <%= entityReactName %> = (props: RouteComponentProps<{url: string}>
                   <%= entityInstance %>List.map((<%= entityInstance %>, i) => (
                   <tr key={`entity-${i}`} data-cy="entityTable">
                     <td>
-                      <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="link" size="sm">
+                      <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="link" size="sm">
                         {<%= entityInstance %>.<%= primaryKey.name %>}
                       </Button>
                     </td>
@@ -403,6 +403,7 @@ _%>
   <%_ } _%>
 <%_ } _%>
 <%_ for (relationship of relationships) {
+  const otherEntity = relationship.otherEntity;
   const ownerSide = relationship.ownerSide;
   const relationshipFieldName = relationship.relationshipFieldName;
   const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
@@ -430,13 +431,13 @@ _%>
                         {
                           (<%= entityInstance %>.<%= relationshipFieldNamePlural %>) ?
                               (<%= entityInstance %>.<%= relationshipFieldNamePlural %>.map((val, j) =>
-                                  <span key={j}><Link to={`<%= otherEntityStateName %>/${val.id}`}>{val.<%= otherEntityField %>}</Link>{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '}</span>
+                                  <span key={j}><Link to={`/<%= otherEntity.entityPage %>/${val.<%= otherEntity.primaryKey.name %>}`}>{val.<%= otherEntityField %>}</Link>{(j === <%= entityInstance %>.<%= relationshipFieldNamePlural %>.length - 1) ? '' : ', '}</span>
                               )
                           ) : null
                         }
       <%_ } else { _%>
                         {<%= entityInstance + "." + relationshipFieldName %> ?
-                        <Link to={`<%= otherEntityStateName %>/${<%= entityInstance + "." + relationshipFieldName + "." + otherEntityPkName + "}" %>`}>
+                        <Link to={`/<%= otherEntity.entityPage %>/${<%= entityInstance + "." + relationshipFieldName + "." + otherEntityPkName + "}" %>`}>
                           {<%= entityInstance + "." + relationshipFieldName + "." + otherEntityField %>}
                         </Link> : ''}
       <%_ } _%>
@@ -446,14 +447,14 @@ _%>
 <%_ } _%>
                       <td className="text-end">
                         <div className="btn-group flex-btn-group-container">
-                          <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="info" size="sm" data-cy="entityDetailsButton">
+                          <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}`} color="info" size="sm" data-cy="entityDetailsButton">
                             <FontAwesomeIcon icon="eye" /> <span className="d-none d-md-inline" ><Translate contentKey="entity.action.view">View</Translate></span>
                           </Button>
 <%_ if (!readOnly) { _%>
-                          <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}/edit<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="primary" size="sm" data-cy="entityEditButton">
+                          <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/edit<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="primary" size="sm" data-cy="entityEditButton">
                             <FontAwesomeIcon icon="pencil-alt" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.edit">Edit</Translate></span>
                           </Button>
-                          <Button tag={Link} to={`${match.url}/${<%= entityInstance %>.<%= primaryKey.name %>}/delete<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="danger" size="sm" data-cy="entityDeleteButton">
+                          <Button tag={Link} to={`/<%= entityPage %>/${<%= entityInstance %>.<%= primaryKey.name %>}/delete<%_ if (paginationPagination) { _%>?page=${paginationState.activePage}&sort=${paginationState.sort},${paginationState.order}<%_ } _%>`} color="danger" size="sm" data-cy="entityDeleteButton">
                             <FontAwesomeIcon icon="trash" /> <span className="d-none d-md-inline"><Translate contentKey="entity.action.delete">Delete</Translate></span>
                           </Button>
 <%_ } _%>

package/generators/entity-i18n/templates/i18n/entity_fr.json.ejs

@@ -39,7 +39,7 @@ let helpBlocks = 0; %>
 <%_ } _%>
 <%_ if (!readOnly) { _%>
             "delete": {
-                "question": "Etes-vous certain de vouloir supprimer le <%= entityClassHumanized %> {{ id }} ?"
+                "question": "Êtes-vous certain de vouloir supprimer le <%= entityClassHumanized %> {{ id }} ?"
             },
 <%_ } _%>
             "detail": {

package/generators/entity-server/files.js

@@ -78,6 +78,36 @@ const serverFiles = {
         },
       ],
     },
+    {
+      condition: generator => generator.databaseTypeSql && generator.requiresPersistableImplementation,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/Entity.java.jhi.spring_data_persistable',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_persistable`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.databaseTypeSql && generator.reactive && generator.requiresPersistableImplementation,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/EntityCallback.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Callback.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => generator.databaseTypeSql && !generator.reactive && generator.requiresPersistableImplementation,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/Entity.java.jhi.javax_lifecycle_events',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.javax_lifecycle_events`,
+        },
+      ],
+    },
     {
       condition: generator => generator.databaseTypeCassandra,
       path: SERVER_MAIN_SRC_DIR,
@@ -172,16 +202,6 @@ const serverFiles = {
         },
       ],
     },
-    {
-      condition: generator => generator.searchEngine === ELASTICSEARCH && !generator.embedded && !generator.paginationNo,
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/repository/search/SortToSortBuilderListConverter.java',
-          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/SortToSortBuilderListConverter.java`,
-        },
-      ],
-    },
     {
       condition: generator => !generator.reactive && !generator.embedded && generator.databaseType !== COUCHBASE,
       path: SERVER_MAIN_SRC_DIR,

package/generators/entity-server/index.js

@@ -168,6 +168,17 @@ module.exports = class extends BaseBlueprintGenerator {
         this.reactiveUniqueEntityTypes = new Set(this.reactiveEagerRelations.map(rel => rel.otherEntityNameCapitalized));
         this.reactiveUniqueEntityTypes.add(this.entityClass);
       },
+
+      relationshipsSqlDerivedProperties() {
+        if (!this.databaseTypeSql) return;
+        for (const relationship of this.relationships) {
+          if (!relationship.otherEntity.embedded) {
+            relationship.joinColumnNames = relationship.otherEntity.primaryKey.fields.map(
+              otherField => `${relationship.columnNamePrefix}${otherField.columnName}`
+            );
+          }
+        }
+      },
     };
   }
 
@@ -184,6 +195,9 @@ module.exports = class extends BaseBlueprintGenerator {
         if (this.isJhipsterVersionLessThan('7.6.1')) {
           this.removeFile(`${this.entityAbsoluteFolder}/repository/search/SortToFieldSortBuilderConverter.java`);
         }
+        if (this.isJhipsterVersionLessThan('7.7.1')) {
+          this.removeFile(`${this.entityAbsoluteFolder}/repository/search/SortToSortBuilderListConverter.java`);
+        }
       },
       ...writeFiles(),
       ...super._missingPostWriting(),
@@ -209,7 +223,11 @@ module.exports = class extends BaseBlueprintGenerator {
     return this._postWriting();
   }
 
-  /* Private methods used in templates */
+  /**
+   * @deprecated
+   * TODO remove for v8
+   * Private methods used in templates
+   */
   _getJoinColumnName(relationship) {
     if (relationship.id === true) {
       return 'id';

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

@@ -23,7 +23,7 @@
 <&_ if (fragment.staticImportSection) { -&>
 <%_ if (!embedded) { _%>
 import static <%= packageName %>.config.Constants.ID_DELIMITER;
-import static <%= packageName %>.domain.<%= entityClass %>.TYPE_NAME;
+import static <%= packageName %>.domain.<%= persistClass %>.TYPE_NAME;
 import static org.springframework.data.couchbase.core.mapping.id.GenerationStrategy.UNIQUE;
 <%_ } _%>
 <&_ } -&>

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

@@ -23,11 +23,15 @@ import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ if (relationships.length !== 0) { _%>
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.domain.Pageable;
+import static <%= packageName %>.repository.JHipsterCouchbaseRepository.pageableStatement;
+import com.couchbase.client.java.query.QueryScanConsistency;
+import org.springframework.data.couchbase.repository.ScanConsistency;
   <%_ 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;
   <%_ } _%>
 <%_ } _%>
@@ -39,12 +43,12 @@ import org.springframework.stereotype.Repository;
 import java.util.UUID;
 <%_ } _%>
 
-import static <%= packageName %>.domain.<%= entityClass %>.TYPE_NAME;
+import static <%= packageName %>.domain.<%= persistClass %>.TYPE_NAME;
 
 /**
  * Spring Data Couchbase repository for the <%= persistClass %> entity.
  */
-<%_ if (!relationshipsContainEagerLoad) { _%>
+<%_ if (!implementsEagerLoadApis) { _%>
 @SuppressWarnings("unused")
 <%_ } _%>
 <%_
@@ -60,9 +64,9 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
     String SELECT = "SELECT meta(b).id as __id, meta(b).cas as __cas, b.*" + <%
       for (const relationship of notEmbeddedRelationships) {
           if (relationship.collection) {
-            %> ", (SELECT `<%= relationship.relationshipFieldName %>`.*, meta(`<%= relationship.relationshipFieldName %>`).id FROM `<%= relationship.relationshipFieldNamePlural %>` `<%= relationship.relationshipFieldName %>`) as `<%= relationship.relationshipFieldNamePlural %>`"  + <%
+            %> ", ARRAY OBJECT_ADD(item, 'id', meta(item).id) FOR item IN `<%= relationship.relationshipFieldNamePlural %>` END AS `<%= relationship.relationshipFieldNamePlural %>`"  + <%
           } else {
-            %> ", (SELECT `<%= relationship.relationshipFieldName %>`.*, meta(`<%= relationship.relationshipFieldName %>`).id)[0] as `<%= relationship.relationshipFieldName %>`" + <%
+            %> ", OBJECT_ADD(`<%= relationship.relationshipFieldName %>`, 'id', meta(`<%= relationship.relationshipFieldName %>`).id) AS `<%= relationship.relationshipFieldName %>`" + <%
           }
       } %>
         " FROM #{#n1ql.bucket} b";
@@ -81,8 +85,19 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
 
     String WHERE = " WHERE b.type = '" + TYPE_NAME + "'";
 
-    @Query(SELECT + JOIN + WHERE)
-    <%= pageOrFlux %><<%= persistClass %>> findAll(Pageable pageable);
+    default <%= pageOrFlux %><<%= persistClass %>> findAll(Pageable pageable) {
+        return
+        <% if (!reactive) { %>new PageImpl<>(<% } %>
+            findAll(pageableStatement(pageable, "b"))
+        <% if (!reactive) { %>,
+            pageable,
+            count()
+        )<% } %>;
+    }
+
+    @Query(SELECT + JOIN + WHERE + " #{[0]}")
+    @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+    <%= listOrFlux %><<%= persistClass %>> findAll(String pageableStatement);
 
     @Query(SELECT + JOIN + WHERE)
     <%= listOrFlux %><<%= persistClass %>> findAll();
@@ -95,8 +110,16 @@ public interface <%= entityClass %>Repository extends JHipsterCouchbaseRepositor
     @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION)
     <%= listOrFlux %><<%= persistClass %>> search(String queryString);
 
-    @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION)
-    <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable);
+    default <%= pageOrFlux %><<%= persistClass %>> search(String queryString, Pageable pageable) {
+        return
+            <% if (!reactive) { %>new PageImpl<>(<% } %>
+                search(queryString, pageableStatement(pageable, "b"))
+            <% if (!reactive) { %>)<% } %>;
+    }
+
+    @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED)
+    @Query(SELECT + JOIN + WHERE + " AND " + SEARCH_CONDITION + " #{[1]}")
+    <%= listOrFlux %><<%= persistClass %>> search(String queryString, String pageableStatement);
 <%_ } _%>
 
 }

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

@@ -0,0 +1,77 @@
+<%#
+ Copyright 2013-2022 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 mapper = entityInstance  + 'Mapper';
+const dtoToEntity = mapper + '.' + 'toEntity';
+const entityToDto = mapper + '.' + 'toDto';
+const entityToDtoReference = mapper + '::' + 'toDto';
+const returnPrefix = (returnDirectly && !searchEngineElasticsearch) ? 'return' : instanceType + ' result =';
+let resultEntity;
+let mapsIdEntityInstance;
+let mapsIdRepoInstance;
+let otherEntityName;
+
+if (isUsingMapsId) {
+    mapsIdEntityInstance = mapsIdAssoc.otherEntityNameCapitalized.charAt(0).toLowerCase() + mapsIdAssoc.otherEntityNameCapitalized.slice(1);
+    mapsIdRepoInstance = `${mapsIdEntityInstance}Repository`;
+    otherEntityName = mapsIdAssoc.otherEntityName;
+} _%>
+<%_ if (!viaService) { _%>
+  <%_ if (dtoMapstruct) { _%>
+    <%_ resultEntity = persistInstance; _%>
+        <%= persistClass %> <%= persistInstance %> = <%= dtoToEntity %>(<%= instanceName %>);
+    <%_ if (isPersisted) { _%>
+        <%= persistInstance %>.setIsPersisted();
+    <%_ } _%>
+    <%_ if (isUsingMapsId) { _%>
+        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
+        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= persistInstance %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= mapsIdAssoc.relationshipName %><%_ } _%>);
+    <%_ } _%>
+    <%_ if (updatableEntity) { _%>
+        <%= persistInstance %> = <%= entityInstance %>Repository.save(<%= persistInstance %>);
+    <%_ } else { _%>
+        // no save call needed as we have no fields that can be updated
+    <%_ } _%>
+        <%= returnPrefix %> <%= entityToDto %>(<%= persistInstance %>);
+  <%_ } else {
+      resultEntity = 'result'; _%>
+    <%_ if (isUsingMapsId) { _%>
+        <%= mapsIdAssoc.otherEntity.primaryKey.type %> <%= otherEntityName %>Id = <%= instanceName %>.get<%= mapsIdAssoc.relationshipNameCapitalized %>().get<%= primaryKey.nameCapitalized %>();
+        <%= mapsIdRepoInstance %>.findById(<%= otherEntityName %>Id).ifPresent(<%= instanceName %>::<%_ if (!fluentMethods) { _%>set<%= mapsIdAssoc.relationshipNameCapitalized %> <%_ } else { _%><%= otherEntityName %><%_ } _%>);
+    <%_ } _%>
+    <%_ if (isPersisted) { _%>
+        <%= persistInstance %>.setIsPersisted();
+    <%_ } _%>
+    <%_ if (updatableEntity) { _%>
+        <%= returnPrefix %> <%= entityInstance %>Repository.save(<%= persistInstance %>);
+    <%_ } else { _%>
+        // no save call needed as we have no fields that can be updated
+        <%= returnPrefix %> <%= persistInstance %>;
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (searchEngineElasticsearch) { _%>
+        <%= entityInstance %>SearchRepository.save(<%= resultEntity %>);
+    <%_ if (returnDirectly) { _%>
+        return result;
+    <%_ } _%>
+  <%_ } _%>
+<%_ } else { _%>
+        <%= returnPrefix %> <%= entityInstance %>Service.update(<%= instanceName %>);
+<%_ } _%>

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

@@ -25,7 +25,7 @@ _%>
 <%_ if (viaService) { _%>
         return <%= entityInstance %>Service.save(<%= instanceName %>)
 <%_ } else { _%>
-        return <%= entityInstance %>Repository.save(<%if (dtoMapstruct) { %><%= dtoToEntity %>(<% } %><%= instanceName %>)<%if (dtoMapstruct) { %>)<% } -%>
+        return <%= entityInstance %>Repository.save(<%if (dtoMapstruct) { %><%= dtoToEntity %>(<% } %><%= instanceName %><%if (dtoMapstruct) { %>)<% } -%>)
     <%_ if (searchEngineElasticsearch) { %>
             .flatMap(<%= entityInstance %>SearchRepository::save)
     <%_ } -%>

package/generators/entity-server/templates/reactive/partials/update_template.ejs

@@ -0,0 +1,41 @@
+<%#
+ Copyright 2013-2022 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 mapper = entityInstance  + 'Mapper';
+const dtoToEntity = mapper + '.' + 'toEntity';
+const entityToDtoReference = mapper + '::' + 'toDto';
+_%>
+<%_ if (viaService) { _%>
+        return <%= entityInstance %>Service.update(<%= instanceName %>)
+<%_ } else { _%>
+    <%_ if (updatableEntity) { _%>
+        return <%= entityInstance %>Repository.save(<%if (dtoMapstruct) { %><%= dtoToEntity %>(<% } %><%= instanceName %><%if (dtoMapstruct) { %>)<% } -%><% if (isPersisted) { %>.setIsPersisted()<% } %>)
+    <%_ } else { _%>
+        // no save call needed as we have no fields that can be updated
+        return <%= entityInstance %>Repository.findById(<%= instanceName %>.get<%= primaryKey.nameCapitalized %>())
+    <%_ } _%>
+    <%_ if (searchEngineElasticsearch) { %>
+            .flatMap(<%= entityInstance %>SearchRepository::save)
+    <%_ } -%>
+    <%_ if (dtoMapstruct) { %>
+            .map(<%= entityToDtoReference  %>)
+    <%_ } -%>
+    <%_ if (returnDirectly) { _%>;<%_ } _%>
+<%_ } _%>