Skip to content

Commit 3100858

Browse files
committed
use springdoc as default library for swagger-ui
1 parent 30beb6f commit 3100858

File tree

10 files changed

+24
-63
lines changed

10 files changed

+24
-63
lines changed

src/main/resources/handlebars/JavaSpring/application.mustache

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
{{^springBootV2}}
2-
springfox.documentation.swagger.v2.path=/api-docs
3-
{{/springBootV2}}
4-
{{#springBootV2}}
51
{{#useOas2}}
62
springfox.documentation.swagger.v2.path=/api-docs
73
server.contextPath={{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}
84
{{/useOas2}}
95
{{^useOas2}}
10-
springfox.documentation.open-api.v3.path=/api-docs
6+
springdoc.api-docs.path=/api-docs
117
{{/useOas2}}
12-
{{/springBootV2}}
138
server.servlet.contextPath={{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}
149
server.port={{serverPort}}
1510
spring.jackson.date-format={{basePackage}}.RFC3339DateFormat

src/main/resources/handlebars/JavaSpring/application.properties.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
springfox.documentation.swagger.v2.path=/api-docs
33
{{/useOas2}}
44
{{^useOas2}}
5-
springfox.documentation.open-api.v3.path=/api-docs
5+
springdoc.api-docs.path=/api-docs
66
{{/useOas2}}

src/main/resources/handlebars/JavaSpring/libraries/spring-boot/homeController.mustache

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ public class HomeController {
1111
@RequestMapping(value = "/")
1212
public String index() {
1313
{{#useOas2}}
14-
System.out.println("swagger-ui.html");
1514
return "redirect:swagger-ui.html";
1615
{{/useOas2}}
1716
{{^useOas2}}
18-
System.out.println("/swagger-ui/index.html");
1917
return "redirect:/swagger-ui/";
2018
{{/useOas2}}
2119
}

src/main/resources/handlebars/JavaSpring/libraries/spring-boot/pom.mustache

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@
1313
<springfox-version>2.9.2</springfox-version>
1414
{{/useOas2}}
1515
{{^useOas2}}
16-
{{^springBootV2}}
17-
<springdoc-version>1.2.9</springdoc-version>
18-
{{/springBootV2}}
19-
{{#springBootV2}}
20-
<springfox-version>3.0.0</springfox-version>
21-
{{/springBootV2}}
16+
<springdoc-version>1.7.0</springdoc-version>
2217
{{/useOas2}}
2318
</properties>
2419
<parent>
@@ -79,37 +74,19 @@
7974
<artifactId>springfox-swagger2</artifactId>
8075
<version>${springfox-version}</version>
8176
</dependency>
82-
{{/useOas2}}
83-
{{^useOas2}}
84-
{{#springBootV2}}
85-
<dependency>
86-
<groupId>io.springfox</groupId>
87-
<artifactId>springfox-oas</artifactId>
88-
<version>${springfox-version}</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>io.springfox</groupId>
92-
<artifactId>springfox-swagger-ui</artifactId>
93-
<version>${springfox-version}</version>
94-
</dependency>
95-
{{/springBootV2}}
96-
{{/useOas2}}
97-
{{#useOas2}}
9877
<dependency>
9978
<groupId>io.springfox</groupId>
10079
<artifactId>springfox-swagger-ui</artifactId>
10180
<version>${springfox-version}</version>
10281
</dependency>
10382
{{/useOas2}}
10483
{{^useOas2}}
105-
{{^springBootV2}}
10684
<!-- SpringDoc dependencies -->
10785
<dependency>
10886
<groupId>org.springdoc</groupId>
10987
<artifactId>springdoc-openapi-ui</artifactId>
11088
<version>${springdoc-version}</version>
11189
</dependency>
112-
{{/springBootV2}}
11390
{{/useOas2}}
11491

11592
{{#withXml}}

src/main/resources/handlebars/JavaSpring/libraries/spring-boot/swagger2SpringBoot.mustache

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import org.springframework.context.annotation.ComponentScan;
1212
{{#useOas2}}
1313
import springfox.documentation.swagger2.annotations.EnableSwagger2;
1414
{{/useOas2}}
15-
{{^useOas2}}
16-
import springfox.documentation.oas.annotations.EnableOpenApi;
17-
{{/useOas2}}
1815

1916
import org.springframework.context.annotation.Configuration;
2017
import org.springframework.format.FormatterRegistry;
@@ -24,9 +21,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
2421
{{#useOas2}}
2522
@EnableSwagger2
2623
{{/useOas2}}
27-
{{^useOas2}}
28-
@EnableOpenApi
29-
{{/useOas2}}
3024
@ComponentScan(basePackages = { "{{basePackage}}", "{{apiPackage}}" , "{{configPackage}}"})
3125
public class Swagger2SpringBoot implements CommandLineRunner {
3226

src/main/resources/handlebars/JavaSpring/libraries/spring-boot/swaggerUiConfiguration.mustache

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,27 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
88
{{>generatedAnnotation}}
99
@Configuration
1010
public class SwaggerUiConfiguration implements WebMvcConfigurer {
11+
1112
@Override
13+
{{#useOas2}}
1214
public void addResourceHandlers(ResourceHandlerRegistry registry) {
13-
{{#useOas2}}
15+
1416
registry
1517
.addResourceHandler("/swagger-ui.html")
1618
.addResourceLocations("classpath:/META-INF/resources/");
1719
1820
registry
1921
.addResourceHandler("/webjars/**")
2022
.addResourceLocations("classpath:/META-INF/resources/webjars/");
21-
{{/useOas2}}
22-
{{^useOas2}}
2323
registry.
2424
addResourceHandler("/swagger-ui/**")
2525
.addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
2626
.resourceChain(false);
27-
{{/useOas2}}
2827
}
29-
30-
@Override
28+
{{/useOas2}}
29+
{{^useOas2}}
3130
public void addViewControllers(ViewControllerRegistry registry) {
32-
{{^useOas2}}
3331
registry.addViewController("/swagger-ui/").setViewName("forward:/swagger-ui/index.html");
34-
{{/useOas2}}
3532
}
33+
{{/useOas2}}
3634
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
springfox.documentation.open-api.v3.path=/api-docs
1+
springdoc.api-docs.path=/api-docs
22
server.servlet.contextPath={{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}
33
server.port={{serverPort}}

src/main/resources/handlebars/JavaSpring/libraries/spring-boot3/pom.mustache

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<maven.compiler.release>17</maven.compiler.release>
1111
<springboot-version>3.1.1</springboot-version>
1212
<swagger-annotations-version>2.2.14</swagger-annotations-version>
13+
<springdoc-version>1.7.0</springdoc-version>
1314
</properties>
1415
<parent>
1516
<groupId>org.springframework.boot</groupId>
@@ -74,6 +75,12 @@
7475
<version>2.10.1</version>
7576
</dependency>
7677
{{/notNullJacksonAnnotation}}
78+
<!-- SpringDoc dependencies -->
79+
<dependency>
80+
<groupId>org.springdoc</groupId>
81+
<artifactId>springdoc-openapi-ui</artifactId>
82+
<version>${springdoc-version}</version>
83+
</dependency>
7784

7885
<dependency>
7986
<groupId>io.swagger.core.v3</groupId>

src/main/resources/handlebars/JavaSpring/libraries/spring-boot3/swaggerUiConfiguration.mustache

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
88
{{>generatedAnnotation}}
99
@Configuration
1010
public class SwaggerUiConfiguration implements WebMvcConfigurer {
11-
@Override
12-
public void addResourceHandlers(ResourceHandlerRegistry registry) {
13-
registry.
14-
addResourceHandler("/swagger-ui/**")
15-
.addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
16-
.resourceChain(false);
17-
}
1811
1912
@Override
2013
public void addViewControllers(ViewControllerRegistry registry) {

src/main/resources/handlebars/JavaSpring/swaggerDocumentationConfig.mustache

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package {{configPackage}};
33
import org.springframework.context.annotation.Bean;
44
import org.springframework.context.annotation.Configuration;
55

6+
{{#useOas2}}
67
import springfox.documentation.service.Contact;
78
import springfox.documentation.spi.DocumentationType;
89
import springfox.documentation.spring.web.plugins.Docket;
910
import springfox.documentation.builders.RequestHandlerSelectors;
1011
import springfox.documentation.builders.ApiInfoBuilder;
1112
import springfox.documentation.service.ApiInfo;
13+
{{/useOas2}}
1214
{{^useOas2}}
1315
import io.swagger.v3.oas.models.OpenAPI;
1416
import io.swagger.v3.oas.models.info.Info;
@@ -22,14 +24,11 @@ import java.util.Optional;
2224
@Configuration
2325
public class SwaggerDocumentationConfig {
2426
27+
{{#useOas2}}
2528
@Bean
2629
public Docket customImplementation(){
27-
{{#useOas2}}
30+
2831
return new Docket(DocumentationType.SWAGGER_2)
29-
{{/useOas2}}
30-
{{^useOas2}}
31-
return new Docket(DocumentationType.OAS_30)
32-
{{/useOas2}}
3332
.select()
3433
.apis(RequestHandlerSelectors.basePackage("{{apiPackage}}"))
3534
.build()
@@ -62,8 +61,8 @@ public class SwaggerDocumentationConfig {
6261
.contact(new Contact("","", "{{infoEmail}}"))
6362
.build();
6463
}
65-
66-
{{^useOas2}}
64+
{{/useOas2}}
65+
{{^useOas2}}
6766
@Bean
6867
public OpenAPI openApi() {
6968
return new OpenAPI()
@@ -78,6 +77,6 @@ public class SwaggerDocumentationConfig {
7877
.contact(new io.swagger.v3.oas.models.info.Contact()
7978
.email("{{infoEmail}}")));
8079
}
81-
{{/useOas2}}
80+
{{/useOas2}}
8281

8382
}

0 commit comments

Comments
 (0)