generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/java/generators/node/templates/npmw

@@ -1,15 +1,11 @@
 #!/bin/sh
 
-basedir=`dirname "$0"`
+basedir=$(dirname "$0")
 
 if [ -f "$basedir/mvnw" ]; then
   bindir="$basedir/target/node"
   repodir="$basedir/target/node/node_modules"
   installCommand="$basedir/mvnw --batch-mode -ntp -Pwebapp frontend:install-node-and-npm@install-node-and-npm"
-
-  PATH="$basedir/$builddir/:$PATH"
-  NPM_EXE="$basedir/$builddir/node_modules/npm/bin/npm-cli.js"
-  NODE_EXE="$basedir/$builddir/node"
 elif [ -f "$basedir/gradlew" ]; then
   bindir="$basedir/build/node/bin"
   repodir="$basedir/build/node/lib/node_modules"

package/dist/generators/java/support/add-java-annotation.js

@@ -16,16 +16,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export default function addJavaAnnotation(content, { package: packageName, annotation }) {
+import { escapeRegExp } from 'lodash-es';
+const addJavaImportToContent = (content, identifier, { staticImport } = {}) => {
+    const importStatement = `import ${staticImport ? 'static ' : ''}${identifier};`;
+    return new RegExp(escapeRegExp(importStatement)).test(content)
+        ? content
+        : content.replace(/(package [\w.]+;\n\n?)/, `$1${importStatement}\n`);
+};
+export function addJavaImport(contentOrIdentifier, identifierOrType, type) {
+    if (typeof identifierOrType === 'string') {
+        return addJavaImportToContent(contentOrIdentifier, identifierOrType, type);
+    }
+    return (content) => addJavaImportToContent(content, contentOrIdentifier, identifierOrType);
+}
+const addJavaAnnotationToContent = (content, annotationDef) => {
+    const { package: packageName, annotation, parameters } = annotationDef;
     if (packageName) {
-        if (!new RegExp(`import ${packageName.replace('.', '\\.')}.${annotation};`).test(content)) {
-            // add the import statement just after the package statement, prettier will arrange it correctly
-            content = content.replace(/(package [\w.]+;\n)/, `$1import ${packageName}.${annotation};\n`);
-        }
+        content = addJavaImport(content, `${packageName}.${annotation}`);
     }
-    if (!new RegExp(`\n@${annotation}\n`).test(content)) {
+    const annotationToAdd = parameters ? `${annotation}(${parameters()})` : annotation;
+    if (!new RegExp(escapeRegExp(`\n@${annotationToAdd}\n`)).test(content)) {
+        if (new RegExp(escapeRegExp(`\n@${annotation}(`)).test(content)) {
+            throw new Error(`Annotation already exists: ${annotation} replace is not implemented yet.`);
+        }
         // add the annotation before class or interface
-        content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/g, `\n@${annotation}\n$1`);
+        content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/, `\n@${annotationToAdd}\n$1`);
     }
     return content;
+};
+export function addJavaAnnotation(contentOrAnnotation, annotation) {
+    if (typeof contentOrAnnotation === 'string') {
+        return addJavaAnnotationToContent(contentOrAnnotation, annotation);
+    }
+    return (content) => addJavaAnnotationToContent(content, contentOrAnnotation);
 }

package/dist/generators/java/support/generated-annotation-transform.js

@@ -19,7 +19,7 @@
 import { extname } from 'path';
 import { passthrough } from '@yeoman/transform';
 import { isFileStateDeleted } from 'mem-fs-editor/state';
-import addJavaAnnotation from './add-java-annotation.js';
+import { addJavaAnnotation } from './add-java-annotation.js';
 const generatedAnnotationTransform = packageName => {
     return passthrough(file => {
         if (!file.path.endsWith('package-info.java') &&

package/dist/generators/java/support/index.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { default as addJavaAnnotation } from './add-java-annotation.js';
+export * from './add-java-annotation.js';
 export * from './artifacts.js';
 export * from './checks/index.js';
 export * from './doc.js';

package/dist/generators/jdl/generator.js

@@ -156,8 +156,8 @@ export default class JdlGenerator extends BaseGenerator {
                             app.sharedFs = createMemFs();
                         }
                     }
+                    addApplicationIndex(this.applications);
                 }
-                addApplicationIndex(this.applications);
                 customizeForMicroservices(this.exportedApplicationsWithEntities);
             },
             async generateJson() {
@@ -174,7 +174,7 @@ export default class JdlGenerator extends BaseGenerator {
                     return;
                 }
                 const generatorOptions = { defaults: true, reproducible: this.options.reproducible ?? this.reproducible, force: this.force };
-                if (this.ignoreApplication || this.applications.length === 0) {
+                if (this.ignoreApplication !== false && (this.ignoreApplication || this.applications.length === 0)) {
                     if (this.applications.length === 0) {
                         const entities = this.exportedEntities;
                         await this.composeWithJHipster(this.entitiesGenerator, {
@@ -194,11 +194,7 @@ export default class JdlGenerator extends BaseGenerator {
                         }
                     }
                 }
-                else if (this.applications.length === 1) {
-                    this.log.info('Generating 1 application');
-                    await this.composeWithJHipster(this.entrypointGenerator, { generatorOptions });
-                }
-                else {
+                else if (this.applications.length > 1) {
                     this.log.info(`Generating ${this.applications.length} applications`);
                     await this.composeWithJHipster(this.workspacesGenerator, {
                         generatorOptions: {
@@ -207,6 +203,10 @@ export default class JdlGenerator extends BaseGenerator {
                         },
                     });
                 }
+                else {
+                    this.log.info('Generating 1 application');
+                    await this.composeWithJHipster(this.entrypointGenerator, { generatorOptions });
+                }
             },
         });
     }

package/dist/generators/kubernetes/files.js

@@ -101,7 +101,7 @@ export function writeFiles() {
             "https://${appConfig.baseName.toLowerCase()}:${appConfig.composePort}/*", `;
                     }
                     this.keycloakRedirectUris += `"http://localhost:${appConfig.composePort}/*",
-            "https://localhost:${appConfig.composePort}/*", `;
+            "https://localhost:${appConfig.composePort}/*",`;
                     if (appConfig.devServerPort !== undefined) {
                         this.keycloakRedirectUris += `"http://localhost:${appConfig.devServerPort}/*", `;
                     }

package/dist/generators/kubernetes/templates/db/mysql.yml.ejs

@@ -70,7 +70,7 @@ spec:
           value: <%= app.baseName.toLowerCase() %>
         args:
         - --lower_case_table_names=1
-        - --skip-ssl
+        - --skip-mysqlx
         - --character_set_server=utf8mb4
         - --explicit_defaults_for_timestamp
         ports:

package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs

@@ -36,7 +36,7 @@ data:
       "oauth2DevicePollingInterval": 5,
       "enabled": true,
       "sslRequired": "external",
-      "registrationAllowed": false,
+      "registrationAllowed": true,
       "registrationEmailAsUsername": false,
       "rememberMe": false,
       "verifyEmail": false,
@@ -459,6 +459,9 @@ data:
       "requiredCredentials": [
         "password"
       ],
+      "defaultGroups": [
+        "/Users"
+      ],
       "otpPolicyType": "totp",
       "otpPolicyAlgorithm": "HmacSHA1",
       "otpPolicyInitialCounter": 0,
@@ -2305,6 +2308,14 @@ data:
               "priority": 60,
               "userSetupAllowed": false,
               "autheticatorFlow": false
+            },
+            {
+              "authenticator": "registration-terms-and-conditions",
+              "authenticatorFlow": false,
+              "requirement": "DISABLED",
+              "priority": 70,
+              "autheticatorFlow": false,
+              "userSetupAllowed": false
             }
           ]
         },
@@ -2396,9 +2407,9 @@ data:
           "config": {}
         },
         {
-          "alias": "terms_and_conditions",
+          "alias": "TERMS_AND_CONDITIONS",
           "name": "Terms and Conditions",
-          "providerId": "terms_and_conditions",
+          "providerId": "TERMS_AND_CONDITIONS",
           "enabled": false,
           "defaultAction": false,
           "priority": 20,

package/dist/generators/languages/generator.js

@@ -32,6 +32,8 @@ import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/
 import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js';
 import { QUEUES } from '../base-application/priorities.js';
 import { PRIORITY_NAMES } from '../base/priorities.js';
+import { clientFrameworkTypes } from '../../jdl/index.js';
+const { NO: NO_CLIENT_FRAMEWORK, ANGULAR } = clientFrameworkTypes;
 /**
  * This is the base class for a generator that generates entities.
  *
@@ -64,8 +66,8 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
             await this.dependsOnBootstrapApplication();
         }
         if (!this.jhipsterConfigWithDefaults.skipClient &&
-            this.jhipsterConfigWithDefaults.clientFramework !== 'no' &&
-            (!this.jhipsterConfig.enableTranslation || this.jhipsterConfigWithDefaults.clientFramework === 'angular')) {
+            this.jhipsterConfigWithDefaults.clientFramework !== NO_CLIENT_FRAMEWORK &&
+            (!this.jhipsterConfig.enableTranslation || this.jhipsterConfigWithDefaults.clientFramework === ANGULAR)) {
             // We must write languages files for translation process for entities only generation.
             // Angular frontend uses translation files even if enableTranslation is enabled.
             // As side effect, with angular frontends, translation files will be written for nativeLanguage for entity only generation.
@@ -308,6 +310,7 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
                 if (application.enableTranslation &&
                     application.generateUserManagement &&
                     !application.skipServer &&
+                    application.backendTypeJavaAny &&
                     application.backendTypeSpringBoot) {
                     updateLanguagesInJava.call(this, { application, control });
                 }

package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs

@@ -55,7 +55,7 @@ import org.springframework.core.env.Profiles;
 @Configuration
 public class LiquibaseConfiguration {
 
-    private final Logger log = LoggerFactory.getLogger(LiquibaseConfiguration.class);
+    private static final Logger log = LoggerFactory.getLogger(LiquibaseConfiguration.class);
 
     private final Environment env;
 

package/dist/generators/maven/command.js

@@ -0,0 +1,15 @@
+const command = {
+    options: {},
+    configs: {
+        sortMavenPom: {
+            description: 'Sort the pom.xml file',
+            cli: {
+                type: Boolean,
+                hide: true,
+            },
+            scope: 'generator',
+        },
+    },
+    import: [],
+};
+export default command;

package/dist/generators/maven/generator.js

@@ -25,6 +25,7 @@ import cleanupOldServerFilesTask from './cleanup.js';
 import { createPomStorage } from './support/index.js';
 export default class MavenGenerator extends BaseApplicationGenerator {
     pomStorage;
+    sortMavenPom;
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -35,8 +36,11 @@ export default class MavenGenerator extends BaseApplicationGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
             pomStorage() {
-                this.pomStorage = createPomStorage(this);
+                this.pomStorage = createPomStorage(this, { sortFile: this.sortMavenPom });
             },
         });
     }
@@ -72,6 +76,7 @@ export default class MavenGenerator extends BaseApplicationGenerator {
                         }
                     };
                 }
+                source.mergeMavenPomContent = content => this.pomStorage.merge(content);
                 source.addMavenAnnotationProcessor = createForEach(artifact => this.pomStorage.addAnnotationProcessor(artifact));
                 source.addMavenDependency = createForEach(artifact => this.pomStorage.addDependency(artifact));
                 source.addMavenDependencyManagement = createForEach(artifact => this.pomStorage.addDependencyManagement(artifact));

package/dist/generators/maven/index.js

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from './command.js';
 export { default } from './generator.js';

package/dist/generators/maven/internal/xml-store.js

@@ -36,19 +36,20 @@ const defaultXmlBuildOptions = {
     indentBy: '    ',
 };
 export default class XmlStorage {
-    sortFile = true;
+    sortFile;
     saveFile;
     loadFile;
     parser;
     builder;
     _cachedStore;
-    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, }) {
+    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, sortFile, }) {
         assert(saveFile, 'saveFile callback is required to create a storage');
         assert(loadFile, 'loadFile callback is required to create a storage');
         this.parser = new XMLParser({ ...defaultXmlParserOptions, ...xmlParserOptions });
         this.builder = new XMLBuilder({ ...defaultXmlBuildOptions, ...xmlBuildOptions });
         this.saveFile = saveFile;
         this.loadFile = loadFile;
+        this.sortFile = sortFile ?? true;
     }
     clearCache() {
         delete this._cachedStore;
@@ -59,6 +60,10 @@ export default class XmlStorage {
         }
         this.persist(false);
     }
+    merge(source) {
+        assert(typeof source === 'object', 'Storage `merge` method only accept objects');
+        this._cachedStore = merge({}, this.store, source);
+    }
     sort() { }
     persist(sort = this.sortFile) {
         if (this._cachedStore) {
@@ -77,10 +82,6 @@ export default class XmlStorage {
             this._cachedStore = this.parser.parse(this.loadFile());
         }
     }
-    merge(source) {
-        assert(typeof source === 'object', 'Storage `merge` method only accept objects');
-        this._cachedStore = merge({}, this.store, source);
-    }
     mergeContent(existing, newContent) {
         return newContent ? { ...existing, ...this.parser.parse(newContent) } : existing;
     }

package/dist/generators/maven/support/pom-store.js

@@ -55,6 +55,17 @@ const propertiesOrder = [
     'spring-boot.version',
 ];
 const formatFirstXmlLevel = content => content.replace(/(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, '\n$1');
+const sortSection = section => {
+    return Object.fromEntries(Object.entries(section).sort(([key1, value1], [key2, value2]) => {
+        if (typeof value1 === typeof value2)
+            key1.localeCompare(key2);
+        if (typeof value1 === 'string')
+            return -1;
+        if (typeof value2 === 'string')
+            return 1;
+        return 0;
+    }));
+};
 const isComment = name => name.startsWith('#');
 const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr);
 const sortWithTemplate = (template, a, b) => {
@@ -129,7 +140,7 @@ const sortArtifacts = (artifacts) => artifacts.sort((a, b) => {
     }
     return a.artifactId.localeCompare(b.artifactId);
 });
-const sortProfiles = (profiles) => profiles.sort((a, b) => a.id.localeCompare(b.id));
+const sortProfiles = (profiles) => profiles.sort((a, b) => a.id?.localeCompare(b.id) ?? 1);
 const ensureChildPath = (node, childPath) => {
     let child = get(node, childPath);
     if (child)
@@ -158,8 +169,8 @@ const ensureChild = (current, ...childPath) => {
 const reorderArtifact = ({ groupId, artifactId, inProfile, version, ...rest }) => ({ inProfile, groupId, artifactId, version, ...rest });
 const reorderDependency = ({ groupId, artifactId, inProfile, version, type, scope, classifier, ...rest }) => ({ inProfile, groupId, artifactId, version, type, scope, classifier, ...rest });
 export default class PomStorage extends XmlStorage {
-    constructor({ saveFile, loadFile }) {
-        super({ saveFile, loadFile });
+    constructor({ saveFile, loadFile, sortFile }) {
+        super({ saveFile, loadFile, sortFile });
     }
     addProperty({ inProfile, property, value = null }) {
         const node = this.getNode({ nodePath: 'properties', profile: inProfile });
@@ -262,11 +273,14 @@ export default class PomStorage extends XmlStorage {
             if (Array.isArray(project.dependencyManagement?.dependencies?.dependency)) {
                 project.dependencyManagement.dependencies.dependency = sortArtifacts(project.dependencyManagement.dependencies.dependency);
             }
-            if (Array.isArray(project.build?.plugins?.plugin)) {
-                project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin);
-            }
-            if (Array.isArray(project.build?.pluginManagement?.plugins?.plugin)) {
-                project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin);
+            if (project.build) {
+                project.build = sortSection(project.build);
+                if (Array.isArray(project.build.plugins?.plugin)) {
+                    project.build.plugins.plugin = sortArtifacts(project.build.plugins.plugin);
+                }
+                if (Array.isArray(project.build.pluginManagement?.plugins?.plugin)) {
+                    project.build.pluginManagement.plugins.plugin = sortArtifacts(project.build.pluginManagement.plugins.plugin);
+                }
             }
             if (Array.isArray(project.profiles?.profile)) {
                 project.profiles.profile = sortProfiles(project.profiles.profile);
@@ -280,11 +294,12 @@ const emptyPomFile = `<?xml version="1.0" encoding="UTF-8"?>
     <modelVersion>4.0.0</modelVersion>
 </project>
 `;
-export const createPomStorage = (generator) => {
+export const createPomStorage = (generator, { sortFile } = {}) => {
     const loadFile = () => generator.readDestination('pom.xml', { defaults: emptyPomFile })?.toString() ?? '';
     const pomStorage = new PomStorage({
         loadFile,
         saveFile: content => generator.writeDestination('pom.xml', formatFirstXmlLevel(content)),
+        sortFile,
     });
     generator.fs.store.on('change', filename => {
         if (filename === generator.destinationPath('pom.xml')) {

package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+wrapperVersion=3.3.2
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip