From cfed66d3a76e67c5b103a66f95dbca17c7b5089e Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sun, 11 Jun 2023 13:17:27 +0530 Subject: [PATCH] JAVA-21455 Move SpringFox code out of spring-boot-mvc to spring-boot-mvc-legacy (#14212) --- .../spring-boot-mvc-legacy/README.md | 8 +++ .../spring-boot-mvc-legacy/pom.xml | 51 +++++++++++++++++++ .../baeldung/swagger2boot/Application.java | 0 .../configuration/SpringFoxConfig.java | 11 ++-- .../controller/RegularRestController.java | 0 .../com/baeldung/swagger2boot/model/User.java | 0 .../plugin/EmailAnnotationPlugin.java | 0 .../repository/UserRepository.java | 0 .../src/main/resources/application.properties | 1 + spring-boot-modules/spring-boot-mvc/README.md | 1 - spring-boot-modules/spring-boot-mvc/pom.xml | 7 --- 11 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 spring-boot-modules/spring-boot-mvc-legacy/README.md create mode 100644 spring-boot-modules/spring-boot-mvc-legacy/pom.xml rename spring-boot-modules/{spring-boot-mvc => spring-boot-mvc-legacy}/src/main/java/com/baeldung/swagger2boot/Application.java (100%) rename spring-boot-modules/{spring-boot-mvc => spring-boot-mvc-legacy}/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java (92%) rename spring-boot-modules/{spring-boot-mvc => spring-boot-mvc-legacy}/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java (100%) rename spring-boot-modules/{spring-boot-mvc => spring-boot-mvc-legacy}/src/main/java/com/baeldung/swagger2boot/model/User.java (100%) rename spring-boot-modules/{spring-boot-mvc => spring-boot-mvc-legacy}/src/main/java/com/baeldung/swagger2boot/plugin/EmailAnnotationPlugin.java (100%) rename spring-boot-modules/{spring-boot-mvc => spring-boot-mvc-legacy}/src/main/java/com/baeldung/swagger2boot/repository/UserRepository.java (100%) create mode 100644 spring-boot-modules/spring-boot-mvc-legacy/src/main/resources/application.properties diff --git a/spring-boot-modules/spring-boot-mvc-legacy/README.md b/spring-boot-modules/spring-boot-mvc-legacy/README.md new file mode 100644 index 0000000000..a4e075b7fa --- /dev/null +++ b/spring-boot-modules/spring-boot-mvc-legacy/README.md @@ -0,0 +1,8 @@ +## Spring Boot MVC Legacy + +This module contains legacy Spring MVC articles in Spring Boot projects. + +### Relevant Articles: + +- [Setting Up Swagger 2 with a Spring REST API Using Springfox](https://www.baeldung.com/swagger-2-documentation-for-spring-rest-api) + diff --git a/spring-boot-modules/spring-boot-mvc-legacy/pom.xml b/spring-boot-modules/spring-boot-mvc-legacy/pom.xml new file mode 100644 index 0000000000..b5422b12bd --- /dev/null +++ b/spring-boot-modules/spring-boot-mvc-legacy/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + spring-boot-mvc-legacy + spring-boot-mvc-legacy + jar + Module For Spring Boot MVC Legacy + + + com.baeldung.spring-boot-modules + spring-boot-modules + 1.0.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.hsqldb + hsqldb + runtime + + + javax.validation + validation-api + + + + io.springfox + springfox-boot-starter + ${spring.fox.version} + + + + + 3.0.0 + + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/Application.java b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/Application.java similarity index 100% rename from spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/Application.java rename to spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/Application.java diff --git a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java similarity index 92% rename from spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java rename to spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java index 5998ffeb2a..69316d6b28 100644 --- a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java +++ b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/configuration/SpringFoxConfig.java @@ -1,16 +1,17 @@ package com.baeldung.swagger2boot.configuration; -import com.baeldung.swagger2boot.plugin.EmailAnnotationPlugin; +import java.util.Collections; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; + +import com.baeldung.swagger2boot.plugin.EmailAnnotationPlugin; + import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.data.rest.configuration.SpringDataRestConfiguration; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger.web.DocExpansion; import springfox.documentation.swagger.web.ModelRendering; @@ -19,8 +20,6 @@ import springfox.documentation.swagger.web.TagsSorter; import springfox.documentation.swagger.web.UiConfiguration; import springfox.documentation.swagger.web.UiConfigurationBuilder; -import java.util.Collections; - @Configuration public class SpringFoxConfig { diff --git a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java similarity index 100% rename from spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java rename to spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/controller/RegularRestController.java diff --git a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/model/User.java b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/model/User.java similarity index 100% rename from spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/model/User.java rename to spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/model/User.java diff --git a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/plugin/EmailAnnotationPlugin.java b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/plugin/EmailAnnotationPlugin.java similarity index 100% rename from spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/plugin/EmailAnnotationPlugin.java rename to spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/plugin/EmailAnnotationPlugin.java diff --git a/spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/repository/UserRepository.java b/spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/repository/UserRepository.java similarity index 100% rename from spring-boot-modules/spring-boot-mvc/src/main/java/com/baeldung/swagger2boot/repository/UserRepository.java rename to spring-boot-modules/spring-boot-mvc-legacy/src/main/java/com/baeldung/swagger2boot/repository/UserRepository.java diff --git a/spring-boot-modules/spring-boot-mvc-legacy/src/main/resources/application.properties b/spring-boot-modules/spring-boot-mvc-legacy/src/main/resources/application.properties new file mode 100644 index 0000000000..d52a63b19c --- /dev/null +++ b/spring-boot-modules/spring-boot-mvc-legacy/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.mvc.pathmatch.matching-strategy = ANT_PATH_MATCHER diff --git a/spring-boot-modules/spring-boot-mvc/README.md b/spring-boot-modules/spring-boot-mvc/README.md index 852990bd73..f45feb6169 100644 --- a/spring-boot-modules/spring-boot-mvc/README.md +++ b/spring-boot-modules/spring-boot-mvc/README.md @@ -7,7 +7,6 @@ This module contains articles about Spring Web MVC in Spring Boot projects. - [Custom Validation MessageSource in Spring Boot](https://www.baeldung.com/spring-custom-validation-message-source) - [Display RSS Feed with Spring MVC](https://www.baeldung.com/spring-mvc-rss-feed) - [A Controller, Service and DAO Example with Spring Boot and JSF](https://www.baeldung.com/jsf-spring-boot-controller-service-dao) -- [Setting Up Swagger 2 with a Spring REST API Using Springfox](https://www.baeldung.com/swagger-2-documentation-for-spring-rest-api) - [Using Spring ResponseEntity to Manipulate the HTTP Response](https://www.baeldung.com/spring-response-entity) - [The @ServletComponentScan Annotation in Spring Boot](https://www.baeldung.com/spring-servletcomponentscan) - [Guide to Internationalization in Spring Boot](https://www.baeldung.com/spring-boot-internationalization) diff --git a/spring-boot-modules/spring-boot-mvc/pom.xml b/spring-boot-modules/spring-boot-mvc/pom.xml index d5ec7742c9..369bcf799b 100644 --- a/spring-boot-modules/spring-boot-mvc/pom.xml +++ b/spring-boot-modules/spring-boot-mvc/pom.xml @@ -80,12 +80,6 @@ org.springframework.boot spring-boot-starter-validation - - - io.springfox - springfox-boot-starter - ${spring.fox.version} - org.aspectj @@ -113,7 +107,6 @@ - 3.0.0 1.10.0 2.3.7