generator-jhipster 7.6.0 → 7.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (432) hide show
  1. package/README.md +1 -4
  2. package/cli/commands.js +3 -0
  3. package/cli/environment-builder.js +53 -18
  4. package/cli/import-jdl.js +3 -0
  5. package/cli/index.mjs +20 -0
  6. package/cli/jhipster.js +19 -11
  7. package/cli/program.js +94 -38
  8. package/generators/app/esm.mjs +1 -3
  9. package/generators/app/index.js +11 -16
  10. package/generators/aws/esm.mjs +1 -3
  11. package/generators/azure-app-service/esm.mjs +1 -3
  12. package/generators/azure-spring-cloud/esm.mjs +1 -3
  13. package/generators/base/esm.mjs +1 -3
  14. package/generators/bootstrap/esm.mjs +1 -3
  15. package/generators/bootstrap/index.js +36 -86
  16. package/generators/bootstrap-application/esm.mjs +19 -0
  17. package/generators/bootstrap-application/generator.mjs +353 -0
  18. package/generators/bootstrap-application/index.mjs +19 -0
  19. package/generators/ci-cd/esm.mjs +1 -3
  20. package/generators/ci-cd/index.js +1 -1
  21. package/generators/ci-cd/prompts.js +1 -1
  22. package/generators/ci-cd/templates/github-actions.yml.ejs +6 -6
  23. package/generators/client/esm.mjs +5 -3
  24. package/generators/client/files-angular.js +9 -0
  25. package/generators/client/files-common.js +9 -9
  26. package/generators/client/files-react.js +25 -2
  27. package/generators/client/files-vue.js +7 -6
  28. package/generators/client/index.js +3 -2
  29. package/generators/client/needle-api/needle-client-react.js +11 -8
  30. package/generators/client/templates/angular/angular.json.ejs +2 -10
  31. package/generators/client/templates/angular/jest.conf.js.ejs +1 -1
  32. package/generators/client/templates/angular/package.json +29 -27
  33. package/generators/client/templates/angular/package.json.ejs +6 -2
  34. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs +1 -1
  35. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs +7 -7
  36. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +5 -5
  37. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +3 -3
  38. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs +10 -10
  39. package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs +8 -8
  40. package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +2 -2
  41. package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +5 -5
  42. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs +1 -1
  43. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +2 -2
  44. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +2 -2
  45. package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +6 -6
  46. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +51 -49
  47. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +16 -16
  48. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +32 -32
  49. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +4 -4
  50. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +18 -18
  51. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +12 -12
  52. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +4 -4
  53. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +4 -4
  54. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +8 -8
  55. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +1 -1
  56. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +1 -1
  57. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +4 -4
  58. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +5 -5
  59. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +1 -1
  60. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +11 -11
  61. package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs +1 -1
  62. package/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs +1 -1
  63. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +4 -2
  64. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs +0 -6
  65. package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +0 -6
  66. package/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs +3 -3
  67. package/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs +5 -5
  68. package/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs +29 -0
  69. package/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs +0 -4
  70. package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +31 -1
  71. package/generators/client/templates/common/package.json +7 -6
  72. package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +1 -7
  73. package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +2 -3
  74. package/generators/client/templates/react/.eslintrc.json.ejs +1 -1
  75. package/generators/client/templates/react/jest.conf.js.ejs +1 -1
  76. package/generators/client/templates/react/package.json +44 -45
  77. package/generators/client/templates/react/package.json.ejs +1 -0
  78. package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +1 -1
  79. package/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs +53 -6
  80. package/generators/client/templates/react/src/main/webapp/app/config/translation-middleware.ts.ejs +58 -0
  81. package/generators/client/templates/react/src/main/webapp/app/entities/menu.tsx.ejs +45 -0
  82. package/generators/client/templates/react/src/main/webapp/app/entities/reducers.ts.ejs +25 -0
  83. package/generators/client/templates/react/src/main/webapp/app/entities/routes.tsx.ejs +47 -0
  84. package/generators/client/templates/react/src/main/webapp/app/index.tsx.ejs +7 -7
  85. package/generators/client/templates/react/src/main/webapp/app/main.tsx.ejs +19 -0
  86. package/generators/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +1 -1
  87. package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +2 -1
  88. package/generators/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.ejs +5 -1
  89. package/generators/client/templates/react/src/main/webapp/app/routes.tsx.ejs +24 -7
  90. package/generators/client/templates/react/src/main/webapp/app/shared/error/error-loading.tsx.ejs +15 -0
  91. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs +34 -6
  92. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs +9 -2
  93. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.spec.ts.ejs +9 -3
  94. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs +21 -5
  95. package/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs +15 -0
  96. package/generators/client/templates/react/src/main/webapp/microfrontends/entities-menu.tsx.ejs +3 -0
  97. package/generators/client/templates/react/src/main/webapp/microfrontends/entities-routes.tsx.ejs +3 -0
  98. package/generators/client/templates/react/tsconfig.json.ejs +3 -3
  99. package/generators/client/templates/react/tsconfig.test.json.ejs +9 -1
  100. package/generators/client/templates/react/webpack/webpack.common.js.ejs +6 -13
  101. package/generators/client/templates/react/webpack/webpack.dev.js.ejs +7 -8
  102. package/generators/client/templates/react/webpack/webpack.microfrontend.js.jhi.react.ejs +99 -0
  103. package/generators/client/templates/react/webpack/webpack.prod.js.ejs +31 -21
  104. package/generators/client/templates/vue/package.json +30 -31
  105. package/generators/client/templates/vue/package.json.ejs +1 -1
  106. package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +4 -3
  107. package/generators/client/templates/vue/src/main/webapp/app/entities/user/user.service.ts.ejs +0 -0
  108. package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +29 -1
  109. package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +2 -2
  110. package/generators/client/templates/vue/src/main/webapp/app/shared/config/config.ts.ejs +0 -4
  111. package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +1 -1
  112. package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +2 -2
  113. package/generators/client/templates/vue/tsconfig.json.ejs +0 -3
  114. package/generators/client/templates/vue/webpack/webpack.common.js.ejs +6 -2
  115. package/generators/cloudfoundry/esm.mjs +1 -3
  116. package/generators/common/esm.mjs +2 -3
  117. package/generators/common/files.js +1 -2
  118. package/generators/common/index.js +6 -0
  119. package/generators/common/templates/.husky/{pre-commit → pre-commit.ejs} +4 -0
  120. package/generators/common/templates/README.md.jhi.ejs +3 -1
  121. package/generators/common/templates/package.json +4 -4
  122. package/generators/common/templates/sonar-project.properties.ejs +1 -1
  123. package/generators/cypress/esm.mjs +2 -3
  124. package/generators/cypress/files.js +2 -1
  125. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +18 -14
  126. package/generators/database-changelog/esm.mjs +1 -3
  127. package/generators/database-changelog/index.js +1 -1
  128. package/generators/database-changelog-liquibase/esm.mjs +2 -3
  129. package/generators/docker-compose/esm.mjs +1 -3
  130. package/generators/docker-compose/index.js +9 -5
  131. package/generators/entities/esm.mjs +1 -3
  132. package/generators/entities/index.js +2 -2
  133. package/generators/entities-client/esm.mjs +1 -3
  134. package/generators/entity/esm.mjs +1 -3
  135. package/generators/entity/index.js +39 -28
  136. package/generators/entity/prompts.js +4 -1
  137. package/generators/entity-client/esm.mjs +2 -3
  138. package/generators/entity-client/index.js +8 -0
  139. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs +1 -1
  140. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +2 -2
  141. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +20 -21
  142. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +1 -1
  143. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +14 -16
  144. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +3 -3
  145. package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +2 -1
  146. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +3 -3
  147. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs +5 -4
  148. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-reducer.spec.ts.ejs +1 -1
  149. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +20 -19
  150. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs +2 -2
  151. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +21 -20
  152. package/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
  153. package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
  154. package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs +1 -1
  155. package/generators/entity-i18n/esm.mjs +2 -3
  156. package/generators/entity-i18n/templates/i18n/entity_fr.json.ejs +1 -1
  157. package/generators/entity-server/esm.mjs +2 -3
  158. package/generators/entity-server/files-couchbase.js +23 -2
  159. package/generators/entity-server/files.js +40 -6
  160. package/generators/entity-server/index.js +27 -2
  161. package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +11 -13
  162. package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +30 -43
  163. package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs +5 -6
  164. package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.n1ql.ejs +5 -0
  165. package/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs +2 -2
  166. package/generators/entity-server/templates/partials/save_template.ejs +1 -1
  167. package/generators/entity-server/templates/partials/update_template.ejs +77 -0
  168. package/generators/entity-server/templates/reactive/partials/save_template.ejs +1 -1
  169. package/generators/entity-server/templates/reactive/partials/update_template.ejs +41 -0
  170. package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +5 -5
  171. package/generators/entity-server/templates/src/main/java/package/common/get_template.ejs +1 -1
  172. package/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +17 -8
  173. package/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +5 -5
  174. package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +1 -1
  175. package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +1 -1
  176. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +4 -3
  177. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_lifecycle_events.ejs +31 -0
  178. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_persistable.ejs +54 -0
  179. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_reactive.ejs +1 -1
  180. package/generators/entity-server/templates/src/main/java/package/domain/EntityCallback.java.ejs +43 -0
  181. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +36 -23
  182. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +24 -28
  183. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationships.java.ejs +37 -0
  184. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationshipsImpl.java.ejs +91 -0
  185. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +17 -25
  186. package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +2 -2
  187. package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +3 -3
  188. package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +12 -27
  189. package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +10 -2
  190. package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +8 -6
  191. package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +21 -5
  192. package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +61 -90
  193. package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +6 -4
  194. package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +33 -20
  195. package/generators/export-jdl/esm.mjs +1 -3
  196. package/generators/gae/esm.mjs +1 -3
  197. package/generators/generate-blueprint/constants.mjs +146 -0
  198. package/generators/generate-blueprint/esm.mjs +19 -0
  199. package/generators/generate-blueprint/files.mjs +81 -0
  200. package/generators/generate-blueprint/generator.mjs +363 -0
  201. package/generators/generate-blueprint/index.mjs +20 -0
  202. package/generators/generate-blueprint/templates/.eslintrc.json.ejs +41 -0
  203. package/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs +32 -0
  204. package/generators/generate-blueprint/templates/.mocharc.cjs.ejs +29 -0
  205. package/generators/{server/templates/couchbase/src/main/java/package/config/couchbase/package-info.java.ejs → generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs} +4 -7
  206. package/generators/generate-blueprint/templates/README.md.ejs +75 -0
  207. package/generators/generate-blueprint/templates/cli/cli.mjs.ejs +35 -0
  208. package/generators/generate-blueprint/templates/cli/commands.cjs.ejs +25 -0
  209. package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs +98 -0
  210. package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +42 -0
  211. package/generators/generate-blueprint/templates/generators/generator/index.mjs.ejs +19 -0
  212. package/generators/generate-blueprint/templates/generators/generator/templates/template-file.ejs +0 -0
  213. package/generators/generate-blueprint/templates/test/utils.mjs.ejs +17 -0
  214. package/generators/generator-base-blueprint.js +29 -0
  215. package/generators/generator-base-docker.js +1 -0
  216. package/generators/generator-base-entities.cjs +368 -0
  217. package/generators/generator-base-private.js +1 -1
  218. package/generators/generator-base.js +157 -23
  219. package/generators/generator-constants.js +22 -20
  220. package/generators/generator-list.js +2 -0
  221. package/generators/generator-transforms.js +0 -1
  222. package/generators/gradle/constants.cjs +1 -1
  223. package/generators/gradle/esm.mjs +19 -0
  224. package/generators/heroku/esm.mjs +1 -3
  225. package/generators/info/esm.mjs +1 -3
  226. package/generators/init/esm.mjs +19 -0
  227. package/generators/init/files.cjs +9 -3
  228. package/generators/init/index.cjs +5 -0
  229. package/generators/init/templates/.gitignore.jhi.ejs +5 -0
  230. package/generators/init/templates/{.lintstagedrc.js.ejs → .lintstagedrc.cjs.ejs} +0 -0
  231. package/generators/java/esm.mjs +19 -0
  232. package/generators/java/index.cjs +58 -2
  233. package/generators/kubernetes/esm.mjs +1 -3
  234. package/generators/kubernetes-helm/esm.mjs +1 -3
  235. package/generators/kubernetes-knative/esm.mjs +1 -3
  236. package/generators/languages/esm.mjs +2 -3
  237. package/generators/languages/templates/src/test/resources/i18n/messages_fr.properties.ejs +4 -1
  238. package/generators/maven/esm.mjs +19 -0
  239. package/generators/maven/files.cjs +0 -1
  240. package/generators/maven/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
  241. package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +18 -2
  242. package/generators/maven/templates/mvnw +13 -7
  243. package/generators/maven/templates/mvnw.cmd +19 -13
  244. package/generators/maven/templates/pom.xml.jhi.ejs +1 -1
  245. package/generators/openapi-client/esm.mjs +1 -3
  246. package/generators/openapi-client/index.js +11 -4
  247. package/generators/openshift/esm.mjs +1 -3
  248. package/generators/page/esm.mjs +1 -3
  249. package/generators/project-name/esm.mjs +19 -0
  250. package/generators/server/cleanup.js +19 -3
  251. package/generators/server/esm.mjs +2 -2
  252. package/generators/server/files-couchbase.js +28 -31
  253. package/generators/server/files.js +115 -18
  254. package/generators/server/index.js +23 -17
  255. package/generators/server/needle-api/needle-server-gradle.js +38 -0
  256. package/generators/server/needle-api/needle-server-maven.js +1 -1
  257. package/generators/server/templates/.mvn/jvm.config +1 -0
  258. package/generators/server/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
  259. package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +18 -2
  260. package/generators/server/templates/build.gradle.ejs +7 -5
  261. package/generators/server/templates/couchbase/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs +91 -0
  262. package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +47 -45
  263. package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs +2 -2
  264. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json.ejs +3 -0
  265. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json.ejs +3 -0
  266. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__admin.json.ejs → user/admin.json.ejs} +2 -2
  267. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__user.json.ejs → user/user.json.ejs} +2 -2
  268. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.2__create_indexes.n1ql.ejs +34 -0
  269. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_collections.n1ql.ejs +8 -0
  270. package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +4 -3
  271. package/generators/server/templates/couchbase/src/test/java/package/repository/{JHipsterCouchbaseRepositoryTest.java.ejs → CouchbaseSearchRepositoryTest.java.ejs} +2 -2
  272. package/generators/server/templates/devcontainer/Dockerfile.ejs +25 -0
  273. package/generators/server/templates/devcontainer/devcontainer.json.ejs +64 -0
  274. package/generators/server/templates/gradle/profile_prod.gradle.ejs +4 -0
  275. package/generators/server/templates/gradle/wrapper/gradle-wrapper.jar +0 -0
  276. package/generators/server/templates/gradle.properties.ejs +8 -8
  277. package/generators/server/templates/mvnw +13 -7
  278. package/generators/server/templates/mvnw.cmd +19 -13
  279. package/generators/server/templates/npmw +14 -5
  280. package/generators/server/templates/pom.xml.ejs +65 -58
  281. package/generators/server/templates/settings.gradle.ejs +6 -4
  282. package/generators/server/templates/src/main/docker/app.yml.ejs +4 -6
  283. package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +2 -1
  284. package/generators/server/templates/src/main/docker/mysql.yml.ejs +1 -0
  285. package/generators/server/templates/src/main/docker/zipkin.yml.ejs +25 -0
  286. package/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs +6 -0
  287. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +26 -16
  288. package/generators/{client/templates/react/src/main/webapp/app/entities/index.tsx.ejs → server/templates/src/main/java/package/config/KafkaSseConsumer.java.ejs} +8 -14
  289. package/generators/server/templates/src/main/java/package/config/KafkaSseProducer.java.ejs +30 -0
  290. package/generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.java.ejs +1 -1
  291. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +12 -10
  292. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +2 -1
  293. package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +11 -0
  294. package/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +6 -6
  295. package/generators/server/templates/src/main/java/package/domain/User.java.ejs +9 -7
  296. package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +1 -11
  297. package/generators/server/templates/src/main/java/package/repository/EntityManager.java.ejs +48 -38
  298. package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +48 -72
  299. package/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs +1 -1
  300. package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +1 -1
  301. package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +1 -1
  302. package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +8 -6
  303. package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +0 -1
  304. package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +1 -1
  305. package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs +60 -108
  306. package/generators/server/templates/src/main/java/package/web/rest/KafkaResource_reactive.java.ejs +74 -0
  307. package/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs +1 -1
  308. package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +2 -2
  309. package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +8 -0
  310. package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +6 -0
  311. package/generators/server/templates/src/main/resources/config/application.yml.ejs +28 -22
  312. package/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs +3 -4
  313. package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +12 -4
  314. package/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs +18 -15
  315. package/generators/server/templates/src/test/java/package/config/CassandraTestContainer.java.ejs +122 -0
  316. package/generators/server/templates/src/test/java/package/config/EmbeddedCassandra.java.ejs +11 -0
  317. package/generators/server/templates/src/test/java/package/config/EmbeddedKafka.java.ejs +11 -0
  318. package/generators/server/templates/src/test/java/package/config/EmbeddedMongo.java.ejs +11 -0
  319. package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +2 -0
  320. package/generators/server/templates/src/test/java/package/config/KafkaTestContainer.java.ejs +38 -0
  321. package/generators/server/templates/src/test/java/package/config/MongoDbTestContainer.java.ejs +67 -0
  322. package/generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs +114 -0
  323. package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +3 -10
  324. package/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs +8 -0
  325. package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +17 -3
  326. package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs +1 -4
  327. package/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_reactive.java.ejs +1 -1
  328. package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +5 -5
  329. package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +1 -1
  330. package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +2 -4
  331. package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs +1 -4
  332. package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +1 -1
  333. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +15 -8
  334. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs +1 -4
  335. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs +1 -4
  336. package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs +52 -123
  337. package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT_reactive.java.ejs +99 -0
  338. package/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs +7 -10
  339. package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +1 -6
  340. package/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs +1 -4
  341. package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +42 -47
  342. package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs +1 -4
  343. package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +2 -5
  344. package/generators/server/templates/src/test/resources/META-INF/spring.factories.ejs +1 -1
  345. package/generators/server/templates/src/test/resources/config/application.yml.ejs +21 -20
  346. package/generators/server/templates/src/test/resources/testcontainers.properties.ejs +1 -0
  347. package/generators/spring-boot/esm.mjs +19 -0
  348. package/generators/spring-controller/esm.mjs +1 -3
  349. package/generators/spring-service/esm.mjs +1 -3
  350. package/generators/upgrade/esm.mjs +1 -3
  351. package/generators/upgrade-config/esm.mjs +1 -3
  352. package/generators/workspaces/esm.mjs +1 -3
  353. package/generators/workspaces/index.js +2 -1
  354. package/lib/constants/logo.cjs +30 -0
  355. package/lib/constants/priorities.cjs +216 -2
  356. package/lib/constants/priorities.mjs +29 -1
  357. package/lib/index.mjs +6 -0
  358. package/lib/support/mixin.cjs +5 -1
  359. package/lib/support/shared-data.cjs +34 -1
  360. package/package.json +33 -29
  361. package/utils/entity.js +21 -2
  362. package/utils/faker.js +3 -3
  363. package/utils/field.js +69 -52
  364. package/utils/relationship.js +15 -4
  365. package/utils/user.js +109 -0
  366. package/generators/app/generator.spec.mjs +0 -47
  367. package/generators/aws/generator.spec.mjs +0 -47
  368. package/generators/azure-app-service/generator.spec.mjs +0 -47
  369. package/generators/azure-spring-cloud/generator.spec.mjs +0 -47
  370. package/generators/base/generator.spec.mjs +0 -44
  371. package/generators/bootstrap/generator.spec.mjs +0 -44
  372. package/generators/ci-cd/generator.spec.mjs +0 -47
  373. package/generators/client/__workflow/devserver-angular.json +0 -13
  374. package/generators/client/__workflow/devserver-react.json +0 -13
  375. package/generators/client/__workflow/devserver-vue.json +0 -13
  376. package/generators/client/generator.spec.mjs +0 -47
  377. package/generators/cloudfoundry/generator.spec.mjs +0 -47
  378. package/generators/common/generator.spec.mjs +0 -47
  379. package/generators/cypress/generator.spec.mjs +0 -47
  380. package/generators/database-changelog/generator.spec.mjs +0 -47
  381. package/generators/database-changelog-liquibase/generator.spec.mjs +0 -47
  382. package/generators/docker-compose/generator.spec.mjs +0 -44
  383. package/generators/entities/generator.spec.mjs +0 -47
  384. package/generators/entities-client/generator.spec.mjs +0 -47
  385. package/generators/entity/generator.spec.mjs +0 -47
  386. package/generators/entity-client/generator.spec.mjs +0 -47
  387. package/generators/entity-i18n/generator.spec.mjs +0 -47
  388. package/generators/entity-server/generator.spec.mjs +0 -47
  389. package/generators/entity-server/templates/src/main/java/package/repository/search/SortToFieldSortBuilderConverter.java.ejs +0 -24
  390. package/generators/export-jdl/generator.spec.mjs +0 -44
  391. package/generators/gae/generator.spec.mjs +0 -47
  392. package/generators/gradle/__snapshots__/generator.spec.cjs.snap +0 -59
  393. package/generators/gradle/generator.spec.cjs +0 -71
  394. package/generators/heroku/generator.spec.mjs +0 -47
  395. package/generators/info/generator.spec.mjs +0 -44
  396. package/generators/init/__snapshots__/generator.spec.cjs.snap +0 -65
  397. package/generators/init/generator.spec.cjs +0 -112
  398. package/generators/java/__snapshots__/generator.spec.cjs.snap +0 -118
  399. package/generators/java/generator.spec.cjs +0 -87
  400. package/generators/kubernetes/generator.spec.mjs +0 -44
  401. package/generators/kubernetes-helm/generator.spec.mjs +0 -44
  402. package/generators/kubernetes-knative/generator.spec.mjs +0 -44
  403. package/generators/languages/generator.spec.mjs +0 -47
  404. package/generators/maven/__snapshots__/generator.spec.cjs.snap +0 -53
  405. package/generators/maven/generator.spec.cjs +0 -78
  406. package/generators/maven/templates/.mvn/wrapper/MavenWrapperDownloader.java +0 -117
  407. package/generators/openapi-client/generator.spec.mjs +0 -47
  408. package/generators/openshift/generator.spec.mjs +0 -44
  409. package/generators/page/generator.spec.mjs +0 -47
  410. package/generators/project-name/generator.spec.cjs +0 -43
  411. package/generators/server/__snapshots__/generator.spec.mjs.snap +0 -1931
  412. package/generators/server/generator.spec.mjs +0 -52
  413. package/generators/server/templates/.mvn/wrapper/MavenWrapperDownloader.java +0 -117
  414. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactory.java.ejs +0 -83
  415. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java.ejs +0 -40
  416. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryQuery.java.ejs +0 -44
  417. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlQueryCreator.java.ejs +0 -162
  418. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java.ejs +0 -104
  419. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json.ejs +0 -3
  420. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json.ejs +0 -3
  421. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs +0 -19
  422. package/generators/server/templates/src/main/java/package/config/KafkaProperties.java.ejs +0 -68
  423. package/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs +0 -125
  424. package/generators/server/templates/src/test/java/package/MongoDbTestContainerExtension.java.ejs +0 -37
  425. package/generators/server/templates/src/test/java/package/TestContainersSpringContextCustomizerFactory.java.ejs +0 -24
  426. package/generators/spring-boot/__snapshots__/generator.spec.cjs.snap +0 -80
  427. package/generators/spring-boot/generator.spec.cjs +0 -64
  428. package/generators/spring-controller/generator.spec.mjs +0 -47
  429. package/generators/spring-service/generator.spec.mjs +0 -47
  430. package/generators/upgrade/generator.spec.mjs +0 -44
  431. package/generators/upgrade-config/generator.spec.mjs +0 -44
  432. package/generators/workspaces/generator.spec.mjs +0 -47
@@ -18,9 +18,7 @@
18
18
  -%>
19
19
  package <%= packageName %>.web.rest;
20
20
 
21
- <%_ if (databaseTypeCassandra) { _%>
22
- import <%= packageName %>.AbstractCassandraTest;
23
- <%_ } else if (databaseTypeCouchbase) { _%>
21
+ <%_ if (databaseTypeCouchbase) { _%>
24
22
  import <%= packageName %>.CouchbaseTestContainerExtension;
25
23
  <%_ } _%>
26
24
  import <%= packageName %>.IntegrationTest;
@@ -29,7 +27,7 @@ import <%= packageName %>.config.Constants;
29
27
  import <%= packageName %>.domain.PersistentToken;
30
28
  <%_ } _%>
31
29
  import <%= packageName %>.domain.<%= asEntity('User') %>;
32
- <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
30
+ <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
33
31
  import <%= packageName %>.repository.AuthorityRepository;
34
32
  <%_ } _%>
35
33
  <%_ if (authenticationTypeSession && !reactive) { _%>
@@ -51,9 +49,6 @@ import org.apache.commons.lang3.RandomStringUtils;
51
49
  import org.junit.jupiter.api.BeforeEach;
52
50
  <%_ } _%>
53
51
  import org.junit.jupiter.api.Test;
54
- <%_ if (databaseTypeCouchbase) { _%>
55
- import org.junit.jupiter.api.extension.ExtendWith;
56
- <%_ } _%>
57
52
  import org.springframework.beans.factory.annotation.Autowired;
58
53
  <%_ if (reactive) { _%>
59
54
  import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
@@ -104,6 +99,9 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock
104
99
  import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
105
100
  import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
106
101
  <%_ } _%>
102
+ <%_ if (databaseTypeCouchbase) { _%>
103
+ import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultHandlers.exportTestSecurityContext;
104
+ <%_ } _%>
107
105
 
108
106
  /**
109
107
  * Integration tests for the {@link AccountResource} REST controller.
@@ -115,7 +113,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
115
113
  <%_ } _%>
116
114
  @WithMockUser(value = TEST_USER_LOGIN)
117
115
  @IntegrationTest
118
- class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
116
+ class AccountResourceIT {
119
117
  static final String TEST_USER_LOGIN = "test";
120
118
 
121
119
  @Autowired
@@ -341,6 +339,9 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
341
339
  .contentType(MediaType.APPLICATION_JSON)
342
340
  .content(TestUtil.convertObjectToJsonBytes(invalidUser))<% if (testsNeedCsrf) { %>
343
341
  .with(csrf())<% } %>)
342
+ <%_ if (databaseTypeCouchbase) { _%>
343
+ .andDo(exportTestSecurityContext())
344
+ <%_ } _%>
344
345
  .andExpect(status().isBadRequest());
345
346
  <%_ } else { _%>
346
347
  accountWebTestClient.post().uri("/api/register")
@@ -537,6 +538,9 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
537
538
  .contentType(MediaType.APPLICATION_JSON)
538
539
  .content(TestUtil.convertObjectToJsonBytes(secondUser))<% if (testsNeedCsrf) { %>
539
540
  .with(csrf())<% } %>)
541
+ <%_ if (databaseTypeCouchbase) { _%>
542
+ .andDo(exportTestSecurityContext())
543
+ <%_ } _%>
540
544
  .andExpect(status().isCreated());
541
545
  <%_ } _%>
542
546
 
@@ -903,6 +907,9 @@ class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassan
903
907
  .contentType(MediaType.APPLICATION_JSON)
904
908
  .content(TestUtil.convertObjectToJsonBytes(userDTO))<% if (testsNeedCsrf) { %>
905
909
  .with(csrf())<% } %>)
910
+ <%_ if (databaseTypeCouchbase) { _%>
911
+ .andDo(exportTestSecurityContext())
912
+ <%_ } _%>
906
913
  .andExpect(status().isBadRequest());
907
914
  <%_ } _%>
908
915
 
@@ -32,9 +32,6 @@ import static org.mockito.Mockito.*;
32
32
  <%_ } _%>
33
33
  <%_ } _%>
34
34
 
35
- <%_ if (databaseTypeCassandra) { _%>
36
- import <%= packageName %>.AbstractCassandraTest;
37
- <%_ } _%>
38
35
  import <%= packageName %>.IntegrationTest;
39
36
  import <%= packageName %>.security.AuthoritiesConstants;
40
37
 
@@ -77,7 +74,7 @@ import org.springframework.transaction.annotation.Transactional;
77
74
  <%_ } _%>
78
75
  @WithMockUser(value = TEST_USER_LOGIN)
79
76
  @IntegrationTest
80
- class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
77
+ class AccountResourceIT {
81
78
 
82
79
  <%_ if (reactive) { _%>
83
80
  private Map<String, Object> claims;
@@ -18,9 +18,6 @@
18
18
  -%>
19
19
  package <%= packageName %>.web.rest;
20
20
 
21
- <%_ if (databaseTypeCassandra) { _%>
22
- import <%= packageName %>.AbstractCassandraTest;
23
- <%_ } _%>
24
21
  import <%= packageName %>.IntegrationTest;
25
22
  <%_ if (reactive && searchEngineElasticsearch) { _%>
26
23
  import <%= packageName %>.repository.search.UserSearchRepository;
@@ -63,7 +60,7 @@ import static <%= packageName %>.web.rest.AccountResourceIT.TEST_USER_LOGIN;
63
60
  <%_ } _%>
64
61
  @WithMockUser(value = TEST_USER_LOGIN)
65
62
  @IntegrationTest
66
- class AccountResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
63
+ class AccountResourceIT {
67
64
  static final String TEST_USER_LOGIN = "test";
68
65
 
69
66
  @Autowired
@@ -18,156 +18,85 @@
18
18
  -%>
19
19
  package <%= packageName %>.web.rest;
20
20
 
21
- import <%= packageName %>.config.KafkaProperties;
22
- import org.apache.kafka.clients.consumer.ConsumerRecord;
23
- import org.apache.kafka.clients.consumer.ConsumerRecords;
24
- import org.apache.kafka.clients.consumer.KafkaConsumer;
25
- import org.apache.kafka.clients.producer.KafkaProducer;
26
- import org.apache.kafka.clients.producer.ProducerRecord;
27
- import org.junit.jupiter.api.BeforeAll;
28
- import org.junit.jupiter.api.BeforeEach;
29
- import org.junit.jupiter.api.Test;
30
- import org.springframework.http.MediaType;
31
- <%_ if (reactive) { _%>
32
- import org.springframework.test.web.reactive.server.WebTestClient;
33
- <%_ } else { _%>
34
- import org.springframework.test.web.servlet.MockMvc;
35
- import org.springframework.test.web.servlet.MvcResult;
36
- import org.springframework.test.web.servlet.setup.MockMvcBuilders;
37
- <%_ } _%>
38
- import org.testcontainers.containers.KafkaContainer;
39
- import org.testcontainers.utility.DockerImageName;
40
-
41
- import java.time.Duration;
42
- import java.util.Collections;
43
- import java.util.HashMap;
44
- import java.util.Map;
45
-
46
21
  import static org.assertj.core.api.Assertions.assertThat;
47
- <%_ if (!reactive) { _%>
48
22
  import static org.junit.jupiter.api.Assertions.fail;
49
23
  import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
50
24
  import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
51
25
  import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
52
- <%_ } _%>
53
26
 
27
+ import java.util.HashMap;
28
+ import java.util.Map;
29
+ import java.util.concurrent.BlockingQueue;
30
+
31
+ import org.junit.jupiter.api.Test;
32
+ import org.springframework.beans.factory.annotation.Autowired;
33
+ import org.springframework.beans.factory.annotation.Qualifier;
34
+ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
35
+ import org.springframework.cloud.stream.test.binder.MessageCollector;
36
+ import org.springframework.messaging.Message;
37
+ import org.springframework.messaging.MessageChannel;
38
+ import org.springframework.messaging.MessageHeaders;
39
+ import org.springframework.messaging.support.GenericMessage;
40
+ import org.springframework.security.test.context.support.WithMockUser;
41
+ import org.springframework.test.web.servlet.MockMvc;
42
+ import org.springframework.test.web.servlet.MvcResult;
43
+ import org.springframework.util.MimeTypeUtils;
44
+ import <%= packageName %>.IntegrationTest;
45
+ import <%= packageName %>.config.EmbeddedKafka;
46
+ import <%= packageName %>.config.KafkaSseConsumer;
47
+ import <%= packageName %>.config.KafkaSseProducer;
48
+
49
+ @IntegrationTest
50
+ @AutoConfigureMockMvc
51
+ @WithMockUser
52
+ @EmbeddedKafka
54
53
  class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
55
54
 
56
- private static boolean started = false;
57
- private static KafkaContainer kafkaContainer;
55
+ @Autowired
56
+ private MessageCollector collector;
58
57
 
59
- <%_ if (reactive) { _%>
60
- private WebTestClient client;
61
- <%_ } else { _%>
58
+ @Autowired
62
59
  private MockMvc restMockMvc;
63
- <%_ } _%>
64
-
65
- @BeforeAll
66
- static void startServer() {
67
- if (!started) {
68
- startTestcontainer();
69
- started = true;
70
- }
71
- }
72
60
 
73
- private static void startTestcontainer() {
74
- // TODO: withNetwork will need to be removed soon
75
- // See discussion at https://github.com/jhipster/generator-jhipster/issues/11544#issuecomment-609065206
76
- kafkaContainer = new KafkaContainer(DockerImageName.parse("<%= DOCKER_KAFKA %>")).withNetwork(null);
77
- kafkaContainer.start();
78
- }
79
-
80
- @BeforeEach
81
- void setup() {
82
- KafkaProperties kafkaProperties = new KafkaProperties();
83
- Map<String, String> producerProps = getProducerProps();
84
- kafkaProperties.setProducer(new HashMap<>(producerProps));
85
-
86
- Map<String, String> consumerProps = getConsumerProps("default-group");
87
- consumerProps.put("client.id", "default-client");
88
- kafkaProperties.setConsumer(consumerProps);
89
-
90
- <%= upperFirstCamelCase(baseName) %>KafkaResource kafkaResource = new <%= upperFirstCamelCase(baseName) %>KafkaResource(kafkaProperties);
61
+ @Autowired
62
+ @Qualifier(KafkaSseProducer.CHANNELNAME)
63
+ private MessageChannel output;
91
64
 
92
- <%_ if (reactive) { _%>
93
- client = WebTestClient.bindToController(kafkaResource).build();
94
- <%_ } else { _%>
95
- restMockMvc = MockMvcBuilders.standaloneSetup(kafkaResource).build();
96
- <%_ } _%>
97
- }
65
+ @Autowired
66
+ @Qualifier(KafkaSseConsumer.CHANNELNAME)
67
+ private MessageChannel input;
98
68
 
99
69
  @Test
100
- void producesMessages()<% if (!reactive) { %> throws Exception<% } %> {
101
- <%_ if (reactive) { _%>
102
- client.post().uri("/api/<%= dasherizedBaseName %>-kafka/publish/topic-produce?message=value-produce")
103
- .exchange()
104
- .expectStatus().isOk()
105
- .expectHeader().contentType(MediaType.APPLICATION_JSON);
106
- <%_ } else { _%>
107
- restMockMvc.perform(post("/api/<%= dasherizedBaseName %>-kafka/publish/topic-produce?message=value-produce"))
108
- .andExpect(status().isOk())
109
- .andExpect(content().contentType(MediaType.APPLICATION_JSON));
110
- <%_ } _%>
111
-
112
- Map<String, Object> consumerProps = new HashMap<>(getConsumerProps("group-produce"));
113
- KafkaConsumer<String, String> consumer = new KafkaConsumer<>(consumerProps);
114
- consumer.subscribe(Collections.singletonList("topic-produce"));
115
- ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(1));
116
-
117
- assertThat(records.count()).isEqualTo(1);
118
- ConsumerRecord<String, String> record = records.iterator().next();
119
- assertThat(record.value()).isEqualTo("value-produce");
70
+ void producesMessages() throws Exception {
71
+ restMockMvc
72
+ .perform(post("/api/<%= dasherizedBaseName %>-kafka/publish?message=value-produce"))
73
+ .andExpect(status().isOk());
74
+ BlockingQueue<Message<?>> messages = collector.forChannel(output);
75
+ GenericMessage<String> payload = (GenericMessage<String>) messages.take();
76
+ assertThat(payload.getPayload()).isEqualTo("value-produce");
120
77
  }
121
78
 
122
79
  @Test
123
- void consumesMessages()<% if (!reactive) { %> throws Exception<% } %> {
124
- Map<String, Object> producerProps = new HashMap<>(getProducerProps());
125
- KafkaProducer<String, String> producer = new KafkaProducer<>(producerProps);
126
-
127
- producer.send(new ProducerRecord<>("topic-consume", "value-consume"));
128
-
129
- <%_ if (reactive) { _%>
130
- String value = client.get().uri("/api/<%= dasherizedBaseName %>-kafka/consume?topic=topic-consume")
131
- .accept(MediaType.TEXT_EVENT_STREAM)
132
- .exchange()
133
- .expectStatus().isOk()
134
- .expectHeader().contentTypeCompatibleWith(MediaType.TEXT_EVENT_STREAM)
135
- .returnResult(String.class)
136
- .getResponseBody().blockFirst(Duration.ofSeconds(10));
137
-
138
- assertThat(value).isEqualTo("value-consume");
139
- <%_ } else { _%>
140
- MvcResult mvcResult = restMockMvc.perform(get("/api/<%= dasherizedBaseName %>-kafka/consume?topic=topic-consume"))
80
+ void consumesMessages() throws Exception {
81
+ Map<String, Object> map = new HashMap<>();
82
+ map.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN_VALUE);
83
+ MessageHeaders headers = new MessageHeaders(map);
84
+ Message<String> testMessage = new GenericMessage<>("value-consume", headers);
85
+ MvcResult mvcResult = restMockMvc
86
+ .perform(get("/api/<%= dasherizedBaseName %>-kafka/register"))
141
87
  .andExpect(status().isOk())
142
88
  .andExpect(request().asyncStarted())
143
89
  .andReturn();
144
-
145
90
  for (int i = 0; i < 100; i++) {
91
+ input.send(testMessage);
146
92
  Thread.sleep(100);
147
93
  String content = mvcResult.getResponse().getContentAsString();
148
94
  if (content.contains("data:value-consume")) {
95
+ restMockMvc
96
+ .perform(get("/api/<%= dasherizedBaseName %>-kafka/unregister"));
149
97
  return;
150
98
  }
151
99
  }
152
100
  fail("Expected content data:value-consume not received");
153
- <%_ } _%>
154
- }
155
-
156
- private Map<String, String> getProducerProps() {
157
- Map<String, String> producerProps = new HashMap<>();
158
- producerProps.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
159
- producerProps.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
160
- producerProps.put("bootstrap.servers", kafkaContainer.getBootstrapServers());
161
- return producerProps;
162
- }
163
-
164
- private Map<String, String> getConsumerProps(String group) {
165
- Map<String, String> consumerProps = new HashMap<>();
166
- consumerProps.put("key.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
167
- consumerProps.put("value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
168
- consumerProps.put("bootstrap.servers", kafkaContainer.getBootstrapServers());
169
- consumerProps.put("auto.offset.reset", "earliest");
170
- consumerProps.put("group.id", group);
171
- return consumerProps;
172
101
  }
173
102
  }
@@ -0,0 +1,99 @@
1
+ <%#
2
+ Copyright 2013-2022 the original author or authors from the JHipster project.
3
+
4
+ This file is part of the JHipster project, see https://www.jhipster.tech/
5
+ for more information.
6
+
7
+ Licensed under the Apache License, Version 2.0 (the "License");
8
+ you may not use this file except in compliance with the License.
9
+ You may obtain a copy of the License at
10
+
11
+ https://www.apache.org/licenses/LICENSE-2.0
12
+
13
+ Unless required by applicable law or agreed to in writing, software
14
+ distributed under the License is distributed on an "AS IS" BASIS,
15
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
+ See the License for the specific language governing permissions and
17
+ limitations under the License.
18
+ -%>
19
+ package <%= packageName %>.web.rest;
20
+
21
+ import static org.assertj.core.api.Assertions.assertThat;
22
+
23
+ import java.time.Duration;
24
+ import java.util.HashMap;
25
+ import java.util.Map;
26
+ import java.util.concurrent.BlockingQueue;
27
+
28
+ import org.junit.jupiter.api.Test;
29
+ import org.springframework.beans.factory.annotation.Autowired;
30
+ import org.springframework.beans.factory.annotation.Qualifier;
31
+ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
32
+ import org.springframework.cloud.stream.test.binder.MessageCollector;
33
+ import org.springframework.http.MediaType;
34
+ import org.springframework.messaging.Message;
35
+ import org.springframework.messaging.MessageChannel;
36
+ import org.springframework.messaging.MessageHeaders;
37
+ import org.springframework.messaging.support.GenericMessage;
38
+ import org.springframework.security.test.context.support.WithMockUser;
39
+ import org.springframework.test.web.reactive.server.WebTestClient;
40
+ import org.springframework.util.MimeTypeUtils;
41
+ import <%= packageName %>.IntegrationTest;
42
+ import <%= packageName %>.config.EmbeddedKafka;
43
+ import <%= packageName %>.config.KafkaSseConsumer;
44
+ import <%= packageName %>.config.KafkaSseProducer;
45
+
46
+ @IntegrationTest
47
+ @AutoConfigureMockMvc
48
+ @WithMockUser
49
+ @EmbeddedKafka
50
+ class <%= upperFirstCamelCase(baseName) %>KafkaResourceIT {
51
+
52
+ @Autowired
53
+ private WebTestClient client;
54
+
55
+ @Autowired
56
+ @Qualifier(KafkaSseProducer.CHANNELNAME)
57
+ private MessageChannel output;
58
+
59
+ @Autowired
60
+ @Qualifier(KafkaSseConsumer.CHANNELNAME)
61
+ private MessageChannel input;
62
+
63
+ @Autowired
64
+ private MessageCollector collector;
65
+
66
+ @Test
67
+ void producesMessages() throws InterruptedException {
68
+ client.post().uri("/api/<%= dasherizedBaseName %>-kafka/publish?message=value-produce")
69
+ .exchange()
70
+ .expectStatus()
71
+ .isNoContent();
72
+
73
+ BlockingQueue<Message<?>> messages = collector.forChannel(output);
74
+ GenericMessage<String> payload = (GenericMessage<String>) messages.take();
75
+ assertThat(payload.getPayload()).isEqualTo("value-produce");
76
+ }
77
+
78
+ @Test
79
+ void consumesMessages() {
80
+ Map<String, Object> map = new HashMap<>();
81
+ map.put(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN_VALUE);
82
+ MessageHeaders headers = new MessageHeaders(map);
83
+ Message<String> testMessage = new GenericMessage<>("value-consume", headers);
84
+ input.send(testMessage);
85
+ String value = client
86
+ .get()
87
+ .uri("/api/<%= dasherizedBaseName %>-kafka/consume")
88
+ .accept(MediaType.TEXT_EVENT_STREAM)
89
+ .exchange()
90
+ .expectStatus()
91
+ .isOk()
92
+ .expectHeader()
93
+ .contentTypeCompatibleWith(MediaType.TEXT_EVENT_STREAM)
94
+ .returnResult(String.class)
95
+ .getResponseBody()
96
+ .blockFirst(Duration.ofSeconds(10));
97
+ assertThat(value).isEqualTo("value-consume");
98
+ }
99
+ }
@@ -18,9 +18,6 @@
18
18
  -%>
19
19
  package <%= packageName %>.web.rest;
20
20
 
21
- <%_ if (databaseTypeCassandra) { _%>
22
- import <%= packageName %>.AbstractCassandraTest;
23
- <%_ } _%>
24
21
  import <%= packageName %>.IntegrationTest;
25
22
  <%_ if (databaseTypeSql && reactive) { _%>
26
23
  import <%= packageName %>.config.Constants;
@@ -108,7 +105,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
108
105
  <%_ } _%>
109
106
  @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
110
107
  @IntegrationTest
111
- class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
108
+ class PublicUserResourceIT {
112
109
 
113
110
  private static final String DEFAULT_LOGIN = "johndoe";
114
111
 
@@ -179,7 +176,7 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
179
176
 
180
177
  // Get all the users
181
178
  <%_ if (reactive) { _%>
182
- <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,DESC")
179
+ <%= asDto('User') %> foundUser = webTestClient.get().uri("/api/users?sort=id,desc")
183
180
  .accept(MediaType.APPLICATION_JSON)
184
181
  .exchange()
185
182
  .expectStatus().isOk()
@@ -246,14 +243,14 @@ class PublicUserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCas
246
243
  userRepository.<% if (reactive) { %>save<% } else { %>saveAndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
247
244
 
248
245
  <%_ if (reactive) { _%>
249
- webTestClient.get().uri("/api/users?sort=resetKey,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
250
- webTestClient.get().uri("/api/users?sort=password,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
251
- webTestClient.get().uri("/api/users?sort=resetKey,id,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
252
- webTestClient.get().uri("/api/users?sort=id,DESC").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk();
246
+ webTestClient.get().uri("/api/users?sort=resetKey,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
247
+ webTestClient.get().uri("/api/users?sort=password,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
248
+ webTestClient.get().uri("/api/users?sort=resetKey,desc&sort=id,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isBadRequest();
249
+ webTestClient.get().uri("/api/users?sort=id,desc").accept(MediaType.APPLICATION_JSON).exchange().expectStatus().isOk();
253
250
  <%_ } else { _%>
254
251
  restUserMockMvc.perform(get("/api/users?sort=resetKey,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
255
252
  restUserMockMvc.perform(get("/api/users?sort=password,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
256
- restUserMockMvc.perform(get("/api/users?sort=resetKey,id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
253
+ restUserMockMvc.perform(get("/api/users?sort=resetKey,desc&sort=id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
257
254
  restUserMockMvc.perform(get("/api/users?sort=id,desc").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk());
258
255
  <%_ } _%>
259
256
  }
@@ -51,7 +51,6 @@ import javax.persistence.criteria.Root;
51
51
  <%_ if (searchEngineCouchbase) { _%>
52
52
  import java.util.NoSuchElementException;
53
53
  import java.util.concurrent.Callable;
54
- import java.util.concurrent.TimeUnit;
55
54
  import java.util.function.Function;
56
55
  import java.time.Duration;
57
56
  import reactor.core.publisher.Mono;
@@ -65,10 +64,6 @@ import static org.assertj.core.api.Assertions.assertThat;
65
64
  public final class TestUtil {
66
65
 
67
66
  private static final ObjectMapper mapper = createObjectMapper();
68
- <%_ if (searchEngineCouchbase) { _%>
69
- private static final int MAX_ATTEMPTS = 3;
70
- // private static final Delay DEFAULT_DELAY = Delay.exponential(TimeUnit.SECONDS);
71
- <%_ } _%>
72
67
 
73
68
  private static ObjectMapper createObjectMapper() {
74
69
  ObjectMapper mapper = new ObjectMapper();
@@ -267,7 +262,7 @@ public final class TestUtil {
267
262
  .switchIfEmpty(Mono.error(new NoSuchElementException()))
268
263
  )
269
264
  .retry()
270
- .timeout(Duration.ofSeconds(5))
265
+ .timeout(Duration.ofSeconds(60))
271
266
  .block();
272
267
  }
273
268
 
@@ -18,9 +18,6 @@
18
18
  -%>
19
19
  package <%= packageName %>.web.rest;
20
20
 
21
- <%_ if (databaseTypeCassandra) { _%>
22
- import <%= packageName %>.AbstractCassandraTest;
23
- <%_ } _%>
24
21
  import <%= packageName %>.IntegrationTest;
25
22
  <%_ if (!skipUserManagement) { _%>
26
23
  <%_ if (databaseTypeSql && reactive) { _%>
@@ -74,7 +71,7 @@ import static org.hamcrest.Matchers.not;
74
71
  @AutoConfigureMockMvc
75
72
  <%_ } _%>
76
73
  @IntegrationTest
77
- class UserJWTControllerIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
74
+ class UserJWTControllerIT {
78
75
 
79
76
  <%_ if (!skipUserManagement) { _%>
80
77
  @Autowired