generator-jhipster 7.1.0 → 7.4.0

package/generators/server/files.js

@@ -18,8 +18,22 @@
  */
 const cleanup = 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');
+const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
+const { SPRING_WEBSOCKET } = require('../../jdl/jhipster/websocket-types');
+const databaseTypes = require('../../jdl/jhipster/database-types');
+const { COUCHBASE, MARIADB, MONGODB, NEO4J, SQL } = require('../../jdl/jhipster/database-types');
+const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS } = require('../../jdl/jhipster/cache-types');
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+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;
 const INTERPOLATE_REGEX = constants.INTERPOLATE_REGEX;
 const DOCKER_DIR = constants.DOCKER_DIR;
 const TEST_DIR = constants.TEST_DIR;
@@ -31,12 +45,168 @@ const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
 const shouldSkipUserManagement = generator =>
-  generator.skipUserManagement && (generator.applicationType !== 'monolith' || generator.authenticationType !== 'oauth2');
+  generator.skipUserManagement && (generator.applicationType !== MONOLITH || generator.authenticationType !== OAUTH2);
+
+const h2Files = {
+  serverResource: [
+    {
+      condition: generator => generator.devDatabaseTypeH2Any,
+      path: SERVER_MAIN_RES_DIR,
+      templates: [{ file: 'h2.server.properties', renameTo: () => '.h2.server.properties' }],
+    },
+  ],
+};
+
+const liquibaseFiles = {
+  serverResource: [
+    {
+      path: SERVER_MAIN_RES_DIR,
+      templates: [
+        {
+          override: generator => !generator.jhipsterConfig.incrementalChangelog || generator.configOptions.recreateInitialChangelog,
+          file: 'config/liquibase/changelog/initial_schema.xml',
+          renameTo: () => 'config/liquibase/changelog/00000000000000_initial_schema.xml',
+          options: { interpolate: INTERPOLATE_REGEX },
+        },
+        {
+          override: generator => !generator.jhipsterConfig.incrementalChangelog || generator.configOptions.recreateInitialChangelog,
+          file: 'config/liquibase/master.xml',
+        },
+      ],
+    },
+  ],
+};
+
+const mongoDbFiles = {
+  docker: [
+    {
+      path: DOCKER_DIR,
+      templates: ['mongodb.yml', 'mongodb-cluster.yml', 'mongodb/MongoDB.Dockerfile', 'mongodb/scripts/init_replicaset.js'],
+    },
+  ],
+  serverResource: [
+    {
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/dbmigrations/package-info.java',
+          renameTo: generator => `${generator.javaDir}config/dbmigrations/package-info.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.skipUserManagement || (generator.skipUserManagement && generator.authenticationType === OAUTH2),
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/dbmigrations/InitialSetupMigration.java',
+          renameTo: generator => `${generator.javaDir}config/dbmigrations/InitialSetupMigration.java`,
+        },
+      ],
+    },
+  ],
+};
+
+const neo4jFiles = {
+  docker: [
+    {
+      path: DOCKER_DIR,
+      templates: ['neo4j.yml'],
+    },
+  ],
+  serverResource: [
+    {
+      condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
+        {
+          file: 'package/config/neo4j/Neo4jMigrations.java',
+          renameTo: generator => `${generator.javaDir}config/neo4j/Neo4jMigrations.java`,
+        },
+        {
+          file: 'package/config/neo4j/package-info.java',
+          renameTo: generator => `${generator.javaDir}config/neo4j/package-info.java`,
+        },
+      ],
+    },
+    {
+      condition: generator => !generator.skipUserManagement || generator.authenticationType === OAUTH2,
+      path: SERVER_MAIN_RES_DIR,
+      templates: ['config/neo4j/migrations/user__admin.json', 'config/neo4j/migrations/user__user.json'],
+    },
+  ],
+  serverTestFw: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/AbstractNeo4jIT.java',
+          renameTo: generator => `${generator.testDir}/AbstractNeo4jIT.java`,
+        },
+      ],
+    },
+  ],
+};
+
+const cassandraFiles = {
+  docker: [
+    {
+      path: DOCKER_DIR,
+      templates: [
+        // docker-compose files
+        'cassandra.yml',
+        'cassandra-cluster.yml',
+        'cassandra-migration.yml',
+        // dockerfiles
+        'cassandra/Cassandra-Migration.Dockerfile',
+        // scripts
+        'cassandra/scripts/autoMigrate.sh',
+        'cassandra/scripts/execute-cql.sh',
+      ],
+    },
+  ],
+  serverResource: [
+    {
+      path: SERVER_MAIN_RES_DIR,
+      templates: [
+        'config/cql/create-keyspace-prod.cql',
+        'config/cql/create-keyspace.cql',
+        'config/cql/drop-keyspace.cql',
+        { file: 'config/cql/changelog/README.md', method: 'copy' },
+      ],
+    },
+    {
+      condition: generator =>
+        generator.applicationType !== MICROSERVICE && (!generator.skipUserManagement || generator.authenticationType === OAUTH2),
+      path: SERVER_MAIN_RES_DIR,
+      templates: [
+        { file: 'config/cql/changelog/create-tables.cql', renameTo: () => 'config/cql/changelog/00000000000000_create-tables.cql' },
+        {
+          file: 'config/cql/changelog/insert_default_users.cql',
+          renameTo: () => 'config/cql/changelog/00000000000001_insert_default_users.cql',
+        },
+      ],
+    },
+  ],
+  serverTestFw: [
+    {
+      path: SERVER_TEST_SRC_DIR,
+      templates: [
+        {
+          file: 'package/CassandraKeyspaceIT.java',
+          renameTo: generator => `${generator.testDir}CassandraKeyspaceIT.java`,
+        },
+        { file: 'package/AbstractCassandraTest.java', renameTo: generator => `${generator.testDir}AbstractCassandraTest.java` },
+      ],
+    },
+  ],
+};
+
 /**
  * The default is to use a file path string. It implies use of the template method.
  * For any other config an object { file:.., method:.., template:.. } can be used
  */
-const serverFiles = {
+const baseServerFiles = {
   jib: [
     {
       path: 'src/main/docker/jib/',
@@ -64,56 +234,32 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.prodDatabaseType !== 'no' && generator.prodDatabaseType !== 'oracle',
+      condition: generator => generator.databaseTypeSql && !generator.prodDatabaseTypeOracle,
       path: DOCKER_DIR,
       templates: [{ file: generator => `${generator.prodDatabaseType}.yml` }],
     },
     {
-      condition: generator => generator.prodDatabaseType === 'mongodb',
-      path: DOCKER_DIR,
-      templates: ['mongodb-cluster.yml', 'mongodb/MongoDB.Dockerfile', 'mongodb/scripts/init_replicaset.js'],
-    },
-    {
-      condition: generator => generator.prodDatabaseType === 'couchbase',
-      path: DOCKER_DIR,
-      templates: ['couchbase-cluster.yml', 'couchbase/Couchbase.Dockerfile', 'couchbase/scripts/configure-node.sh'],
-    },
-    {
-      condition: generator => generator.prodDatabaseType === 'cassandra',
-      path: DOCKER_DIR,
-      templates: [
-        // docker-compose files
-        'cassandra-cluster.yml',
-        'cassandra-migration.yml',
-        // dockerfiles
-        'cassandra/Cassandra-Migration.Dockerfile',
-        // scripts
-        'cassandra/scripts/autoMigrate.sh',
-        'cassandra/scripts/execute-cql.sh',
-      ],
-    },
-    {
-      condition: generator => generator.cacheProvider === 'hazelcast',
+      condition: generator => generator.cacheProvider === HAZELCAST,
       path: DOCKER_DIR,
       templates: ['hazelcast-management-center.yml'],
     },
     {
-      condition: generator => generator.cacheProvider === 'memcached',
+      condition: generator => generator.cacheProvider === MEMCACHED,
       path: DOCKER_DIR,
       templates: ['memcached.yml'],
     },
     {
-      condition: generator => generator.cacheProvider === 'redis',
+      condition: generator => generator.cacheProvider === REDIS,
       path: DOCKER_DIR,
       templates: ['redis.yml', 'redis-cluster.yml', 'redis/Redis-Cluster.Dockerfile', 'redis/connectRedisCluster.sh'],
     },
     {
-      condition: generator => generator.searchEngine === 'elasticsearch',
+      condition: generator => generator.searchEngine === ELASTICSEARCH,
       path: DOCKER_DIR,
       templates: ['elasticsearch.yml'],
     },
     {
-      condition: generator => generator.messageBroker === 'kafka',
+      condition: generator => generator.messageBroker === KAFKA,
       path: DOCKER_DIR,
       templates: ['kafka.yml'],
     },
@@ -123,7 +269,7 @@ const serverFiles = {
       templates: [{ file: 'config/README.md', renameTo: () => 'central-server-config/README.md' }],
     },
     {
-      condition: generator => generator.serviceDiscoveryType && generator.serviceDiscoveryType === 'consul',
+      condition: generator => generator.serviceDiscoveryType && generator.serviceDiscoveryType === CONSUL,
       path: DOCKER_DIR,
       templates: [
         'consul.yml',
@@ -132,7 +278,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.serviceDiscoveryType && generator.serviceDiscoveryType === 'eureka',
+      condition: generator => generator.serviceDiscoveryType && generator.serviceDiscoveryType === EUREKA,
       path: DOCKER_DIR,
       templates: [
         'jhipster-registry.yml',
@@ -152,7 +298,7 @@ const serverFiles = {
       templates: ['swagger-editor.yml'],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2' && generator.applicationType !== 'microservice',
+      condition: generator => generator.authenticationType === OAUTH2 && generator.applicationType !== MICROSERVICE,
       path: DOCKER_DIR,
       templates: [
         'keycloak.yml',
@@ -166,7 +312,7 @@ const serverFiles = {
       templates: [{ file: 'checkstyle.xml', options: { interpolate: INTERPOLATE_REGEX } }],
     },
     {
-      condition: generator => generator.buildTool === 'gradle',
+      condition: generator => generator.buildTool === GRADLE,
       templates: [
         'build.gradle',
         'settings.gradle',
@@ -184,11 +330,11 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.buildTool === 'gradle' && !!generator.enableSwaggerCodegen,
+      condition: generator => generator.buildTool === GRADLE && !!generator.enableSwaggerCodegen,
       templates: ['gradle/swagger.gradle'],
     },
     {
-      condition: generator => generator.buildTool === 'maven',
+      condition: generator => generator.buildTool === MAVEN,
       templates: [
         { file: 'mvnw', method: 'copy', noEjs: true },
         { file: 'mvnw.cmd', method: 'copy', noEjs: true },
@@ -199,7 +345,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.buildTool === 'maven',
+      condition: generator => generator.buildTool === MAVEN,
       templates: [
         { file: 'npmw', method: 'copy', noEjs: true },
         { file: 'npmw.cmd', method: 'copy', noEjs: true },
@@ -236,11 +382,6 @@ const serverFiles = {
       path: SERVER_MAIN_RES_DIR,
       templates: [{ file: 'banner.txt', method: 'copy', noEjs: true }],
     },
-    {
-      condition: generator => generator.devDatabaseType === 'h2Disk' || generator.devDatabaseType === 'h2Memory',
-      path: SERVER_MAIN_RES_DIR,
-      templates: [{ file: 'h2.server.properties', renameTo: () => '.h2.server.properties' }],
-    },
     {
       condition: generator => !!generator.enableSwaggerCodegen,
       path: SERVER_MAIN_RES_DIR,
@@ -259,120 +400,12 @@ const serverFiles = {
         'i18n/messages.properties',
       ],
     },
-    {
-      condition: generator => generator.databaseType === 'sql',
-      path: SERVER_MAIN_RES_DIR,
-      templates: [
-        {
-          override: generator => !generator.jhipsterConfig.incrementalChangelog || generator.configOptions.recreateInitialChangelog,
-          file: 'config/liquibase/changelog/initial_schema.xml',
-          renameTo: () => 'config/liquibase/changelog/00000000000000_initial_schema.xml',
-          options: { interpolate: INTERPOLATE_REGEX },
-        },
-        {
-          override: generator => !generator.jhipsterConfig.incrementalChangelog || generator.configOptions.recreateInitialChangelog,
-          file: 'config/liquibase/master.xml',
-        },
-      ],
-    },
-    {
-      condition: generator => generator.databaseType === 'mongodb',
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/config/dbmigrations/package-info.java',
-          renameTo: generator => `${generator.javaDir}config/dbmigrations/package-info.java`,
-        },
-      ],
-    },
-    {
-      condition: generator =>
-        generator.databaseType === 'mongodb' &&
-        (!generator.skipUserManagement || (generator.skipUserManagement && generator.authenticationType === 'oauth2')),
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/config/dbmigrations/InitialSetupMigration.java',
-          renameTo: generator => `${generator.javaDir}config/dbmigrations/InitialSetupMigration.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.databaseType === 'couchbase',
-      path: SERVER_MAIN_RES_DIR,
-      templates: ['config/couchmove/changelog/V0__create_indexes.n1ql'],
-    },
-    {
-      condition: generator =>
-        generator.databaseType === 'couchbase' && (!generator.skipUserManagement || generator.authenticationType === 'oauth2'),
-      path: SERVER_MAIN_RES_DIR,
-      templates: [
-        'config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json',
-        'config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json',
-        'config/couchmove/changelog/V0.1__initial_setup/user__admin.json',
-        'config/couchmove/changelog/V0.1__initial_setup/user__user.json',
-      ],
-    },
-    {
-      condition: generator =>
-        generator.databaseType === 'neo4j' && (!generator.skipUserManagement || generator.authenticationType === 'oauth2'),
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/config/neo4j/Neo4jMigrations.java',
-          renameTo: generator => `${generator.javaDir}config/neo4j/Neo4jMigrations.java`,
-        },
-        {
-          file: 'package/config/neo4j/package-info.java',
-          renameTo: generator => `${generator.javaDir}config/neo4j/package-info.java`,
-        },
-      ],
-    },
-    {
-      condition: generator =>
-        generator.databaseType === 'neo4j' && (!generator.skipUserManagement || generator.authenticationType === 'oauth2'),
-      path: SERVER_MAIN_RES_DIR,
-      templates: [
-        {
-          file: 'config/couchmove/changelog/V0.1__initial_setup/user__admin.json',
-          renameTo: () => 'config/neo4j/migrations/user__admin.json',
-        },
-        {
-          file: 'config/couchmove/changelog/V0.1__initial_setup/user__user.json',
-          renameTo: () => 'config/neo4j/migrations/user__user.json',
-        },
-      ],
-    },
-    {
-      condition: generator => generator.databaseType === 'cassandra',
-      path: SERVER_MAIN_RES_DIR,
-      templates: [
-        'config/cql/create-keyspace-prod.cql',
-        'config/cql/create-keyspace.cql',
-        'config/cql/drop-keyspace.cql',
-        { file: 'config/cql/changelog/README.md', method: 'copy' },
-      ],
-    },
-    {
-      condition: generator =>
-        generator.databaseType === 'cassandra' &&
-        generator.applicationType !== 'microservice' &&
-        (!generator.skipUserManagement || generator.authenticationType === 'oauth2'),
-      path: SERVER_MAIN_RES_DIR,
-      templates: [
-        { file: 'config/cql/changelog/create-tables.cql', renameTo: () => 'config/cql/changelog/00000000000000_create-tables.cql' },
-        {
-          file: 'config/cql/changelog/insert_default_users.cql',
-          renameTo: () => 'config/cql/changelog/00000000000001_insert_default_users.cql',
-        },
-      ],
-    },
   ],
   serverJavaAuthConfig: [
     {
       condition: generator =>
         !generator.reactive &&
-        (generator.databaseType === 'sql' || generator.databaseType === 'mongodb' || generator.databaseType === 'couchbase'),
+        (generator.databaseType === SQL || generator.databaseType === MONGODB || generator.databaseType === COUCHBASE),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -408,7 +441,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'jwt',
+      condition: generator => generator.authenticationType === JWT,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -419,10 +452,14 @@ const serverFiles = {
           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`,
+        },
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'jwt' && !generator.reactive,
+      condition: generator => generator.authenticationType === JWT && !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -432,7 +469,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.reactive && generator.applicationType === 'gateway' && generator.authenticationType === 'jwt',
+      condition: generator => generator.reactive && generator.applicationType === GATEWAY && generator.authenticationType === JWT,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -462,7 +499,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType === 'session' && !generator.reactive,
+      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType === SESSION && !generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -473,6 +510,16 @@ const serverFiles = {
           file: 'package/domain/PersistentToken.java',
           renameTo: generator => `${generator.javaDir}domain/PersistentToken.java`,
         },
+      ],
+    },
+    {
+      condition: generator =>
+        !shouldSkipUserManagement(generator) &&
+        generator.authenticationType === SESSION &&
+        !generator.reactive &&
+        generator.databaseType !== COUCHBASE,
+      path: SERVER_MAIN_SRC_DIR,
+      templates: [
         {
           file: 'package/repository/PersistentTokenRepository.java',
           renameTo: generator => `${generator.javaDir}repository/PersistentTokenRepository.java`,
@@ -480,7 +527,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2',
+      condition: generator => generator.authenticationType === OAUTH2,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -498,7 +545,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2',
+      condition: generator => generator.authenticationType === OAUTH2,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -514,8 +561,8 @@ const serverFiles = {
     {
       condition: generator =>
         !generator.reactive &&
-        generator.authenticationType === 'oauth2' &&
-        (generator.applicationType === 'microservice' || generator.applicationType === 'gateway'),
+        generator.authenticationType === OAUTH2 &&
+        (generator.applicationType === MICROSERVICE || generator.applicationType === GATEWAY),
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -525,7 +572,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== 'oauth2',
+      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== OAUTH2,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -539,7 +586,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType !== 'microservice' && generator.authenticationType === 'jwt',
+      condition: generator => generator.applicationType !== MICROSERVICE && generator.authenticationType === JWT,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -563,7 +610,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.reactive && generator.authenticationType === 'oauth2' && generator.applicationType === 'monolith',
+      condition: generator => !generator.reactive && generator.authenticationType === OAUTH2 && generator.applicationType === MONOLITH,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -573,7 +620,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.reactive && generator.authenticationType === 'oauth2' && generator.applicationType === 'monolith',
+      condition: generator => !generator.reactive && generator.authenticationType === OAUTH2 && generator.applicationType === MONOLITH,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -585,7 +632,7 @@ const serverFiles = {
   ],
   serverJavaGateway: [
     {
-      condition: generator => generator.applicationType === 'gateway' && generator.serviceDiscoveryType,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         { file: 'package/web/rest/vm/RouteVM.java', renameTo: generator => `${generator.javaDir}web/rest/vm/RouteVM.java` },
@@ -597,7 +644,7 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        generator.authenticationType === 'oauth2' && (generator.applicationType === 'monolith' || generator.applicationType === 'gateway'),
+        generator.authenticationType === OAUTH2 && (generator.applicationType === MONOLITH || generator.applicationType === GATEWAY),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -611,7 +658,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType === 'gateway' && generator.serviceDiscoveryType && generator.reactive,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType && generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -625,7 +672,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType === 'gateway' && generator.serviceDiscoveryType && generator.reactive,
+      condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType && generator.reactive,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -643,8 +690,8 @@ const serverFiles = {
     {
       condition: generator =>
         !generator.reactive &&
-        (generator.applicationType === 'microservice' || generator.applicationType === 'gateway') &&
-        generator.authenticationType === 'jwt',
+        (generator.applicationType === MICROSERVICE || generator.applicationType === GATEWAY) &&
+        generator.authenticationType === JWT,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -660,8 +707,8 @@ const serverFiles = {
     {
       condition: generator =>
         !generator.reactive &&
-        generator.authenticationType === 'oauth2' &&
-        (generator.applicationType === 'microservice' || generator.applicationType === 'gateway'),
+        generator.authenticationType === OAUTH2 &&
+        (generator.applicationType === MICROSERVICE || generator.applicationType === GATEWAY),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -687,7 +734,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.reactive && generator.applicationType === 'gateway' && !generator.serviceDiscoveryType,
+      condition: generator => !generator.reactive && generator.applicationType === GATEWAY && !generator.serviceDiscoveryType,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -697,7 +744,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType === 'microservice',
+      condition: generator => generator.applicationType === MICROSERVICE,
       path: SERVER_MAIN_RES_DIR,
       templates: [{ file: 'static/microservices_index.html', renameTo: () => 'static/index.html' }],
     },
@@ -798,7 +845,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement || ['sql', 'mongodb', 'couchbase', 'neo4j'].includes(generator.databaseType),
+      condition: generator => !generator.skipUserManagement || [SQL, MONGODB, COUCHBASE, NEO4J].includes(generator.databaseType),
       path: SERVER_MAIN_SRC_DIR,
       templates: [{ file: 'package/config/Constants.java', renameTo: generator => `${generator.javaDir}config/Constants.java` }],
     },
@@ -814,8 +861,8 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        ['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(generator.cacheProvider) ||
-        generator.applicationType === 'gateway',
+        [EHCACHE, CAFFEINE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS].includes(generator.cacheProvider) ||
+        generator.applicationType === GATEWAY,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -825,7 +872,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.cacheProvider === 'infinispan',
+      condition: generator => generator.cacheProvider === INFINISPAN,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -835,7 +882,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.cacheProvider === 'redis',
+      condition: generator => generator.cacheProvider === REDIS,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -845,7 +892,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.databaseType !== 'no',
+      condition: generator => generator.databaseType !== NO_DATABASE,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -855,7 +902,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.databaseType === 'sql',
+      condition: generator => generator.databaseType === SQL,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -865,7 +912,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.databaseType === 'sql' && generator.reactive,
+      condition: generator => generator.databaseType === SQL && generator.reactive,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -880,9 +927,7 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        generator.databaseType === 'sql' &&
-        generator.reactive &&
-        (!generator.skipUserManagement || generator.authenticationType === 'oauth2'),
+        generator.databaseType === SQL && generator.reactive && (!generator.skipUserManagement || generator.authenticationType === OAUTH2),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -892,55 +937,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.reactive && generator.databaseType === 'couchbase',
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/repository/N1qlCouchbaseRepository.java',
-          renameTo: generator => `${generator.javaDir}repository/N1qlCouchbaseRepository.java`,
-        },
-        {
-          file: 'package/repository/CustomN1qlCouchbaseRepository.java',
-          renameTo: generator => `${generator.javaDir}repository/CustomN1qlCouchbaseRepository.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.searchEngine === 'couchbase',
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/repository/search/SearchCouchbaseRepository.java',
-          renameTo: generator => `${generator.javaDir}repository/search/SearchCouchbaseRepository.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.searchEngine === 'couchbase',
-      path: SERVER_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'package/repository/CustomN1qlCouchbaseRepositoryTest.java',
-          renameTo: generator => `${generator.testDir}repository/CustomN1qlCouchbaseRepositoryTest.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.reactive && generator.databaseType === 'couchbase',
-      path: SERVER_MAIN_SRC_DIR,
-      templates: [
-        {
-          file: 'package/repository/ReactiveN1qlCouchbaseRepository.java',
-          renameTo: generator => `${generator.javaDir}repository/ReactiveN1qlCouchbaseRepository.java`,
-        },
-        {
-          file: 'package/repository/CustomReactiveN1qlCouchbaseRepository.java',
-          renameTo: generator => `${generator.javaDir}repository/CustomReactiveN1qlCouchbaseRepository.java`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.websocket === 'spring-websocket',
+      condition: generator => generator.websocket === SPRING_WEBSOCKET,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -954,7 +951,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.searchEngine === 'elasticsearch',
+      condition: generator => generator.searchEngine === ELASTICSEARCH,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -970,7 +967,7 @@ const serverFiles = {
       templates: [{ file: 'package/domain/package-info.java', renameTo: generator => `${generator.javaDir}domain/package-info.java` }],
     },
     {
-      condition: generator => ['sql', 'mongodb', 'neo4j', 'couchbase'].includes(generator.databaseType),
+      condition: generator => [SQL, MONGODB, NEO4J, COUCHBASE].includes(generator.databaseType),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -982,7 +979,7 @@ const serverFiles = {
   ],
   serverJavaPackageInfo: [
     {
-      condition: generator => generator.searchEngine === 'elasticsearch',
+      condition: generator => generator.searchEngine === ELASTICSEARCH,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1024,7 +1021,7 @@ const serverFiles = {
       templates: [{ file: 'package/service/package-info.java', renameTo: generator => `${generator.javaDir}service/package-info.java` }],
     },
     {
-      condition: generator => generator.messageBroker === 'kafka',
+      condition: generator => generator.messageBroker === KAFKA,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1114,7 +1111,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.messageBroker === 'kafka',
+      condition: generator => generator.messageBroker === KAFKA,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1126,7 +1123,7 @@ const serverFiles = {
   ],
   serverJavaWebsocket: [
     {
-      condition: generator => generator.websocket === 'spring-websocket',
+      condition: generator => generator.websocket === SPRING_WEBSOCKET,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1165,38 +1162,36 @@ const serverFiles = {
       templates: ['META-INF/services/reactor.blockhound.integration.BlockHoundIntegration'],
     },
   ],
-  serverTestFw: [
+  springBootOauth2: [
     {
-      condition: generator => generator.databaseType === 'cassandra',
-      path: SERVER_TEST_SRC_DIR,
+      condition: generator => generator.authenticationTypeOauth2 && generator.applicationTypeMonolith,
+      path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/CassandraKeyspaceIT.java',
-          renameTo: generator => `${generator.testDir}CassandraKeyspaceIT.java`,
+          file: 'package/config/OAuth2Configuration.java',
+          renameTo: generator => `${generator.javaDir}config/OAuth2Configuration.java`,
         },
-        { file: 'package/AbstractCassandraTest.java', renameTo: generator => `${generator.testDir}AbstractCassandraTest.java` },
       ],
     },
     {
-      condition: generator => generator.databaseType === 'couchbase',
-      path: SERVER_TEST_SRC_DIR,
+      condition: generator => generator.authenticationTypeOauth2 && !generator.applicationTypeMicroservice,
+      path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
-          file: 'package/config/DatabaseConfigurationIT.java',
-          renameTo: generator => `${generator.testDir}config/DatabaseConfigurationIT.java`,
+          file: generator => `package/web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
+          renameTo: generator => `${generator.javaDir}web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
         },
       ],
     },
     {
-      condition: generator => generator.databaseType === 'neo4j',
+      condition: generator => generator.authenticationTypeOauth2 && !generator.applicationTypeMicroservice,
       path: SERVER_TEST_SRC_DIR,
       templates: [
-        {
-          file: 'package/AbstractNeo4jIT.java',
-          renameTo: generator => `${generator.testDir}/AbstractNeo4jIT.java`,
-        },
+        { file: 'package/test/util/OAuth2TestUtil.java', renameTo: generator => `${generator.testDir}test/util/OAuth2TestUtil.java` },
       ],
     },
+  ],
+  serverTestFw: [
     {
       path: SERVER_TEST_SRC_DIR,
       templates: [
@@ -1222,7 +1217,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.databaseType === 'sql' && !generator.reactive,
+      condition: generator => generator.databaseType === SQL && !generator.reactive,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1244,12 +1239,12 @@ const serverFiles = {
       templates: ['config/application.yml', 'logback.xml'],
     },
     {
-      condition: generator => generator.databaseType === 'sql' && !generator.reactive,
+      condition: generator => generator.databaseType === SQL && !generator.reactive,
       path: SERVER_TEST_RES_DIR,
       templates: ['config/application-testcontainers.yml'],
     },
     {
-      condition: generator => generator.prodDatabaseType === 'mariadb' && !generator.reactive,
+      condition: generator => generator.prodDatabaseType === MARIADB && !generator.reactive,
       path: SERVER_TEST_RES_DIR,
       templates: [{ file: 'testcontainers/mariadb/my.cnf', method: 'copy', noEjs: true }],
     },
@@ -1296,7 +1291,7 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        generator.authenticationType === 'oauth2' && (generator.applicationType === 'monolith' || generator.applicationType === 'gateway'),
+        generator.authenticationType === OAUTH2 && (generator.applicationType === MONOLITH || generator.applicationType === GATEWAY),
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1337,7 +1332,7 @@ const serverFiles = {
       templates: ['cucumber.properties'],
     },
     {
-      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== 'oauth2',
+      condition: generator => !shouldSkipUserManagement(generator) && generator.authenticationType !== OAUTH2,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         // Create auth config test files
@@ -1348,7 +1343,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.messageBroker === 'kafka',
+      condition: generator => generator.messageBroker === KAFKA,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1382,20 +1377,20 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        (generator.authenticationType === 'oauth2' && generator.applicationType !== 'microservice') ||
-        (!generator.skipUserManagement && generator.databaseType === 'sql'),
+        (generator.authenticationType === OAUTH2 && generator.applicationType !== MICROSERVICE) ||
+        (!generator.skipUserManagement && generator.databaseType === SQL),
       path: SERVER_MAIN_RES_DIR,
       templates: ['config/liquibase/data/user.csv'],
     },
     {
       condition: generator =>
-        (generator.authenticationType === 'oauth2' && generator.applicationType !== 'microservice' && generator.databaseType === 'sql') ||
-        (!generator.skipUserManagement && generator.databaseType === 'sql'),
+        (generator.authenticationType === OAUTH2 && generator.applicationType !== MICROSERVICE && generator.databaseType === SQL) ||
+        (!generator.skipUserManagement && generator.databaseType === SQL),
       path: SERVER_MAIN_RES_DIR,
       templates: ['config/liquibase/data/authority.csv', 'config/liquibase/data/user_authority.csv'],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2',
+      condition: generator => generator.authenticationType === OAUTH2,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         { file: 'package/config/Constants.java', renameTo: generator => `${generator.javaDir}config/Constants.java` },
@@ -1415,7 +1410,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2' && generator.databaseType !== 'no',
+      condition: generator => generator.authenticationType === OAUTH2 && generator.databaseType !== NO_DATABASE,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1442,7 +1437,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.skipUserManagement && ['monolith', 'gateway'].includes(generator.applicationType),
+      condition: generator => generator.skipUserManagement && [MONOLITH, GATEWAY].includes(generator.applicationType),
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1452,7 +1447,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2',
+      condition: generator => generator.authenticationType === OAUTH2,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1462,7 +1457,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2' && generator.databaseType !== 'no',
+      condition: generator => generator.authenticationType === OAUTH2 && generator.databaseType !== NO_DATABASE,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1481,9 +1476,7 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        generator.skipUserManagement &&
-        generator.authenticationType !== 'oauth2' &&
-        ['monolith', 'gateway'].includes(generator.applicationType),
+        generator.skipUserManagement && generator.authenticationType !== OAUTH2 && [MONOLITH, GATEWAY].includes(generator.applicationType),
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1494,9 +1487,7 @@ const serverFiles = {
     },
     {
       condition: generator =>
-        generator.skipUserManagement &&
-        generator.authenticationType === 'oauth2' &&
-        ['monolith', 'gateway'].includes(generator.applicationType),
+        generator.skipUserManagement && generator.authenticationType === OAUTH2 && [MONOLITH, GATEWAY].includes(generator.applicationType),
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1506,7 +1497,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2' && generator.searchEngine === 'elasticsearch',
+      condition: generator => generator.authenticationType === OAUTH2 && generator.searchEngine === ELASTICSEARCH,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1516,7 +1507,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'oauth2' && generator.searchEngine === 'elasticsearch',
+      condition: generator => generator.authenticationType === OAUTH2 && generator.searchEngine === ELASTICSEARCH,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1588,7 +1579,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.searchEngine === 'elasticsearch',
+      condition: generator => !generator.skipUserManagement && generator.searchEngine === ELASTICSEARCH,
       path: SERVER_MAIN_SRC_DIR,
       templates: [
         {
@@ -1598,7 +1589,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.searchEngine === 'elasticsearch',
+      condition: generator => !generator.skipUserManagement && generator.searchEngine === ELASTICSEARCH,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1608,13 +1599,21 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.authenticationType === 'jwt',
+      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`,
@@ -1622,7 +1621,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => generator.applicationType !== 'microservice' && generator.authenticationType === 'jwt',
+      condition: generator => generator.applicationType !== MICROSERVICE && generator.authenticationType === JWT,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1648,9 +1647,13 @@ const serverFiles = {
       templates: [
         /* User management java test files */
         'templates/mail/testEmail.html',
-        'i18n/messages_en.properties',
       ],
     },
+    {
+      condition: generator => !generator.skipUserManagement && !generator.enableTranslation,
+      path: SERVER_TEST_RES_DIR,
+      templates: ['i18n/messages_en.properties'],
+    },
     {
       condition: generator => !generator.skipUserManagement,
       path: SERVER_TEST_SRC_DIR,
@@ -1682,7 +1685,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.authenticationType !== 'oauth2',
+      condition: generator => !generator.skipUserManagement && generator.authenticationType !== OAUTH2,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1692,7 +1695,7 @@ const serverFiles = {
       ],
     },
     {
-      condition: generator => !generator.skipUserManagement && generator.authenticationType === 'oauth2',
+      condition: generator => !generator.skipUserManagement && generator.authenticationType === OAUTH2,
       path: SERVER_TEST_SRC_DIR,
       templates: [
         {
@@ -1713,6 +1716,15 @@ const serverFiles = {
   ],
 };
 
+const serverFiles = mergeSections(
+  baseServerFiles,
+  addSectionsCondition(h2Files, context => context.devDatabaseTypeH2Any),
+  addSectionsCondition(liquibaseFiles, context => context.databaseTypeSql),
+  addSectionsCondition(mongoDbFiles, context => context.databaseTypeMongodb),
+  addSectionsCondition(neo4jFiles, context => context.databaseTypeNeo4j),
+  addSectionsCondition(cassandraFiles, context => context.databaseTypeCassandra)
+);
+
 function writeFiles() {
   return {
     setUp() {
@@ -1735,6 +1747,10 @@ function writeFiles() {
     writeFiles() {
       return this.writeFilesToDisk(serverFiles);
     },
+
+    ...writeCouchbaseFiles(),
+
+    ...writeSqlFiles(),
   };
 }