generator-jhipster 7.1.0 → 7.4.0

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 (917) hide show
  1. package/README.md +1 -1
  2. package/cli/commands.js +21 -0
  3. package/cli/environment-builder.js +10 -2
  4. package/cli/import-jdl.js +7 -10
  5. package/cli/jdl.js +1 -0
  6. package/cli/jhipster-command.js +14 -28
  7. package/cli/program.js +37 -29
  8. package/generators/add/index.cjs +78 -0
  9. package/generators/app/esm.mjs +21 -0
  10. package/generators/app/generator.spec.mjs +47 -0
  11. package/generators/app/index.js +38 -34
  12. package/generators/app/prompts.js +1 -1
  13. package/generators/aws/esm.mjs +21 -0
  14. package/generators/aws/generator.spec.mjs +47 -0
  15. package/generators/aws/index.js +8 -8
  16. package/generators/aws/lib/eb.js +1 -1
  17. package/generators/azure-app-service/esm.mjs +21 -0
  18. package/generators/azure-app-service/generator.spec.mjs +47 -0
  19. package/generators/azure-app-service/index.js +30 -19
  20. package/generators/azure-app-service/templates/github/workflows/azure-app-service.yml.ejs +3 -3
  21. package/generators/azure-spring-cloud/esm.mjs +21 -0
  22. package/generators/azure-spring-cloud/generator.spec.mjs +47 -0
  23. package/generators/azure-spring-cloud/index.js +68 -46
  24. package/generators/azure-spring-cloud/templates/application-azure.yml.ejs +4 -4
  25. package/generators/azure-spring-cloud/templates/github/workflows/azure-spring-cloud.yml.ejs +3 -3
  26. package/generators/base/esm.mjs +21 -0
  27. package/generators/base/generator.spec.mjs +44 -0
  28. package/generators/bootstrap/esm.mjs +21 -0
  29. package/generators/bootstrap/generator.spec.mjs +44 -0
  30. package/generators/bootstrap/index.js +55 -58
  31. package/generators/ci-cd/esm.mjs +21 -0
  32. package/generators/ci-cd/generator.spec.mjs +47 -0
  33. package/generators/ci-cd/index.js +30 -47
  34. package/generators/ci-cd/templates/github-actions.yml.ejs +5 -2
  35. package/generators/ci-cd/templates/travis.yml.ejs +9 -4
  36. package/generators/cleanup.js +5 -0
  37. package/generators/client/__workflow/devserver-angular.json +13 -0
  38. package/generators/client/__workflow/devserver-react.json +13 -0
  39. package/generators/client/__workflow/devserver-vue.json +13 -0
  40. package/generators/client/esm.mjs +21 -0
  41. package/generators/client/files-angular.js +8 -9
  42. package/generators/client/files-common.js +7 -3
  43. package/generators/client/files-react.js +11 -1
  44. package/generators/client/files-vue.js +56 -6
  45. package/generators/client/generator.spec.mjs +47 -0
  46. package/generators/client/index.js +127 -51
  47. package/generators/client/needle-api/needle-client-vue.js +5 -5
  48. package/generators/client/templates/angular/.eslintrc.json.ejs +1 -0
  49. package/generators/client/templates/angular/README.md.jhi.client.angular.ejs +48 -0
  50. package/generators/client/templates/angular/angular.json.ejs +0 -1
  51. package/generators/client/templates/angular/package.json +28 -25
  52. package/generators/client/templates/angular/package.json.ejs +18 -18
  53. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +52 -54
  54. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs +65 -0
  55. package/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +35 -37
  56. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +78 -80
  57. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.spec.ts.ejs +41 -0
  58. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +73 -75
  59. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs +62 -0
  60. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +44 -46
  61. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs +61 -0
  62. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +116 -118
  63. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.spec.ts.ejs +66 -0
  64. package/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +75 -77
  65. package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +74 -76
  66. package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +1 -1
  67. package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +48 -50
  68. package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +50 -52
  69. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +45 -47
  70. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -2
  71. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.spec.ts.ejs +66 -0
  72. package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs +99 -101
  73. package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs +3 -5
  74. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +1 -1
  75. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +61 -63
  76. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +19 -21
  77. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.ts.ejs +1 -1
  78. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +2 -2
  79. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs +1 -1
  80. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +28 -30
  81. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +62 -64
  82. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +35 -37
  83. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +40 -42
  84. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +1 -1
  85. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +87 -89
  86. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +3 -3
  87. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs +41 -43
  88. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +81 -83
  89. package/generators/client/templates/angular/src/main/webapp/app/app.constants.ts.ejs +0 -4
  90. package/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +3 -1
  91. package/generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs +2 -2
  92. package/generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs +1 -2
  93. package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +179 -172
  94. package/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs +9 -9
  95. package/generators/client/templates/angular/src/main/webapp/app/core/config/application-config.service.ts.ejs +9 -0
  96. package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs +2 -1
  97. package/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs +14 -22
  98. package/generators/client/templates/angular/src/main/webapp/app/entities/user/user.service.spec.ts.ejs +87 -89
  99. package/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +93 -95
  100. package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +166 -168
  101. package/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs +2 -2
  102. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +66 -68
  103. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +1 -1
  104. package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs +27 -29
  105. package/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +112 -114
  106. package/generators/client/templates/angular/src/main/webapp/app/login/login.service.ts.ejs +1 -11
  107. package/generators/client/templates/angular/src/main/webapp/app/login/logout.model.ts.ejs +1 -1
  108. package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +132 -134
  109. package/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +29 -31
  110. package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +24 -37
  111. package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +5 -3
  112. package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +7 -5
  113. package/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +7 -10
  114. package/generators/client/templates/angular/src/main/webapp/declarations.d.ts.ejs +8 -1
  115. package/generators/client/templates/angular/webpack/environment.js.ejs +2 -2
  116. package/generators/client/templates/angular/webpack/logo-jhipster.png +0 -0
  117. package/generators/client/templates/angular/webpack/proxy.conf.js.ejs +2 -3
  118. package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +23 -7
  119. package/generators/client/templates/angular/webpack/webpack.microfrontend.js.ejs +3 -3
  120. package/generators/client/templates/common/README.md.jhi.client.ejs +224 -0
  121. package/generators/client/templates/common/package.json +9 -10
  122. package/generators/client/templates/common/webpack/webpack.microfrontend.js.jhi.ejs +56 -0
  123. package/generators/client/templates/react/.eslintrc.json.ejs +1 -0
  124. package/generators/client/templates/react/jest.conf.js.ejs +7 -1
  125. package/generators/client/templates/react/package.json +61 -64
  126. package/generators/client/templates/react/package.json.ejs +22 -31
  127. package/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +0 -3
  128. package/generators/client/templates/react/src/main/webapp/app/app.tsx.ejs +1 -2
  129. package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +0 -3
  130. package/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.ts.ejs +0 -2
  131. package/generators/client/templates/react/src/main/webapp/app/config/constants.ts.ejs +0 -9
  132. package/generators/client/templates/react/src/main/webapp/app/config/error-middleware.ts.ejs +2 -2
  133. package/generators/client/templates/react/src/main/webapp/app/config/logger-middleware.ts.ejs +1 -1
  134. package/generators/client/templates/react/src/main/webapp/app/config/notification-middleware.ts.ejs +1 -3
  135. package/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs +1 -3
  136. package/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +2 -2
  137. package/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.spec.ts.ejs +0 -4
  138. package/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +1 -1
  139. package/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.spec.ts.ejs +1 -2
  140. package/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +4 -4
  141. package/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +2 -2
  142. package/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +1 -2
  143. package/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.ejs +3 -1
  144. package/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +6 -6
  145. package/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +8 -8
  146. package/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +5 -1
  147. package/generators/client/templates/react/src/main/webapp/app/modules/login/logout.tsx.ejs +1 -6
  148. package/generators/client/templates/react/src/main/webapp/app/shared/auth/private-route.spec.tsx.ejs +0 -3
  149. package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary-route.spec.tsx.ejs +0 -3
  150. package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary.spec.tsx.ejs +0 -3
  151. package/generators/client/templates/react/src/main/webapp/app/shared/error/error-boundary.tsx.ejs +1 -2
  152. package/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.tsx.ejs +1 -1
  153. package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +3 -5
  154. package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.spec.tsx.ejs +0 -3
  155. package/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +1 -1
  156. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.spec.tsx.ejs +0 -3
  157. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +3 -3
  158. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +7 -7
  159. package/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +1 -1
  160. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.spec.ts.ejs +1 -5
  161. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.ejs +0 -2
  162. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs +12 -12
  163. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs +1 -1
  164. package/generators/client/templates/react/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +0 -1
  165. package/generators/client/templates/react/src/main/webapp/app/shared/util/date-utils.ts.ejs +1 -1
  166. package/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs +6 -0
  167. package/generators/client/templates/react/webpack/environment.js.ejs +35 -0
  168. package/generators/client/templates/react/webpack/webpack.common.js.ejs +31 -37
  169. package/generators/client/templates/react/webpack/webpack.dev.js.ejs +21 -7
  170. package/generators/client/templates/react/webpack/webpack.prod.js.ejs +14 -7
  171. package/generators/client/templates/vue/.eslintrc.js.ejs +8 -5
  172. package/generators/client/templates/vue/package.json +47 -55
  173. package/generators/client/templates/vue/package.json.ejs +33 -40
  174. package/generators/client/templates/vue/src/main/webapp/app/account/account.service.ts.ejs +4 -5
  175. package/generators/client/templates/vue/src/main/webapp/app/account/activate/activate.component.ts.ejs +2 -2
  176. package/generators/client/templates/vue/src/main/webapp/app/account/change-password/change-password.component.ts.ejs +1 -1
  177. package/generators/client/templates/vue/src/main/webapp/app/account/reset-password/finish/reset-password-finish.component.ts.ejs +1 -1
  178. package/generators/client/templates/vue/src/main/webapp/app/account/reset-password/init/reset-password-init.component.ts.ejs +1 -1
  179. package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.component.ts.ejs +1 -1
  180. package/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs +7 -1
  181. package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +1 -1
  182. package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +1 -1
  183. package/generators/client/templates/vue/src/main/webapp/app/admin/configuration/configuration.vue.ejs +1 -1
  184. package/generators/client/templates/vue/src/main/webapp/app/admin/health/health-modal.component.ts.ejs +2 -4
  185. package/generators/client/templates/vue/src/main/webapp/app/admin/health/health.component.ts.ejs +1 -2
  186. package/generators/client/templates/vue/src/main/webapp/app/admin/health/health.service.ts.ejs +5 -9
  187. package/generators/client/templates/vue/src/main/webapp/app/admin/logs/logs.component.ts.ejs +2 -2
  188. package/generators/client/templates/vue/src/main/webapp/app/admin/logs/logs.service.ts.ejs +1 -1
  189. package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +1 -1
  190. package/generators/client/templates/vue/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +1 -6
  191. package/generators/client/templates/vue/src/main/webapp/app/admin/tracker/tracker.service.ts.ejs +5 -4
  192. package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +9 -0
  193. package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs +5 -0
  194. package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +6 -1
  195. package/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.service.ts.ejs +3 -2
  196. package/generators/client/templates/vue/src/main/webapp/app/constants.ts.ejs +18 -9
  197. package/generators/client/templates/vue/src/main/webapp/app/core/home/home.component.ts.ejs +1 -1
  198. package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +16 -16
  199. package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue.ejs +6 -0
  200. package/generators/client/templates/vue/src/main/webapp/app/declarations.d.ts.ejs +41 -0
  201. package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.component.ts.ejs +34 -0
  202. package/generators/client/templates/vue/src/main/webapp/app/entities/entities-menu.vue.ejs +13 -0
  203. package/generators/client/templates/vue/src/main/webapp/app/entities/entities.component.ts.ejs +12 -0
  204. package/generators/client/templates/vue/src/main/webapp/app/entities/entities.vue.ejs +5 -0
  205. package/generators/{common/templates/.huskyrc.ejs → client/templates/vue/src/main/webapp/app/index.ts.ejs} +1 -5
  206. package/generators/client/templates/vue/src/main/webapp/app/locale/translation.service.ts.ejs +26 -10
  207. package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +12 -5
  208. package/generators/client/templates/vue/src/main/webapp/app/router/admin.ts.ejs +4 -4
  209. package/generators/client/templates/vue/src/main/webapp/app/router/entities.ts.ejs +44 -1
  210. package/generators/client/templates/vue/src/main/webapp/app/router/index.ts.ejs +11 -0
  211. package/generators/client/templates/vue/src/main/webapp/app/shared/alert/alert.service.ts.ejs +61 -0
  212. package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +5 -3
  213. package/generators/client/templates/vue/src/main/webapp/app/shared/config/config.ts.ejs +3 -1
  214. package/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +13 -18
  215. package/generators/client/templates/vue/src/main/webapp/app/shims-vue.d.ts.ejs +18 -0
  216. package/generators/client/templates/vue/src/test/javascript/jest.conf.js.ejs +28 -8
  217. package/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs +2 -2
  218. package/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +1 -1
  219. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs +12 -12
  220. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.service.spec.ts.ejs +2 -1
  221. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +3 -1
  222. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs +2 -1
  223. package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +3 -1
  224. package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs +52 -0
  225. package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs +4 -0
  226. package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs +7 -0
  227. package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs +1 -0
  228. package/generators/client/templates/vue/src/test/javascript/spec/app/shared/alert/alert.service.spec.ts.ejs +124 -0
  229. package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs +33 -1
  230. package/generators/client/templates/vue/src/test/javascript/spec/app/shared/data/data-utils.service.spec.ts.ejs +6 -6
  231. package/generators/client/templates/vue/tsconfig.json.ejs +5 -9
  232. package/generators/{server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.ejs → client/templates/vue/tsconfig.spec.json.ejs} +17 -21
  233. package/generators/client/templates/vue/webpack/config.js.ejs +50 -0
  234. package/generators/client/templates/vue/webpack/vue.utils.js.ejs +33 -32
  235. package/generators/client/templates/vue/webpack/webpack.common.js.ejs +164 -119
  236. package/generators/client/templates/vue/webpack/webpack.dev.js.ejs +19 -80
  237. package/generators/client/templates/vue/webpack/webpack.microfrontend.js.jhi.vue.ejs +77 -0
  238. package/generators/client/templates/vue/webpack/webpack.prod.js.ejs +5 -46
  239. package/generators/cloudfoundry/esm.mjs +21 -0
  240. package/generators/cloudfoundry/generator.spec.mjs +47 -0
  241. package/generators/cloudfoundry/index.js +38 -24
  242. package/generators/common/esm.mjs +21 -0
  243. package/generators/common/files.js +9 -2
  244. package/generators/common/generator.spec.mjs +47 -0
  245. package/generators/common/index.js +66 -11
  246. package/generators/common/templates/.husky/pre-commit +4 -0
  247. package/generators/common/templates/.prettierrc.ejs +1 -1
  248. package/generators/common/templates/{README.md.ejs → README.md.jhi.ejs} +85 -171
  249. package/generators/common/templates/package.json +5 -5
  250. package/generators/cypress/esm.mjs +21 -0
  251. package/generators/cypress/generator.spec.mjs +47 -0
  252. package/generators/cypress/index.js +17 -14
  253. package/generators/cypress/templates/cypress.json.ejs +8 -1
  254. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/login-page.spec.ts.ejs +4 -4
  255. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/password-page.spec.ts.ejs +2 -2
  256. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/register-page.spec.ts.ejs +1 -1
  257. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/reset-password-page.spec.ts.ejs +1 -1
  258. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +4 -4
  259. package/generators/cypress/templates/src/test/javascript/cypress/integration/administration/administration.spec.ts.ejs +1 -3
  260. package/generators/cypress/templates/src/test/javascript/cypress/integration/lighthouse.audits.ts.ejs +3 -3
  261. package/generators/cypress/templates/src/test/javascript/cypress/plugins/index.ts.ejs +6 -44
  262. package/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs +30 -2
  263. package/generators/cypress/templates/src/test/javascript/cypress/support/entity.ts.ejs +4 -4
  264. package/generators/cypress/templates/src/test/javascript/cypress/support/index.ts.ejs +1 -1
  265. package/generators/cypress/templates/src/test/javascript/cypress/support/management.ts.ejs +1 -1
  266. package/generators/cypress/templates/src/test/javascript/cypress/support/navbar.ts.ejs +1 -1
  267. package/generators/cypress/templates/src/test/javascript/cypress/support/oauth2.ts.ejs +104 -79
  268. package/generators/database-changelog/esm.mjs +21 -0
  269. package/generators/database-changelog/generator.spec.mjs +47 -0
  270. package/generators/database-changelog/index.js +35 -24
  271. package/generators/database-changelog-liquibase/esm.mjs +21 -0
  272. package/generators/database-changelog-liquibase/generator.spec.mjs +47 -0
  273. package/generators/database-changelog-liquibase/index.js +17 -11
  274. package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs +2 -1
  275. package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs +3 -3
  276. package/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +4 -4
  277. package/generators/docker-base.js +3 -3
  278. package/generators/docker-compose/esm.mjs +21 -0
  279. package/generators/docker-compose/generator.spec.mjs +44 -0
  280. package/generators/docker-compose/index.js +23 -11
  281. package/generators/docker-compose/templates/README-DOCKER-COMPOSE.md.ejs +1 -1
  282. package/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +113 -39
  283. package/generators/docker-prompts.js +3 -3
  284. package/generators/entities/esm.mjs +21 -0
  285. package/generators/entities/generator.spec.mjs +47 -0
  286. package/generators/entities/index.js +37 -28
  287. package/generators/entities-client/esm.mjs +21 -0
  288. package/generators/entities-client/generator.spec.mjs +47 -0
  289. package/generators/entities-client/index.js +12 -9
  290. package/generators/entity/esm.mjs +21 -0
  291. package/generators/entity/generator.spec.mjs +47 -0
  292. package/generators/entity/index.js +54 -36
  293. package/generators/entity-client/esm.mjs +21 -0
  294. package/generators/entity-client/files.js +6 -11
  295. package/generators/entity-client/generator.spec.mjs +47 -0
  296. package/generators/entity-client/index.js +77 -10
  297. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +42 -44
  298. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +57 -54
  299. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +2 -2
  300. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +2 -2
  301. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +105 -107
  302. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +17 -4
  303. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +3 -4
  304. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +6 -0
  305. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing-resolve.service.spec.ts.ejs +52 -54
  306. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/route/entity-management-routing.module.ts.ejs +1 -1
  307. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/service/entity.service.spec.ts.ejs +173 -175
  308. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +2 -4
  309. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +193 -195
  310. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +7 -0
  311. package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +262 -110
  312. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +5 -2
  313. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +26 -23
  314. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +7 -7
  315. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-details.component.ts.ejs +5 -0
  316. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.component.ts.ejs +22 -3
  317. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity-update.vue.ejs +6 -9
  318. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.component.ts.ejs +9 -1
  319. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +1 -1
  320. package/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.service.ts.ejs +2 -6
  321. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs +2 -1
  322. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +2 -0
  323. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +3 -1
  324. package/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +1 -1
  325. package/generators/entity-i18n/esm.mjs +21 -0
  326. package/generators/entity-i18n/files.js +61 -26
  327. package/generators/entity-i18n/generator.spec.mjs +47 -0
  328. package/generators/entity-i18n/index.js +12 -9
  329. package/generators/entity-i18n/templates/i18n/entity_hr.json.ejs +0 -0
  330. package/generators/entity-i18n/templates/i18n/entity_pa.json.ejs +69 -0
  331. package/generators/entity-server/esm.mjs +21 -0
  332. package/generators/entity-server/files-couchbase.js +73 -0
  333. package/generators/entity-server/files.js +102 -31
  334. package/generators/entity-server/generator.spec.mjs +47 -0
  335. package/generators/entity-server/index.js +29 -13
  336. package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +212 -0
  337. package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +138 -0
  338. package/generators/entity-server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/entity.fts.ejs +6 -3
  339. package/generators/entity-server/templates/partials/save_template.ejs +2 -2
  340. package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +3 -3
  341. package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +2 -2
  342. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +375 -0
  343. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.elastic_search.ejs +25 -0
  344. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.hibernate_cache.ejs +41 -0
  345. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_persistence.ejs +130 -0
  346. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.javax_validation.ejs +51 -0
  347. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_cassandra.ejs +48 -0
  348. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_mongodb.ejs +82 -0
  349. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_neo4j.ejs +97 -0
  350. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.spring_data_reactive.ejs +114 -0
  351. package/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs +11 -4
  352. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +10 -15
  353. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +17 -30
  354. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +6 -9
  355. package/generators/entity-server/templates/src/main/java/package/repository/EntitySqlHelper_reactive.java.ejs +46 -0
  356. package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +3 -3
  357. package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +61 -10
  358. package/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs +12 -8
  359. package/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +4 -4
  360. package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +18 -13
  361. package/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +8 -4
  362. package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +9 -9
  363. package/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs +1 -1
  364. package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +7 -3
  365. package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +52 -54
  366. package/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs +1 -1
  367. package/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs +1 -1
  368. package/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs +1 -1
  369. package/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs +1 -1
  370. package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +36 -22
  371. package/generators/export-jdl/esm.mjs +21 -0
  372. package/generators/export-jdl/generator.spec.mjs +44 -0
  373. package/generators/export-jdl/index.js +2 -2
  374. package/generators/gae/esm.mjs +21 -0
  375. package/generators/gae/generator.spec.mjs +47 -0
  376. package/generators/gae/index.js +60 -41
  377. package/generators/gae/templates/dispatch.yaml.ejs +2 -2
  378. package/generators/generator-base-blueprint.js +35 -37
  379. package/generators/generator-base-docker.js +4 -24
  380. package/generators/generator-base-private.js +59 -116
  381. package/generators/generator-base.js +544 -91
  382. package/generators/generator-constants.js +43 -29
  383. package/generators/generator-defaults.js +1 -0
  384. package/generators/generator-list.js +27 -2
  385. package/generators/generator-transforms.js +31 -24
  386. package/generators/gradle/__snapshots__/generator.spec.cjs.snap +59 -0
  387. package/generators/gradle/constants.cjs +29 -0
  388. package/generators/gradle/files.cjs +37 -0
  389. package/generators/gradle/generator.spec.cjs +71 -0
  390. package/generators/gradle/index.cjs +136 -0
  391. package/generators/gradle/templates/.eslintignore.jhi.gradle.ejs +19 -0
  392. package/generators/gradle/templates/.gitignore.jhi.gradle.ejs +28 -0
  393. package/generators/gradle/templates/.prettierignore.jhi.gradle.ejs +22 -0
  394. package/generators/gradle/templates/build.gradle.jhi.ejs +48 -0
  395. package/generators/gradle/templates/gradle.properties.jhi.ejs +57 -0
  396. package/generators/gradle/templates/settings.gradle.jhi.ejs +20 -0
  397. package/generators/heroku/esm.mjs +21 -0
  398. package/generators/heroku/generator.spec.mjs +47 -0
  399. package/generators/heroku/index.js +92 -80
  400. package/generators/heroku/templates/Procfile.ejs +1 -1
  401. package/generators/heroku/templates/application-heroku.yml.ejs +9 -9
  402. package/generators/heroku/templates/bootstrap-heroku.yml.ejs +2 -2
  403. package/generators/heroku/templates/pom-profile.xml.ejs +1 -1
  404. package/generators/info/esm.mjs +21 -0
  405. package/generators/info/generator.spec.mjs +44 -0
  406. package/generators/info/index.js +4 -2
  407. package/generators/init/__snapshots__/generator.spec.cjs.snap +65 -0
  408. package/generators/init/config.cjs +36 -0
  409. package/generators/init/constants.cjs +35 -0
  410. package/generators/init/files.cjs +51 -0
  411. package/generators/init/generator.spec.cjs +112 -0
  412. package/generators/init/index.cjs +283 -0
  413. package/generators/init/mixin.cjs +76 -0
  414. package/generators/init/options.cjs +27 -0
  415. package/generators/init/templates/.editorconfig.jhi.ejs +40 -0
  416. package/generators/init/templates/.eslintignore.jhi.ejs +21 -0
  417. package/generators/init/templates/.gitattributes.jhi.ejs +170 -0
  418. package/generators/init/templates/.gitignore.jhi.ejs +128 -0
  419. package/generators/init/templates/.husky/pre-commit +4 -0
  420. package/generators/{client/templates/vue/webpack/utils.js.ejs → init/templates/.lintstagedrc.js.ejs} +1 -10
  421. package/generators/init/templates/.prettierignore.jhi.ejs +23 -0
  422. package/generators/init/templates/.prettierrc.yml.jhi.ejs +29 -0
  423. package/generators/init/templates/README.md.ejs +19 -0
  424. package/generators/init/templates/package.json +6 -0
  425. package/generators/init/templates/package.json.ejs +41 -0
  426. package/generators/java/__snapshots__/generator.spec.cjs.snap +118 -0
  427. package/generators/java/config.cjs +43 -0
  428. package/generators/java/constants.cjs +69 -0
  429. package/generators/java/files.cjs +26 -0
  430. package/generators/java/generator.spec.cjs +87 -0
  431. package/generators/java/index.cjs +226 -0
  432. package/generators/java/mixin.cjs +120 -0
  433. package/generators/java/options.cjs +32 -0
  434. package/generators/java/templates/.editorconfig.jhi.java.ejs +23 -0
  435. package/generators/java/templates/.gitignore.jhi.java.ejs +34 -0
  436. package/generators/java/templates/.prettierrc.yml.jhi.java.ejs +25 -0
  437. package/generators/kubernetes/esm.mjs +21 -0
  438. package/generators/kubernetes/files.js +20 -8
  439. package/generators/kubernetes/generator.spec.mjs +44 -0
  440. package/generators/kubernetes/index.js +126 -64
  441. package/generators/kubernetes/kubernetes-constants.js +50 -0
  442. package/generators/kubernetes/prompts.js +25 -16
  443. package/generators/kubernetes/templates/README-KUBERNETES.md.ejs +12 -13
  444. package/generators/kubernetes/templates/db/couchbase.yml.ejs +3 -3
  445. package/generators/kubernetes/templates/db/elasticsearch.yml.ejs +5 -5
  446. package/generators/kubernetes/templates/db/mariadb.yml.ejs +5 -5
  447. package/generators/kubernetes/templates/db/mongodb.yml.ejs +2 -2
  448. package/generators/kubernetes/templates/db/mssql.yml.ejs +5 -5
  449. package/generators/kubernetes/templates/db/mysql.yml.ejs +5 -5
  450. package/generators/kubernetes/templates/db/neo4j.yml.ejs +5 -5
  451. package/generators/kubernetes/templates/db/postgresql.yml.ejs +5 -5
  452. package/generators/kubernetes/templates/deployment.yml.ejs +61 -56
  453. package/generators/kubernetes/templates/ingress.yml.ejs +2 -2
  454. package/generators/kubernetes/templates/istio/destination-rule.yml.ejs +1 -1
  455. package/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +5 -2
  456. package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +5 -2
  457. package/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +10 -8
  458. package/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +5 -2
  459. package/generators/kubernetes/templates/istio/gateway.yml.ejs +11 -9
  460. package/generators/kubernetes/templates/kubectl-apply.sh.ejs +24 -23
  461. package/generators/kubernetes/templates/kustomize/kustomization.yml.ejs +27 -27
  462. package/generators/kubernetes/templates/messagebroker/kafka.yml.ejs +4 -4
  463. package/generators/kubernetes/templates/monitoring/jhipster-grafana-dashboard.yml.ejs +2 -2
  464. package/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs +6 -6
  465. package/generators/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.ejs +2 -2
  466. package/generators/kubernetes/templates/registry/application-configmap.yml.ejs +6 -6
  467. package/generators/kubernetes/templates/registry/consul.yml.ejs +2 -2
  468. package/generators/kubernetes/templates/registry/jhipster-registry.yml.ejs +4 -4
  469. package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs +9 -0
  470. package/generators/kubernetes/templates/service.yml.ejs +8 -8
  471. package/generators/kubernetes-base.js +44 -18
  472. package/generators/kubernetes-helm/esm.mjs +21 -0
  473. package/generators/kubernetes-helm/files.js +20 -21
  474. package/generators/kubernetes-helm/generator.spec.mjs +44 -0
  475. package/generators/kubernetes-helm/index.js +106 -46
  476. package/generators/kubernetes-helm/templates/README-KUBERNETES-HELM.md.ejs +2 -3
  477. package/generators/kubernetes-helm/templates/app/Chart.yml.ejs +27 -0
  478. package/generators/kubernetes-helm/templates/app/helpers.tpl.ejs +4 -15
  479. package/generators/kubernetes-helm/templates/app/requirements.yml.ejs +11 -6
  480. package/generators/kubernetes-helm/templates/app/values.yml.ejs +73 -10
  481. package/generators/kubernetes-helm/templates/csvc/Chart.yml.ejs +17 -0
  482. package/generators/kubernetes-helm/templates/csvc/helpers.tpl.ejs +1 -1
  483. package/generators/kubernetes-helm/templates/csvc/requirements.yml.ejs +3 -3
  484. package/generators/kubernetes-helm/templates/csvc/values.yml.ejs +6 -6
  485. package/generators/kubernetes-helm/templates/helm-apply.sh.ejs +2 -2
  486. package/generators/kubernetes-helm/templates/helm-upgrade.sh.ejs +1 -1
  487. package/generators/kubernetes-knative/esm.mjs +21 -0
  488. package/generators/kubernetes-knative/files.js +30 -19
  489. package/generators/kubernetes-knative/generator.spec.mjs +44 -0
  490. package/generators/kubernetes-knative/index.js +134 -72
  491. package/generators/kubernetes-knative/prompts.js +7 -3
  492. package/generators/kubernetes-knative/templates/README-KUBERNETES-KNATIVE.md.ejs +5 -5
  493. package/generators/kubernetes-knative/templates/helm-apply.sh.ejs +1 -1
  494. package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +10 -8
  495. package/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs +24 -19
  496. package/generators/kubernetes-knative/templates/service.yml.ejs +32 -32
  497. package/generators/languages/esm.mjs +21 -0
  498. package/generators/languages/files.js +73 -0
  499. package/generators/languages/generator.spec.mjs +47 -0
  500. package/generators/languages/index.js +45 -22
  501. package/generators/languages/prompts.js +1 -1
  502. package/generators/languages/templates/src/main/resources/i18n/messages_hr.properties.ejs +0 -0
  503. package/generators/languages/templates/src/main/resources/i18n/messages_pa.properties.ejs +41 -0
  504. package/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs +2 -2
  505. package/generators/languages/templates/src/main/webapp/i18n/al/health.json.ejs +17 -15
  506. package/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs +2 -2
  507. package/generators/languages/templates/src/main/webapp/i18n/ar-ly/health.json.ejs +17 -15
  508. package/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs +2 -2
  509. package/generators/languages/templates/src/main/webapp/i18n/bg/health.json.ejs +19 -16
  510. package/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs +2 -2
  511. package/generators/languages/templates/src/main/webapp/i18n/bn/health.json.ejs +17 -15
  512. package/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs +2 -2
  513. package/generators/languages/templates/src/main/webapp/i18n/by/health.json.ejs +17 -15
  514. package/generators/languages/templates/src/main/webapp/i18n/ca/global.json.ejs +2 -2
  515. package/generators/languages/templates/src/main/webapp/i18n/ca/health.json.ejs +17 -15
  516. package/generators/languages/templates/src/main/webapp/i18n/cs/global.json.ejs +2 -2
  517. package/generators/languages/templates/src/main/webapp/i18n/cs/health.json.ejs +17 -15
  518. package/generators/languages/templates/src/main/webapp/i18n/da/global.json.ejs +2 -2
  519. package/generators/languages/templates/src/main/webapp/i18n/da/health.json.ejs +17 -15
  520. package/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs +2 -2
  521. package/generators/languages/templates/src/main/webapp/i18n/de/health.json.ejs +17 -15
  522. package/generators/languages/templates/src/main/webapp/i18n/el/global.json.ejs +2 -2
  523. package/generators/languages/templates/src/main/webapp/i18n/el/health.json.ejs +17 -15
  524. package/generators/languages/templates/src/main/webapp/i18n/en/global.json.ejs +2 -2
  525. package/generators/languages/templates/src/main/webapp/i18n/en/health.json.ejs +17 -15
  526. package/generators/languages/templates/src/main/webapp/i18n/es/global.json.ejs +2 -2
  527. package/generators/languages/templates/src/main/webapp/i18n/es/health.json.ejs +17 -15
  528. package/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs +2 -2
  529. package/generators/languages/templates/src/main/webapp/i18n/et/health.json.ejs +17 -15
  530. package/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs +2 -2
  531. package/generators/languages/templates/src/main/webapp/i18n/fa/health.json.ejs +17 -15
  532. package/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs +2 -2
  533. package/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs +17 -15
  534. package/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs +2 -2
  535. package/generators/languages/templates/src/main/webapp/i18n/fr/health.json.ejs +17 -15
  536. package/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs +2 -2
  537. package/generators/languages/templates/src/main/webapp/i18n/gl/health.json.ejs +17 -15
  538. package/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs +2 -2
  539. package/generators/languages/templates/src/main/webapp/i18n/hi/health.json.ejs +17 -15
  540. package/generators/languages/templates/src/main/webapp/i18n/hr/activate.json.ejs +0 -0
  541. package/generators/languages/templates/src/main/webapp/i18n/hr/configuration.json +0 -0
  542. package/generators/languages/templates/src/main/webapp/i18n/hr/error.json +0 -0
  543. package/generators/languages/templates/src/main/webapp/i18n/hr/gateway.json +0 -0
  544. package/generators/languages/templates/src/main/webapp/i18n/hr/global.json.ejs +2 -2
  545. package/generators/languages/templates/src/main/webapp/i18n/hr/health.json.ejs +15 -13
  546. package/generators/languages/templates/src/main/webapp/i18n/hr/home.json +0 -0
  547. package/generators/languages/templates/src/main/webapp/i18n/hr/login.json +0 -0
  548. package/generators/languages/templates/src/main/webapp/i18n/hr/logs.json +0 -0
  549. package/generators/languages/templates/src/main/webapp/i18n/hr/metrics.json +0 -0
  550. package/generators/languages/templates/src/main/webapp/i18n/hr/password.json +0 -0
  551. package/generators/languages/templates/src/main/webapp/i18n/hr/register.json +0 -0
  552. package/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs +1 -2
  553. package/generators/languages/templates/src/main/webapp/i18n/hr/sessions.json +0 -0
  554. package/generators/languages/templates/src/main/webapp/i18n/hr/settings.json +0 -0
  555. package/generators/languages/templates/src/main/webapp/i18n/hr/tracker.json +0 -0
  556. package/generators/languages/templates/src/main/webapp/i18n/hr/user-management.json +0 -0
  557. package/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs +2 -2
  558. package/generators/languages/templates/src/main/webapp/i18n/hu/health.json.ejs +17 -15
  559. package/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs +2 -2
  560. package/generators/languages/templates/src/main/webapp/i18n/hy/health.json.ejs +17 -15
  561. package/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs +2 -2
  562. package/generators/languages/templates/src/main/webapp/i18n/in/health.json.ejs +17 -15
  563. package/generators/languages/templates/src/main/webapp/i18n/it/global.json.ejs +2 -2
  564. package/generators/languages/templates/src/main/webapp/i18n/it/health.json.ejs +17 -15
  565. package/generators/languages/templates/src/main/webapp/i18n/ja/global.json.ejs +2 -2
  566. package/generators/languages/templates/src/main/webapp/i18n/ja/health.json.ejs +17 -15
  567. package/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs +2 -2
  568. package/generators/languages/templates/src/main/webapp/i18n/ko/health.json.ejs +17 -15
  569. package/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs +2 -2
  570. package/generators/languages/templates/src/main/webapp/i18n/mr/health.json.ejs +17 -15
  571. package/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs +2 -2
  572. package/generators/languages/templates/src/main/webapp/i18n/my/health.json.ejs +17 -15
  573. package/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs +2 -2
  574. package/generators/languages/templates/src/main/webapp/i18n/nl/health.json.ejs +17 -15
  575. package/generators/languages/templates/src/main/webapp/i18n/pa/activate.json.ejs +27 -0
  576. package/generators/languages/templates/src/main/webapp/i18n/pa/configuration.json +10 -0
  577. package/generators/languages/templates/src/main/webapp/i18n/pa/error.json +14 -0
  578. package/generators/languages/templates/src/main/webapp/i18n/pa/gateway.json +15 -0
  579. package/generators/languages/templates/src/main/webapp/i18n/pa/global.json.ejs +162 -0
  580. package/generators/languages/templates/src/main/webapp/i18n/pa/health.json.ejs +71 -0
  581. package/generators/languages/templates/src/main/webapp/i18n/pa/home.json +19 -0
  582. package/generators/languages/templates/src/main/webapp/i18n/pa/login.json +19 -0
  583. package/generators/languages/templates/src/main/webapp/i18n/pa/logs.json +11 -0
  584. package/generators/languages/templates/src/main/webapp/i18n/pa/metrics.json +102 -0
  585. package/generators/languages/templates/src/main/webapp/i18n/pa/password.json +12 -0
  586. package/generators/languages/templates/src/main/webapp/i18n/pa/register.json +24 -0
  587. package/generators/languages/templates/src/main/webapp/i18n/pa/reset.json.ejs +44 -0
  588. package/generators/languages/templates/src/main/webapp/i18n/pa/sessions.json +15 -0
  589. package/generators/languages/templates/src/main/webapp/i18n/pa/settings.json +32 -0
  590. package/generators/languages/templates/src/main/webapp/i18n/pa/tracker.json +12 -0
  591. package/generators/languages/templates/src/main/webapp/i18n/pa/user-management.json +31 -0
  592. package/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs +2 -2
  593. package/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs +17 -15
  594. package/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs +2 -2
  595. package/generators/languages/templates/src/main/webapp/i18n/pt-br/health.json.ejs +17 -15
  596. package/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs +2 -2
  597. package/generators/languages/templates/src/main/webapp/i18n/pt-pt/health.json.ejs +17 -15
  598. package/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs +2 -2
  599. package/generators/languages/templates/src/main/webapp/i18n/ro/health.json.ejs +17 -15
  600. package/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs +2 -2
  601. package/generators/languages/templates/src/main/webapp/i18n/ru/health.json.ejs +17 -15
  602. package/generators/languages/templates/src/main/webapp/i18n/si/global.json.ejs +2 -2
  603. package/generators/languages/templates/src/main/webapp/i18n/si/health.json.ejs +17 -15
  604. package/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs +2 -2
  605. package/generators/languages/templates/src/main/webapp/i18n/sk/health.json.ejs +17 -15
  606. package/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs +2 -2
  607. package/generators/languages/templates/src/main/webapp/i18n/sr/health.json.ejs +16 -14
  608. package/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs +2 -2
  609. package/generators/languages/templates/src/main/webapp/i18n/sv/health.json.ejs +17 -15
  610. package/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs +2 -2
  611. package/generators/languages/templates/src/main/webapp/i18n/ta/health.json.ejs +17 -15
  612. package/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs +2 -2
  613. package/generators/languages/templates/src/main/webapp/i18n/te/health.json.ejs +17 -15
  614. package/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs +2 -2
  615. package/generators/languages/templates/src/main/webapp/i18n/th/health.json.ejs +17 -15
  616. package/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs +2 -2
  617. package/generators/languages/templates/src/main/webapp/i18n/tr/health.json.ejs +17 -15
  618. package/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs +2 -2
  619. package/generators/languages/templates/src/main/webapp/i18n/ua/health.json.ejs +17 -15
  620. package/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs +2 -2
  621. package/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/health.json.ejs +16 -14
  622. package/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs +2 -2
  623. package/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.ejs +17 -15
  624. package/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs +2 -2
  625. package/generators/languages/templates/src/main/webapp/i18n/vi/health.json.ejs +17 -15
  626. package/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs +2 -2
  627. package/generators/languages/templates/src/main/webapp/i18n/zh-cn/health.json.ejs +17 -15
  628. package/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs +2 -2
  629. package/generators/languages/templates/src/main/webapp/i18n/zh-tw/health.json.ejs +17 -15
  630. package/generators/languages/templates/src/test/resources/i18n/messages_hr.properties.ejs +0 -0
  631. package/generators/languages/templates/src/test/resources/i18n/messages_pa.properties.ejs +4 -0
  632. package/generators/maven/__snapshots__/generator.spec.cjs.snap +53 -0
  633. package/generators/maven/constants.cjs +27 -0
  634. package/generators/maven/files.cjs +36 -0
  635. package/generators/maven/generator.spec.cjs +78 -0
  636. package/generators/maven/index.cjs +131 -0
  637. package/generators/maven/templates/.eslintignore.jhi.maven.ejs +19 -0
  638. package/generators/maven/templates/.gitignore.jhi.maven.ejs +9 -0
  639. package/generators/maven/templates/.mvn/wrapper/MavenWrapperDownloader.java +117 -0
  640. package/generators/maven/templates/.mvn/wrapper/maven-wrapper.jar +0 -0
  641. package/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +2 -0
  642. package/generators/maven/templates/.prettierignore.jhi.maven.ejs +3 -0
  643. package/generators/maven/templates/mvnw +310 -0
  644. package/generators/maven/templates/mvnw.cmd +182 -0
  645. package/generators/maven/templates/pom.xml.jhi.ejs +98 -0
  646. package/generators/openapi-client/esm.mjs +21 -0
  647. package/generators/openapi-client/files.js +21 -15
  648. package/generators/openapi-client/generator.spec.mjs +47 -0
  649. package/generators/openapi-client/index.js +80 -28
  650. package/generators/openapi-client/prompts.js +6 -2
  651. package/generators/openshift/esm.mjs +21 -0
  652. package/generators/openshift/files.js +12 -5
  653. package/generators/openshift/generator.spec.mjs +44 -0
  654. package/generators/openshift/index.js +136 -64
  655. package/generators/openshift/prompts.js +12 -4
  656. package/generators/openshift/templates/apply.sh.ejs +6 -6
  657. package/generators/openshift/templates/db/cassandra.yml.ejs +8 -9
  658. package/generators/openshift/templates/db/couchbase.yml.ejs +8 -9
  659. package/generators/openshift/templates/db/elasticsearch.yml.ejs +8 -9
  660. package/generators/openshift/templates/db/mariadb.yml.ejs +8 -9
  661. package/generators/openshift/templates/db/mongodb.yml.ejs +8 -9
  662. package/generators/openshift/templates/db/mysql.yml.ejs +8 -9
  663. package/generators/openshift/templates/db/postgresql.yml.ejs +8 -9
  664. package/generators/openshift/templates/deployment.yml.ejs +46 -46
  665. package/generators/openshift/templates/messagebroker/kafka.yml.ejs +13 -14
  666. package/generators/openshift/templates/monitoring/jhipster-metrics.yml.ejs +17 -17
  667. package/generators/openshift/templates/registry/application-configmap.yml.ejs +6 -6
  668. package/generators/options.js +63 -0
  669. package/generators/page/esm.mjs +21 -0
  670. package/generators/page/generator.spec.mjs +47 -0
  671. package/generators/page/index.js +17 -13
  672. package/generators/project-name/config.cjs +40 -0
  673. package/generators/project-name/constants.cjs +37 -0
  674. package/generators/project-name/generator.spec.cjs +43 -0
  675. package/generators/project-name/index.cjs +194 -0
  676. package/generators/project-name/mixin.cjs +82 -0
  677. package/generators/project-name/options.cjs +33 -0
  678. package/generators/server/__snapshots__/generator.spec.mjs.snap +1848 -0
  679. package/generators/server/esm.mjs +21 -0
  680. package/generators/server/files-couchbase.js +155 -0
  681. package/generators/server/files-sql.js +52 -0
  682. package/generators/server/files.js +302 -286
  683. package/generators/server/generator.spec.mjs +52 -0
  684. package/generators/server/index.js +193 -97
  685. package/generators/server/needle-api/needle-server-cache.js +7 -8
  686. package/generators/server/prompts.js +104 -62
  687. package/generators/server/templates/.mvn/wrapper/MavenWrapperDownloader.java +1 -1
  688. package/generators/server/templates/.mvn/wrapper/maven-wrapper.properties +1 -1
  689. package/generators/server/templates/build.gradle.ejs +43 -9
  690. package/generators/server/templates/checkstyle.xml.ejs +2 -2
  691. package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase/Couchbase.Dockerfile.ejs +0 -0
  692. package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase/scripts/configure-node.sh.ejs +4 -4
  693. package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase-cluster.yml.ejs +0 -0
  694. package/generators/server/templates/{src → couchbase/src}/main/docker/couchbase.yml.ejs +0 -0
  695. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactory.java.ejs +83 -0
  696. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java.ejs +40 -0
  697. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryQuery.java.ejs +44 -0
  698. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlQueryCreator.java.ejs +162 -0
  699. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java.ejs +104 -0
  700. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/package-info.java.ejs +25 -0
  701. package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +114 -0
  702. package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs +49 -0
  703. package/generators/server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json.ejs +0 -0
  704. package/generators/server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json.ejs +0 -0
  705. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/user__admin.json.ejs +18 -0
  706. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/user__user.json.ejs +17 -0
  707. package/generators/server/templates/{src → couchbase/src}/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs +3 -6
  708. package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +55 -0
  709. package/generators/server/templates/{src/test/java/package/repository/CustomN1qlCouchbaseRepositoryTest.java.ejs → couchbase/src/test/java/package/repository/JHipsterCouchbaseRepositoryTest.java.ejs} +3 -4
  710. package/generators/server/templates/gradle/docker.gradle.ejs +3 -3
  711. package/generators/server/templates/gradle/profile_dev.gradle.ejs +36 -12
  712. package/generators/server/templates/gradle/profile_prod.gradle.ejs +7 -7
  713. package/generators/server/templates/gradle/war.gradle.ejs +4 -4
  714. package/generators/server/templates/gradle.properties.ejs +21 -17
  715. package/generators/server/templates/mvnw +1 -1
  716. package/generators/server/templates/mvnw.cmd +1 -1
  717. package/generators/server/templates/npmw +1 -1
  718. package/generators/server/templates/npmw.cmd +1 -1
  719. package/generators/server/templates/package.json.ejs +4 -8
  720. package/generators/server/templates/pom.xml.ejs +352 -160
  721. package/generators/server/templates/settings.gradle.ejs +38 -9
  722. package/generators/server/templates/sql/reactive/src/main/java/package/repository/UserSqlHelper.java.ejs +48 -0
  723. package/generators/server/templates/src/main/docker/app.yml.ejs +80 -75
  724. package/generators/server/templates/src/main/docker/config/README.md.ejs +2 -2
  725. package/generators/server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs +117 -41
  726. package/generators/server/templates/src/main/docker/elasticsearch.yml.ejs +12 -1
  727. package/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs +8 -8
  728. package/generators/server/templates/src/main/docker/jhipster-registry.yml.ejs +3 -3
  729. package/generators/server/templates/src/main/docker/prometheus/prometheus.yml.ejs +1 -1
  730. package/generators/server/templates/src/main/java/package/Application.java.ejs +6 -5
  731. package/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs +1 -1
  732. package/generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs +1 -1
  733. package/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs +94 -96
  734. package/generators/server/templates/src/main/java/package/config/Constants.java.ejs +8 -8
  735. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs +2 -8
  736. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +116 -33
  737. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_mongodb.java.ejs +4 -6
  738. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_neo4j.java.ejs +4 -6
  739. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs +13 -13
  740. package/generators/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs +5 -4
  741. package/generators/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs +6 -1
  742. package/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs +3 -3
  743. package/generators/server/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs +5 -5
  744. package/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +1 -4
  745. package/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs +13 -13
  746. package/generators/server/templates/src/main/java/package/config/OAuth2Configuration.java.ejs +38 -0
  747. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +99 -102
  748. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +114 -66
  749. package/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +31 -32
  750. package/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs +4 -2
  751. package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs +5 -5
  752. package/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs +2 -6
  753. package/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs +48 -36
  754. package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +20 -20
  755. package/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +55 -55
  756. package/generators/server/templates/src/main/java/package/domain/User.java.ejs +185 -160
  757. package/generators/server/templates/src/main/java/package/management/SecurityMetersService.java.ejs +68 -0
  758. package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +40 -15
  759. package/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs +14 -36
  760. package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +209 -163
  761. package/generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.ejs +4 -4
  762. package/generators/server/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs +33 -7
  763. package/generators/server/templates/src/main/java/package/repository/search/package-info.java.ejs +2 -2
  764. package/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs +11 -11
  765. package/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs +43 -45
  766. package/generators/server/templates/src/main/java/package/security/SecurityUtils.java.ejs +62 -29
  767. package/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs +10 -10
  768. package/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +31 -6
  769. package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +29 -4
  770. package/generators/server/templates/src/main/java/package/service/MailService.java.ejs +2 -2
  771. package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +326 -304
  772. package/generators/server/templates/src/main/java/package/service/dto/AdminUserDTO.java.ejs +24 -24
  773. package/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs +7 -7
  774. package/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs +11 -11
  775. package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +71 -0
  776. package/generators/server/templates/src/main/java/package/web/filter/OAuth2RefreshTokensWebFilter.java.ejs +103 -0
  777. package/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs +3 -3
  778. package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +77 -76
  779. package/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs +3 -3
  780. package/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs +12 -12
  781. package/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs +58 -22
  782. package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +62 -39
  783. package/generators/server/templates/src/main/java/package/web/rest/UserJWTController.java.ejs +3 -3
  784. package/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +51 -51
  785. package/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs +4 -4
  786. package/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs +19 -19
  787. package/generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs +4 -4
  788. package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +105 -102
  789. package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +78 -78
  790. package/generators/server/templates/src/main/resources/config/application-tls.yml.ejs +1 -1
  791. package/generators/server/templates/src/main/resources/config/application.yml.ejs +42 -55
  792. package/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs +7 -7
  793. package/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs +6 -6
  794. package/generators/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.ejs +1 -1
  795. package/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs +26 -34
  796. package/generators/server/templates/src/main/resources/config/liquibase/data/user.csv.ejs +2 -2
  797. package/generators/server/templates/src/main/resources/config/liquibase/data/user_authority.csv.ejs +1 -1
  798. package/generators/server/templates/src/main/resources/config/liquibase/master.xml.ejs +14 -14
  799. package/generators/server/templates/src/main/resources/config/{couchmove/changelog/V0.1__initial_setup → neo4j/migrations}/user__admin.json.ejs +2 -2
  800. package/generators/server/templates/src/main/resources/config/{couchmove/changelog/V0.1__initial_setup → neo4j/migrations}/user__user.json.ejs +2 -2
  801. package/generators/server/templates/src/main/resources/h2.server.properties.ejs +2 -2
  802. package/generators/server/templates/src/main/resources/logback-spring.xml.ejs +55 -55
  803. package/generators/server/templates/src/main/resources/static/microservices_index.html.ejs +1 -1
  804. package/generators/server/templates/src/main/resources/swagger/api.yml.ejs +6 -6
  805. package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +13 -7
  806. package/generators/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.ejs +9 -9
  807. package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +3 -0
  808. package/generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs +27 -28
  809. package/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs +5 -7
  810. package/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +6 -4
  811. package/generators/server/templates/src/test/java/package/management/SecurityMetersServiceTests.java.ejs +113 -0
  812. package/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapper.java.ejs +3 -3
  813. package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs +24 -24
  814. package/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest.java.ejs +97 -10
  815. package/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +23 -18
  816. package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderSecurityMetersTests.java.ejs +198 -0
  817. package/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +13 -3
  818. package/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +16 -2
  819. package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +108 -4
  820. package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +4 -4
  821. package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs +133 -133
  822. package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +17 -17
  823. package/generators/server/templates/src/test/java/package/test/util/OAuth2TestUtil.java.ejs +104 -0
  824. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +397 -338
  825. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs +67 -70
  826. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs +20 -20
  827. package/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs +2 -2
  828. package/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs +14 -14
  829. package/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs +41 -34
  830. package/generators/server/templates/src/test/java/package/web/rest/PublicUserResourceIT.java.ejs +59 -59
  831. package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +25 -55
  832. package/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs +35 -35
  833. package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +263 -261
  834. package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs +13 -13
  835. package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs +3 -3
  836. package/generators/server/templates/src/test/resources/config/application-testcontainers.yml.ejs +17 -17
  837. package/generators/server/templates/src/test/resources/config/application.yml.ejs +34 -36
  838. package/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs +4 -4
  839. package/generators/server/templates/src/test/resources/logback.xml.ejs +54 -52
  840. package/generators/spring-boot/__snapshots__/generator.spec.cjs.snap +80 -0
  841. package/generators/spring-boot/config.cjs +30 -0
  842. package/generators/spring-boot/constants.cjs +28 -0
  843. package/generators/spring-boot/files.cjs +46 -0
  844. package/generators/spring-boot/generator.spec.cjs +64 -0
  845. package/generators/spring-boot/index.cjs +162 -0
  846. package/generators/spring-boot/mixin.cjs +82 -0
  847. package/generators/spring-boot/options.cjs +19 -0
  848. package/generators/spring-boot/templates/build.gradle.jhi.spring-boot.ejs +29 -0
  849. package/generators/spring-boot/templates/pom.xml.jhi.spring-boot.ejs +45 -0
  850. package/generators/spring-boot/templates/src/main/java/package/Application.java.jhi.ejs +31 -0
  851. package/generators/spring-boot/templates/src/main/resources/application.properties.jhi.ejs +19 -0
  852. package/generators/spring-boot/templates/src/test/java/package/ApplicationTests.java.jhi.ejs +31 -0
  853. package/generators/spring-controller/esm.mjs +21 -0
  854. package/generators/spring-controller/generator.spec.mjs +47 -0
  855. package/generators/spring-controller/index.js +39 -19
  856. package/generators/spring-controller/templates/src/main/java/package/web/rest/Resource.java.ejs +5 -5
  857. package/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs +2 -2
  858. package/generators/spring-service/esm.mjs +21 -0
  859. package/generators/spring-service/generator.spec.mjs +47 -0
  860. package/generators/spring-service/index.js +33 -13
  861. package/generators/spring-service/templates/src/main/java/package/service/Service.java.ejs +16 -8
  862. package/generators/spring-service/templates/src/main/java/package/service/impl/ServiceImpl.java.ejs +9 -5
  863. package/generators/statistics.js +3 -1
  864. package/generators/upgrade/esm.mjs +21 -0
  865. package/generators/upgrade/generator.spec.mjs +44 -0
  866. package/generators/upgrade/index.js +5 -6
  867. package/generators/upgrade-config/esm.mjs +21 -0
  868. package/generators/upgrade-config/generator.spec.mjs +44 -0
  869. package/generators/upgrade-config/index.js +2 -2
  870. package/generators/utils.js +78 -11
  871. package/generators/workspaces/esm.mjs +21 -0
  872. package/generators/workspaces/generator.spec.mjs +47 -0
  873. package/generators/workspaces/index.js +20 -12
  874. package/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +8 -0
  875. package/jdl/converters/json-to-jdl-entity-converter.js +1 -0
  876. package/jdl/jhipster/application-options.js +18 -3
  877. package/jdl/jhipster/default-application-options.js +13 -7
  878. package/jdl/jhipster/deployment-options.js +25 -12
  879. package/jdl/jhipster/kubernetes-platform-types.js +40 -0
  880. package/jdl/jhipster/message-broker-types.js +1 -0
  881. package/jdl/jhipster/openapi-options.js +21 -0
  882. package/jdl/jhipster/openshift-platform-types.js +27 -0
  883. package/jdl/models/jdl-enum-value.js +2 -1
  884. package/jdl/models/jdl-enum.js +11 -1
  885. package/jdl/parsing/jdl-ast-builder-visitor.js +10 -2
  886. package/jdl/parsing/jdl-parser.js +3 -0
  887. package/jdl/parsing/lexer/application-tokens.js +4 -0
  888. package/jdl/parsing/validator.js +7 -1
  889. package/jdl/validators/application-validator.js +1 -0
  890. package/lib/constants/generators.mjs +20 -0
  891. package/lib/constants/priorities.cjs +131 -0
  892. package/lib/constants/priorities.mjs +19 -0
  893. package/lib/support/index.cjs +21 -0
  894. package/lib/support/mixin.cjs +199 -0
  895. package/lib/support/shared-data.cjs +74 -0
  896. package/package.json +55 -36
  897. package/utils/entity.js +21 -4
  898. package/utils/field.js +27 -3
  899. package/utils/liquibase.js +31 -20
  900. package/utils/multi-step-transform/index.js +52 -0
  901. package/utils/multi-step-transform/template-data.js +60 -0
  902. package/utils/multi-step-transform/template-file-fs.js +43 -0
  903. package/utils/multi-step-transform/template-file.js +84 -0
  904. package/NOTICE +0 -4
  905. package/generators/client/templates/angular/.npmrc.ejs +0 -1
  906. package/generators/client/templates/vue/webpack/dev.env.js.ejs +0 -18
  907. package/generators/client/templates/vue/webpack/env.js.ejs +0 -67
  908. package/generators/client/templates/vue/webpack/loader.conf.js.ejs +0 -20
  909. package/generators/client/templates/vue/webpack/prod.env.js.ejs +0 -16
  910. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs +0 -769
  911. package/generators/server/templates/src/main/java/package/config/OAuth2SsoConfiguration.java.ejs +0 -94
  912. package/generators/server/templates/src/main/java/package/config/OAuth2TokenServicesConfiguration.java.ejs +0 -68
  913. package/generators/server/templates/src/main/java/package/repository/CustomN1qlCouchbaseRepository.java.ejs +0 -135
  914. package/generators/server/templates/src/main/java/package/repository/CustomReactiveN1qlCouchbaseRepository.java.ejs +0 -157
  915. package/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs +0 -46
  916. package/generators/server/templates/src/main/java/package/repository/ReactiveN1qlCouchbaseRepository.java.ejs +0 -47
  917. package/generators/server/templates/src/test/java/package/config/DatabaseConfigurationIT.java.ejs +0 -112
@@ -18,32 +18,32 @@
18
18
  -%>
19
19
  package <%= packageName %>.web.rest;
20
20
 
21
- <%_ if (databaseType === 'cassandra') { _%>
21
+ <%_ if (databaseTypeCassandra) { _%>
22
22
  import <%= packageName %>.AbstractCassandraTest;
23
23
  <%_ } _%>
24
24
  import <%= packageName %>.IntegrationTest;
25
- <%_ if (databaseType === 'sql' && reactive) { _%>
25
+ <%_ if (databaseTypeSql && reactive) { _%>
26
26
  import <%= packageName %>.config.Constants;
27
27
  <%_ } _%>
28
- <%_ if (databaseType !== 'cassandra' && databaseType !== 'couchbase') { _%>
28
+ <%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
29
29
  import <%= packageName %>.domain.Authority;
30
30
  <%_ } _%>
31
31
  import <%= packageName %>.domain.<%= asEntity('User') %>;
32
- <%_ if (databaseType === 'sql' && reactive) { _%>
32
+ <%_ if (databaseTypeSql && reactive) { _%>
33
33
  import <%= packageName %>.repository.AuthorityRepository;
34
34
  <%_ } _%>
35
35
  import <%= packageName %>.repository.UserRepository;
36
- <%_ if (searchEngine === 'elasticsearch') { _%>
36
+ <%_ if (searchEngineElasticsearch) { _%>
37
37
  import <%= packageName %>.repository.search.UserSearchRepository;
38
38
  <%_ } _%>
39
39
  import <%= packageName %>.security.AuthoritiesConstants;
40
40
  import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
41
41
  import <%= packageName %>.service.dto.<%= asDto('User') %>;
42
- <%_ if (databaseType === 'sql' && reactive) { _%>
42
+ <%_ if (databaseTypeSql && reactive) { _%>
43
43
  import <%= packageName %>.service.EntityManager;
44
44
  <%_ } _%>
45
45
  import <%= packageName %>.service.mapper.UserMapper;
46
- <%_ if (authenticationType !== 'oauth2') { _%>
46
+ <%_ if (!authenticationTypeOauth2) { _%>
47
47
  import <%= packageName %>.web.rest.vm.ManagedUserVM;
48
48
  <%_ } _%>
49
49
  import org.apache.commons.lang3.RandomStringUtils;
@@ -55,14 +55,14 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
55
55
  <%_ } else { _%>
56
56
  import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
57
57
  <%_ } _%>
58
- <%_ if (cacheManagerIsAvailable === true) { _%>
58
+ <%_ if (cacheManagerIsAvailable) { _%>
59
59
  import org.springframework.cache.CacheManager;
60
60
  <%_ } _%>
61
- <%_ if (cacheProvider === 'memcached' ) { _%>
61
+ <%_ if (cacheProviderMemcached) { _%>
62
62
  import org.springframework.cache.support.NoOpCacheManager;
63
63
  <%_ } _%>
64
64
  import org.springframework.http.MediaType;
65
- <%_ if (databaseType === 'couchbase') { _%>
65
+ <%_ if (databaseTypeCouchbase) { _%>
66
66
  import org.springframework.security.core.context.SecurityContextHolder;
67
67
  import org.springframework.security.test.context.TestSecurityContextHolder;
68
68
  <%_ } _%>
@@ -73,32 +73,32 @@ import org.springframework.test.web.reactive.server.WebTestClient;
73
73
  <%_ if (!reactive) { _%>
74
74
  import org.springframework.test.web.servlet.MockMvc;
75
75
  <%_ } _%>
76
- <%_ if (databaseType === 'sql' && !reactive) { _%>
76
+ <%_ if (databaseTypeSql && !reactive) { _%>
77
77
  import org.springframework.transaction.annotation.Transactional;
78
78
  <%_ } _%>
79
- <%_ if (reactive && searchEngine === 'elasticsearch') { _%>
79
+ <%_ if (reactive && searchEngineElasticsearch) { _%>
80
80
  import reactor.core.publisher.Mono;
81
81
  <%_ } _%>
82
82
 
83
- <%_ if (databaseType === 'sql' && !reactive) { _%>
83
+ <%_ if (databaseTypeSql && !reactive) { _%>
84
84
  import javax.persistence.EntityManager;
85
85
  <%_ } _%>
86
- <%_ if (databaseType !== 'cassandra') { _%>
86
+ <%_ if (!databaseTypeCassandra) { _%>
87
87
  import java.time.Instant;
88
88
  <%_ } _%>
89
89
  import java.util.*;
90
90
  import java.util.function.Consumer;
91
- <%_ if (databaseType === 'cassandra' || databaseType === 'couchbase') { _%>
91
+ <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
92
92
  import java.util.stream.Collectors;
93
93
  import java.util.stream.Stream;
94
94
  <%_ } _%>
95
95
 
96
96
  import static org.assertj.core.api.Assertions.assertThat;
97
- <%_ if (reactive && searchEngine === 'elasticsearch') { _%>
97
+ <%_ if (reactive && searchEngineElasticsearch) { _%>
98
98
  import static org.mockito.Mockito.*;
99
99
  <%_ } _%>
100
100
  <%_ if (!reactive) { _%>
101
- <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
101
+ <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
102
102
  import static org.hamcrest.Matchers.hasItems;
103
103
  <%_ } _%>
104
104
  import static org.hamcrest.Matchers.hasItem;
@@ -121,59 +121,59 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
121
121
  <%_ } _%>
122
122
  @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
123
123
  @IntegrationTest
124
- class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCassandraTest <% } %>{
124
+ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
125
125
 
126
126
  private static final String DEFAULT_LOGIN = "johndoe";
127
- <%_ if (authenticationType !== 'oauth2') { _%>
127
+ <%_ if (!authenticationTypeOauth2) { _%>
128
128
  private static final String UPDATED_LOGIN = "jhipster";
129
- <%_ } _%>
129
+ <%_ } _%>
130
130
 
131
- <%_ if (databaseType === 'couchbase') { _%>
131
+ <%_ if (databaseTypeCouchbase) { _%>
132
132
  private static final String DEFAULT_ID = <%= asEntity('User') %>.PREFIX + DEFAULT_LOGIN;
133
- <%_ } else { _%>
133
+ <%_ } else { _%>
134
134
  private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- getPrimaryKeyValue(user.primaryKey.type) %>;
135
- <%_ } _%>
136
- <%_ if (authenticationType !== 'oauth2') { _%>
135
+ <%_ } _%>
136
+ <%_ if (!authenticationTypeOauth2) { _%>
137
137
 
138
138
  private static final String DEFAULT_PASSWORD = "passjohndoe";
139
139
  private static final String UPDATED_PASSWORD = "passjhipster";
140
- <%_ } _%>
140
+ <%_ } _%>
141
141
 
142
142
  private static final String DEFAULT_EMAIL = "johndoe@localhost";
143
- <%_ if (authenticationType !== 'oauth2') { _%>
143
+ <%_ if (!authenticationTypeOauth2) { _%>
144
144
  private static final String UPDATED_EMAIL = "jhipster@localhost";
145
- <%_ } _%>
145
+ <%_ } _%>
146
146
 
147
147
  private static final String DEFAULT_FIRSTNAME = "john";
148
- <%_ if (authenticationType !== 'oauth2') { _%>
148
+ <%_ if (!authenticationTypeOauth2) { _%>
149
149
  private static final String UPDATED_FIRSTNAME = "jhipsterFirstName";
150
- <%_ } _%>
150
+ <%_ } _%>
151
151
 
152
152
  private static final String DEFAULT_LASTNAME = "doe";
153
- <%_ if (authenticationType !== 'oauth2') { _%>
153
+ <%_ if (!authenticationTypeOauth2) { _%>
154
154
  private static final String UPDATED_LASTNAME = "jhipsterLastName";
155
- <%_ } _%>
155
+ <%_ } _%>
156
156
 
157
- <%_ if (databaseType !== 'cassandra') { _%>
157
+ <%_ if (!databaseTypeCassandra) { _%>
158
158
  private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50";
159
- <%_ if (authenticationType !== 'oauth2') { _%>
159
+ <%_ if (!authenticationTypeOauth2) { _%>
160
160
  private static final String UPDATED_IMAGEURL = "http://placehold.it/40x40";
161
- <%_ } _%>
161
+ <%_ } _%>
162
162
 
163
- <%_ } _%>
163
+ <%_ } _%>
164
164
  private static final String DEFAULT_LANGKEY = "en";
165
- <%_ if (authenticationType !== 'oauth2') { _%>
165
+ <%_ if (!authenticationTypeOauth2) { _%>
166
166
  private static final String UPDATED_LANGKEY = "fr";
167
- <%_ } _%>
167
+ <%_ } _%>
168
168
 
169
169
  @Autowired
170
170
  private UserRepository userRepository;
171
- <%_ if (databaseType === 'sql' && reactive) { _%>
171
+ <%_ if (databaseTypeSql && reactive) { _%>
172
172
 
173
173
  @Autowired
174
174
  private AuthorityRepository authorityRepository;
175
- <%_ } _%>
176
- <%_ if (searchEngine === 'elasticsearch') { _%>
175
+ <%_ } _%>
176
+ <%_ if (searchEngineElasticsearch) { _%>
177
177
 
178
178
  /**
179
179
  * This repository is mocked in the <%= packageName %>.repository.search test package.
@@ -182,74 +182,74 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
182
182
  */
183
183
  @Autowired
184
184
  private UserSearchRepository mockUserSearchRepository;
185
- <%_ } _%>
185
+ <%_ } _%>
186
186
 
187
187
  @Autowired
188
188
  private UserMapper userMapper;
189
- <%_ if (databaseType === 'sql') { _%>
189
+ <%_ if (databaseTypeSql) { _%>
190
190
 
191
191
  @Autowired
192
192
  private EntityManager em;
193
- <%_ } _%>
194
- <%_ if (cacheManagerIsAvailable === true) { _%>
193
+ <%_ } _%>
194
+ <%_ if (cacheManagerIsAvailable) { _%>
195
195
 
196
196
  @Autowired
197
197
  private CacheManager cacheManager;
198
- <%_ } _%>
198
+ <%_ } _%>
199
199
 
200
200
  @Autowired
201
- <%_ if (reactive) { _%>
201
+ <%_ if (reactive) { _%>
202
202
  private WebTestClient webTestClient;
203
- <%_ } else { _%>
203
+ <%_ } else { _%>
204
204
  private MockMvc restUserMockMvc;
205
- <%_ } _%>
205
+ <%_ } _%>
206
206
 
207
207
  private <%= asEntity('User') %> user;
208
208
 
209
- <%_ if (cacheManagerIsAvailable === true) { _%>
209
+ <%_ if (cacheManagerIsAvailable) { _%>
210
210
  @BeforeEach
211
211
  public void setup() {
212
212
  cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear();
213
213
  cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear();
214
214
  }
215
215
 
216
- <%_ } _%>
217
- <%_ if (reactive && testsNeedCsrf) { _%>
216
+ <%_ } _%>
217
+ <%_ if (reactive && testsNeedCsrf) { _%>
218
218
  @BeforeEach
219
219
  public void setupCsrf() {
220
220
  webTestClient = webTestClient.mutateWith(csrf());
221
221
  }
222
222
 
223
- <%_ } _%>
223
+ <%_ } _%>
224
224
  /**
225
225
  * Create a User.
226
226
  *
227
227
  * This is a static method, as tests for other entities might also need it,
228
228
  * if they test an entity which has a required relationship to the User entity.
229
229
  */
230
- public static <%= asEntity('User') %> createEntity(<% if (databaseType === 'sql') { %>EntityManager em<% } %>) {
230
+ public static <%= asEntity('User') %> createEntity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
231
231
  <%= asEntity('User') %> user = new <%= asEntity('User') %>();
232
- <%_ if (databaseType === 'cassandra' || (authenticationType === 'oauth2' && databaseType !== 'couchbase')) { _%>
232
+ <%_ if (databaseTypeCassandra || (authenticationTypeOauth2 && !databaseTypeCouchbase)) { _%>
233
233
  user.setId(UUID.randomUUID().toString());
234
- <%_ } _%>
235
- user.setLogin(DEFAULT_LOGIN<% if (databaseType === 'sql') { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
236
- <%_ if (authenticationType !== 'oauth2') { _%>
234
+ <%_ } _%>
235
+ user.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
236
+ <%_ if (!authenticationTypeOauth2) { _%>
237
237
  user.setPassword(RandomStringUtils.random(60));
238
- <%_ } _%>
238
+ <%_ } _%>
239
239
  user.setActivated(true);
240
- user.setEmail(<% if (databaseType === 'sql') { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
240
+ user.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
241
241
  user.setFirstName(DEFAULT_FIRSTNAME);
242
242
  user.setLastName(DEFAULT_LASTNAME);
243
- <%_ if (databaseType !== 'cassandra') { _%>
243
+ <%_ if (!databaseTypeCassandra) { _%>
244
244
  user.setImageUrl(DEFAULT_IMAGEURL);
245
- <%_ } _%>
245
+ <%_ } _%>
246
246
  user.setLangKey(DEFAULT_LANGKEY);
247
- <%_ if (databaseType === 'sql' && reactive) { _%>
247
+ <%_ if (databaseTypeSql && reactive) { _%>
248
248
  user.setCreatedBy(Constants.SYSTEM);
249
- <%_ } _%>
249
+ <%_ } _%>
250
250
  return user;
251
251
  }
252
- <%_ if (databaseType === 'sql' && reactive) { _%>
252
+ <%_ if (databaseTypeSql && reactive) { _%>
253
253
 
254
254
  /**
255
255
  * Delete all the users from the database.
@@ -262,44 +262,44 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
262
262
  // It can fail, if other entities are still referring this - it will be removed later.
263
263
  }
264
264
  }
265
- <%_ } _%>
265
+ <%_ } _%>
266
266
 
267
267
  /**
268
268
  * Setups the database with one user.
269
269
  */
270
- public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseType === 'sql' ) { %>, EntityManager em<% } _%>) {
271
- <%_ if (databaseType === 'sql' && reactive) { _%>
270
+ public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql ) { %>, EntityManager em<% } _%>) {
271
+ <%_ if (databaseTypeSql && reactive) { _%>
272
272
  userRepository.deleteAllUserAuthorities().block();
273
- <%_ } _%>
274
- <%_ if (databaseType !== 'sql' || reactive) { _%>
273
+ <%_ } _%>
274
+ <%_ if (!databaseTypeSql || reactive) { _%>
275
275
  userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
276
- <%_ } _%>
277
- <%= asEntity('User') %> user = createEntity(<% if (databaseType === 'sql' ) { %>em<% } _%>);
278
- <%_ if (databaseType === 'sql') { _%>
276
+ <%_ } _%>
277
+ <%= asEntity('User') %> user = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
278
+ <%_ if (databaseTypeSql) { _%>
279
279
  user.setLogin(DEFAULT_LOGIN);
280
280
  user.setEmail(DEFAULT_EMAIL);
281
- <%_ } _%>
281
+ <%_ } _%>
282
282
  return user;
283
283
  }
284
284
 
285
285
  @BeforeEach
286
286
  public void initTest() {
287
- user = initTestUser(userRepository<% if (databaseType === 'sql' ) { %>, em<% } _%>);
287
+ user = initTestUser(userRepository<% if (databaseTypeSql) { %>, em<% } _%>);
288
288
  }
289
- <%_ if (authenticationType !== 'oauth2') { _%>
289
+ <%_ if (!authenticationTypeOauth2) { _%>
290
290
 
291
291
  @Test
292
- <%_ if (databaseType === 'sql' && !reactive) { _%>
292
+ <%_ if (databaseTypeSql && !reactive) { _%>
293
293
  @Transactional
294
- <%_ } _%>
294
+ <%_ } _%>
295
295
  void createUser() throws Exception {
296
296
  int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
297
297
  .collectList().block()<% } %>.size();
298
- <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
298
+ <%_ if (searchEngineElasticsearch && reactive) { _%>
299
299
  // Configure the mock search repository
300
300
  when(mockUserSearchRepository.save(any()))
301
301
  .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
302
- <%_ } _%>
302
+ <%_ } _%>
303
303
 
304
304
  // Create the User
305
305
  ManagedUserVM managedUserVM = new ManagedUserVM();
@@ -309,25 +309,25 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
309
309
  managedUserVM.setLastName(DEFAULT_LASTNAME);
310
310
  managedUserVM.setEmail(DEFAULT_EMAIL);
311
311
  managedUserVM.setActivated(true);
312
- <%_ if (databaseType !== 'cassandra') { _%>
312
+ <%_ if (!databaseTypeCassandra) { _%>
313
313
  managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
314
- <%_ } _%>
314
+ <%_ } _%>
315
315
  managedUserVM.setLangKey(DEFAULT_LANGKEY);
316
316
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
317
317
 
318
- <%_ if (!reactive) { _%>
318
+ <%_ if (!reactive) { _%>
319
319
  restUserMockMvc.perform(post("/api/admin/users")
320
320
  .contentType(MediaType.APPLICATION_JSON)
321
321
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
322
322
  .with(csrf())<% } %>)
323
323
  .andExpect(status().isCreated());
324
- <%_ } else { _%>
324
+ <%_ } else { _%>
325
325
  webTestClient.post().uri("/api/admin/users")
326
326
  .contentType(MediaType.APPLICATION_JSON)
327
327
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
328
328
  .exchange()
329
329
  .expectStatus().isCreated();
330
- <%_ } _%>
330
+ <%_ } _%>
331
331
 
332
332
  // Validate the User in the database
333
333
  assertPersistedUsers(users -> {
@@ -337,7 +337,7 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
337
337
  assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
338
338
  assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
339
339
  assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
340
- <%_ if (databaseType !== 'cassandra') { _%>
340
+ <%_ if (!databaseTypeCassandra) { _%>
341
341
  assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
342
342
  <%_ } _%>
343
343
  assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
@@ -345,62 +345,62 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
345
345
  }
346
346
 
347
347
  @Test
348
- <%_ if (databaseType === 'sql' && !reactive) { _%>
348
+ <%_ if (databaseTypeSql && !reactive) { _%>
349
349
  @Transactional
350
- <%_ } _%>
350
+ <%_ } _%>
351
351
  void createUserWithExistingId() throws Exception {
352
352
  int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
353
353
  .collectList().block()<% } %>.size();
354
354
 
355
355
  ManagedUserVM managedUserVM = new ManagedUserVM();
356
- <%_ if (databaseType === 'cassandra') { _%>
356
+ <%_ if (databaseTypeCassandra) { _%>
357
357
  managedUserVM.setId(UUID.randomUUID().toString());
358
- <%_ } else if (databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { _%>
358
+ <%_ } else if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
359
359
  managedUserVM.setId("1L");
360
- <%_ } else { _%>
360
+ <%_ } else { _%>
361
361
  managedUserVM.setId(DEFAULT_ID);
362
- <%_ } _%>
362
+ <%_ } _%>
363
363
  managedUserVM.setLogin(DEFAULT_LOGIN);
364
364
  managedUserVM.setPassword(DEFAULT_PASSWORD);
365
365
  managedUserVM.setFirstName(DEFAULT_FIRSTNAME);
366
366
  managedUserVM.setLastName(DEFAULT_LASTNAME);
367
367
  managedUserVM.setEmail(DEFAULT_EMAIL);
368
368
  managedUserVM.setActivated(true);
369
- <%_ if (databaseType !== 'cassandra') { _%>
369
+ <%_ if (!databaseTypeCassandra) { _%>
370
370
  managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
371
- <%_ } _%>
371
+ <%_ } _%>
372
372
  managedUserVM.setLangKey(DEFAULT_LANGKEY);
373
373
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
374
374
 
375
375
  // An entity with an existing ID cannot be created, so this API call must fail
376
- <%_ if (!reactive) { _%>
376
+ <%_ if (!reactive) { _%>
377
377
  restUserMockMvc.perform(post("/api/admin/users")
378
378
  .contentType(MediaType.APPLICATION_JSON)
379
379
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
380
380
  .with(csrf())<% } %>)
381
381
  .andExpect(status().isBadRequest());
382
- <%_ } else { _%>
382
+ <%_ } else { _%>
383
383
  webTestClient.post().uri("/api/admin/users")
384
384
  .contentType(MediaType.APPLICATION_JSON)
385
385
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
386
386
  .exchange()
387
387
  .expectStatus().isBadRequest();
388
- <%_ } _%>
388
+ <%_ } _%>
389
389
 
390
390
  // Validate the User in the database
391
391
  assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
392
392
  }
393
393
 
394
394
  @Test
395
- <%_ if (databaseType === 'sql' && !reactive) { _%>
395
+ <%_ if (databaseTypeSql && !reactive) { _%>
396
396
  @Transactional
397
- <%_ } _%>
397
+ <%_ } _%>
398
398
  void createUserWithExistingLogin() throws Exception {
399
399
  // Initialize the database
400
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
401
- <%_ if (searchEngine === 'elasticsearch') { _%>
400
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
401
+ <%_ if (searchEngineElasticsearch) { _%>
402
402
  mockUserSearchRepository.save(user);
403
- <%_ } _%>
403
+ <%_ } _%>
404
404
  int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
405
405
  .collectList().block()<% } %>.size();
406
406
 
@@ -411,41 +411,41 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
411
411
  managedUserVM.setLastName(DEFAULT_LASTNAME);
412
412
  managedUserVM.setEmail("anothermail@localhost");
413
413
  managedUserVM.setActivated(true);
414
- <%_ if (databaseType !== 'cassandra') { _%>
414
+ <%_ if (!databaseTypeCassandra) { _%>
415
415
  managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
416
- <%_ } _%>
416
+ <%_ } _%>
417
417
  managedUserVM.setLangKey(DEFAULT_LANGKEY);
418
418
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
419
419
 
420
420
  // Create the User
421
- <%_ if (!reactive) { _%>
421
+ <%_ if (!reactive) { _%>
422
422
  restUserMockMvc.perform(post("/api/admin/users")
423
423
  .contentType(MediaType.APPLICATION_JSON)
424
424
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
425
425
  .with(csrf())<% } %>)
426
426
  .andExpect(status().isBadRequest());
427
- <%_ } else { _%>
427
+ <%_ } else { _%>
428
428
  webTestClient.post().uri("/api/admin/users")
429
429
  .contentType(MediaType.APPLICATION_JSON)
430
430
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
431
431
  .exchange()
432
432
  .expectStatus().isBadRequest();
433
- <%_ } _%>
433
+ <%_ } _%>
434
434
 
435
435
  // Validate the User in the database
436
436
  assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
437
437
  }
438
438
 
439
439
  @Test
440
- <%_ if (databaseType === 'sql' && !reactive) { _%>
440
+ <%_ if (databaseTypeSql && !reactive) { _%>
441
441
  @Transactional
442
- <%_ } _%>
442
+ <%_ } _%>
443
443
  void createUserWithExistingEmail() throws Exception {
444
444
  // Initialize the database
445
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
446
- <%_ if (searchEngine === 'elasticsearch') { _%>
445
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
446
+ <%_ if (searchEngineElasticsearch) { _%>
447
447
  mockUserSearchRepository.save(user);
448
- <%_ } _%>
448
+ <%_ } _%>
449
449
  int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
450
450
  .collectList().block()<% } %>.size();
451
451
 
@@ -456,26 +456,26 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
456
456
  managedUserVM.setLastName(DEFAULT_LASTNAME);
457
457
  managedUserVM.setEmail(DEFAULT_EMAIL);// this email should already be used
458
458
  managedUserVM.setActivated(true);
459
- <%_ if (databaseType !== 'cassandra') { _%>
459
+ <%_ if (!databaseTypeCassandra) { _%>
460
460
  managedUserVM.setImageUrl(DEFAULT_IMAGEURL);
461
- <%_ } _%>
461
+ <%_ } _%>
462
462
  managedUserVM.setLangKey(DEFAULT_LANGKEY);
463
463
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
464
464
 
465
465
  // Create the User
466
- <%_ if (!reactive) { _%>
466
+ <%_ if (!reactive) { _%>
467
467
  restUserMockMvc.perform(post("/api/admin/users")
468
468
  .contentType(MediaType.APPLICATION_JSON)
469
469
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
470
470
  .with(csrf())<% } %>)
471
471
  .andExpect(status().isBadRequest());
472
- <%_ } else { _%>
472
+ <%_ } else { _%>
473
473
  webTestClient.post().uri("/api/admin/users")
474
474
  .contentType(MediaType.APPLICATION_JSON)
475
475
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
476
476
  .exchange()
477
477
  .expectStatus().isBadRequest();
478
- <%_ } _%>
478
+ <%_ } _%>
479
479
 
480
480
  // Validate the User in the database
481
481
  assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
@@ -483,22 +483,22 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
483
483
  <%_ } _%>
484
484
 
485
485
  @Test
486
- <%_ if (databaseType === 'sql' && !reactive) { _%>
486
+ <%_ if (databaseTypeSql && !reactive) { _%>
487
487
  @Transactional
488
- <%_ } _%>
488
+ <%_ } _%>
489
489
  void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
490
490
  // Initialize the database
491
- userRepository.<% if (databaseType === 'sql' && reactive && authenticationType === 'oauth2') { %>create<% } else { %>save<% } %><% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
492
- <%_ if (databaseType === 'sql' && reactive) { _%>
491
+ userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
492
+ <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
493
493
  authorityRepository
494
494
  .findById(AuthoritiesConstants.USER)
495
495
  .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
496
496
  .block();
497
- <%_ } _%>
497
+ <%_ } _%>
498
498
 
499
499
  // Get all the users
500
- <%_ if (!reactive) { _%>
501
- restUserMockMvc.perform(get("/api/admin/users<% if (databaseType === 'sql') { %>?sort=id,desc<% } %>")
500
+ <%_ if (!reactive) { _%>
501
+ restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
502
502
  .accept(MediaType.APPLICATION_JSON))
503
503
  .andExpect(status().isOk())
504
504
  .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -506,11 +506,11 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
506
506
  .andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
507
507
  .andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
508
508
  .andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
509
- <%_ if (databaseType !== 'cassandra') { _%>
509
+ <%_ if (!databaseTypeCassandra) { _%>
510
510
  .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
511
- <%_ } _%>
511
+ <%_ } _%>
512
512
  .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
513
- <%_ } else { _%>
513
+ <%_ } else { _%>
514
514
  <%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,DESC")
515
515
  .accept(MediaType.APPLICATION_JSON)
516
516
  .exchange()
@@ -522,40 +522,40 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
522
522
  assertThat(foundUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
523
523
  assertThat(foundUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
524
524
  assertThat(foundUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
525
- <%_ if (databaseType !== 'cassandra') { _%>
525
+ <%_ if (!databaseTypeCassandra) { _%>
526
526
  assertThat(foundUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
527
- <%_ } _%>
527
+ <%_ } _%>
528
528
  assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
529
- <%_ if (databaseType === 'sql') { _%>
529
+ <%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
530
530
  assertThat(foundUser.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
531
- <%_ } _%>
532
- <%_ } _%>
531
+ <%_ } _%>
532
+ <%_ } _%>
533
533
  }
534
534
 
535
535
  @Test
536
- <%_ if (databaseType === 'sql' && !reactive) { _%>
536
+ <%_ if (databaseTypeSql && !reactive) { _%>
537
537
  @Transactional
538
- <%_ } _%>
538
+ <%_ } _%>
539
539
  void getUser()<% if (!reactive) { %> throws Exception<% } %> {
540
540
  // Initialize the database
541
- userRepository.<% if (databaseType === 'sql' && reactive && authenticationType === 'oauth2') { %>create<% } else { %>save<% } %><% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
542
- <%_ if (databaseType === 'sql' && reactive) { _%>
541
+ userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
542
+ <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
543
543
  authorityRepository
544
544
  .findById(AuthoritiesConstants.USER)
545
545
  .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
546
546
  .block();
547
- <%_ } _%>
548
-
549
- <%_ if (searchEngine === 'elasticsearch') { _%>
547
+ <%_ } _%>
548
+
549
+ <%_ if (searchEngineElasticsearch) { _%>
550
550
  mockUserSearchRepository.save(user);
551
- <%_ } _%>
552
- <%_ if (cacheManagerIsAvailable === true) { _%>
551
+ <%_ } _%>
552
+ <%_ if (cacheManagerIsAvailable) { _%>
553
553
 
554
554
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
555
- <%_ } _%>
555
+ <%_ } _%>
556
556
 
557
557
  // Get the user
558
- <%_ if (!reactive) { _%>
558
+ <%_ if (!reactive) { _%>
559
559
  restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
560
560
  .andExpect(status().isOk())
561
561
  .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -563,11 +563,11 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
563
563
  .andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
564
564
  .andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
565
565
  .andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
566
- <%_ if (databaseType !== 'cassandra') { _%>
566
+ <%_ if (!databaseTypeCassandra) { _%>
567
567
  .andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
568
- <%_ } _%>
568
+ <%_ } _%>
569
569
  .andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
570
- <%_ } else { _%>
570
+ <%_ } else { _%>
571
571
  webTestClient.get().uri("/api/admin/users/{login}", user.getLogin())
572
572
  .exchange()
573
573
  .expectStatus().isOk()
@@ -577,52 +577,54 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
577
577
  .jsonPath("$.firstName").isEqualTo(DEFAULT_FIRSTNAME)
578
578
  .jsonPath("$.lastName").isEqualTo(DEFAULT_LASTNAME)
579
579
  .jsonPath("$.email").isEqualTo(DEFAULT_EMAIL)
580
- <%_ if (databaseType !== 'cassandra') { _%>
580
+ <%_ if (!databaseTypeCassandra) { _%>
581
581
  .jsonPath("$.imageUrl").isEqualTo(DEFAULT_IMAGEURL)
582
- <%_ } _%>
583
- .jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<% if (databaseType !== 'sql') { %>;<% } else { %>
582
+ <%_ } _%>
583
+ .jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
584
+ if (!databaseTypeSql || applicationTypeMicroservice) { %>;
585
+ <%_ } else { _%>
584
586
  .jsonPath("$.authorities")
585
587
  .isEqualTo(AuthoritiesConstants.USER);
586
588
  <% } %>
587
- <%_ } _%>
589
+ <%_ } _%>
588
590
 
589
- <%_ if (cacheProvider === 'memcached') { _%>
591
+ <%_ if (cacheProviderMemcached) { _%>
590
592
  if (!(cacheManager instanceof NoOpCacheManager)) {
591
593
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
592
594
  }
593
- <%_ } else if (cacheManagerIsAvailable === true) { _%>
595
+ <%_ } else if (cacheManagerIsAvailable) { _%>
594
596
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
595
- <%_ } _%>
597
+ <%_ } _%>
596
598
  }
597
599
 
598
600
  @Test
599
- <%_ if (databaseType === 'sql' && !reactive) { _%>
601
+ <%_ if (databaseTypeSql && !reactive) { _%>
600
602
  @Transactional
601
- <%_ } _%>
603
+ <%_ } _%>
602
604
  void getNonExistingUser()<% if (!reactive) { %> throws Exception<% } %> {
603
- <%_ if (!reactive) { _%>
605
+ <%_ if (!reactive) { _%>
604
606
  restUserMockMvc.perform(get("/api/admin/users/unknown"))
605
607
  .andExpect(status().isNotFound());
606
- <%_ } else { _%>
608
+ <%_ } else { _%>
607
609
  webTestClient.get().uri("/api/admin/users/unknown")
608
610
  .exchange()
609
611
  .expectStatus().isNotFound();
610
- <%_ } _%>
612
+ <%_ } _%>
611
613
  }
612
- <%_ if (authenticationType !== 'oauth2') { _%>
614
+ <%_ if (!authenticationTypeOauth2) { _%>
613
615
 
614
616
  @Test
615
- <%_ if (databaseType === 'sql' && !reactive) { _%>
617
+ <%_ if (databaseTypeSql && !reactive) { _%>
616
618
  @Transactional
617
- <%_ } _%>
619
+ <%_ } _%>
618
620
  void updateUser() throws Exception {
619
621
  // Initialize the database
620
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
621
- <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
622
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
623
+ <%_ if (searchEngineElasticsearch && reactive) { _%>
622
624
  // Configure the mock search repository
623
625
  when(mockUserSearchRepository.save(any()))
624
626
  .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
625
- <%_ } _%>
627
+ <%_ } _%>
626
628
  int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
627
629
  .collectList().block()<% } %>.size();
628
630
 
@@ -637,31 +639,31 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
637
639
  managedUserVM.setLastName(UPDATED_LASTNAME);
638
640
  managedUserVM.setEmail(UPDATED_EMAIL);
639
641
  managedUserVM.setActivated(updatedUser.isActivated());
640
- <%_ if (databaseType !== 'cassandra') { _%>
642
+ <%_ if (!databaseTypeCassandra) { _%>
641
643
  managedUserVM.setImageUrl(UPDATED_IMAGEURL);
642
- <%_ } _%>
644
+ <%_ } _%>
643
645
  managedUserVM.setLangKey(UPDATED_LANGKEY);
644
- <%_ if (databaseType !== 'cassandra') { _%>
646
+ <%_ if (!databaseTypeCassandra) { _%>
645
647
  managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
646
648
  managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
647
649
  managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
648
650
  managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
649
- <%_ } _%>
651
+ <%_ } _%>
650
652
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
651
653
 
652
- <%_ if (!reactive) { _%>
654
+ <%_ if (!reactive) { _%>
653
655
  restUserMockMvc.perform(put("/api/admin/users")
654
656
  .contentType(MediaType.APPLICATION_JSON)
655
657
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
656
658
  .with(csrf())<% } %>)
657
659
  .andExpect(status().isOk());
658
- <%_ } else { _%>
660
+ <%_ } else { _%>
659
661
  webTestClient.put().uri("/api/admin/users")
660
662
  .contentType(MediaType.APPLICATION_JSON)
661
663
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
662
664
  .exchange()
663
665
  .expectStatus().isOk();
664
- <%_ } _%>
666
+ <%_ } _%>
665
667
 
666
668
  // Validate the User in the database
667
669
  assertPersistedUsers(users -> {
@@ -670,25 +672,25 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
670
672
  assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
671
673
  assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
672
674
  assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
673
- <%_ if (databaseType !== 'cassandra') { _%>
675
+ <%_ if (!databaseTypeCassandra) { _%>
674
676
  assertThat(testUser.getImageUrl()).isEqualTo(UPDATED_IMAGEURL);
675
- <%_ } _%>
677
+ <%_ } _%>
676
678
  assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
677
679
  });
678
680
  }
679
681
 
680
682
  @Test
681
- <%_ if (databaseType === 'sql' && !reactive) { _%>
683
+ <%_ if (databaseTypeSql && !reactive) { _%>
682
684
  @Transactional
683
- <%_ } _%>
685
+ <%_ } _%>
684
686
  void updateUserLogin() throws Exception {
685
687
  // Initialize the database
686
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
687
- <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
688
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
689
+ <%_ if (searchEngineElasticsearch && reactive) { _%>
688
690
  // Configure the mock search repository
689
691
  when(mockUserSearchRepository.save(any()))
690
692
  .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
691
- <%_ } _%>
693
+ <%_ } _%>
692
694
  int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
693
695
  .collectList().block()<% } %>.size();
694
696
 
@@ -703,31 +705,31 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
703
705
  managedUserVM.setLastName(UPDATED_LASTNAME);
704
706
  managedUserVM.setEmail(UPDATED_EMAIL);
705
707
  managedUserVM.setActivated(updatedUser.isActivated());
706
- <%_ if (databaseType !== 'cassandra') { _%>
708
+ <%_ if (!databaseTypeCassandra) { _%>
707
709
  managedUserVM.setImageUrl(UPDATED_IMAGEURL);
708
- <%_ } _%>
710
+ <%_ } _%>
709
711
  managedUserVM.setLangKey(UPDATED_LANGKEY);
710
- <%_ if (databaseType !== 'cassandra') { _%>
712
+ <%_ if (!databaseTypeCassandra) { _%>
711
713
  managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
712
714
  managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
713
715
  managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
714
716
  managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
715
- <%_ } _%>
717
+ <%_ } _%>
716
718
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
717
719
 
718
- <%_ if (!reactive) { _%>
720
+ <%_ if (!reactive) { _%>
719
721
  restUserMockMvc.perform(put("/api/admin/users")
720
722
  .contentType(MediaType.APPLICATION_JSON)
721
723
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
722
724
  .with(csrf())<% } %>)
723
725
  .andExpect(status().isOk());
724
- <%_ } else { _%>
726
+ <%_ } else { _%>
725
727
  webTestClient.put().uri("/api/admin/users")
726
728
  .contentType(MediaType.APPLICATION_JSON)
727
729
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
728
730
  .exchange()
729
731
  .expectStatus().isOk();
730
- <%_ } _%>
732
+ <%_ } _%>
731
733
 
732
734
  // Validate the User in the database
733
735
  assertPersistedUsers(users -> {
@@ -737,45 +739,45 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
737
739
  assertThat(testUser.getFirstName()).isEqualTo(UPDATED_FIRSTNAME);
738
740
  assertThat(testUser.getLastName()).isEqualTo(UPDATED_LASTNAME);
739
741
  assertThat(testUser.getEmail()).isEqualTo(UPDATED_EMAIL);
740
- <%_ if (databaseType !== 'cassandra') { _%>
742
+ <%_ if (!databaseTypeCassandra) { _%>
741
743
  assertThat(testUser.getImageUrl()).isEqualTo(UPDATED_IMAGEURL);
742
- <%_ } _%>
744
+ <%_ } _%>
743
745
  assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
744
746
  });
745
747
  }
746
748
 
747
749
  @Test
748
- <%_ if (databaseType === 'sql' && !reactive) { _%>
750
+ <%_ if (databaseTypeSql && !reactive) { _%>
749
751
  @Transactional
750
- <%_ } _%>
752
+ <%_ } _%>
751
753
  void updateUserExistingEmail() throws Exception {
752
754
  // Initialize the database with 2 users
753
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
754
- <%_ if (searchEngine === 'elasticsearch') { _%>
755
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
756
+ <%_ if (searchEngineElasticsearch) { _%>
755
757
  mockUserSearchRepository.save(user);
756
- <%_ } _%>
758
+ <%_ } _%>
757
759
 
758
760
  <%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
759
- <%_ if (databaseType === 'cassandra') { _%>
761
+ <%_ if (databaseTypeCassandra) { _%>
760
762
  anotherUser.setId(UUID.randomUUID().toString());
761
- <%_ } _%>
763
+ <%_ } _%>
762
764
  anotherUser.setLogin("jhipster");
763
765
  anotherUser.setPassword(RandomStringUtils.random(60));
764
766
  anotherUser.setActivated(true);
765
767
  anotherUser.setEmail("jhipster@localhost");
766
768
  anotherUser.setFirstName("java");
767
769
  anotherUser.setLastName("hipster");
768
- <%_ if (databaseType !== 'cassandra') { _%>
770
+ <%_ if (!databaseTypeCassandra) { _%>
769
771
  anotherUser.setImageUrl("");
770
- <%_ } _%>
772
+ <%_ } _%>
771
773
  anotherUser.setLangKey("en");
772
- <%_ if (databaseType === 'sql' && reactive) { _%>
774
+ <%_ if (databaseTypeSql && reactive) { _%>
773
775
  anotherUser.setCreatedBy(Constants.SYSTEM);
774
- <%_ } _%>
775
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
776
- <%_ if (searchEngine === 'elasticsearch') { _%>
776
+ <%_ } _%>
777
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
778
+ <%_ if (searchEngineElasticsearch) { _%>
777
779
  mockUserSearchRepository.save(anotherUser);
778
- <%_ } _%>
780
+ <%_ } _%>
779
781
 
780
782
  // Update the user
781
783
  <%= asEntity('User') %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
@@ -788,65 +790,65 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
788
790
  managedUserVM.setLastName(updatedUser.getLastName());
789
791
  managedUserVM.setEmail("jhipster@localhost");// this email should already be used by anotherUser
790
792
  managedUserVM.setActivated(updatedUser.isActivated());
791
- <%_ if (databaseType !== 'cassandra') { _%>
793
+ <%_ if (!databaseTypeCassandra) { _%>
792
794
  managedUserVM.setImageUrl(updatedUser.getImageUrl());
793
- <%_ } _%>
795
+ <%_ } _%>
794
796
  managedUserVM.setLangKey(updatedUser.getLangKey());
795
- <%_ if (databaseType !== 'cassandra') { _%>
797
+ <%_ if (!databaseTypeCassandra) { _%>
796
798
  managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
797
799
  managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
798
800
  managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
799
801
  managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
800
- <%_ } _%>
802
+ <%_ } _%>
801
803
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
802
804
 
803
- <%_ if (!reactive) { _%>
805
+ <%_ if (!reactive) { _%>
804
806
  restUserMockMvc.perform(put("/api/admin/users")
805
807
  .contentType(MediaType.APPLICATION_JSON)
806
808
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
807
809
  .with(csrf())<% } %>)
808
810
  .andExpect(status().isBadRequest());
809
- <%_ } else { _%>
811
+ <%_ } else { _%>
810
812
  webTestClient.put().uri("/api/admin/users")
811
813
  .contentType(MediaType.APPLICATION_JSON)
812
814
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
813
815
  .exchange()
814
816
  .expectStatus().isBadRequest();
815
- <%_ } _%>
817
+ <%_ } _%>
816
818
  }
817
819
 
818
820
  @Test
819
- <%_ if (databaseType === 'sql' && !reactive) { _%>
821
+ <%_ if (databaseTypeSql && !reactive) { _%>
820
822
  @Transactional
821
- <%_ } _%>
823
+ <%_ } _%>
822
824
  void updateUserExistingLogin() throws Exception {
823
825
  // Initialize the database
824
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
825
- <%_ if (searchEngine === 'elasticsearch') { _%>
826
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
827
+ <%_ if (searchEngineElasticsearch) { _%>
826
828
  mockUserSearchRepository.save(user);
827
- <%_ } _%>
829
+ <%_ } _%>
828
830
 
829
831
  <%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
830
- <%_ if (databaseType === 'cassandra') { _%>
832
+ <%_ if (databaseTypeCassandra) { _%>
831
833
  anotherUser.setId(UUID.randomUUID().toString());
832
- <%_ } _%>
834
+ <%_ } _%>
833
835
  anotherUser.setLogin("jhipster");
834
836
  anotherUser.setPassword(RandomStringUtils.random(60));
835
837
  anotherUser.setActivated(true);
836
838
  anotherUser.setEmail("jhipster@localhost");
837
839
  anotherUser.setFirstName("java");
838
840
  anotherUser.setLastName("hipster");
839
- <%_ if (databaseType !== 'cassandra') { _%>
841
+ <%_ if (!databaseTypeCassandra) { _%>
840
842
  anotherUser.setImageUrl("");
841
- <%_ } _%>
843
+ <%_ } _%>
842
844
  anotherUser.setLangKey("en");
843
- <%_ if (databaseType === 'sql' && reactive) { _%>
845
+ <%_ if (databaseTypeSql && reactive) { _%>
844
846
  anotherUser.setCreatedBy(Constants.SYSTEM);
845
- <%_ } _%>
846
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
847
- <%_ if (searchEngine === 'elasticsearch') { _%>
847
+ <%_ } _%>
848
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
849
+ <%_ if (searchEngineElasticsearch) { _%>
848
850
  mockUserSearchRepository.save(anotherUser);
849
- <%_ } _%>
851
+ <%_ } _%>
850
852
 
851
853
  // Update the user
852
854
  <%= asEntity('User') %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>get<% } %>();
@@ -859,68 +861,68 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
859
861
  managedUserVM.setLastName(updatedUser.getLastName());
860
862
  managedUserVM.setEmail(updatedUser.getEmail());
861
863
  managedUserVM.setActivated(updatedUser.isActivated());
862
- <%_ if (databaseType !== 'cassandra') { _%>
864
+ <%_ if (!databaseTypeCassandra) { _%>
863
865
  managedUserVM.setImageUrl(updatedUser.getImageUrl());
864
- <%_ } _%>
866
+ <%_ } _%>
865
867
  managedUserVM.setLangKey(updatedUser.getLangKey());
866
- <%_ if (databaseType !== 'cassandra') { _%>
868
+ <%_ if (!databaseTypeCassandra) { _%>
867
869
  managedUserVM.setCreatedBy(updatedUser.getCreatedBy());
868
870
  managedUserVM.setCreatedDate(updatedUser.getCreatedDate());
869
871
  managedUserVM.setLastModifiedBy(updatedUser.getLastModifiedBy());
870
872
  managedUserVM.setLastModifiedDate(updatedUser.getLastModifiedDate());
871
- <%_ } _%>
873
+ <%_ } _%>
872
874
  managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
873
875
 
874
- <%_ if (!reactive) { _%>
876
+ <%_ if (!reactive) { _%>
875
877
  restUserMockMvc.perform(put("/api/admin/users")
876
878
  .contentType(MediaType.APPLICATION_JSON)
877
879
  .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
878
880
  .with(csrf())<% } %>)
879
881
  .andExpect(status().isBadRequest());
880
- <%_ } else { _%>
882
+ <%_ } else { _%>
881
883
  webTestClient.put().uri("/api/admin/users")
882
884
  .contentType(MediaType.APPLICATION_JSON)
883
885
  .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
884
886
  .exchange()
885
887
  .expectStatus().isBadRequest();
886
- <%_ } _%>
888
+ <%_ } _%>
887
889
  }
888
890
 
889
891
  @Test
890
- <%_ if (databaseType === 'sql' && !reactive) { _%>
892
+ <%_ if (databaseTypeSql && !reactive) { _%>
891
893
  @Transactional
892
- <%_ } _%>
894
+ <%_ } _%>
893
895
  void deleteUser()<% if (!reactive) { %> throws Exception<% } %> {
894
896
  // Initialize the database
895
- userRepository.save<% if (databaseType === 'sql' && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
896
- <%_ if (searchEngine === 'elasticsearch' && reactive) { _%>
897
+ userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
898
+ <%_ if (searchEngineElasticsearch && reactive) { _%>
897
899
  // Configure the mock search repository
898
900
  when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
899
- <%_ } _%>
901
+ <%_ } _%>
900
902
  int databaseSizeBeforeDelete = userRepository.findAll()<% if (reactive) { %>
901
903
  .collectList().block()<% } %>.size();
902
904
 
903
905
  // Delete the user
904
- <%_ if (!reactive) { _%>
906
+ <%_ if (!reactive) { _%>
905
907
  restUserMockMvc.perform(delete("/api/admin/users/{login}", user.getLogin())
906
908
  .accept(MediaType.APPLICATION_JSON)<% if (testsNeedCsrf) { %>
907
909
  .with(csrf())<% } %>)
908
910
  .andExpect(status().isNoContent());
909
- <%_ } else { _%>
911
+ <%_ } else { _%>
910
912
  webTestClient.delete().uri("/api/admin/users/{login}", user.getLogin())
911
913
  .accept(MediaType.APPLICATION_JSON)
912
914
  .exchange()
913
915
  .expectStatus().isNoContent();
914
- <%_ } _%>
915
- <%_ if (cacheManagerIsAvailable === true) { _%>
916
+ <%_ } _%>
917
+ <%_ if (cacheManagerIsAvailable) { _%>
916
918
 
917
919
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
918
- <%_ } _%>
920
+ <%_ } _%>
919
921
 
920
922
  // Validate the database is empty
921
923
  assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeDelete - 1));
922
924
  }
923
- <%_ } _%>
925
+ <%_ } _%>
924
926
 
925
927
  @Test
926
928
  void testUserEquals() throws Exception {
@@ -945,14 +947,14 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
945
947
  userDTO.setLastName(DEFAULT_LASTNAME);
946
948
  userDTO.setEmail(DEFAULT_EMAIL);
947
949
  userDTO.setActivated(true);
948
- <%_ if (databaseType !== 'cassandra') { _%>
950
+ <%_ if (!databaseTypeCassandra) { _%>
949
951
  userDTO.setImageUrl(DEFAULT_IMAGEURL);
950
- <%_ } _%>
952
+ <%_ } _%>
951
953
  userDTO.setLangKey(DEFAULT_LANGKEY);
952
- <%_ if (databaseType !== 'cassandra') { _%>
954
+ <%_ if (!databaseTypeCassandra) { _%>
953
955
  userDTO.setCreatedBy(DEFAULT_LOGIN);
954
956
  userDTO.setLastModifiedBy(DEFAULT_LOGIN);
955
- <%_ } _%>
957
+ <%_ } _%>
956
958
  userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
957
959
 
958
960
  <%= asEntity('User') %> user = userMapper.userDTOToUser(userDTO);
@@ -962,37 +964,37 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
962
964
  assertThat(user.getLastName()).isEqualTo(DEFAULT_LASTNAME);
963
965
  assertThat(user.getEmail()).isEqualTo(DEFAULT_EMAIL);
964
966
  assertThat(user.isActivated()).isTrue();
965
- <%_ if (databaseType !== 'cassandra') { _%>
967
+ <%_ if (!databaseTypeCassandra) { _%>
966
968
  assertThat(user.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
967
- <%_ } _%>
969
+ <%_ } _%>
968
970
  assertThat(user.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
969
- <%_ if (databaseType !== 'cassandra') { _%>
971
+ <%_ if (!databaseTypeCassandra) { _%>
970
972
  assertThat(user.getCreatedBy()).isNull();
971
973
  assertThat(user.getCreatedDate()).isNotNull();
972
974
  assertThat(user.getLastModifiedBy()).isNull();
973
975
  assertThat(user.getLastModifiedDate()).isNotNull();
974
- <%_ } _%>
975
- assertThat(user.getAuthorities())<% if (databaseType !== 'cassandra' && databaseType !== 'couchbase') { %>.extracting("name")<%_ } _%>.containsExactly(AuthoritiesConstants.USER);
976
+ <%_ } _%>
977
+ assertThat(user.getAuthorities())<% if (!databaseTypeCassandra && !databaseTypeCouchbase) { %>.extracting("name")<%_ } _%>.containsExactly(AuthoritiesConstants.USER);
976
978
  }
977
979
 
978
980
  @Test
979
981
  void testUserToUserDTO() {
980
982
  user.setId(DEFAULT_ID);
981
- <%_ if (databaseType !== 'cassandra') { _%>
983
+ <%_ if (!databaseTypeCassandra) { _%>
982
984
  user.setCreatedBy(DEFAULT_LOGIN);
983
985
  user.setCreatedDate(Instant.now());
984
986
  user.setLastModifiedBy(DEFAULT_LOGIN);
985
987
  user.setLastModifiedDate(Instant.now());
986
- <%_ } _%>
987
- <%_ if (databaseType !== 'cassandra' && databaseType !== 'couchbase') { _%>
988
+ <%_ } _%>
989
+ <%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
988
990
  Set<Authority> authorities = new HashSet<>();
989
991
  Authority authority = new Authority();
990
992
  authority.setName(AuthoritiesConstants.USER);
991
993
  authorities.add(authority);
992
994
  user.setAuthorities(authorities);
993
- <%_ } else { _%>
995
+ <%_ } else { _%>
994
996
  user.setAuthorities(Stream.of(AuthoritiesConstants.USER).collect(Collectors.toSet()));
995
- <%_ } _%>
997
+ <%_ } _%>
996
998
 
997
999
  <%= asDto('AdminUser') %> userDTO = userMapper.userToAdminUserDTO(user);
998
1000
 
@@ -1002,20 +1004,20 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
1002
1004
  assertThat(userDTO.getLastName()).isEqualTo(DEFAULT_LASTNAME);
1003
1005
  assertThat(userDTO.getEmail()).isEqualTo(DEFAULT_EMAIL);
1004
1006
  assertThat(userDTO.isActivated()).isTrue();
1005
- <%_ if (databaseType !== 'cassandra') { _%>
1007
+ <%_ if (!databaseTypeCassandra) { _%>
1006
1008
  assertThat(userDTO.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
1007
- <%_ } _%>
1009
+ <%_ } _%>
1008
1010
  assertThat(userDTO.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
1009
- <%_ if (databaseType !== 'cassandra') { _%>
1011
+ <%_ if (!databaseTypeCassandra) { _%>
1010
1012
  assertThat(userDTO.getCreatedBy()).isEqualTo(DEFAULT_LOGIN);
1011
1013
  assertThat(userDTO.getCreatedDate()).isEqualTo(user.getCreatedDate());
1012
1014
  assertThat(userDTO.getLastModifiedBy()).isEqualTo(DEFAULT_LOGIN);
1013
1015
  assertThat(userDTO.getLastModifiedDate()).isEqualTo(user.getLastModifiedDate());
1014
- <%_ } _%>
1016
+ <%_ } _%>
1015
1017
  assertThat(userDTO.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
1016
1018
  assertThat(userDTO.toString()).isNotNull();
1017
1019
  }
1018
- <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j') { _%>
1020
+ <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { _%>
1019
1021
 
1020
1022
  @Test
1021
1023
  void testAuthorityEquals() {
@@ -1040,13 +1042,13 @@ class UserResourceIT <% if (databaseType === 'cassandra') { %>extends AbstractCa
1040
1042
  .isEqualTo(authorityB)
1041
1043
  .hasSameHashCodeAs(authorityB);
1042
1044
  }
1043
- <%_ } _%>
1045
+ <%_ } _%>
1044
1046
 
1045
1047
  private void assertPersistedUsers(Consumer<List<<%= asEntity('User') %>>> userAssertion) {
1046
- <%_ if (databaseType === 'couchbase') { _%>
1048
+ <%_ if (databaseTypeCouchbase) { _%>
1047
1049
  // The security filter chain clears the security context after remote calls
1048
1050
  SecurityContextHolder.setContext(TestSecurityContextHolder.getContext());
1049
- <%_ } _%>
1051
+ <%_ } _%>
1050
1052
  userAssertion.accept(userRepository.findAll()<% if (reactive) { %>.collectList().block()<% } %>);
1051
1053
  }
1052
1054
  }