Skip to content

Commit 79c377d

Browse files
sendilkumarnsendilkumarn
authored
Merge pull request #305 from jhipster/v7.4.0
Upgrade support to JHipster V7.4.0
2 parents b64c191 + 95b34d1 commit 79c377d

File tree

65 files changed

+2725
-970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2725
-970
lines changed

‎.github/workflows/angular.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
JHI_LIB_REPO: https://github.com/jhipster/jhipster-bom.git
2626
JHI_LIB_BRANCH: release
2727
JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git
28-
JHI_GEN_BRANCH: v7.2.0
28+
JHI_GEN_BRANCH: v7.4.0
2929
SPRING_OUTPUT_ANSI_ENABLED: ALWAYS
3030
SPRING_JPA_SHOW_SQL: false
3131
JHI_DISABLE_WEBPACK_LOGS: true

‎.github/workflows/react.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
JHI_LIB_REPO: https://github.com/jhipster/jhipster-bom.git
2626
JHI_LIB_BRANCH: release
2727
JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git
28-
JHI_GEN_BRANCH: v7.2.0
28+
JHI_GEN_BRANCH: v7.4.0
2929
SPRING_OUTPUT_ANSI_ENABLED: ALWAYS
3030
SPRING_JPA_SHOW_SQL: false
3131
JHI_DISABLE_WEBPACK_LOGS: true

‎.github/workflows/webflux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
JHI_LIB_REPO: https://github.com/jhipster/jhipster-bom.git
2626
JHI_LIB_BRANCH: release
2727
JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git
28-
JHI_GEN_BRANCH: v7.2.0
28+
JHI_GEN_BRANCH: v7.4.0
2929
SPRING_OUTPUT_ANSI_ENABLED: ALWAYS
3030
SPRING_JPA_SHOW_SQL: false
3131
JHI_DISABLE_WEBPACK_LOGS: true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const entityCouchbaseFiles = {
4040
templates: [
4141
{
4242
file: 'package/domain/Entity.kt.jhi.spring_data_couchbase',
43-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_couchbase`,
43+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_couchbase`,
4444
useBluePrint: true,
4545
},
4646
],
@@ -51,7 +51,7 @@ const entityCouchbaseFiles = {
5151
templates: [
5252
{
5353
file: 'package/repository/EntityRepository.kt',
54-
renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}Repository.kt`,
54+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}Repository.kt`,
5555
useBluePrint: true,
5656
},
5757
],

‎generators/entity-server/files.js

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ const serverFiles = {
5454
templates: [
5555
{
5656
file: 'package/domain/Entity.kt.jhi',
57-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi`,
57+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi`,
5858
useBluePrint: true,
5959
},
6060
{
6161
file: 'package/domain/Entity.kt.jhi.javax_validation',
62-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.javax_validation`,
62+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.javax_validation`,
6363
useBluePrint: true,
6464
},
6565
],
@@ -70,7 +70,7 @@ const serverFiles = {
7070
templates: [
7171
{
7272
file: 'package/domain/Entity.kt.jhi.spring_data_reactive',
73-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_reactive`,
73+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_reactive`,
7474
useBluePrint: true,
7575
},
7676
],
@@ -81,7 +81,8 @@ const serverFiles = {
8181
templates: [
8282
{
8383
file: 'package/domain/Entity.kt.jhi.spring_data_cassandra',
84-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_cassandra`,
84+
renameTo: generator =>
85+
`${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_cassandra`,
8586
useBluePrint: true,
8687
},
8788
],
@@ -92,7 +93,7 @@ const serverFiles = {
9293
templates: [
9394
{
9495
file: 'package/domain/Entity.kt.jhi.spring_data_neo4j',
95-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_neo4j`,
96+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_neo4j`,
9697
useBluePrint: true,
9798
},
9899
],
@@ -103,7 +104,7 @@ const serverFiles = {
103104
templates: [
104105
{
105106
file: 'package/domain/Entity.kt.jhi.javax_persistence',
106-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.javax_persistence`,
107+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.javax_persistence`,
107108
useBluePrint: true,
108109
},
109110
],
@@ -114,7 +115,7 @@ const serverFiles = {
114115
templates: [
115116
{
116117
file: 'package/domain/Entity.kt.jhi.spring_data_mongodb',
117-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_mongodb`,
118+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.spring_data_mongodb`,
118119
useBluePrint: true,
119120
},
120121
],
@@ -125,7 +126,7 @@ const serverFiles = {
125126
templates: [
126127
{
127128
file: 'package/domain/Entity.kt.jhi.hibernate_cache',
128-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.hibernate_cache`,
129+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.hibernate_cache`,
129130
useBluePrint: true,
130131
},
131132
],
@@ -136,7 +137,7 @@ const serverFiles = {
136137
templates: [
137138
{
138139
file: 'package/domain/Entity.kt.jhi.elastic_search',
139-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}.kt.jhi.elastic_search`,
140+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.kt.jhi.elastic_search`,
140141
useBluePrint: true,
141142
},
142143
],
@@ -147,7 +148,7 @@ const serverFiles = {
147148
templates: [
148149
{
149150
file: 'package/web/rest/EntityResource.kt',
150-
renameTo: generator => `${generator.packageFolder}/web/rest/${generator.entityClass}Resource.kt`,
151+
renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}Resource.kt`,
151152
useBluePrint: true,
152153
},
153154
],
@@ -158,12 +159,12 @@ const serverFiles = {
158159
templates: [
159160
{
160161
file: 'package/service/criteria/EntityCriteria.kt',
161-
renameTo: generator => `${generator.packageFolder}/service/criteria/${generator.entityClass}Criteria.kt`,
162+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/criteria/${generator.entityClass}Criteria.kt`,
162163
useBluePrint: true,
163164
},
164165
{
165166
file: 'package/service/EntityQueryService.kt',
166-
renameTo: generator => `${generator.packageFolder}/service/${generator.entityClass}QueryService.kt`,
167+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/${generator.entityClass}QueryService.kt`,
167168
useBluePrint: true,
168169
},
169170
],
@@ -174,7 +175,7 @@ const serverFiles = {
174175
templates: [
175176
{
176177
file: 'package/repository/search/EntitySearchRepository.kt',
177-
renameTo: generator => `${generator.packageFolder}/repository/search/${generator.entityClass}SearchRepository.kt`,
178+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/search/${generator.entityClass}SearchRepository.kt`,
178179
useBluePrint: true,
179180
},
180181
],
@@ -185,7 +186,7 @@ const serverFiles = {
185186
templates: [
186187
{
187188
file: 'package/repository/EntityRepository.kt',
188-
renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}Repository.kt`,
189+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}Repository.kt`,
189190
useBluePrint: true,
190191
},
191192
],
@@ -196,7 +197,7 @@ const serverFiles = {
196197
templates: [
197198
{
198199
file: 'package/repository/EntityRepository_reactive.kt',
199-
renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}ReactiveRepository.kt`,
200+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}ReactiveRepository.kt`,
200201
useBluePrint: true,
201202
},
202203
],
@@ -207,12 +208,17 @@ const serverFiles = {
207208
templates: [
208209
{
209210
file: 'package/repository/EntityRepositoryInternalImpl_reactive.kt',
210-
renameTo: generator => `${generator.packageFolder}/repository/${generator.entityClass}RepositoryInternalImpl.kt`,
211+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}RepositoryInternalImpl.kt`,
212+
useBluePrint: true,
213+
},
214+
{
215+
file: 'package/repository/EntitySqlHelper_reactive.kt',
216+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/${generator.entityClass}SqlHelper.kt`,
211217
useBluePrint: true,
212218
},
213219
{
214220
file: 'package/repository/rowmapper/EntityRowMapper.kt',
215-
renameTo: generator => `${generator.packageFolder}/repository/rowmapper/${generator.entityClass}RowMapper.kt`,
221+
renameTo: generator => `${generator.entityAbsoluteFolder}/repository/rowmapper/${generator.entityClass}RowMapper.kt`,
216222
useBluePrint: true,
217223
},
218224
],
@@ -223,12 +229,12 @@ const serverFiles = {
223229
templates: [
224230
{
225231
file: 'package/service/EntityService.kt',
226-
renameTo: generator => `${generator.packageFolder}/service/${generator.entityClass}Service.kt`,
232+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/${generator.entityClass}Service.kt`,
227233
useBluePrint: true,
228234
},
229235
{
230236
file: 'package/service/impl/EntityServiceImpl.kt',
231-
renameTo: generator => `${generator.packageFolder}/service/impl/${generator.entityClass}ServiceImpl.kt`,
237+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/impl/${generator.entityClass}ServiceImpl.kt`,
232238
useBluePrint: true,
233239
},
234240
],
@@ -239,7 +245,7 @@ const serverFiles = {
239245
templates: [
240246
{
241247
file: 'package/service/impl/EntityServiceImpl.kt',
242-
renameTo: generator => `${generator.packageFolder}/service/${generator.entityClass}Service.kt`,
248+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/${generator.entityClass}Service.kt`,
243249
useBluePrint: true,
244250
},
245251
],
@@ -250,17 +256,17 @@ const serverFiles = {
250256
templates: [
251257
{
252258
file: 'package/service/dto/EntityDTO.kt',
253-
renameTo: generator => `${generator.packageFolder}/service/dto/${generator.asDto(generator.entityClass)}.kt`,
259+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}.kt`,
254260
useBluePrint: true,
255261
},
256262
{
257263
file: 'package/service/mapper/BaseEntityMapper.kt',
258-
renameTo: generator => `${generator.packageFolder}/service/mapper/EntityMapper.kt`,
264+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/EntityMapper.kt`,
259265
useBluePrint: true,
260266
},
261267
{
262268
file: 'package/service/mapper/EntityMapper.kt',
263-
renameTo: generator => `${generator.packageFolder}/service/mapper/${generator.entityClass}Mapper.kt`,
269+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}Mapper.kt`,
264270
useBluePrint: true,
265271
},
266272
],
@@ -281,7 +287,7 @@ const serverFiles = {
281287
SERVER_TEST_SRC_KOTLIN_DIR,
282288
},
283289
},
284-
renameTo: generator => `${generator.packageFolder}/web/rest/${generator.entityClass}ResourceIT.kt`,
290+
renameTo: generator => `${generator.entityAbsoluteFolder}/web/rest/${generator.entityClass}ResourceIT.kt`,
285291
useBluePrint: true,
286292
},
287293
],
@@ -293,7 +299,7 @@ const serverFiles = {
293299
{
294300
file: 'package/repository/search/EntitySearchRepositoryMockConfiguration.kt',
295301
renameTo: generator =>
296-
`${generator.packageFolder}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.kt`,
302+
`${generator.entityAbsoluteFolder}/repository/search/${generator.entityClass}SearchRepositoryMockConfiguration.kt`,
297303
useBluePrint: true,
298304
},
299305
],
@@ -314,7 +320,7 @@ const serverFiles = {
314320
templates: [
315321
{
316322
file: 'package/domain/EntityTest.kt',
317-
renameTo: generator => `${generator.packageFolder}/domain/${generator.persistClass}Test.kt`,
323+
renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}Test.kt`,
318324
useBluePrint: true,
319325
},
320326
],
@@ -325,7 +331,7 @@ const serverFiles = {
325331
templates: [
326332
{
327333
file: 'package/service/dto/EntityDTOTest.kt',
328-
renameTo: generator => `${generator.packageFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.kt`,
334+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/dto/${generator.asDto(generator.entityClass)}Test.kt`,
329335
useBluePrint: true,
330336
},
331337
],
@@ -336,7 +342,7 @@ const serverFiles = {
336342
templates: [
337343
{
338344
file: 'package/service/mapper/EntityMapperTest.kt',
339-
renameTo: generator => `${generator.packageFolder}/service/mapper/${generator.entityClass}MapperTest.kt`,
345+
renameTo: generator => `${generator.entityAbsoluteFolder}/service/mapper/${generator.entityClass}MapperTest.kt`,
340346
useBluePrint: true,
341347
},
342348
],
@@ -377,6 +383,7 @@ function writeFiles() {
377383
...utils.getEnumInfo(field, this.clientRootFolder),
378384
frontendAppName: this.frontendAppName,
379385
packageName: this.packageName,
386+
entityAbsolutePackage: this.entityAbsolutePackage || this.packageName,
380387
};
381388
// eslint-disable-next-line no-console
382389
if (!this.skipServer) {
@@ -385,7 +392,7 @@ function writeFiles() {
385392
)}/${SERVER_MAIN_SRC_KOTLIN_DIR}package/domain/enumeration/Enum.kt.ejs`;
386393
this.template(
387394
pathToTemplateFile,
388-
`${SERVER_MAIN_SRC_KOTLIN_DIR}${this.packageFolder}/domain/enumeration/${fieldType}.kt`,
395+
`${SERVER_MAIN_SRC_KOTLIN_DIR}${this.entityAbsoluteFolder}/domain/enumeration/${fieldType}.kt`,
389396
this,
390397
{},
391398
enumInfo

‎generators/entity-server/templates/couchbase/src/main/kotlin/package/repository/EntityRepository.kt.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
See the License for the specific language governing permissions and
1717
limitations under the License.
1818
-%>
19-
package <%= packageName %>.repository
19+
package <%= entityAbsolutePackage %>.repository
2020

21-
import <%= packageName %>.domain.<%= persistClass %>
21+
import <%= entityAbsolutePackage %>.domain.<%= persistClass %>
2222

2323
<%_ if (relationships.length !== 0 || searchEngineCouchbase) { _%>
2424
import org.springframework.data.couchbase.repository.Query

‎generators/entity-server/templates/src/main/kotlin/package/domain/Entity.kt.jhi.ejs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<%_ } _%>
4444
});
4545
-&>
46-
package <%= packageName %>.domain
46+
package <%= entityAbsolutePackage %>.domain
4747

4848
<&- fragments.importSection() -&>
4949
<%_ if (relationshipsContainOtherSideIgnore) { _%>
@@ -73,9 +73,13 @@ import java.util.UUID
7373
<%_ }
7474
Object.keys(uniqueEnums).forEach(function(element) { _%>
7575
76-
import <%= packageName %>.domain.enumeration.<%= element %>
76+
import <%= entityAbsolutePackage %>.domain.enumeration.<%= element %>
7777
<%_ }); _%>
7878

79+
<%_ for (const otherEntity of otherEntities.filter(otherEntity => otherEntity.entityPackage !== entityPackage)) { _%>
80+
import <%= otherEntity.entityAbsoluteClass %>
81+
<%_ } _%>
82+
7983
<%_ if (typeof javadoc == 'undefined') { _%>
8084
/**
8185
* A <%= persistClass %>.

‎generators/entity-server/templates/src/main/kotlin/package/domain/enumeration/Enum.kt.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
See the License for the specific language governing permissions and
1717
limitations under the License.
1818
-%>
19-
package <%= packageName %>.domain.enumeration
19+
package <%= entityAbsolutePackage %>.domain.enumeration
2020
2121
<%_ if (typeof javadoc === 'undefined') { _%>
2222
/**

‎generators/entity-server/templates/src/main/kotlin/package/repository/EntityRepository.kt.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
See the License for the specific language governing permissions and
1717
limitations under the License.
1818
-%>
19-
package <%= packageName %>.repository
19+
package <%= entityAbsolutePackage %>.repository
2020
21-
import <%= packageName %>.domain.<%= persistClass %>
21+
import <%= entityAbsolutePackage %>.domain.<%= persistClass %>
2222
<%_ if (relationshipsContainEagerLoad) { _%>
2323
import org.springframework.data.domain.Page
2424
import org.springframework.data.domain.Pageable

0 commit comments

Comments
 (0)