generator-jhipster 7.8.0 → 7.9.1

package/generators/languages/templates/src/test/resources/i18n/messages_uz_Latn_UZ.properties.ejs

@@ -1 +1,4 @@
-email.test.title=<%= baseName %>
+email.test.title=test title
+# Value used for English locale unit test in MailServiceIT
+# as this file is loaded instead of real file
+email.activation.title=account activation <%= baseName %>

package/generators/languages/templates/src/test/resources/i18n/messages_vi.properties.ejs

@@ -1 +1,4 @@
-email.test.title=kích hoạt tài khoản
+email.test.title=test title
+# Value used for English locale unit test in MailServiceIT
+# as this file is loaded instead of real file
+email.activation.title=kích hoạt tài khoản <%= baseName %>

package/generators/languages/templates/src/test/resources/i18n/messages_zh_CN.properties.ejs

@@ -1 +1,4 @@
-email.test.title=激活账号
+email.test.title=test title
+# Value used for English locale unit test in MailServiceIT
+# as this file is loaded instead of real file
+email.activation.title=激活账号 <%= baseName %>

package/generators/languages/templates/src/test/resources/i18n/messages_zh_TW.properties.ejs

@@ -1 +1,4 @@
-email.test.title=\u5E33\u865F\u555F\u7528
+email.test.title=test title
+# Value used for English locale unit test in MailServiceIT
+# as this file is loaded instead of real file
+email.activation.title=\u5E33\u865F\u555F\u7528 <%= baseName %>

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

@@ -5,14 +5,14 @@
 # to you 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
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
+#   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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

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

@@ -59,8 +59,8 @@
     <properties>
         <java.version><%= JAVA_VERSION %></java.version>
 
-        <compiler-plugin.version>3.8.4</compiler-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <compiler-plugin.version>3.10.1</compiler-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
 <&- fragments.propertiesSection() -&>
     </properties>
 

package/generators/openapi-client/files.js

@@ -26,7 +26,7 @@ const { GRADLE, MAVEN } = require('../../jdl/jhipster/build-tool-types');
 const { GATEWAY, MICROSERVICE } = require('../../jdl/jhipster/application-types');
 const { JWT, SESSION } = require('../../jdl/jhipster/authentication-types');
 
-const { AUTHENTICATION_TYPE, BASE_NAME, BUILD_TOOL, PACKAGE_FOLDER, PACKAGE_NAME, REACTIVE } = OptionNames;
+const { REACTIVE } = OptionNames;
 
 module.exports = {
   writeFiles,
@@ -45,12 +45,6 @@ function writeFiles() {
 function customizeFiles() {
   return {
     callOpenApiGenerator() {
-      this.baseName = this.config.get(BASE_NAME);
-      this.authenticationType = this.config.get(AUTHENTICATION_TYPE);
-      this.packageName = this.config.get(PACKAGE_NAME);
-      this.packageFolder = this.config.get(PACKAGE_FOLDER);
-      this.buildTool = this.config.get(BUILD_TOOL);
-
       if (Object.keys(this.clientsToGenerate).length === 0) {
         this.log('No openapi client configured. Please run "jhipster openapi-client" to generate your first OpenAPI client.');
         return;
@@ -66,7 +60,7 @@ function customizeFiles() {
         const inputSpec = this.clientsToGenerate[cliName].spec;
         const generatorName = this.clientsToGenerate[cliName].generatorName;
 
-        const openApiCmd = ['openapi-generator generate'];
+        const openApiCmd = ['openapi-generator-cli generate'];
         let openApiGeneratorName;
         let openApiGeneratorLibrary;
         const additionalParameters = [];

package/generators/openapi-client/index.js

@@ -64,6 +64,8 @@ module.exports = class extends BaseBlueprintGenerator {
       },
       getConfig() {
         this.openApiClients = this.config.get('openApiClients') || {};
+        this.loadAppConfig();
+        this.loadServerConfig();
       },
     };
   }

package/generators/openshift/templates/registry/consul.yml.ejs

@@ -213,8 +213,6 @@ objects:
       name: ${APPLICATION_NAME}
       labels:
         app: ${APPLICATION_NAME}
-      annotations:
-        service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
     spec:
       ports:
       - name: http
@@ -238,6 +236,7 @@ objects:
       - name: consuldns
         port: 8600
       clusterIP: None
+      publishNotReadyAddresses: true
       selector:
         app: ${APPLICATION_NAME}
   -

package/generators/openshift/templates/registry/jhipster-registry.yml.ejs

@@ -133,8 +133,6 @@ objects:
       name: ${APPLICATION_NAME}
       labels:
         app: ${APPLICATION_NAME}
-      annotations:
-        service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
     spec:
       ports:
       - name: http-bc
@@ -144,6 +142,7 @@ objects:
         port: 80
         targetPort: 8761
       clusterIP: None
+      publishNotReadyAddresses: true
       selector:
         app: ${APPLICATION_NAME}
   -

package/generators/project-name/index.cjs

@@ -18,6 +18,8 @@
  */
 /* eslint-disable consistent-return */
 const chalk = require('chalk');
+const { startCase } = require('lodash');
+
 const { generateMixedChain } = require('../../lib/support/mixin.cjs');
 const {
   INITIALIZING_PRIORITY,
@@ -104,7 +106,7 @@ module.exports = class extends MixedChain {
               name: PROJECT_NAME,
               type: 'input',
               message: 'What is the project name of your application?',
-              default: () => this._getDefaultProjectName(),
+              default: answers => this._getDefaultProjectName(answers[BASE_NAME]),
             },
           ],
           this.config
@@ -168,19 +170,20 @@ module.exports = class extends MixedChain {
    */
 
   /**
+   * @param {String} baseName - Base name to be derived
    * @returns default app name
    */
-  _getDefaultProjectName() {
-    return defaultConfig.projectName;
+  _getDefaultProjectName(baseName) {
+    return baseName ? `${startCase(baseName)} Application` : defaultConfig.projectName;
   }
 
   /**
    * Validates baseName
-   * @param String input - Base name to be checked
+   * @param {String} input - Base name to be checked
    * @returns Boolean
    */
   _validateBaseName(input) {
-    if (!/^([a-zA-Z0-9_]*)$/.test(input)) {
+    if (!/^([\w-]*)$/.test(input)) {
       return 'Your base name cannot contain special characters or a blank space';
     }
     if (/_/.test(input)) {

package/generators/server/cleanup-angular.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('4.0.0')) {
+    generator.removeFile(`${javaDir}config/locale/AngularCookieLocaleResolver.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-cache-provider.js

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+
+/**
+ * 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.cacheProviderHazelcast) {
+    if (generator.isJhipsterVersionLessThan('3.12.0')) {
+      generator.removeFile(`${javaDir}config/hazelcast/HazelcastCacheRegionFactory.java`);
+      generator.removeFile(`${javaDir}config/hazelcast/package-info.java`);
+    }
+  }
+  if (generator.cacheProviderRedis) {
+    if (generator.isJhipsterVersionLessThan('7.8.2')) {
+      generator.removeFile(`${testDir}RedisTestContainerExtension.java`);
+    }
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-cassandra.js

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('4.3.0')) {
+    generator.removeFile(`${javaDir}config/cassandra/CustomZonedDateTimeCodec.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('5.8.0')) {
+    generator.removeFile(`${testResourceDir}cassandra-random-port.yml`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.0.0-beta.0')) {
+    generator.removeFile(`${javaDir}config/metrics/CassandraHealthIndicator.java`);
+    generator.removeFile(`${javaDir}config/cassandra/package-info.java`);
+    generator.removeFile(`${javaDir}config/cassandra/CassandraConfiguration.java`);
+    generator.removeFile(`${testDir}config/CassandraConfigurationIT.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    generator.removeFile(`${testDir}AbstractCassandraTest.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-cucumber.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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) {
+  const rootTestDir = generator.TEST_DIR;
+  if (generator.isJhipsterVersionLessThan('7.4.2')) {
+    generator.removeFile(`${testResourceDir}cucumber.properties`);
+    generator.removeFile(`${rootTestDir}features/gitkeep`);
+    generator.removeFile(`${rootTestDir}features/user/user.feature`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-elasticsearch.js

@@ -0,0 +1,48 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('4.0.0')) {
+    generator.removeFile(`${javaDir}config/ElasticSearchConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('5.2.2')) {
+    generator.removeFile(`${javaDir}config/ElasticsearchConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.0.0-beta.0')) {
+    generator.removeFile(`${testDir}config/ElasticsearchTestConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    if (!generator.skipUserManagement) {
+      generator.removeFile(`${testDir}repository/search/UserSearchRepositoryMockConfiguration.java`);
+    }
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-gradle.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('5.0.0')) {
+    generator.removeFile('gradle/mapstruct.gradle');
+  }
+  if (generator.isJhipsterVersionLessThan('5.2.2')) {
+    generator.removeFile('gradle/liquibase.gradle');
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-kafka.js

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('6.5.2')) {
+    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaConsumer.java`);
+    generator.removeFile(`${javaDir}service/${generator.upperFirstCamelCase(generator.baseName)}KafkaProducer.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    generator.removeFile(`${javaDir}config/KafkaProperties.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-maven.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('7.7.1')) {
+    generator.removeFile('.mvn/wrapper/MavenWrapperDownloader.java');
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-mongodb.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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.10.0')) {
+    generator.removeFile(`${javaDir}config/CloudMongoDbConfiguration.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.7.1')) {
+    generator.removeFile(`${testDir}MongoDbTestContainerExtension.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-oauth2.js

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('6.0.0')) {
+    generator.removeFile(`${javaDir}config/OAuth2Configuration.java`);
+    generator.removeFile(`${javaDir}security/OAuth2AuthenticationSuccessHandler.java`);
+  }
+  if (generator.isJhipsterVersionLessThan('7.6.1')) {
+    if (!generator.databaseTypeNo) {
+      generator.removeFile(`${javaDir}web/rest/UserResource.java`);
+    }
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};

package/generators/server/cleanup-reactive.js

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2013-2022 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.
+ */
+/**
+ * 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('6.8.1')) {
+    generator.removeFile(`${javaDir}config/ReactivePageableHandlerMethodArgumentResolver.java`);
+    generator.removeFile(`${javaDir}config/ReactiveSortHandlerMethodArgumentResolver.java`);
+  }
+}
+
+module.exports = {
+  cleanupOldServerFiles,
+};