diff --git a/generators/spring-boot/files.ts b/generators/spring-boot/files.ts index df7a95786646..1ea3299c6d43 100644 --- a/generators/spring-boot/files.ts +++ b/generators/spring-boot/files.ts @@ -18,12 +18,7 @@ */ import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js'; import { addSectionsCondition, mergeSections } from '../base/support/index.js'; -import { - javaMainPackageTemplatesBlock, - moveToJavaPackageSrcDir, - moveToJavaPackageTestDir, - moveToSrcMainResourcesDir, -} from '../java/support/index.js'; +import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourcesDir } from '../java/support/index.js'; const imperativeConfigFiles = { imperativeFiles: [ @@ -352,10 +347,6 @@ export const baseServerFiles = { }, ], serverMicroservice: [ - javaMainPackageTemplatesBlock({ - condition: generator => generator.applicationTypeMicroservice, - templates: ['config/SpringDocConfiguration.java'], - }), { condition: generator => generator.applicationTypeMicroservice, path: SERVER_MAIN_RES_DIR, diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs deleted file mode 100644 index d887534647ad..000000000000 --- a/generators/spring-boot/templates/src/main/java/_package_/config/SpringDocConfiguration.java.ejs +++ /dev/null @@ -1,40 +0,0 @@ -<%# - Copyright 2013-2024 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. --%> -package <%- packageName %>.config; - -import java.util.List; - -import org.springdoc.core.customizers.ServerBaseUrlCustomizer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class SpringDocConfiguration { - - @Bean - public ServerBaseUrlCustomizer serverBaseUrlRequestCustomizer() { - return (serverBaseUrl, request) -> { - List forwardedPrefix = request.getHeaders().get("X-Forwarded-Prefix"); - if (forwardedPrefix != null && forwardedPrefix.size() > 0) { - return forwardedPrefix.get(0); - } - return serverBaseUrl; - }; - } -} diff --git a/generators/spring-data-cassandra/__snapshots__/generator.spec.ts.snap b/generators/spring-data-cassandra/__snapshots__/generator.spec.ts.snap index 6c8e9c2af925..6627efafd5f5 100644 --- a/generators/spring-data-cassandra/__snapshots__/generator.spec.ts.snap +++ b/generators/spring-data-cassandra/__snapshots__/generator.spec.ts.snap @@ -538,9 +538,6 @@ exports[`generator - cassandra microservice-jwt-reactive(false)-maven-enableTran "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -885,9 +882,6 @@ exports[`generator - cassandra microservice-jwt-reactive(true)-gradle-enableTran "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -1232,9 +1226,6 @@ exports[`generator - cassandra microservice-oauth2-reactive(true)-gradle-enableT "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, diff --git a/generators/spring-data-couchbase/__snapshots__/generator.spec.ts.snap b/generators/spring-data-couchbase/__snapshots__/generator.spec.ts.snap index c56fa03dfecc..026e49dede4b 100644 --- a/generators/spring-data-couchbase/__snapshots__/generator.spec.ts.snap +++ b/generators/spring-data-couchbase/__snapshots__/generator.spec.ts.snap @@ -577,9 +577,6 @@ exports[`generator - couchbase microservice-jwt-reactive(false)-maven-enableTran "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -921,9 +918,6 @@ exports[`generator - couchbase microservice-jwt-reactive(true)-gradle-enableTran "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -1268,9 +1262,6 @@ exports[`generator - couchbase microservice-oauth2-reactive(true)-gradle-enableT "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, diff --git a/generators/spring-data-elasticsearch/__snapshots__/generator.spec.ts.snap b/generators/spring-data-elasticsearch/__snapshots__/generator.spec.ts.snap index d60b89762c7f..0ba2d0d284bf 100644 --- a/generators/spring-data-elasticsearch/__snapshots__/generator.spec.ts.snap +++ b/generators/spring-data-elasticsearch/__snapshots__/generator.spec.ts.snap @@ -595,9 +595,6 @@ exports[`generator - elasticsearch microservice-jwt-reactive(false)-maven-enable "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -993,9 +990,6 @@ exports[`generator - elasticsearch microservice-jwt-reactive(true)-gradle-enable "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -1376,9 +1370,6 @@ exports[`generator - elasticsearch microservice-oauth2-reactive(true)-gradle-ena "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, diff --git a/generators/spring-data-mongodb/__snapshots__/generator.spec.ts.snap b/generators/spring-data-mongodb/__snapshots__/generator.spec.ts.snap index 478f7404b4ef..0c51d9c7d4f6 100644 --- a/generators/spring-data-mongodb/__snapshots__/generator.spec.ts.snap +++ b/generators/spring-data-mongodb/__snapshots__/generator.spec.ts.snap @@ -544,9 +544,6 @@ exports[`generator - mongodb microservice-jwt-reactive(false)-maven-enableTransl "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -879,9 +876,6 @@ exports[`generator - mongodb microservice-jwt-reactive(true)-gradle-enableTransl "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -1211,9 +1205,6 @@ exports[`generator - mongodb microservice-oauth2-reactive(true)-gradle-enableTra "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, diff --git a/generators/spring-data-neo4j/__snapshots__/generator.spec.ts.snap b/generators/spring-data-neo4j/__snapshots__/generator.spec.ts.snap index 2624cec22893..c52dbdcd98b4 100644 --- a/generators/spring-data-neo4j/__snapshots__/generator.spec.ts.snap +++ b/generators/spring-data-neo4j/__snapshots__/generator.spec.ts.snap @@ -550,9 +550,6 @@ exports[`generator - neo4j microservice-jwt-reactive(false)-maven-enableTranslat "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -882,9 +879,6 @@ exports[`generator - neo4j microservice-jwt-reactive(true)-gradle-enableTranslat "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -1214,9 +1208,6 @@ exports[`generator - neo4j microservice-oauth2-reactive(true)-gradle-enableTrans "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, diff --git a/generators/spring-data-relational/__snapshots__/generator.spec.ts.snap b/generators/spring-data-relational/__snapshots__/generator.spec.ts.snap index 19111e643025..0b4ae143654f 100644 --- a/generators/spring-data-relational/__snapshots__/generator.spec.ts.snap +++ b/generators/spring-data-relational/__snapshots__/generator.spec.ts.snap @@ -2088,9 +2088,6 @@ exports[`generator - sql microservice-jwt-mariadb-reactive(true)-gradle-enableTr "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -2348,9 +2345,6 @@ exports[`generator - sql microservice-jwt-mssql-reactive(true)-gradle-enableTran "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -2599,9 +2593,6 @@ exports[`generator - sql microservice-jwt-mysql-reactive(false)-maven-enableTran "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -2874,9 +2865,6 @@ exports[`generator - sql microservice-jwt-mysql-reactive(true)-gradle-enableTran "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -3122,9 +3110,6 @@ exports[`generator - sql microservice-jwt-oracle-reactive(false)-maven-enableTra "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -3394,9 +3379,6 @@ exports[`generator - sql microservice-jwt-oracle-reactive(true)-gradle-enableTra "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -3630,9 +3612,6 @@ exports[`generator - sql microservice-jwt-postgresql-reactive(false)-maven-enabl "src/main/java/tech/jhipster/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -3899,9 +3878,6 @@ exports[`generator - sql microservice-jwt-postgresql-reactive(true)-gradle-enabl "src/main/java/com/mycompany/config/SecurityJwtConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -4147,9 +4123,6 @@ exports[`generator - sql microservice-oauth2-mariadb-reactive(false)-maven-enabl "src/main/java/tech/jhipster/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -4404,9 +4377,6 @@ exports[`generator - sql microservice-oauth2-mariadb-reactive(true)-gradle-enabl "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -4640,9 +4610,6 @@ exports[`generator - sql microservice-oauth2-mssql-reactive(false)-maven-enableT "src/main/java/tech/jhipster/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/tech/jhipster/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/tech/jhipster/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -4897,9 +4864,6 @@ exports[`generator - sql microservice-oauth2-mssql-reactive(true)-gradle-enableT "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -5145,9 +5109,6 @@ exports[`generator - sql microservice-oauth2-mysql-reactive(true)-gradle-enableT "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -5399,9 +5360,6 @@ exports[`generator - sql microservice-oauth2-oracle-reactive(true)-gradle-enable "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", }, @@ -5650,9 +5608,6 @@ exports[`generator - sql microservice-oauth2-postgresql-reactive(true)-gradle-en "src/main/java/com/mycompany/config/SecurityConfiguration.java": { "stateCleared": "modified", }, - "src/main/java/com/mycompany/config/SpringDocConfiguration.java": { - "stateCleared": "modified", - }, "src/main/java/com/mycompany/config/WebConfigurer.java": { "stateCleared": "modified", },