generator-jhipster 7.2.0 → 7.4.1

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

@@ -51,6 +51,8 @@ import { DATE_TIME_LONG_FORMAT } from '@/shared/date/filters';
   <%_ } _%>
 <%_ } _%>
 
+import AlertService from '@/shared/alert/alert.service';
+
 <%_ const importEntitiesSeen = [entityAngularName];
   let hasManyToMany = false;
   for (relationship of relationships) { _%>
@@ -76,6 +78,10 @@ import { I<%= otherEntityAngularName %> } from '@/shared/model/<%= otherEntityMo
 <%_ importEntitiesSeen.push(otherEntityAngularName); } } _%>
 import { I<%= entityAngularName %>, <%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 import <%= entityAngularName %>Service from './<%= entityFileName %>.service';
+<%_ const enumImports = generateEntityClientEnumImports(fields); _%>
+<%_ enumImports.forEach( (importedPath, importedType) => { _%>
+import { <%- importedType %> } from '<%- importedPath %>';
+<%_ }); _%>
 
 const validations: any = {
   <%= entityInstance %>: {
@@ -111,7 +117,7 @@ _%>
 <%_ } _%>
 <%_ for (relationship of relationships) { _%>
   <%_ if (relationship.relationshipValidate && relationship.relationshipRequired) { _%>
-    <%= relationship.relationshipFieldName %>: {
+    <%= relationship.collection ? relationship.relationshipFieldNamePlural : relationship.relationshipFieldName %>: {
       required
     },
   <%_ } _%>
@@ -124,6 +130,8 @@ _%>
 })
 export default class <%= entityAngularName %>Update extends <% if (fieldsContainBlob) { %>mixins(JhiDataUtils)<% } else { %>Vue<% } %> {
   @Inject('<%= entityInstance %>Service') private <%= entityInstance %>Service: () => <%= entityAngularName %>Service;
+  @Inject('alertService') private alertService: () => AlertService;
+
   public <%= entityInstance %>: I<%= entityAngularName %> = new <%= entityAngularName %>();
   <%_
     const entitiesSeen = [entityAngularName];
@@ -144,6 +152,9 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
   public <%= otherEntityNamePlural %> : <% if (otherEntityAngularName === 'User') { %>Array<any><%_ } else { _%>I<%= otherEntityAngularName %>[]<%_ } _%> = [];
   <%_ } _%>
   <%_ entitiesSeen.push(otherEntityAngularName);entitiesSeen.push(otherEntityNamePlural); } } _%>
+  <%_ enumImports.forEach( (importedPath, importedType) => { _%>
+  public <%- _.lowerFirst(importedType) %>Values : string[] = Object.keys(<%- importedType %>);
+  <%_ }); _%>
   public isSaving = false;
   public currentLanguage = '';
 
@@ -199,7 +210,10 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
           variant: 'info',
           solid: true,
           autoHideDelay: 5000,
-        });
+        })
+      }).catch(error => {
+          this.isSaving = false;
+          this.alertService().showHttpError(this,error.response);
       });
     } else {
       this.<%= entityInstance %>Service().create(this.<%= entityInstance %>).then((param) => {
@@ -217,7 +231,10 @@ export default class <%= entityAngularName %>Update extends <% if (fieldsContain
           solid: true,
           autoHideDelay: 5000,
         });
-      });
+      }).catch(error => {
+          this.isSaving = false;
+          this.alertService().showHttpError(this,error.response);
+      });;
     }
   }
 
@@ -264,6 +281,8 @@ _%>
       res.<%= fieldName %> = new Date(res.<%= fieldName %>);
 <%_ } } _%>
       this.<%= entityInstance %> = res;
+    }).catch(error => {
+      this.alertService().showHttpError(this,error.response);
     });
   }
 
@@ -311,11 +330,7 @@ _%>
   <%_ if (hasManyToMany) { _%>
   public getSelected(selectedVals, option) : any {
     if (selectedVals) {
-      for (let i = 0; i < selectedVals.length; i++) {
-        if (option.id === selectedVals[i].id) {
-          return selectedVals[i];
-        }
-      }
+      return selectedVals.find(value => option.id === value.id) ?? option;
     }
     return option;
   }

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

@@ -34,12 +34,9 @@ _%>
                         <label class="form-control-label" v-text="$t('<%= translationKey %>')" for="<%= entityFileName %>-<%= fieldName %>"><%= fieldNameHumanized %></label>
   <%_ if (field.fieldIsEnum) { _%>
                         <select class="form-control" name="<%= fieldName %>" :class="{'valid': !$v.<%= entityInstance %>.<%= fieldName %>.$invalid, 'invalid': $v.<%= entityInstance %>.<%= fieldName %>.$invalid }" v-model="$v.<%= entityInstance %>.<%= fieldName %>.$model" id="<%= entityFileName %>-<%= fieldName %>" data-cy="<%= fieldName %>" <% if (field.fieldValidate === true && field.fieldValidateRules.includes('required')) { %> required<% } %>>
-    <%_ const enumPrefix = frontendAppName + '.'+ fieldType;
-      const values = field.enumValues;
-      for (key in values) {
-        const enumValue = values[key]; _%>
-                            <option value="<%= enumValue.name %>" v-bind:label="$t('<%=enumPrefix%>.<%= enumValue.name %>')"><%= enumValue.value %></option>
-    <%_ } _%>
+    <%_ const enumPrefix = frontendAppName + '.'+ fieldType; _%>
+                            <option v-for="<%= _.lowerFirst(fieldType) %> in <%= _.lowerFirst(fieldType)%>Values" :key="<%= _.lowerFirst(fieldType) %>" v-bind:value="<%= _.lowerFirst(fieldType) %>" v-bind:label="$t('<%= enumPrefix %>.'+<%= _.lowerFirst(fieldType) %>)">{{ <%= _.lowerFirst(fieldType) %> }}</option>
+    
                         </select>
   <%_ } else { _%>
     <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
@@ -195,15 +192,15 @@ _%>
   <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
                     <div class="form-group">
                         <label v-text="$t('<%= translationKey %>')" for="<%= entityFileName %>-<%= relationshipName %>"><%= relationshipNameHumanized %></label>
-                        <select class="form-control" id="<%= entityFileName %>-<%= relationshipName %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipName %>" v-if="<%=entityInstance %>.<%=relationshipFieldNamePlural %> !== undefined" v-model="<%=entityInstance %>.<%=relationshipFieldNamePlural %>"<% if (relationshipRequired) { %> required<% } %>>
+                        <select class="form-control" id="<%= entityFileName %>-<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= relationshipName %>" v-if="<%=entityInstance %>.<%=relationshipFieldNamePlural %> !== undefined" v-model="<%=entityInstance %>.<%=relationshipFieldNamePlural %>"<% if (relationshipRequired) { %> required<% } %>>
                             <option v-bind:value="getSelected(<%=entityInstance %>.<%=relationshipFieldNamePlural %>, <%=otherEntityName %>Option)" v-for="<%=otherEntityName %>Option in <%=otherEntityNamePlural %>" :key="<%=otherEntityName %>Option.id">{{<%=otherEntityName %>Option.<%=otherEntityField %>}}</option>
                         </select>
                     </div>
   <%_ } _%>
   <%_ if (relationship.relationshipValidate) { _%>
-                    <div v-if="$v.<%= entityInstance %>.<%= relationshipName %>.$anyDirty && $v.<%= entityInstance %>.<%= relationshipName %>.$invalid">
+                    <div v-if="$v.<%= entityInstance %>.<%= relationship.collection ? relationshipFieldNamePlural : relationshipFieldName %>.$anyDirty && $v.<%= entityInstance %>.<%= relationship.collection ? relationshipFieldNamePlural : relationshipFieldName %>.$invalid">
     <%_ if (relationshipRequired) { _%>
-                        <small class="form-text text-danger" v-if="!$v.<%= entityInstance %>.<%= relationshipName %>.required" v-text="$t('entity.validation.required')">
+                        <small class="form-text text-danger" v-if="!$v.<%= entityInstance %>.<%= relationship.collection ? relationshipFieldNamePlural : relationshipFieldName %>.required" v-text="$t('entity.validation.required')">
                             This field is required.
                         </small>
     <%_ } _%>

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

@@ -1,5 +1,6 @@
+<%_ if (fieldsContainBlob || paginationInfiniteScroll) { -%>
 import { mixins } from 'vue-class-component';
-
+<%_ } -%>
 import { Component, Vue, Inject } from 'vue-property-decorator';
 import Vue2Filters from 'vue2-filters';
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
@@ -7,12 +8,15 @@ import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileNam
 import JhiDataUtils from '@/shared/data/data-utils.service';
 <% } %>
 import <%= entityAngularName %>Service from './<%= entityFileName %>.service';
+import AlertService from '@/shared/alert/alert.service';
 
 @Component({
   mixins: [Vue2Filters.mixin]
 })
 export default class <%= entityAngularName %> extends <% if (fieldsContainBlob || paginationInfiniteScroll) { %>mixins(JhiDataUtils)<% } else { %>Vue<% } %> {
   @Inject('<%= entityInstance %>Service') private <%= entityInstance %>Service: () => <%= entityAngularName %>Service;
+  @Inject('alertService') private alertService: () => AlertService;
+
 <%_ if (searchEngine) { _%>
   public currentSearch = '';
 <%_ } _%>
@@ -114,6 +118,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
   <%_ } _%>
       }, err => {
         this.isFetching = false;
+        this.alertService().showHttpError(this,err.response);
       });
       return;
     }
@@ -146,6 +151,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
 <%_ } _%>
     }, err => {
       this.isFetching = false;
+      this.alertService().showHttpError(this,err.response);
     });
   }
 
@@ -182,6 +188,8 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
       this.retrieveAll<%= entityAngularName %>s();
   <%_ } _%>
       this.closeDialog();
+    }).catch(error => {
+      this.alertService().showHttpError(this,error.response);
     });
   }
 

package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs

@@ -32,7 +32,7 @@ import { <%- importedType %> } from '<%- importedPath %>';
 <%_ }); _%>
 
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
-import { <%- importedType %> } from '<%- importedPath.replace('app/', '@/'); %>';
+import { <%- importedType %> } from '<%- importedPath %>';
 <%_ }); _%>
 export interface I<%= entityAngularName %> {
     <%_ variablesWithTypes.forEach(variablesWithType => { _%>

package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs

@@ -4,13 +4,9 @@ import buildPaginationQueryOpts from '@/shared/sort/sorts';
 <% } %>
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 
-<%_
-const baseApi = (applicationTypeGateway && locals.microserviceName) ? 'services/' + microserviceName.toLowerCase() + '/api/' : 'api/';
-_%>
-
-const baseApiUrl = '<%= baseApi + entityApiUrl %>';
+const baseApiUrl = '<%= entityApi %>api/<%= entityApiUrl %>';
 <%_ if (searchEngine) { _%>
-const baseSearchApiUrl = '<%= baseApi %>_search/<%= entityApiUrl %>?query=';
+const baseSearchApiUrl = '<%= entityApi %>api/_search/<%= entityApiUrl %>?query=';
 <%_ } _%>
 
 export default class <%= entityAngularName %>Service {

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs

@@ -29,6 +29,7 @@ import <%= entityAngularName %>DetailComponent from '@/entities/<%= entityFolder
 import <%= entityAngularName %>Class from '@/entities/<%= entityFolderName %>/<%= entityFileName %>-details.component';
 import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service';
 import router from '@/router';
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 localVue.use(VueRouter);
@@ -51,7 +52,7 @@ describe('Component Tests', () => {
     beforeEach(() => {
       <%= entityInstance %>ServiceStub = sinon.createStubInstance<<%= entityAngularName %>Service>(<%= entityAngularName %>Service);
 
-      wrapper = shallowMount<<%= entityAngularName %>Class>(<%= entityAngularName %>DetailComponent, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, router, provide: { <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub } });
+      wrapper = shallowMount<<%= entityAngularName %>Class>(<%= entityAngularName %>DetailComponent, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, router, provide: { <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub, alertService: () => new AlertService(), } });
       comp = wrapper.vm;
     });
 

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs

@@ -21,6 +21,7 @@
 import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import sinon, { SinonStubbedInstance } from 'sinon';
 import Router from 'vue-router';
+import { ToastPlugin } from 'bootstrap-vue';
 
 <%_ let dayJsIncluded = false;
   for (field of fields.filter(field => !field.id)) { _%>
@@ -55,6 +56,7 @@ import <%= otherEntityAngularName %>Service from '@/entities/<%= otherEntityClie
     <%_ importEntitiesSeen.push(otherEntityAngularName); _%>
   <%_ } _%>
 <%_ } _%>
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 
@@ -65,6 +67,7 @@ const i18n = config.initI18N(localVue);
 const store = config.initVueXStore(localVue);
 const router = new Router();
 localVue.use(Router);
+localVue.use(ToastPlugin);
 localVue.component('font-awesome-icon', {});
 localVue.component('b-input-group', {});
 localVue.component('b-input-group-prepend', {});
@@ -90,6 +93,7 @@ describe('Component Tests', () => {
         router,
         provide: {
           <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub,
+          alertService: () => new AlertService(),
 <%_
   const entitiesSeen = [entityAngularName];
   for (relationship of relationships) { _%>
@@ -100,7 +104,10 @@ describe('Component Tests', () => {
       <%_ if (relationship.otherEntityUser && authenticationTypeOauth2) { _%>
           userOAuth2Service: () => new UserOAuth2Service(),
       <%_ } else { _%>
-          <%= otherEntityName %>Service: () => new <%= otherEntityAngularName %>Service(),
+          <%= otherEntityName %>Service: () =>
+            sinon.createStubInstance<<%= otherEntityAngularName %>Service>(<%= otherEntityAngularName %>Service, {
+              retrieve: sinon.stub().resolves({}),
+            } as any),
       <%_ } _%>
     <%_ } _%>
     <%_ entitiesSeen.push(otherEntityAngularName); _%>

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs

@@ -22,13 +22,16 @@ _%>
 /* tslint:disable max-line-length */
 import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import sinon, { SinonStubbedInstance } from 'sinon';
+import { ToastPlugin } from 'bootstrap-vue';
 
 import * as config from '@/shared/config/config';
 import <%= entityAngularName %>Component from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.vue';
 import <%= entityAngularName %>Class from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.component';
 import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service';
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
+localVue.use(ToastPlugin);
 
 config.initVueApp(localVue);
 <%_ if (enableTranslation) { _%>
@@ -70,7 +73,8 @@ describe('Component Tests', () => {
         localVue,
         stubs: {<%_ if (!paginationNo) { _%>jhiItemCount:true, bPagination:true,<%_ } _%> bModal: bModalStub as any},
         provide: {
-          <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub
+          <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub,
+          alertService: () => new AlertService(),
         }
       });
       comp = wrapper.vm;
@@ -183,12 +187,14 @@ describe('Component Tests', () => {
 
       // WHEN
       comp.prepareRemove({id: <%- tsKeyId %>});
+      expect(<%= entityInstance %>ServiceStub.retrieve.callCount).toEqual(1);
+
       comp.remove<%= entityAngularName %>();
       await comp.$nextTick();
 
       // THEN
       expect(<%= entityInstance %>ServiceStub.delete.called).toBeTruthy();
-      expect(<%= entityInstance %>ServiceStub.retrieve.callCount).toEqual(1);
+      expect(<%= entityInstance %>ServiceStub.retrieve.callCount).toEqual(2);
     });
 <%_ } _%>
   });

package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs

@@ -33,7 +33,7 @@ import { <%_ if (fieldsContainLocalDate) { _%>DATE_FORMAT,<%_ } if (fieldsContai
 import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service';
 import { <%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
-import { <%- importedType %> } from '<%- importedPath.replace('app/', '@/') %>';
+import { <%- importedType %> } from '<%- importedPath %>';
 <%_ }); _%>
 
 const error = {

package/generators/entity-i18n/index.js

@@ -23,7 +23,6 @@ const { GENERATOR_ENTITY_I_18_N } = require('../generator-list');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
 /* constants used throughout */
-let useBlueprints;
 
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -31,8 +30,12 @@ module.exports = class extends BaseBlueprintGenerator {
 
     this.entity = this.options.context;
     this.jhipsterContext = this.options.jhipsterContext || this.options.context;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_ENTITY_I_18_N, { context: this.options.context });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_ENTITY_I_18_N, { context: this.options.context });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -47,7 +50,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -57,7 +60,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 };

package/generators/entity-server/files-couchbase.js

@@ -37,7 +37,7 @@ const entityCouchbaseFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.spring_data_couchbase',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.spring_data_couchbase`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_couchbase`,
         },
       ],
     },
@@ -47,7 +47,7 @@ const entityCouchbaseFiles = {
       templates: [
         {
           file: 'package/repository/EntityRepository.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}Repository.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}Repository.java`,
         },
       ],
     },

package/generators/entity-server/files.js

@@ -60,11 +60,11 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi`,
         },
         {
           file: 'package/domain/Entity.java.jhi.javax_validation',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.javax_validation`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.javax_validation`,
         },
       ],
     },
@@ -74,7 +74,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.spring_data_reactive',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.spring_data_reactive`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_reactive`,
         },
       ],
     },
@@ -84,7 +84,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.spring_data_cassandra',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.spring_data_cassandra`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_cassandra`,
         },
       ],
     },
@@ -94,7 +94,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.spring_data_neo4j',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.spring_data_neo4j`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_neo4j`,
         },
       ],
     },
@@ -104,7 +104,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.javax_persistence',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.javax_persistence`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.javax_persistence`,
         },
       ],
     },
@@ -114,7 +114,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.spring_data_mongodb',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.spring_data_mongodb`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.spring_data_mongodb`,
         },
       ],
     },
@@ -124,7 +124,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.hibernate_cache',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.hibernate_cache`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.hibernate_cache`,
         },
       ],
     },
@@ -134,7 +134,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/Entity.java.jhi.elastic_search',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.java.jhi.elastic_search`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.elastic_search`,
         },
       ],
     },
@@ -144,7 +144,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/web/rest/EntityResource.java',
-          renameTo: generator => `${generator.packageFolder}/web/rest/${generator.entityClass}Resource.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}Resource.java`,
         },
       ],
     },
@@ -154,11 +154,11 @@ const serverFiles = {
       templates: [
         {
           file: 'package/service/criteria/EntityCriteria.java',
-          renameTo: generator => `${generator.packageFolder}/service/criteria/${generator.entityClass}Criteria.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/criteria/${generator.entityClass}Criteria.java`,
         },
         {
           file: 'package/service/EntityQueryService.java',
-          renameTo: generator => `${generator.packageFolder}/service/${generator.entityClass}QueryService.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/${generator.entityClass}QueryService.java`,
         },
       ],
     },
@@ -168,7 +168,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/repository/search/EntitySearchRepository.java',
-          renameTo: generator => `${generator.packageFolder}/repository/search/${generator.entityClass}SearchRepository.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/${generator.entityClass}SearchRepository.java`,
         },
       ],
     },
@@ -178,7 +178,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/repository/EntityRepository.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}Repository.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}Repository.java`,
         },
       ],
     },
@@ -188,7 +188,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/repository/EntityRepository_reactive.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}Repository.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}Repository.java`,
         },
       ],
     },
@@ -198,11 +198,15 @@ const serverFiles = {
       templates: [
         {
           file: 'package/repository/EntityRepositoryInternalImpl_reactive.java',
-          renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryInternalImpl.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}RepositoryInternalImpl.java`,
+        },
+        {
+          file: 'package/repository/EntitySqlHelper_reactive.java',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}SqlHelper.java`,
         },
         {
           file: 'package/repository/rowmapper/EntityRowMapper.java',
-          renameTo: generator => `${generator.packageFolder}/repository/rowmapper/${generator.entityClass}RowMapper.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/repository/rowmapper/${generator.entityClass}RowMapper.java`,
         },
       ],
     },
@@ -212,11 +216,11 @@ const serverFiles = {
       templates: [
         {
           file: 'package/service/EntityService.java',
-          renameTo: generator => `${generator.packageFolder}/service/${generator.entityClass}Service.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/${generator.entityClass}Service.java`,
         },
         {
           file: 'package/service/impl/EntityServiceImpl.java',
-          renameTo: generator => `${generator.packageFolder}/service/impl/${generator.entityClass}ServiceImpl.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/impl/${generator.entityClass}ServiceImpl.java`,
         },
       ],
     },
@@ -226,7 +230,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/service/impl/EntityServiceImpl.java',
-          renameTo: generator => `${generator.packageFolder}/service/${generator.entityClass}Service.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/${generator.entityClass}Service.java`,
         },
       ],
     },
@@ -236,15 +240,15 @@ const serverFiles = {
       templates: [
         {
           file: 'package/service/dto/EntityDTO.java',
-          renameTo: generator => `${generator.packageFolder}/service/dto/${generator.asDto(generator.entityClass)}.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}.java`,
         },
         {
           file: 'package/service/mapper/BaseEntityMapper.java',
-          renameTo: generator => `${generator.packageFolder}/service/mapper/EntityMapper.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/EntityMapper.java`,
         },
         {
           file: 'package/service/mapper/EntityMapper.java',
-          renameTo: generator => `${generator.packageFolder}/service/mapper/${generator.entityClass}Mapper.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}Mapper.java`,
         },
       ],
     },
@@ -264,7 +268,7 @@ const serverFiles = {
               SERVER_TEST_SRC_DIR,
             },
           },
-          renameTo: generator => `${generator.packageFolder}/web/rest/${generator.entityClass}ResourceIT.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}ResourceIT.java`,
         },
       ],
     },
@@ -275,7 +279,7 @@ const serverFiles = {
         {
           file: 'package/repository/search/EntitySearchRepositoryMockConfiguration.java',
           renameTo: generator =>
-            `${generator.packageFolder}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.java`,
+            `${generator.entityAbsoluteFolder}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.java`,
         },
       ],
     },
@@ -295,7 +299,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/domain/EntityTest.java',
-          renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}Test.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Test.java`,
         },
       ],
     },
@@ -305,7 +309,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/service/dto/EntityDTOTest.java',
-          renameTo: generator => `${generator.packageFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.java`,
         },
       ],
     },
@@ -315,7 +319,7 @@ const serverFiles = {
       templates: [
         {
           file: 'package/service/mapper/EntityMapperTest.java',
-          renameTo: generator => `${generator.packageFolder}/service/mapper/${generator.entityClass}MapperTest.java`,
+          renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}MapperTest.java`,
         },
       ],
     },
@@ -350,6 +354,7 @@ function writeFiles() {
           ...utils.getEnumInfo(field, this.clientRootFolder),
           frontendAppName: this.frontendAppName,
           packageName: this.packageName,
+          entityAbsolutePackage: this.entityAbsolutePackage || this.packageName,
         };
         // eslint-disable-next-line no-console
         if (!this.skipServer) {
@@ -358,7 +363,7 @@ function writeFiles() {
           )}/${SERVER_MAIN_SRC_DIR}package/domain/enumeration/Enum.java.ejs`;
           this.template(
             pathToTemplateFile,
-            `${SERVER_MAIN_SRC_DIR}${this.packageFolder}/domain/enumeration/${fieldType}.java`,
+            `${SERVER_MAIN_SRC_DIR}${this.entityAbsoluteFolder}/domain/enumeration/${fieldType}.java`,
             this,
             {},
             enumInfo
@@ -373,7 +378,7 @@ function writeFiles() {
 function customizeFiles() {
   if (this.databaseType === SQL) {
     if ([EHCACHE, CAFFEINE, INFINISPAN, REDIS].includes(this.cacheProvider) && this.enableHibernateCache) {
-      this.addEntityToCache(this.asEntity(this.entityClass), this.relationships, this.packageName, this.packageFolder, this.cacheProvider);
+      this.addEntityToCache(this.entityAbsoluteClass, this.relationships, this.packageName, this.packageFolder, this.cacheProvider);
     }
   }
 }