Merge branch 'main' into release-2.0

jhipster · Aug 21, 2023 · edf3d83 · edf3d83
2 parents f218c17 + 4e97373
commit edf3d83
Show file tree

Hide file tree

Showing 20 changed files with 135 additions and 164 deletions.
diff --git a/generators/client/generator.mjs b/generators/client/generator.mjs
@@ -75,12 +75,6 @@ export default class extends extendGenerator(ClientGenerator) {
             content.replaceAll('id_token', 'access_token')
           );
         }
-        if (!authenticationTypeOauth2) {
-          // Should be dropped when the blueprint supports public/admin users.
-          this.editFile('src/main/webapp/app/admin/user-management/service/user-management.service.ts', content =>
-            content.replaceAll('api/admin/users', 'api/users')
-          );
-        }
       },
 
       customizeReactForMicronaut({ application: { clientFrameworkReact, authenticationTypeJwt, authenticationTypeOauth2 } }) {
@@ -123,12 +117,6 @@ export default class extends extendGenerator(ClientGenerator) {
               .replace('const jwt = bearerToken.slice(7, bearerToken.length);', '')
           );
         }
-        if (!authenticationTypeOauth2) {
-          // Should be dropped when the blueprint supports public/admin users.
-          this.editFile('src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts', content =>
-            content.replaceAll('api/admin/users', 'api/users')
-          );
-        }
       },
     };
   }

diff --git a/generators/constants.cjs b/generators/constants.cjs
@@ -23,23 +23,31 @@ module.exports = {
   sqlDb: {
     h2Disk: {
       driver: 'org.h2.Driver',
-      dialect: 'io.github.jhipster.domain.util.FixedH2Dialect',
+      dialect: 'org.hibernate.dialect.H2Dialect',
     },
     h2Memory: {
       driver: 'org.h2.Driver',
-      dialect: 'io.github.jhipster.domain.util.FixedH2Dialect',
+      dialect: 'org.hibernate.dialect.H2Dialect',
     },
     mysql: {
       driver: 'com.mysql.jdbc.Driver',
-      dialect: 'org.hibernate.dialect.MySQL5InnoDBDialect',
+      dialect: 'org.hibernate.dialect.MySQL8Dialect',
     },
     mariadb: {
       driver: 'org.mariadb.jdbc.Driver',
       dialect: 'org.hibernate.dialect.MariaDB103Dialect',
     },
     postgresql: {
       driver: 'org.postgresql.Driver',
-      dialect: 'io.github.jhipster.domain.util.FixedPostgreSQL10Dialect',
+      dialect: 'org.hibernate.dialect.PostgreSQL10Dialect',
+    },
+    oracle: {
+      driver: 'oracle.jdbc.OracleDriver',
+      dialect: 'org.hibernate.dialect.Oracle12cDialect',
+    },
+    mssql: {
+      driver: '',
+      dialect: 'org.hibernate.dialect.SQLServer2012Dialect',
     },
   },
   versions: {
@@ -55,9 +63,8 @@ module.exports = {
     javaxInject: '1',
     javaxMail: '2.0.1',
     jbcrypt: '0.4',
-    jhipsterDeps: '3.8.0',
-    liquibase: '4.14.0',
-    liquibaseHibernate5: '4.1.1',
+    liquibase: '4.15.0',
+    liquibaseHibernate5: '4.15.0',
     logback: '1.2.11',
     mapstruct: '1.5.2.Final',
     swaggerAnnotations: '2.2.2',

diff --git a/generators/entity-server/files.cjs b/generators/entity-server/files.cjs
@@ -35,6 +35,17 @@ const randexp = utils.RandexpWithFaker;
  */
 const serverFiles = {
   domain: [
+    {
+      condition: generator =>
+        !generator.reactive && generator.databaseTypeSql && generator.prodDatabaseTypePostgres && generator.fieldsContainImageBlob,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/domain/_PersistClass_.java.jhi.micronaut',
+          renameTo: generator => `${generator.entityAbsoluteFolder}/domain/${generator.persistClass}.java.jhi.micronaut`,
+        },
+      ],
+    },
     {
       path: SERVER_MAIN_SRC_DIR,
       templates: [

diff --git a/generators/entity-server/generator.mjs b/generators/entity-server/generator.mjs
@@ -19,7 +19,7 @@ import {
 import { writeFiles } from './files.cjs';
 import { extendGenerator } from '#lib/utils.mjs';
 
-import NeedleServerChacheMn from './needle-server-cache-mn.cjs';
+import NeedleServerCacheMn from './needle-server-cache-mn.cjs';
 
 export default class extends extendGenerator(EntityServerGenerator) {
   constructor(args, opts, features) {
@@ -101,7 +101,7 @@ export default class extends extendGenerator(EntityServerGenerator) {
       // Override jhipster customizeFiles
       customizeFiles({ application: { cacheProvider, enableHibernateCache } }) {
         if (!enableHibernateCache || !cacheProvider) return;
-        const serverCacheMn = new NeedleServerChacheMn(this);
+        const serverCacheMn = new NeedleServerCacheMn(this);
         if (['ehcache', 'caffeine', 'infinispan', 'redis'].includes(cacheProvider)) {
           serverCacheMn.addEntityToCache(this.persistClass, this.relationships, this.packageName, this.packageFolder, this.cacheProvider);
         }

diff --git a/...ntity-server/templates/src/main/java/package/domain/_PersistClass_.java.jhi.micronaut.ejs b/...ntity-server/templates/src/main/java/package/domain/_PersistClass_.java.jhi.micronaut.ejs
@@ -0,0 +1,37 @@
+<%#
+ Copyright 2013-2022 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<%#
+ This is a fragment file, it will be merged into to root template if available.
+ EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
+-%>
+<&_ if (fragment.importSection) { -&>
+<%_ if (databaseTypePostgres && fieldsContainImageBlob) { _%>
+import org.hibernate.annotations.Type;
+<%_ } _%>
+<&_ } -&>
+
+<%_ for (const field of fields) { -%>
+<&_ if (fragment.field<%- field.fieldNameCapitalized %>AnnotationSection) { -&>
+  <%_ if (field.fieldTypeBytes) { _%>
+    <%_ if (databaseTypePostgres && field.blobContentTypeImage) { _%>
+    @Type(type = "org.hibernate.type.BinaryType")
+    <%_ } _%>
+  <%_ } _%>
+<&_ } -&>
+<%_ } -%>
diff --git a/generators/heroku/templates/pom-profile.xml.ejs b/generators/heroku/templates/pom-profile.xml.ejs
@@ -11,7 +11,7 @@
                             <defaultSchemaName></defaultSchemaName>
                             <username>${env.JDBC_DATABASE_USERNAME}</username>
                             <password>${env.JDBC_DATABASE_PASSWORD}</password>
-                            <referenceUrl>hibernate:spring:<%= packageName %>.domain?dialect=<% if (prodDatabaseType === 'mysql') { %>org.hibernate.dialect.MySQL8Dialect<% } else if (prodDatabaseType === 'mariadb') { %>org.hibernate.dialect.MariaDB103Dialect<% } else if (prodDatabaseType === 'postgresql') { %>io.github.jhipster.domain.util.FixedPostgreSQL10Dialect<% } else if (prodDatabaseType === 'h2Disk') { %>org.hibernate.dialect.H2Dialect<% } else if (prodDatabaseType === 'oracle') { %>org.hibernate.dialect.Oracle12cDialect<% } else if (prodDatabaseType === 'mssql') { %>org.hibernate.dialect.SQLServer2012Dialect<% } %>&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
+                            <referenceUrl>hibernate:spring:<%= packageName %>.domain?dialect=<% if (prodDatabaseType === 'mysql') { %>org.hibernate.dialect.MySQL8Dialect<% } else if (prodDatabaseType === 'mariadb') { %>org.hibernate.dialect.MariaDB103Dialect<% } else if (prodDatabaseType === 'postgresql') { %>org.hibernate.dialect.PostgreSQLDialect<% } else if (prodDatabaseType === 'h2Disk') { %>org.hibernate.dialect.H2Dialect<% } else if (prodDatabaseType === 'oracle') { %>org.hibernate.dialect.Oracle12cDialect<% } else if (prodDatabaseType === 'mssql') { %>org.hibernate.dialect.SQLServer2012Dialect<% } %>&amp;hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>
                             <verbose>true</verbose>
                             <logging>debug</logging>
                             <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>

diff --git a/generators/server/__snapshots__/generator.spec.mjs.snap b/generators/server/__snapshots__/generator.spec.mjs.snap
@@ -62,9 +62,6 @@ Object {
   "package.json": Object {
     "stateCleared": "modified",
   },
-  "pom.xml": Object {
-    "stateCleared": "modified",
-  },
   "sonar-project.properties": Object {
     "stateCleared": "modified",
   },

diff --git a/generators/server/generator.mjs b/generators/server/generator.mjs
@@ -92,7 +92,7 @@ export default class extends extendGenerator(ServerGenerator) {
         this.GRADLE_VERSION = mnConstants.GRADLE_VERSION;
         this.DOCKER_REDIS = mnConstants.DOCKER_REDIS;
         this.DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; // overrides jhipster value until main generator is updated
-        this.JHIPSTER_DEPENDENCIES_VERSION = '3.9.1';
+        this.JHIPSTER_DEPENDENCIES_VERSION = '7.9.3';
       },
     };
   }

diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs
@@ -94,7 +94,7 @@ if (project.hasProperty("gae")) {
 
     dependencyManagement {
         imports {
-            mavenBom 'io.github.jhipster:jhipster-dependencies:${jhipster_dependencies_version}'
+            mavenBom 'tech.jhipster:jhipster-dependencies:${jhipster_dependencies_version}'
         }
     }
     appengineStage.dependsOn thinResolve
@@ -202,7 +202,10 @@ task cucumberTestReport(type: TestReport) {
 }
 
 <%_ } _%>
-<%_ if (databaseType === 'sql') { _%>
+<%_ if (databaseType === 'sql') { 
+        const { sqlDb } = MN_CONSTANTS;
+        const devDbInfo = sqlDb[devDatabaseType];
+_%>
 if (!project.hasProperty("runList")) {
     project.ext.runList = "main"
 }
@@ -212,7 +215,7 @@ project.ext.diffChangelogFile = "<%= SERVER_MAIN_RES_DIR %>config/liquibase/chan
 liquibase {
     activities {
         main {
-            driver "<% if (devDatabaseType === 'mysql') { %>com.mysql.cj.jdbc.Driver<% } else if (devDatabaseType === 'mariadb') { %>org.mariadb.jdbc.Driver<% } else if (devDatabaseType === 'postgresql') { %>org.postgresql.Driver<% } else if (devDatabaseType === 'h2Disk') { %>org.h2.Driver<% } else if (devDatabaseType === 'oracle') { %>oracle.jdbc.OracleDriver<% } %>"
+            driver "<%= devDbInfo.driver %>"
             url "<% if (devDatabaseType === 'mysql') { %>jdbc:mysql://localhost:3306/<%= baseName %><% } else if (devDatabaseType === 'mariadb') { %>jdbc:mariadb://localhost:3306/<%= baseName %><% } else if (devDatabaseType === 'postgresql') { %>jdbc:postgresql://localhost:5432/<%= baseName %><% } else if (devDatabaseType === 'h2Disk') { %>jdbc:h2:file:./build/h2db/db/<%= lowercaseBaseName %><% } else if (devDatabaseType === 'oracle') { %>jdbc:oracle:thin:@localhost:1521:<%= baseName %><% } else if (devDatabaseType === 'mssql') { %>jdbc:sqlserver://localhost:1433;database=<%= baseName %><% } %>"
             username "<% if (devDatabaseType === 'mysql') { %>root<% } else if (devDatabaseType === 'postgresql' || devDatabaseType === 'h2Disk' || devDatabaseType === 'h2Memory') { %><%= baseName %><% } else if (devDatabaseType === 'mssql') { %>SA<% } %>"
             password "<% if (devDatabaseType === 'mssql') { %>yourStrong(!)Password<% } %>"
@@ -222,12 +225,12 @@ liquibase {
             classpath "<%= SERVER_MAIN_RES_DIR %>"
         }
         diffLog {
-            driver "<% if (devDatabaseType === 'mysql') { %>com.mysql.cj.jdbc.Driver<% } else if (devDatabaseType === 'mariadb') { %>org.mariadb.jdbc.Driver<% } else if (devDatabaseType === 'postgresql') { %>org.postgresql.Driver<% } else if (devDatabaseType === 'h2Disk') { %>org.h2.Driver<% } else if (devDatabaseType === 'oracle') { %>oracle.jdbc.OracleDriver<% } %>"
+            driver "<%= devDbInfo.driver %>"
             url "<% if (devDatabaseType === 'mysql') { %>jdbc:mysql://localhost:3306/<%= baseName %><% } else if (devDatabaseType === 'mariadb') { %>jdbc:mariadb://localhost:3306/<%= baseName %><% } else if (devDatabaseType === 'postgresql') { %>jdbc:postgresql://localhost:5432/<%= baseName %><% } else if (devDatabaseType === 'h2Disk') { %>jdbc:h2:file:./build/h2db/db/<%= lowercaseBaseName %><% } else if (devDatabaseType === 'oracle') { %>jdbc:oracle:thin:@localhost:1521:<%= baseName %><% } else if (devDatabaseType === 'mssql') { %>jdbc:sqlserver://localhost:1433;database=<%= baseName %><% } %>"
             username "<% if (devDatabaseType === 'mysql') { %>root<% } else if (devDatabaseType === 'postgresql' || devDatabaseType === 'h2Disk' || devDatabaseType === 'h2Memory') { %><%= baseName %><% } else if (devDatabaseType === 'mssql') { %>SA<% } %>"
             password "<% if (devDatabaseType === 'mssql') { %>yourStrong(!)Password<% } %>"
             changeLogFile project.ext.diffChangelogFile
-            referenceUrl "hibernate:spring:<%= packageName %>.domain?dialect=<% if (devDatabaseType === 'mysql') { %>org.hibernate.dialect.MySQL8Dialect<% } else if (devDatabaseType === 'mariadb') { %>org.hibernate.dialect.MariaDB103Dialect<% } else if (devDatabaseType === 'postgresql') { %>io.github.jhipster.domain.util.FixedPostgreSQL10Dialect<% } else if (devDatabaseType === 'h2Disk') { %>org.hibernate.dialect.H2Dialect<% } else if (devDatabaseType === 'oracle') { %>org.hibernate.dialect.Oracle12cDialect<% } else if (devDatabaseType === 'mssql') { %>org.hibernate.dialect.SQLServer2012Dialect<% } %>&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy"
+            referenceUrl "hibernate:spring:<%= packageName %>.domain?dialect=<%= devDbInfo.dialect %>&hibernate.physical_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy"
             defaultSchemaName "<% if (devDatabaseType === 'mysql') { %><%= baseName %><% } else if (devDatabaseType === 'postgresql') { %><% } %>"
             logLevel "debug"
             classpath "$buildDir/classes/java/main"
@@ -271,7 +274,7 @@ repositories {
 dependencies {
     // import JHipster dependencies BOM
     if (!project.hasProperty("gae")) {
-        implementation platform("io.github.jhipster:jhipster-dependencies:${jhipster_dependencies_version}")
+        implementation platform("tech.jhipster:jhipster-dependencies:${jhipster_dependencies_version}")
     }
 
     annotationProcessor "io.micronaut:micronaut-validation"
@@ -282,20 +285,20 @@ dependencies {
 
     // Use ", version: jhipster_dependencies_version, changing: true" if you want
     // to use a SNAPSHOT release instead of a stable release
-    implementation (group: "io.github.jhipster", name: "jhipster-framework") {
+    implementation (group: "tech.jhipster", name: "jhipster-framework") {
         exclude group: "org.springframework", module: "spring-context-support"
         <% if (reactive) { %>
         exclude group: "org.springframework", module: "spring-webmvc"
         <% } %>
         exclude group: "org.springframework.boot", module: "spring-boot-autoconfigure"
         exclude group: "org.springframework.boot", module: "spring-boot-starter-aop"
         exclude group: "org.springframework.boot", module: "spring-boot-starter-web"
+        exclude group: "org.springframework.boot", module: "spring-boot-starter-validation"
     }
     implementation "org.simplejavamail:simple-java-mail:$simplejavamail_version"
     implementation "jakarta.annotation:jakarta.annotation-api"
     implementation "ch.qos.logback:logback-classic:$logback_version"
     implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
-    implementation "io.dropwizard.metrics:metrics-core"
     implementation "io.micrometer:micrometer-registry-prometheus"
     implementation "net.logstash.logback:logstash-logback-encoder"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"
@@ -494,12 +497,6 @@ dependencies {
     implementation "com.couchbase.client:java-client"
     implementation "com.couchbase.client:encryption"
     <%_ } _%>
-    <%_ if (!reactive) { _%>
-    implementation ("io.springfox:springfox-swagger2") {
-        exclude module: "mapstruct"
-    }
-    implementation "io.springfox:springfox-bean-validators"
-    <%_ } _%>
     <%_ if (devDatabaseType === 'mysql' || prodDatabaseType === 'mysql') { _%>
     implementation "mysql:mysql-connector-java"
     liquibaseRuntime "mysql:mysql-connector-java"
@@ -524,6 +521,10 @@ dependencies {
     annotationProcessor "org.hibernate:hibernate-jpamodelgen:$hibernate_version"
     annotationProcessor "org.glassfish.jaxb:jaxb-runtime:$jaxb_runtime_version"
     <%_ } _%>
+    annotationProcessor("io.micronaut:micronaut-inject-java")
+    annotationProcessor("io.micronaut.data:micronaut-data-processor")
+    annotationProcessor("io.micronaut:micronaut-http-validation")
+    annotationProcessor("io.micronaut.openapi:micronaut-openapi")
 
     // Micronaut test deps
     testAnnotationProcessor "io.micronaut.data:micronaut-data-processor"