generator-jhipster 7.3.0 → 7.5.0

package/generators/openapi-client/index.js

@@ -25,8 +25,6 @@ const prompts = require('./prompts');
 const { writeFiles, customizeFiles } = require('./files');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -35,7 +33,12 @@ module.exports = class extends BaseBlueprintGenerator {
       type: Boolean,
       defaults: OpenAPIDefaultValues.REGEN,
     });
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_OPENAPI_CLIENT);
+  }
+
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENAPI_CLIENT);
+    }
   }
 
   _initializing() {
@@ -55,7 +58,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -68,7 +71,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -101,7 +104,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -110,7 +113,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -119,7 +122,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -146,7 +149,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   install() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._install();
   }
 
@@ -159,7 +162,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/openshift/index.js

@@ -38,13 +38,12 @@ const NO_DATABASE = databaseTypes.NO;
 const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
 const { EPHEMERAL, PERSISTENT } = StorageTypes;
 
-let useBlueprints;
-
 /* eslint-disable consistent-return */
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_OPENSHIFT);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_OPENSHIFT);
+    }
   }
 
   _initializing() {
@@ -90,7 +89,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -110,7 +109,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -159,7 +158,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -177,7 +176,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -186,7 +185,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -261,7 +260,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 

package/generators/openshift/templates/deployment.yml.ejs

@@ -190,7 +190,7 @@ objects:
 <%_ if (app.databaseTypeCouchbase) { _%>
             - name: SPRING_COUCHBASE_CONNECTION_STRING
               value: ${APPLICATION_NAME}-couchbase
-            - name: JHIPSTER_COUCHBASE_BUCKET_NAME
+            - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
               value: ${APPLICATION_NAME}
 <%_ } _%>
 <%_ if (app.searchEngineElasticsearch) { _%>

package/generators/page/index.js

@@ -27,8 +27,6 @@ const { PROTRACTOR } = require('../../jdl/jhipster/test-framework-types');
 
 const { VUE } = constants.SUPPORTED_CLIENT_FRAMEWORKS;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -61,8 +59,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.loadRuntimeOptions();
 
     this.rootGenerator = this.env.rootGenerator() === this;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_PAGE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_PAGE);
+    }
   }
 
   _initializing() {
@@ -81,7 +83,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -92,7 +94,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -110,7 +112,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -130,7 +132,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -147,7 +149,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -165,7 +167,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -183,7 +185,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/server/__snapshots__/generator.spec.mjs.snap

@@ -266,7 +266,6 @@ Object {
       ],
     },
     Object {
-      "condition": [Function],
       "templates": Array [
         Object {
           "file": "npmw",
@@ -378,6 +377,10 @@ Object {
           "file": "package/security/jwt/JWTFilter.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/management/SecurityMetersService.java",
+          "renameTo": [Function],
+        },
       ],
     },
     Object {
@@ -774,10 +777,6 @@ Object {
       "condition": [Function],
       "path": "src/main/java/",
       "templates": Array [
-        Object {
-          "file": "package/config/apidocs/GatewaySwaggerResourcesProvider.java",
-          "renameTo": [Function],
-        },
         Object {
           "file": "package/web/filter/ModifyServersOpenApiFilter.java",
           "renameTo": [Function],
@@ -792,10 +791,6 @@ Object {
           "file": "package/web/filter/ModifyServersOpenApiFilterTest.java",
           "renameTo": [Function],
         },
-        Object {
-          "file": "package/config/apidocs/GatewaySwaggerResourcesProviderTest.java",
-          "renameTo": [Function],
-        },
       ],
     },
   ],
@@ -1130,10 +1125,18 @@ Object {
       "condition": [Function],
       "path": "src/test/java/",
       "templates": Array [
+        Object {
+          "file": "package/management/SecurityMetersServiceTests.java",
+          "renameTo": [Function],
+        },
         Object {
           "file": "package/security/jwt/TokenProviderTest.java",
           "renameTo": [Function],
         },
+        Object {
+          "file": "package/security/jwt/TokenProviderSecurityMetersTests.java",
+          "renameTo": [Function],
+        },
         Object {
           "file": "package/security/jwt/JWTFilterTest.java",
           "renameTo": [Function],
@@ -1158,7 +1161,16 @@ Object {
           "file": "package/cucumber/stepdefs/UserStepDefs.java",
           "renameTo": [Function],
         },
-        "../features/user/user.feature",
+      ],
+    },
+    Object {
+      "condition": [Function],
+      "path": "src/test/resources/",
+      "templates": Array [
+        Object {
+          "file": "package/features/user/user.feature",
+          "renameTo": [Function],
+        },
       ],
     },
     Object {
@@ -1723,17 +1735,18 @@ Object {
           "file": "package/cucumber/CucumberTestContextConfiguration.java",
           "renameTo": [Function],
         },
-        Object {
-          "file": "../features/gitkeep",
-          "noEjs": true,
-        },
       ],
     },
     Object {
       "condition": [Function],
       "path": "src/test/resources/",
       "templates": Array [
-        "cucumber.properties",
+        "junit-platform.properties",
+        Object {
+          "file": "package/features/gitkeep",
+          "noEjs": true,
+          "renameTo": [Function],
+        },
       ],
     },
     Object {

package/generators/server/cleanup.js

@@ -0,0 +1,151 @@
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ *
+ * @param {any} generator - reference to generator
+ * @param {string} javaDir - Java directory
+ * @param {string} testDir - Java tests directory
+ * @param {string} mainResourceDir - Main resources directory
+ * @param {string} testResourceDir - Test resources directory
+ */
+function cleanupOldServerFiles(generator, javaDir, testDir, mainResourceDir, testResourceDir) {
+  if (generator.isJhipsterVersionLessThan('3.5.0')) {
+    generator.removeFile(`${javaDir}domain/util/JSR310DateTimeSerializer.java`);
+    generator.removeFile(`${javaDir}domain/util/JSR310LocalDateDeserializer.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('3.6.0')) {
+    generator.removeFile(`${javaDir}config/HerokuDatabaseConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('3.10.0')) {
+    generator.removeFile(`${javaDir}config/CloudMongoDbConfiguration.java`);
+    generator.removeFile(`${javaDir}security/CustomAccessDeniedHandler.java`);
+    generator.removeFile(`${javaDir}web/filter/CsrfCookieGeneratorFilter.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('3.12.0')) {
+    generator.removeFile(`${javaDir}config/hazelcast/HazelcastCacheRegionFactory.java`);
+    generator.removeFile(`${javaDir}config/hazelcast/package-info.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.0.0')) {
+    generator.removeFile(`${javaDir}async/ExceptionHandlingAsyncTaskExecutor.java`);
+    generator.removeFile(`${javaDir}async/package-info.java`);
+    generator.removeFile(`${javaDir}config/jHipsterProperties.java`);
+    generator.removeFile(`${javaDir}config/LoadBalancedResourceDetails.java`);
+    generator.removeFile(`${javaDir}config/ElasticSearchConfiguration.java`);
+    generator.removeFile(`${javaDir}config/apidoc/package-info.java`);
+    generator.removeFile(`${javaDir}config/apidoc/PageableParameterBuilderPlugin.java`);
+    generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
+    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
+    generator.removeFile(`${javaDir}config/jcache/SpringCacheRegionFactory.java`);
+    generator.removeFile(`${javaDir}config/liquibase/AsyncSpringLiquibase.java`);
+    generator.removeFile(`${javaDir}config/liquibase/package-info.java`);
+    generator.removeFile(`${javaDir}config/locale/AngularCookieLocaleResolver.java`);
+    generator.removeFile(`${javaDir}config/locale/package-info.java`);
+    generator.removeFile(`${javaDir}domain/util/FixedH2Dialect.java`);
+    generator.removeFile(`${javaDir}domain/util/FixedPostgreSQL82Dialect`);
+    generator.removeFile(`${javaDir}domain/util/JSR310DateConverters.java`);
+    generator.removeFile(`${javaDir}domain/util/JSR310PersistenceConverters.java`);
+    generator.removeFile(`${javaDir}security/AjaxAuthenticationFailureHandler.java`);
+    generator.removeFile(`${javaDir}security/AjaxAuthenticationSuccessHandler.java`);
+    generator.removeFile(`${javaDir}security/AjaxLogoutSuccessHandler.java`);
+    generator.removeFile(`${javaDir}security/CustomPersistentRememberMeServices.java`);
+    generator.removeFile(`${javaDir}security/Http401UnauthorizedEntryPoint.java`);
+    generator.removeFile(`${javaDir}security/UserDetailsService.java`);
+    generator.removeFile(`${javaDir}web/filter/CachingHttpHeadersFilter.java`);
+    generator.removeFile(`${javaDir}web/filter/package-info.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.3.0')) {
+    generator.removeFile(`${javaDir}gateway/ratelimiting/RateLimitingRepository.java`);
+    generator.removeFile(`${javaDir}config/cassandra/CustomZonedDateTimeCodec.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('4.7.1')) {
+    generator.removeFile(`${javaDir}web/rest/errors/ErrorVM.java`);
+    generator.removeFile(`${javaDir}web/rest/errors/ParameterizedErrorVM.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('5.0.0')) {
+    generator.removeFile(`${javaDir}config/ThymeleafConfiguration.java`);
+    generator.removeFile(`${javaDir}web/rest/ProfileInfoResource.java`);
+    generator.removeFile(`${mainResourceDir}mails/activationEmail.html`);
+    generator.removeFile(`${mainResourceDir}mails/creationEmail.html`);
+    generator.removeFile(`${mainResourceDir}mails/passwordResetEmail.html`);
+    generator.removeFile(`${mainResourceDir}mails/socialRegistrationValidationEmail.html`);
+    generator.removeFile(`${testResourceDir}mail/testEmail.html`);
+    generator.removeFile(`${testDir}web/rest/ProfileInfoResourceIT.java`);
+    generator.removeFile('gradle/mapstruct.gradle');
+  }
+  if (generator.isJhipsterVersionLessThan('5.2.2')) {
+    generator.removeFile(`${javaDir}config/ElasticsearchConfiguration.java`);
+    generator.removeFile('gradle/liquibase.gradle');
+  }
+  if (generator.isJhipsterVersionLessThan('5.8.0')) {
+    generator.removeFile(`${javaDir}config/MetricsConfiguration.java`);
+    if (generator.databaseType === 'cassandra') {
+      generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('6.0.0')) {
+    generator.removeFile(`${javaDir}web/rest/errors/CustomParameterizedException.java`);
+    generator.removeFile(`${javaDir}web/rest/errors/InternalServerErrorException.java`);
+    generator.removeFile(`${javaDir}web/rest/util/PaginationUtil.java`);
+    generator.removeFile(`${javaDir}web/rest/util/HeaderUtil.java`);
+    generator.removeFile(`${testDir}web/rest/util/PaginationUtilUnitTest.java`);
+    generator.removeFile(`${javaDir}web/rest/vm/LoggerVM.java`);
+    generator.removeFile(`${javaDir}web/rest/LogsResource.java`);
+    generator.removeFile(`${testDir}web/rest/LogsResourceIT.java`);
+    generator.removeFile(`${javaDir}config/OAuth2Configuration.java`);
+    generator.removeFile(`${javaDir}security/OAuth2AuthenticationSuccessHandler.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.5.2')) {
+    generator.removeFile(`${testDir}service/mapper/UserMapperIT.java`);
+    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaConsumer.java`);
+    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaProducer.java`);
+    generator.removeFile(`${testDir}web/rest/ClientForwardControllerIT.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.6.1')) {
+    generator.removeFile(`${javaDir}web/rest/errors/EmailNotFoundException.java`);
+    generator.removeFile(`${javaDir}config/DefaultProfileUtil.java`);
+    generator.removeFolder(`${javaDir}service/util`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.8.0')) {
+    generator.removeFile(`${javaDir}security/oauth2/JwtAuthorityExtractor.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('6.8.1')) {
+    generator.removeFile(`${javaDir}config/ReactivePageableHandlerMethodArgumentResolver.java`);
+    generator.removeFile(`${javaDir}config/ReactiveSortHandlerMethodArgumentResolver.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.0.0-beta.0')) {
+    generator.removeFile(`${javaDir}config/apidoc/SwaggerConfiguration.java`);
+    generator.removeFile(`${javaDir}config/audit/package-info.java`);
+    generator.removeFile(`${javaDir}config/audit/AuditEventConverter.java`);
+    generator.removeFile(`${javaDir}domain/PersistentAuditEvent.java`);
+    generator.removeFile(`${javaDir}repository/PersistenceAuditEventRepository.java`);
+    generator.removeFile(`${javaDir}repository/CustomAuditEventRepository.java`);
+    generator.removeFile(`${javaDir}service/AuditEventService.java`);
+    generator.removeFile(`${javaDir}web/rest/AuditResource.java`);
+    generator.removeFile(`${testDir}service/AuditEventServiceIT.java`);
+    generator.removeFile(`${testDir}web/rest/AuditResourceIT.java`);
+    generator.removeFile(`${testDir}repository/CustomAuditEventRepositoryIT.java`);
+
+    if (generator.databaseType === 'cassandra') {
+      generator.removeFile(`${javaDir}config/metrics/package-info.java`);
+      generator.removeFile(`${javaDir}config/metrics/CassandraHealthIndicator.java`);
+      generator.removeFile(`${javaDir}config/metrics/JHipsterHealthIndicatorConfiguration.java`);
+      generator.removeFile(`${javaDir}config/cassandra/package-info.java`);
+      generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
+      generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
+    }
+    if (generator.searchEngine === 'elasticsearch') {
+      generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
+    }
+  }
+  if (generator.isJhipsterVersionLessThan('7.0.0-beta.1')) {
+    generator.removeFile(`${javaDir}config/CloudDatabaseConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.4.2')) {
+    generator.removeFile(`${javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`);
+    generator.removeFile(`${testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/files-sql.js

@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+const { SERVER_MAIN_SRC_DIR } = require('../generator-constants');
+
+const sqlFiles = {
+  reactiveJavaUserManagement: [
+    {
+      condition: generator => generator.reactive && (!generator.skipUserManagement || generator.authenticationTypeOauth2),
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/repository/UserSqlHelper.java',
+          renameTo: generator => `${generator.javaDir}repository/UserSqlHelper.java`,
+        },
+      ],
+    },
+  ],
+};
+
+function writeSqlFiles() {
+  return {
+    async writeSqlFiles() {
+      if (!this.databaseTypeSql) return;
+
+      await this.writeFiles({
+        sections: sqlFiles,
+        rootTemplatesPath: ['sql/reactive', 'sql'],
+      });
+    },
+  };
+}
+
+module.exports = {
+  sqlFiles,
+  writeSqlFiles,
+};

package/generators/server/files.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const cleanup = require('../cleanup');
+const serverCleanup = require('./cleanup');
 const constants = require('../generator-constants');
 const { GATEWAY, MICROSERVICE, MONOLITH } = require('../../jdl/jhipster/application-types');
 const { JWT, OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
@@ -30,6 +30,7 @@ const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
 const { CONSUL, EUREKA } = require('../../jdl/jhipster/service-discovery-types');
 const { addSectionsCondition, mergeSections } = require('../utils');
 const { writeCouchbaseFiles } = require('./files-couchbase');
+const { writeSqlFiles } = require('./files-sql');
 
 /* Constants use throughout */
 const NO_DATABASE = databaseTypes.NO;
@@ -344,7 +345,6 @@ const baseServerFiles = {
       ],
     },
     {
-      condition: generator => generator.buildTool === MAVEN,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -451,6 +451,10 @@ const baseServerFiles = {
           file: 'package/security/jwt/JWTFilter.java',
           renameTo: generator => `${generator.javaDir}security/jwt/JWTFilter.java`,
         },
+        {
+          file: 'package/management/SecurityMetersService.java',
+          renameTo: generator => `${generator.javaDir}management/SecurityMetersService.java`,
+        },
       ],
     },
     {
@@ -656,10 +660,6 @@ const baseServerFiles = {
       condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType && generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
-        {
-          file: 'package/config/apidocs/GatewaySwaggerResourcesProvider.java',
-          renameTo: generator => `${generator.javaDir}config/apidocs/GatewaySwaggerResourcesProvider.java`,
-        },
         {
           file: 'package/web/filter/ModifyServersOpenApiFilter.java',
           renameTo: generator => `${generator.javaDir}web/filter/ModifyServersOpenApiFilter.java`,
@@ -674,10 +674,6 @@ const baseServerFiles = {
           file: 'package/web/filter/ModifyServersOpenApiFilterTest.java',
           renameTo: generator => `${generator.testDir}web/filter/ModifyServersOpenApiFilterTest.java`,
         },
-        {
-          file: 'package/config/apidocs/GatewaySwaggerResourcesProviderTest.java',
-          renameTo: generator => `${generator.testDir}config/apidocs/GatewaySwaggerResourcesProviderTest.java`,
-        },
       ],
     },
   ],
@@ -1318,13 +1314,15 @@ const baseServerFiles = {
           file: 'package/cucumber/CucumberTestContextConfiguration.java',
           renameTo: generator => `${generator.testDir}cucumber/CucumberTestContextConfiguration.java`,
         },
-        { file: '../features/gitkeep', noEjs: true },
       ],
     },
     {
       condition: generator => generator.cucumberTests,
       path: SERVER_TEST_RES_DIR,
-      templates: ['cucumber.properties'],
+      templates: [
+        'junit-platform.properties',
+        { file: 'package/features/gitkeep', renameTo: generator => `${generator.testDir}cucumber/gitkeep`, noEjs: true },
+      ],
     },
     {
       condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== OAUTH2,
@@ -1597,10 +1595,18 @@ const baseServerFiles = {
       condition: generator => generator.authenticationType === JWT,
       path: SERVER_TEST_SRC_DIR,
       templates: [
+        {
+          file: 'package/management/SecurityMetersServiceTests.java',
+          renameTo: generator => `${generator.testDir}management/SecurityMetersServiceTests.java`,
+        },
         {
           file: 'package/security/jwt/TokenProviderTest.java',
           renameTo: generator => `${generator.testDir}security/jwt/TokenProviderTest.java`,
         },
+        {
+          file: 'package/security/jwt/TokenProviderSecurityMetersTests.java',
+          renameTo: generator => `${generator.testDir}security/jwt/TokenProviderSecurityMetersTests.java`,
+        },
         {
           file: 'package/security/jwt/JWTFilterTest.java',
           renameTo: generator => `${generator.testDir}security/jwt/JWTFilterTest.java`,
@@ -1625,7 +1631,16 @@ const baseServerFiles = {
           file: 'package/cucumber/stepdefs/UserStepDefs.java',
           renameTo: generator => `${generator.testDir}cucumber/stepdefs/UserStepDefs.java`,
         },
-        '../features/user/user.feature',
+      ],
+    },
+    {
+      condition: generator => !generator.skipUserManagement && generator.cucumberTests,
+      path: SERVER_TEST_RES_DIR,
+      templates: [
+        {
+          file: 'package/features/user/user.feature',
+          renameTo: generator => `${generator.testDir}cucumber/user.feature`,
+        },
       ],
     },
     {
@@ -1722,7 +1737,7 @@ function writeFiles() {
     },
 
     cleanupOldServerFiles() {
-      cleanup.cleanupOldServerFiles(
+      serverCleanup.cleanupOldServerFiles(
         this,
         `${SERVER_MAIN_SRC_DIR}/${this.javaDir}`,
         `${SERVER_TEST_SRC_DIR}/${this.testDir}`,
@@ -1736,6 +1751,8 @@ function writeFiles() {
     },
 
     ...writeCouchbaseFiles(),
+
+    ...writeSqlFiles(),
   };
 }