From 8fa008b3dfc220d6e09799109cc577d23667b622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rone=CC=81lio=20Oliveira?= Date: Wed, 6 Oct 2021 22:19:40 -0300 Subject: [PATCH 1/3] Change hardcoded to "primaryKey.type" Update methods to use "primaryKey.type" instead of "Long" hardcoded. --- .../EntityRepositoryInternalImpl_reactive.java.ejs | 4 ++-- .../package/repository/EntityRepository_reactive.java.ejs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs index 06733f4ad45..8165b4f74db 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs @@ -149,13 +149,13 @@ _%> @Override public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) { - return createQuery(null, where("id").is(id)).one(); + return createQuery(null, where("<%= primaryKey.nameCapitalized %>").is(id)).one(); } <%_ if (fieldsContainOwnerManyToMany) { _%> @Override - public Mono<<%= persistClass %>> findOneWithEagerRelationships(Long id) { + public Mono<<%= persistClass %>> findOneWithEagerRelationships(<%= primaryKey.type %> id) { return findById(id); } diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs index c312752d453..8ad3547fab0 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs @@ -104,7 +104,7 @@ if (databaseTypeSql) { Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page); @Override - Mono deleteById(Long id); + Mono deleteById(<%= primaryKey.type %> id); <%_ } _%> @@ -138,7 +138,7 @@ if (databaseTypeSql) { Flux<<%= persistClass %>> findAll(); @Override - Mono<<%= persistClass %>> findById(Long id); + Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id); @Override > Mono save(S entity); @@ -165,7 +165,7 @@ interface <%= entityClass %>RepositoryInternal { Flux<<%= persistClass %>> findAllWithEagerRelationships(Pageable page); - Mono deleteById(Long id); + Mono deleteById(<%= primaryKey.type %> id); <%_ } _%> } From 4325bcca1bbbfff228241a7679e5501b7a50e070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rone=CC=81lio=20Oliveira?= Date: Wed, 6 Oct 2021 23:01:35 -0300 Subject: [PATCH 2/3] Remove hardcoded "id" when using pagination --- .../app/entities/route/entity-management-routing.module.ts.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs index da868de4f06..af7f7ad8d42 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs @@ -33,7 +33,7 @@ const <%= entityInstance %>Route: Routes = [ component: <%= entityAngularName %>Component, <%_ if (paginationPagination) { _%> data: { - defaultSort: 'id,asc', + defaultSort: '<%- primaryKey.name %>,asc', }, <%_ } _%> canActivate: [UserRouteAccessService] From 6fbf11838eeb38e5f2b55e6df74ebe133ceadadd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 8 Oct 2021 12:39:10 -0300 Subject: [PATCH 3/3] Update generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs --- .../repository/EntityRepositoryInternalImpl_reactive.java.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs index 8165b4f74db..1f5d21fa90f 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs @@ -149,7 +149,7 @@ _%> @Override public Mono<<%= persistClass %>> findById(<%= primaryKey.type %> id) { - return createQuery(null, where("<%= primaryKey.nameCapitalized %>").is(id)).one(); + return createQuery(null, where("<%= primaryKey.name %>").is(id)).one(); } <%_ if (fieldsContainOwnerManyToMany) { _%>