generator-jhipster 7.1.0 → 7.4.0

package/generators/maven/templates/mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

package/generators/maven/templates/pom.xml.jhi.ejs

@@ -0,0 +1,98 @@
+<%#
+ Copyright 2013-2021 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.
+-%>
+<&_
+  // Register sections and max allowed fragments, 0 for unlimited.
+  fragments.registerSections({
+    parentSection: 1,
+    repositoriesSection: 0,
+    pluginRepositoriesSection: 0,
+    propertiesSection: 0,
+    dependenciesSection: 0,
+    buildPluginsSection: 0,
+    buildPluginManagementPluginsSection: 0,
+    profilesSection: 0,
+  });
+-&>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId><%= packageName %></groupId>
+    <artifactId><%= dasherizedBaseName %></artifactId>
+    <version><%= JAVA_APP_VERSION %></version>
+    <name><%= humanizedBaseName %></name>
+    <description><%= projectName %> generated with generator-jhipster@<%= jhipsterVersion %></description>
+    <packaging>jar</packaging>
+
+<&- fragments.parentSection('\n\n') -&>
+<&_ if (fragments.repositoriesSection()) { -&>
+    <repositories>
+<&- fragments.repositoriesSection() -&>
+    </repositories>
+
+<&_ } -&>
+<&_ if (fragments.pluginRepositoriesSection()) { -&>
+    <pluginRepositories>
+<&- fragments.pluginRepositoriesSection() -&>
+    </pluginRepositories>
+
+<&_ } -&>
+    <properties>
+        <java.version><%= JAVA_VERSION %></java.version>
+
+        <compiler-plugin.version>3.8.1</compiler-plugin.version>
+        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+<&- fragments.propertiesSection() -&>
+    </properties>
+
+    <dependencies>
+<&- fragments.dependenciesSection() -&>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire-plugin.version}</version>
+            </plugin>
+<&- fragments.buildPluginsSection() -&>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+<&- fragments.buildPluginManagementPluginsSection() -&>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <dependencies>
+<&- fragments.profilesSection() -&>
+    </dependencies>
+</project>

package/generators/openapi-client/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 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.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/openapi-client/files.js

@@ -21,6 +21,12 @@ const path = require('path');
 const _ = require('lodash');
 const chalk = require('chalk');
 const constants = require('../generator-constants');
+const { OptionNames } = require('../../jdl/jhipster/application-options');
+const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
+const { GATEWAY, MICROSERVICE } = require('../../jdl/jhipster/application-types');
+const { JWT, SESSION } = require('../../jdl/jhipster/authentication-types');
+
+const { AUTHENTICATION_TYPE, BASE_NAME, BUILD_TOOL, PACKAGE_FOLDER, PACKAGE_NAME, REACTIVE } = OptionNames;
 
 module.exports = {
   writeFiles,
@@ -30,7 +36,7 @@ module.exports = {
 function writeFiles() {
   return {
     addOpenAPIIgnoreFile() {
-      const basePath = this.config.get('reactive') ? 'java' : 'spring';
+      const basePath = this.config.get(REACTIVE) ? 'java' : 'spring';
       this.copy(`${basePath}/.openapi-generator-ignore`, '.openapi-generator-ignore');
     },
   };
@@ -39,11 +45,11 @@ function writeFiles() {
 function customizeFiles() {
   return {
     callOpenApiGenerator() {
-      this.baseName = this.config.get('baseName');
-      this.authenticationType = this.config.get('authenticationType');
-      this.packageName = this.config.get('packageName');
-      this.packageFolder = this.config.get('packageFolder');
-      this.buildTool = this.config.get('buildTool');
+      this.baseName = this.config.get(BASE_NAME);
+      this.authenticationType = this.config.get(AUTHENTICATION_TYPE);
+      this.packageName = this.config.get(PACKAGE_NAME);
+      this.packageFolder = this.config.get(PACKAGE_FOLDER);
+      this.buildTool = this.config.get(BUILD_TOOL);
 
       if (Object.keys(this.clientsToGenerate).length === 0) {
         this.log('No openapi client configured. Please run "jhipster openapi-client" to generate your first OpenAPI client.');
@@ -104,10 +110,10 @@ function customizeFiles() {
         return;
       }
 
-      if (this.buildTool === 'maven') {
-        if (!['microservice', 'gateway'].includes(this.applicationType)) {
+      if (this.buildTool === MAVEN) {
+        if (![MICROSERVICE, GATEWAY].includes(this.applicationType)) {
           let exclusions;
-          if (this.authenticationType === 'session') {
+          if (this.authenticationType === SESSION) {
             exclusions = `
             <exclusions>
                 <exclusion>
@@ -119,9 +125,9 @@ function customizeFiles() {
           this.addMavenDependency('org.springframework.cloud', 'spring-cloud-starter-openfeign', null, exclusions);
         }
         this.addMavenDependency('org.springframework.cloud', 'spring-cloud-starter-oauth2');
-      } else if (this.buildTool === 'gradle') {
-        if (!['microservice', 'gateway'].includes(this.applicationType)) {
-          if (this.authenticationType === 'session') {
+      } else if (this.buildTool === GRADLE) {
+        if (![MICROSERVICE, GATEWAY].includes(this.applicationType)) {
+          if (this.authenticationType === SESSION) {
             const content =
               "compile 'org.springframework.cloud:spring-cloud-starter-openfeign', { exclude group: 'org.springframework.cloud', module: 'spring-cloud-starter-ribbon' }";
             this.rewriteFile('./build.gradle', 'jhipster-needle-gradle-dependency', content);
@@ -139,11 +145,11 @@ function customizeFiles() {
      */
     addJacksonDataBindNullable() {
       if (!this.enableSwaggerCodegen) {
-        if (this.buildTool === 'maven') {
+        if (this.buildTool === MAVEN) {
           this.addMavenProperty('jackson-databind-nullable.version', constants.JACKSON_DATABIND_NULLABLE_VERSION);
           // eslint-disable-next-line no-template-curly-in-string
           this.addMavenDependency('org.openapitools', 'jackson-databind-nullable', '${jackson-databind-nullable.version}');
-        } else if (this.buildTool === 'gradle') {
+        } else if (this.buildTool === GRADLE) {
           this.addGradleProperty('jacksonDatabindNullableVersion', constants.JACKSON_DATABIND_NULLABLE_VERSION);
           this.addGradleDependency(
             'compile',
@@ -164,7 +170,7 @@ function customizeFiles() {
       this.javaDir = `${constants.SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
       const mainClassFile = `${this.javaDir + this.getMainClassName()}.java`;
 
-      if (this.applicationType !== 'microservice' || !['jwt'].includes(this.authenticationType)) {
+      if (this.applicationType !== MICROSERVICE || ![JWT].includes(this.authenticationType)) {
         this.rewriteFile(
           mainClassFile,
           'import org.springframework.core.env.Environment;',

package/generators/openapi-client/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 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.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/openapi-client/index.js

@@ -16,25 +16,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+/* eslint-disable consistent-return */
 const shelljs = require('shelljs');
 const chalk = require('chalk');
-const BaseGenerator = require('../generator-base');
+const { GENERATOR_OPENAPI_CLIENT } = require('../generator-list');
+const { OpenAPIOptionsNames, OpenAPIDefaultValues } = require('../../jdl/jhipster/openapi-options');
 const prompts = require('./prompts');
 const { writeFiles, customizeFiles } = require('./files');
+const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
-module.exports = class extends BaseGenerator {
-  constructor(args, opts) {
-    super(args, opts);
-    this.option('regen', {
+module.exports = class extends BaseBlueprintGenerator {
+  constructor(args, options, features) {
+    super(args, options, features);
+    this.option(OpenAPIOptionsNames.REGEN, {
       desc: 'Regenerates all saved clients',
       type: Boolean,
-      defaults: false,
+      defaults: OpenAPIDefaultValues.REGEN,
     });
   }
 
-  get initializing() {
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENAPI_CLIENT);
+    }
+  }
+
+  _initializing() {
     return {
+      ...super._initializing(),
       validateFromCli() {
         this.checkInvocationFromCLI();
       },
@@ -48,7 +57,12 @@ module.exports = class extends BaseGenerator {
     };
   }
 
-  get prompting() {
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
+  _prompting() {
     return {
       askActionType: prompts.askActionType,
       askExistingAvailableDocs: prompts.askExistingAvailableDocs,
@@ -56,7 +70,12 @@ module.exports = class extends BaseGenerator {
     };
   }
 
-  get configuring() {
+  get prompting() {
+    if (this.delegateToBlueprint) return {};
+    return this._prompting();
+  }
+
+  _configuring() {
     return {
       determineApisToGenerate() {
         this.clientsToGenerate = {};
@@ -84,33 +103,66 @@ module.exports = class extends BaseGenerator {
     };
   }
 
-  get writing() {
+  get configuring() {
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
+  }
+
+  _writing() {
     return writeFiles();
   }
 
-  get postWriting() {
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
+
+  _postWriting() {
     return customizeFiles();
   }
 
+  get postWriting() {
+    if (this.delegateToBlueprint) return {};
+    return this._postWriting();
+  }
+
+  _install() {
+    return {
+      executeOpenApiClient() {
+        this.clientPackageManager = this.config.get('clientPackageManager');
+        const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} install`, { silent: this.silent });
+        if (stderr) {
+          this.log(`Something went wrong while running npm install: ${stdout} ${stderr}`);
+        }
+        Object.keys(this.clientsToGenerate).forEach(cliName => {
+          this.log(chalk.green(`\nGenerating client for ${cliName}`));
+          const generatorName = this.clientsToGenerate[cliName].generatorName;
+          const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} run openapi-client:${cliName}`, { silent: this.silent });
+          if (!stderr) {
+            this.success(`Succesfully generated ${cliName} ${generatorName} client`);
+          } else {
+            this.log(`Something went wrong while generating client ${cliName}: ${stdout} ${stderr}`);
+          }
+        });
+      },
+    };
+  }
+
   install() {
-    this.clientPackageManager = this.config.get('clientPackageManager');
-    const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} install`, { silent: this.silent });
-    if (stderr) {
-      this.log(`Something went wrong while running npm install: ${stdout} ${stderr}`);
-    }
-    Object.keys(this.clientsToGenerate).forEach(cliName => {
-      this.log(chalk.green(`\nGenerating client for ${cliName}`));
-      const generatorName = this.clientsToGenerate[cliName].generatorName;
-      const { stdout, stderr } = shelljs.exec(`${this.clientPackageManager} run openapi-client:${cliName}`, { silent: this.silent });
-      if (!stderr) {
-        this.success(`Succesfully generated ${cliName} ${generatorName} client`);
-      } else {
-        this.log(`Something went wrong while generating client ${cliName}: ${stdout} ${stderr}`);
-      }
-    });
+    if (this.delegateToBlueprint) return {};
+    return this._install();
+  }
+
+  _end() {
+    return {
+      tearDown() {
+        this.log('End of openapi-client generator');
+      },
+    };
   }
 
   end() {
-    this.log('End of openapi-client generator');
+    if (this.delegateToBlueprint) return {};
+    return this._end();
   }
 };

package/generators/openapi-client/prompts.js

@@ -19,6 +19,10 @@
 const path = require('path');
 const shelljs = require('shelljs');
 const request = require('then-request');
+const OptionNames = require('../../jdl/jhipster/application-options');
+const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
+
+const { REACTIVE, SERVICE_DISCOVERY_TYPE } = OptionNames;
 
 module.exports = {
   askActionType,
@@ -155,7 +159,7 @@ function askActionType() {
       props.action = 'new';
     }
 
-    props.generatorName = this.config.get('reactive') ? 'java' : 'spring';
+    props.generatorName = this.config.get(REACTIVE) ? 'java' : 'spring';
 
     this.props = props;
     if (props.jhipsterEndpoint !== undefined) {
@@ -204,7 +208,7 @@ function askGenerationInfos() {
     {
       when:
         this.props.specOrigin === 'jhipster-endpoint' &&
-        this.config.get('serviceDiscoveryType') === 'eureka' &&
+        this.config.get(SERVICE_DISCOVERY_TYPE) === EUREKA &&
         this.props.generatorName === 'spring',
       type: 'confirm',
       name: 'useServiceDiscovery',

package/generators/openshift/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 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.
+ */
+import generator from './index.js';
+
+export default generator;