generator-jhipster 7.2.0 → 7.3.0

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import { Translate } from 'react-jhipster';
@@ -26,10 +26,12 @@ import { useAppDispatch, useAppSelector } from 'app/config/store';
 import { getEntity, deleteEntity } from './<%= entityFileName %>.reducer';
 
 export const <%= entityReactName %>DeleteDialog = (props: RouteComponentProps<{ id: string }>) => {
+  const [loadModal, setLoadModal] = useState(false);
   const dispatch = useAppDispatch();
 
   useEffect(() => {
     dispatch(getEntity(props.match.params.id));
+    setLoadModal(true);
   }, []);
 
   const <%= entityInstance %>Entity = useAppSelector(state => state.<%= entityInstance %>.entity);
@@ -40,8 +42,9 @@ export const <%= entityReactName %>DeleteDialog = (props: RouteComponentProps<{
   };
 
   useEffect(() => {
-    if (updateSuccess) {
+    if (updateSuccess && loadModal) {
       handleClose();
+      setLoadModal(false);
     }
   }, [updateSuccess]);
 

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

@@ -5,10 +5,13 @@ import JhiDataUtils from '@/shared/data/data-utils.service';
 <% } %>
 import { I<%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model';
 import <%= entityAngularName %>Service from './<%= entityFileName %>.service';
+import AlertService from '@/shared/alert/alert.service';
 
 @Component
 export default class <%= entityAngularName %>Details extends <% if (fieldsContainBlob) { %>mixins(JhiDataUtils)<% } else { %>Vue<% } %> {
   @Inject('<%= entityInstance %>Service') private <%= entityInstance %>Service: () => <%= entityAngularName %>Service;
+  @Inject('alertService') private alertService: () => AlertService;
+
   public <%= entityInstance %>: I<%= entityAngularName %> = {};
 
   beforeRouteEnter(to, from, next) {
@@ -22,6 +25,8 @@ export default class <%= entityAngularName %>Details extends <% if (fieldsContai
   public retrieve<%= entityAngularName %>(<%= entityInstance %>Id) {
     this.<%= entityInstance %>Service().find(<%= entityInstance %>Id).then((res) => {
       this.<%= entityInstance %> = res;
+    }).catch(error => {
+      this.alertService().showHttpError(this,error.response);
     });
   }
 

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) { _%>
@@ -124,6 +126,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];
@@ -199,7 +203,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 +224,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 +274,8 @@ _%>
       res.<%= fieldName %> = new Date(res.<%= fieldName %>);
 <%_ } } _%>
       this.<%= entityInstance %> = res;
+    }).catch(error => {
+      this.alertService().showHttpError(this,error.response);
     });
   }
 

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

@@ -7,12 +7,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 +117,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
   <%_ } _%>
       }, err => {
         this.isFetching = false;
+        this.alertService().showHttpError(this,err.response);
       });
       return;
     }
@@ -146,6 +150,7 @@ export default class <%= entityAngularName %> extends <% if (fieldsContainBlob |
 <%_ } _%>
     }, err => {
       this.isFetching = false;
+      this.alertService().showHttpError(this,err.response);
     });
   }
 
@@ -182,6 +187,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/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

@@ -55,6 +55,7 @@ import <%= otherEntityAngularName %>Service from '@/entities/<%= otherEntityClie
     <%_ importEntitiesSeen.push(otherEntityAngularName); _%>
   <%_ } _%>
 <%_ } _%>
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 
@@ -90,6 +91,7 @@ describe('Component Tests', () => {
         router,
         provide: {
           <%= entityInstance %>Service: () => <%= entityInstance %>ServiceStub,
+          alertService: () => new AlertService(),
 <%_
   const entitiesSeen = [entityAngularName];
   for (relationship of relationships) { _%>

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

@@ -27,6 +27,7 @@ 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();
 
@@ -70,7 +71,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;

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,11 @@ 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/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 +212,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 +226,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 +236,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 +264,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 +275,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 +295,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 +305,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 +315,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 +350,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 +359,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 +374,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);
     }
   }
 }

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

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 <%_ if (relationships.length !== 0 || searchEngineCouchbase) { _%>
 import org.springframework.data.couchbase.repository.Query;

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

@@ -22,7 +22,7 @@
             "store_dynamic": false,
             "type_field": "_type",
             "types": {
-                "<%= packageName %>.domain.<%= entityClass %>": {
+                "<%= entityAbsolutePackage %>.domain.<%= entityClass %>": {
                     "dynamic": true,
                     "enabled": true
                 }

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

@@ -43,7 +43,7 @@
 <%_ } _%>
   });
 -&>
-package <%= packageName %>.domain;
+package <%= entityAbsolutePackage %>.domain;
 
 <&- fragments.staticImportSection() -&>
 <&- fragments.importSection() -&>
@@ -77,7 +77,7 @@ import java.util.UUID;
 <%_ }
 Object.keys(uniqueEnums).forEach(function(element) { _%>
 
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
 
 <%_ if (typeof javadoc === 'undefined') { _%>

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.domain.enumeration;
+package <%= entityAbsolutePackage %>.domain.enumeration;
 
 <%_ if (typeof javadoc === 'undefined') { _%>
 /**

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

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 <%_ if (relationshipsContainEagerLoad) { _%>
 import org.springframework.data.domain.Page;

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
 import java.util.function.BiFunction;
 <%_ if (fieldsContainBigDecimal) { _%>
@@ -56,23 +56,23 @@ import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.r2dbc.core.RowsFetchSpec;
 <%_ } _%>
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <% relationships.forEach(function(rel) {
   if (rel.relationshipManyToMany && rel.ownerSide) { _%>
-import <%= packageName %>.domain.<%= asEntity(rel.otherEntityNameCapitalized) %>;
+import <%= entityAbsolutePackage %>.domain.<%= asEntity(rel.otherEntityNameCapitalized) %>;
   <%_ } _%>
 <%_ }); _%>
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
 
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
 
 <%_ reactiveUniqueEntityTypes.forEach(function(element) { _%>
-import <%= packageName %>.repository.rowmapper.<%= element %>RowMapper;
+import <%= entityAbsolutePackage %>.repository.rowmapper.<%= element %>RowMapper;
 <%_ }); _%>
-import <%= packageName %>.service.EntityManager;
+import <%= entityAbsolutePackage %>.service.EntityManager;
 <%_ if (fieldsContainOwnerManyToMany) { _%>
-import <%= packageName %>.service.EntityManager.LinkTable;
+import <%= entityAbsolutePackage %>.service.EntityManager.LinkTable;
 <%_ } _%>
 
 import reactor.core.publisher.Flux;

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

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository;
+package <%= entityAbsolutePackage %>.repository;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ if (databaseTypeCassandra) { _%>
 import org.springframework.data.cassandra.repository.ReactiveCassandraRepository;
 <%_ } _%>

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.rowmapper;
+package <%= entityAbsolutePackage %>.repository.rowmapper;
 
 <%_ if (fieldsContainBigDecimal) { _%>
 import java.math.BigDecimal;
@@ -35,11 +35,11 @@ import java.util.function.BiFunction;
 
 import org.springframework.stereotype.Service;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 <%_ Object.keys(uniqueEnums).forEach(function(element) { _%>
-import <%= packageName %>.domain.enumeration.<%= element %>;
+import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>;
 <%_ }); _%>
-import <%= packageName %>.service.ColumnConverter;
+import <%= entityAbsolutePackage %>.service.ColumnConverter;
 
 import io.r2dbc.spi.Row;
 

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

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%= packageName %>.repository.search;
+package <%= entityAbsolutePackage %>.repository.search;
 
-import <%= packageName %>.domain.<%= persistClass %>;
+import <%= entityAbsolutePackage %>.domain.<%= persistClass %>;
 
 <%_ if (!paginationNo) { _%>
   <%_ if (!reactive) { _%>