generator-jhipster 7.3.0 → 7.5.0

package/generators/workspaces/index.js

@@ -42,13 +42,17 @@ module.exports = class extends BaseBlueprintGenerator {
 
     if (this.options.help) return;
 
-    this.useBlueprints = !this.fromBlueprint && this.instantiateBlueprints('workspaces');
-
     // Generate workspaces file only when option passed or regenerating
     this.generateWorkspaces = this.options.workspaces !== false || !!this.packageJson.get('workspaces');
 
     // When generating workspaces, save to .yo-rc.json. Use a dummy config otherwise.
     this.workspacesConfig = this.generateWorkspaces ? this.jhipsterConfig : {};
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('workspaces');
+    }
 
     this.loadRuntimeOptions();
   }
@@ -106,7 +110,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    return this.useBlueprints ? undefined : this._configuring();
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
   }
 
   _loading() {
@@ -122,7 +127,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    return this.useBlueprints ? undefined : this._loading();
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
   }
 
   _writing() {
@@ -146,7 +152,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    return this.useBlueprints ? undefined : this._writing();
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
   }
 
   _postWriting() {
@@ -179,7 +186,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    return this.useBlueprints ? undefined : this._postWriting();
+    if (this.delegateToBlueprint) return {};
+    return this._postWriting();
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -199,7 +207,8 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get install() {
-    return this.useBlueprints ? undefined : this._install();
+    if (this.delegateToBlueprint) return {};
+    return this._install();
   }
 
   _detectNodePackageManager() {

package/jdl/jhipster/default-application-options.js

@@ -169,10 +169,16 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
     [SKIP_USER_MANAGEMENT]: true,
     ...customOptions,
   };
-  delete options[CLIENT_FRAMEWORK];
+  let skipClient = options[SKIP_CLIENT];
+  if (skipClient === undefined) {
+    skipClient = options[CLIENT_FRAMEWORK] === undefined;
+  }
+  if (skipClient) {
+    delete options[CLIENT_FRAMEWORK];
+    delete options[SKIP_SERVER];
+  }
   delete options[CLIENT_THEME];
   delete options[CLIENT_THEME_VARIANT];
-  delete options[SKIP_SERVER];
   delete options[WITH_ADMIN_UI];
   if (typeof options[SKIP_USER_MANAGEMENT] !== 'boolean') {
     options[SKIP_USER_MANAGEMENT] = true;
@@ -186,7 +192,7 @@ function getConfigForMicroserviceApplication(customOptions = {}) {
   return {
     ...options,
     [APPLICATION_TYPE]: MICROSERVICE,
-    [SKIP_CLIENT]: true,
+    [SKIP_CLIENT]: skipClient,
   };
 }
 
@@ -205,16 +211,12 @@ function getDefaultConfigForNewApplication(customOptions = {}) {
     [MESSAGE_BROKER]: OptionValues[MESSAGE_BROKER].false,
     [PROD_DATABASE_TYPE]: POSTGRESQL,
     [SEARCH_ENGINE]: OptionValues[SEARCH_ENGINE].false,
-    [SKIP_CLIENT]: OptionValues[SKIP_CLIENT],
     [TEST_FRAMEWORKS]: [],
     [WEBSOCKET]: OptionValues[WEBSOCKET].false,
     [ENABLE_GRADLE_ENTERPRISE]: OptionValues[ENABLE_GRADLE_ENTERPRISE],
     [GRADLE_ENTERPRISE_HOST]: OptionValues[GRADLE_ENTERPRISE_HOST],
     ...customOptions,
   };
-  if (typeof options[SKIP_SERVER] !== 'boolean') {
-    options[SKIP_SERVER] = OptionValues[SKIP_SERVER];
-  }
   if (!options[PACKAGE_NAME] && !options[PACKAGE_FOLDER]) {
     options[PACKAGE_FOLDER] = OptionValues[PACKAGE_FOLDER];
     options[PACKAGE_NAME] = OptionValues[PACKAGE_NAME];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.3.0",
+  "version": "7.5.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -75,64 +75,64 @@
     "prettier:check": "prettier --check \"{,**/}*.{js,cjs,mjs,json,md,yml,java}\"",
     "prettier:format": "prettier --write \"{,**/}*.{js,cjs,mjs,json,md,yml,java}\"",
     "pretest": "npm run lint",
-    "test": "mocha test generators --no-insight --forbid-only --parallel",
+    "test": "mocha test generators --no-insight --forbid-only --parallel --max-old-space-size=4096",
     "update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --",
     "update-snapshots": "npm run update-snapshot -- test generators"
   },
   "dependencies": {
-    "aws-sdk": "2.999.0",
-    "axios": "0.22.0",
+    "aws-sdk": "2.1048.0",
+    "axios": "0.24.0",
     "chalk": "4.1.2",
-    "chevrotain": "9.0.2",
-    "commander": "8.2.0",
-    "conf": "10.0.3",
-    "debug": "4.3.2",
+    "chevrotain": "9.1.0",
+    "commander": "8.3.0",
+    "conf": "10.1.1",
+    "debug": "4.3.3",
     "didyoumean": "1.2.2",
     "ejs": "3.1.6",
     "faker": "5.5.3",
     "glob": "7.2.0",
-    "gulp-filter": "7.0.0",
     "insight": "0.11.1",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "mem-fs-editor": "9.3.0",
+    "mem-fs-editor": "9.4.0",
     "minimatch": "3.0.4",
     "normalize-path": "3.0.0",
     "os-locale": "5.0.0",
     "p-queue": "6.6.2",
+    "p-transform": "1.3.0",
     "parse-gitignore": "1.0.1",
     "pluralize": "8.0.0",
-    "prettier": "2.4.1",
-    "prettier-plugin-java": "1.4.0",
-    "prettier-plugin-packagejson": "2.2.13",
+    "prettier": "2.5.1",
+    "prettier-plugin-java": "1.6.0",
+    "prettier-plugin-packagejson": "2.2.15",
     "progress": "2.0.3",
     "randexp": "0.5.3",
     "semver": "7.3.5",
     "shelljs": "0.8.4",
-    "simple-git": "2.46.0",
+    "simple-git": "2.48.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
     "winston": "3.3.3",
-    "yeoman-environment": "3.6.0",
+    "yeoman-environment": "3.8.1",
     "yeoman-generator": "5.4.2"
   },
   "devDependencies": {
     "chai": "4.3.4",
     "ejs-lint": "1.2.1",
-    "eslint": "7.32.0",
-    "eslint-config-airbnb-base": "14.2.1",
+    "eslint": "8.5.0",
+    "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
-    "eslint-plugin-import": "2.24.2",
-    "eslint-plugin-mocha": "9.0.0",
+    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-mocha": "10.0.3",
     "eslint-plugin-prettier": "4.0.0",
-    "expect": "27.2.4",
+    "expect": "27.4.2",
     "fs-extra": "10.0.0",
     "jsdoc": "3.6.7",
-    "mocha": "9.1.2",
+    "mocha": "9.1.3",
     "mocha-expect-snapshot": "1.1.1",
     "proxyquire": "2.1.3",
-    "sinon": "11.1.2",
+    "sinon": "12.0.1",
     "sinon-chai": "3.7.0",
     "yeoman-assert": "3.1.1",
     "yeoman-test": "6.2.0"

package/utils/entity.js

@@ -31,7 +31,7 @@ const { OAUTH2 } = require('../jdl/jhipster/authentication-types');
 const { CommonDBTypes } = require('../jdl/jhipster/field-types');
 
 const { BOOLEAN, LONG, STRING, UUID } = CommonDBTypes;
-const { MAPSTRUCT } = MapperTypes;
+const { NO: NO_DTO, MAPSTRUCT } = MapperTypes;
 const { PAGINATION, INFINITE_SCROLL } = PaginationTypes;
 const { SERVICE_IMPL } = ServiceTypes;
 const NO_SERVICE = ServiceTypes.NO;
@@ -40,6 +40,7 @@ const NO_MAPPER = MapperTypes.NO;
 
 const BASE_TEMPLATE_DATA = {
   primaryKey: undefined,
+  entityPackage: undefined,
   skipUiGrouping: false,
   haveFieldWithJavadoc: false,
   existingEnum: false,
@@ -105,7 +106,7 @@ function _derivedProperties(entityWithConfig) {
 }
 
 function prepareEntityForTemplates(entityWithConfig, generator) {
-  const entityName = entityWithConfig.name;
+  const entityName = _.upperFirst(entityWithConfig.name);
   _.defaults(entityWithConfig, entityDefaultConfig, BASE_TEMPLATE_DATA);
 
   entityWithConfig.changelogDateForRecent = parseLiquibaseChangelogDate(entityWithConfig.changelogDate);
@@ -128,15 +129,17 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
     entityWithConfig.skipServer = true;
   }
 
+  entityWithConfig.builtInUser = generator.isBuiltInUser(entityName);
+
   _.defaults(entityWithConfig, {
-    entityNameCapitalized: _.upperFirst(entityName),
+    entityNameCapitalized: entityName,
     entityClass: _.upperFirst(entityName),
     entityInstance: _.lowerFirst(entityName),
     entityTableName: generator.getTableName(entityName),
     entityNamePlural: pluralize(entityName),
   });
 
-  const dto = entityWithConfig.dto === MAPSTRUCT;
+  const dto = entityWithConfig.dto && entityWithConfig.dto !== NO_DTO;
   if (dto) {
     _.defaults(entityWithConfig, {
       dtoClass: generator.asDto(entityWithConfig.entityClass),
@@ -201,6 +204,13 @@ function prepareEntityForTemplates(entityWithConfig, generator) {
     entityWithConfig.i18nAlertHeaderPrefix = `${entityWithConfig.microserviceAppName}.${entityWithConfig.entityTranslationKey}`;
   }
 
+  const { microserviceName, entityFileName, microfrontend } = entityWithConfig;
+  entityWithConfig.entityApi = microserviceName ? `services/${microserviceName.toLowerCase()}/` : '';
+  entityWithConfig.entityPage =
+    microfrontend && microserviceName && (entityWithConfig.applicationType === MICROSERVICE || entityWithConfig.applicationType === GATEWAY)
+      ? `${microserviceName.toLowerCase()}/${entityFileName}`
+      : `${entityFileName}`;
+
   const hasBuiltInUserField = entityWithConfig.relationships.some(relationship => generator.isBuiltInUser(relationship.otherEntityName));
   entityWithConfig.saveUserSnapshot =
     entityWithConfig.applicationType === MICROSERVICE &&
@@ -446,6 +456,9 @@ function loadRequiredConfigIntoEntity(entity, config) {
     jhiPrefix: config.jhiPrefix,
     authenticationType: config.authenticationType,
     reactive: config.reactive,
+    microfrontend: config.microfrontend,
+    // Workaround different paths
+    clientFramework: config.clientFramework,
   });
   return entity;
 }

package/utils/field.js

@@ -129,9 +129,12 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
     });
   } else if ([INSTANT, ZONED_DATE_TIME, LOCAL_DATE].includes(field.fieldType)) {
     // Iso: YYYY-MM-DDTHH:mm:ss.sssZ
-    const isoDate = faker.date.recent(1, changelogDate).toISOString();
+    const date = faker.date.recent(1, changelogDate);
+    const isoDate = date.toISOString();
     if (field.fieldType === LOCAL_DATE) {
       data = isoDate.split('T')[0];
+    } else if (type === 'json-serializable') {
+      data = date;
     } else {
       // Write the date without milliseconds so Java can parse it
       // See https://stackoverflow.com/a/34053802/150868
@@ -154,6 +157,10 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
     data = faker.datatype.boolean();
   }
 
+  if (field.fieldType === BYTES && type === 'json-serializable') {
+    data = Buffer.from(data).toString('base64');
+  }
+
   // Validation rules
   if (data !== undefined && field.fieldValidate === true) {
     // manage String max length
@@ -289,6 +296,9 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
 
   field.fieldIsEnum = !field.id && fieldIsEnum(fieldType);
   field.fieldWithContentType = (fieldType === BYTES || fieldType === BYTE_BUFFER) && field.fieldTypeBlobContent !== TEXT;
+  if (field.fieldWithContentType) {
+    field.contentTypeFieldName = `${field.fieldName}ContentType`;
+  }
 
   if (field.fieldNameAsDatabaseColumn === undefined) {
     const fieldNameUnderscored = _.snakeCase(field.fieldName);

package/utils/multi-step-transform/index.js

@@ -1,12 +1,12 @@
 const { default: PQueue } = require('p-queue');
-const OOOTransform = require('yeoman-environment/lib/util/out-of-order-transform');
+const { PTransform } = require('p-transform');
 const { isFilePending } = require('mem-fs-editor/lib/state');
 
 const { TemplateFileFs } = require('./template-file-fs');
 
-module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransform {
+module.exports.MultiStepTransform = class MultiStepTransform extends PTransform {
   constructor(options = {}) {
-    super(options);
+    super({ logName: 'jhipster:multi-step-transform', ...options });
 
     this.twoStepTemplateQueue = new PQueue({ concurrency: 1, autoStart: false });
     this.templateFileFs = new TemplateFileFs(options);
@@ -15,7 +15,7 @@ module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransfor
     this.pendingFiles = [];
   }
 
-  async _executeTransform(file, enc) {
+  async queuedTransform(file, enc) {
     try {
       if (file.contents && this.templateFileFs.isTemplate(file.path)) {
         const templateFile = this.templateFileFs.add(file.path, file.contents.toString());
@@ -43,10 +43,10 @@ module.exports.MultiStepTransform = class MultiStepTransform extends OOOTransfor
     }
   }
 
-  async _final(...args) {
+  _flush(callback) {
     // Clear normal queue before templates.
-    await this.queue.onIdle();
-    await this.twoStepTemplateQueue.start().onIdle();
-    super._final(...args);
+    this.flushQueue()
+      .then(() => this.twoStepTemplateQueue.start().onIdle())
+      .then(() => super._flush(callback));
   }
 };

package/generators/client/templates/react/.npmrc.ejs

@@ -1 +0,0 @@
-legacy-peer-deps = true

package/generators/client/templates/vue/webpack/dev.env.js.ejs

@@ -1,17 +0,0 @@
-'use strict';
-const webpackMerge = require('webpack-merge').merge;
-const prodEnv = require('./prod.env');
-<%_ if (buildToolUnknown) { _%>
-const packageJson = require('./../package.json');
-<%_ } _%>
-
-module.exports = webpackMerge(prodEnv, {
-  NODE_ENV: '"development"',
-  SERVER_API_URL: '\'\'',
-<%_ if (buildToolUnknown) { _%>
-  VERSION: `'${packageJson.version}'`,
-<%_ } else { _%>
-  // APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks.
-  VERSION: `'${process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'UNKNOWN'}'`,
-<%_ } _%>
-});

package/generators/client/templates/vue/webpack/env.js.ejs

@@ -1,67 +0,0 @@
-'use strict';
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
-
-const path = require('path');
-
-module.exports = {
-    dev: {
-        // Paths
-        assetsSubDirectory: 'static',
-        assetsPublicPath: '/',
-        proxyTable: {},
-
-        // Various Dev Server settings
-        host: 'localhost', // can be overwritten by process.env.HOST
-        port: <%= serverPort %>, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-        autoOpenBrowser: false,
-        errorOverlay: true,
-        notifyOnErrors: true,
-        poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-        /**
-         * Source Maps
-         */
-
-        // https://webpack.js.org/configuration/devtool/#development
-        devtool: 'cheap-module-source-map',
-
-        // If you have problems debugging vue-files in devtools,
-        // set this to false - it *may* help
-        // https://vue-loader.vuejs.org/en/options.html#cachebusting
-        cacheBusting: true,
-
-        cssSourceMap: true
-    },
-
-    build: {
-        // Template for index.html
-        index: path.resolve(__dirname, '../target/www/index.html'),
-
-        // Paths
-        assetsRoot: path.resolve(__dirname, '../target'),
-        assetsSubDirectory: 'static',
-        assetsPublicPath: '/',
-
-        /**
-         * Source Maps
-         */
-
-        productionSourceMap: true,
-        // https://webpack.js.org/configuration/devtool/#production
-        devtool: 'source-map',
-
-        // Gzip off by default as many popular static hosts such as
-        // Surge or Netlify already gzip all static assets for you.
-        // Before setting to `true`, make sure to:
-        // npm install --save-dev compression-webpack-plugin
-        productionGzip: false,
-        productionGzipExtensions: ['js', 'css'],
-
-        // Run the build command with an extra argument to
-        // View the bundle analyzer report after build finishes:
-        // `npm run build --report`
-        // Set to `true` or `false` to always turn it on or off
-        bundleAnalyzerReport: process.env.npm_config_report
-    }
-};

package/generators/client/templates/vue/webpack/loader.conf.js.ejs

@@ -1,20 +0,0 @@
-'use strict';
-const utils = require('./vue.utils');
-const config = require('./env');
-const isProduction = process.env.NODE_ENV === 'production';
-const sourceMapEnabled = isProduction ? config.build.productionSourceMap : config.dev.cssSourceMap;
-
-module.exports = {
-  loaders: utils.cssLoaders({
-    sourceMap: sourceMapEnabled,
-    extract: isProduction
-  }),
-  cssSourceMap: sourceMapEnabled,
-  cacheBusting: config.dev.cacheBusting,
-  transformToRequire: {
-    video: ['src', 'poster'],
-    source: 'src',
-    img: 'src',
-    image: 'xlink:href'
-  }
-};

package/generators/client/templates/vue/webpack/prod.env.js.ejs

@@ -1,15 +0,0 @@
-'use strict';
-<%_ if (buildToolUnknown) { _%>
-const packageJson = require('./../package.json');
-<%_ } _%>
-
-module.exports = {
-  NODE_ENV: '"production"',
-  SERVER_API_URL: '""',
-<%_ if (buildToolUnknown) { _%>
-  VERSION: `'${packageJson.version}'`,
-<%_ } else { _%>
-  // APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks.
-  VERSION: `'${process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'UNKNOWN'}'`,
-<%_ } _%>
-};

package/generators/server/templates/src/main/java/package/config/apidocs/GatewaySwaggerResourcesProvider.java.ejs

@@ -1,91 +0,0 @@
-package <%= packageName %>.config.apidocs;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.gateway.route.Route;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
-import reactor.core.scheduler.Schedulers;
-import springfox.documentation.swagger.web.SwaggerResource;
-import springfox.documentation.swagger.web.SwaggerResourcesProvider;
-import tech.jhipster.config.JHipsterConstants;
-
-/**
- * Retrieves all registered microservices Swagger resources.
- */
-@Component
-@Primary
-@Profile(JHipsterConstants.SPRING_PROFILE_API_DOCS)
-@Configuration
-public class GatewaySwaggerResourcesProvider implements SwaggerResourcesProvider {
-
-    @Value("${eureka.instance.appname:<%= baseName.toLowerCase() %>}")
-    private String gatewayName;
-
-    private final RouteLocator routeLocator;
-
-    @Qualifier("swaggerResources")
-    private final SwaggerResourcesProvider swaggerResourcesProvider;
-
-    public GatewaySwaggerResourcesProvider(RouteLocator routeLocator, SwaggerResourcesProvider swaggerResourcesProvider) {
-        this.routeLocator = routeLocator;
-        this.swaggerResourcesProvider = swaggerResourcesProvider;
-    }
-
-    @Override
-    public List<SwaggerResource> get() {
-        List<SwaggerResource> swaggerResources = new ArrayList<>();
-
-        swaggerResources.add(swaggerResource(gatewayName.concat(" (default)"), "/v3/api-docs"));
-        swaggerResources.add(swaggerResource(gatewayName.concat(" (management)"), "/v3/api-docs?group=management"));
-
-        List<String> microservices = routeLocator
-            .getRoutes()
-            .map(this::getMicroserviceName)
-            .collectList()
-            .defaultIfEmpty(Collections.emptyList())
-            .subscribeOn(Schedulers.boundedElastic())
-            .toFuture()
-            .orTimeout(10, TimeUnit.SECONDS)
-            .join();
-        microservices
-            .stream()
-            .filter(this::isNotGateway)
-<%_ if (serviceDiscoveryConsul) { _%>
-            .filter(this::isNotConsul)
-<%_ } _%>
-            .forEach(microservice -> swaggerResources.add(swaggerResource(microservice, getMicroserviceApiDocs(microservice))));
-        return swaggerResources;
-    }
-
-    public static SwaggerResource swaggerResource(String name, String location) {
-        SwaggerResource swaggerResource = new SwaggerResource();
-        swaggerResource.setName(name);
-        swaggerResource.setLocation(location);
-        swaggerResource.setSwaggerVersion("3.0");
-        return swaggerResource;
-    }
-
-    private boolean isNotGateway(String name) {
-        return !name.equalsIgnoreCase(gatewayName);
-    }
-
-<%_ if (serviceDiscoveryConsul) { _%>
-    private boolean isNotConsul(String name) {
-        return !name.equalsIgnoreCase("consul");
-    }
-
-<%_ } _%>
-    private String getMicroserviceApiDocs(String name) {
-        return "/services/".concat(name).concat("/v3/api-docs");
-    }
-
-    private String getMicroserviceName(Route route) {
-        return route.getUri().toString().replace("lb://", "").toLowerCase();
-    }
-}

package/generators/server/templates/src/test/java/package/config/apidocs/GatewaySwaggerResourcesProviderTest.java.ejs

@@ -1,79 +0,0 @@
-package <%= packageName %>.config.apidocs;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-import static <%= packageName %>.config.apidocs.GatewaySwaggerResourcesProvider.swaggerResource;
-
-import java.net.URI;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.springframework.cloud.gateway.route.Route;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.test.util.ReflectionTestUtils;
-import reactor.core.publisher.Flux;
-import springfox.documentation.swagger.web.SwaggerResource;
-import springfox.documentation.swagger.web.SwaggerResourcesProvider;
-
-@ExtendWith(SpringExtension.class)
-class GatewaySwaggerResourcesProviderTest {
-
-    @InjectMocks
-    GatewaySwaggerResourcesProvider gatewaySwaggerResourcesProvider;
-
-    @Mock
-    RouteLocator routeLocator;
-
-    @Mock
-    SwaggerResourcesProvider swaggerResourcesProvider;
-
-    @Test
-    void shouldGet() {
-        // Given
-        ReflectionTestUtils.setField(gatewaySwaggerResourcesProvider, "gatewayName", "burger");
-        when(swaggerResourcesProvider.get())
-            .thenReturn(
-                List.of(
-                    swaggerResource("default", "/v3/api-docs"),
-                    swaggerResource("default", "/v3/api-docs?group=management"),
-                    swaggerResource("default", "/v3/api-docs?group=openapi")
-                )
-            );
-        when(routeLocator.getRoutes())
-            .thenReturn(
-                Flux.just(
-                    Route
-                        .async()
-                        .id("ReactiveCompositeDiscoveryClient_BURGER")
-                        .uri(URI.create("lb://BURGER"))
-                        .predicate(exchange -> true)
-                        .build(),
-                    Route
-                        .async()
-                        .id("ReactiveCompositeDiscoveryClient_BEER")
-                        .uri(URI.create("lb://BEER"))
-                        .predicate(exchange -> true)
-                        .build()
-                )
-            );
-
-        // When
-        List<SwaggerResource> result = gatewaySwaggerResourcesProvider.get();
-
-        // Then
-        assertThat(result).isNotEmpty();
-        assertThat(result.size()).isEqualTo(3);
-
-        assertThat(result.get(0).getName()).isEqualTo("burger (default)");
-        assertThat(result.get(0).getUrl()).isEqualTo("/v3/api-docs");
-
-        assertThat(result.get(1).getName()).isEqualTo("burger (management)");
-        assertThat(result.get(1).getUrl()).isEqualTo("/v3/api-docs?group=management");
-
-        assertThat(result.get(2).getName()).isEqualTo("beer");
-        assertThat(result.get(2).getUrl()).isEqualTo("/services/beer/v3/api-docs");
-    }
-}

package/generators/server/templates/src/test/resources/cucumber.properties.ejs

@@ -1 +0,0 @@
-cucumber.publish.quiet=true