Skip to content

Commit f158d27

Browse files
atkawa7atkawa7
committed
upgraded springfox
1 parent 4ef8f67 commit f158d27

File tree

6 files changed

+60
-54
lines changed

6 files changed

+60
-54
lines changed

‎httpsnippet-demo/pom.xml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.atkawa7</groupId>
66
<artifactId>httpsnippet-parent</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
7+
<version>0.0.2-SNAPSHOT</version>
88
</parent>
99
<artifactId>httpsnippet-demo</artifactId>
1010
<packaging>jar</packaging>
@@ -23,11 +23,6 @@
2323
<artifactId>spotbugs-annotations</artifactId>
2424
<version>${spotbugs-maven-plugin.version}</version>
2525
</dependency>
26-
<dependency>
27-
<groupId>com.google.guava</groupId>
28-
<artifactId>guava</artifactId>
29-
<version>${guava.version}</version>
30-
</dependency>
3126
<dependency>
3227
<groupId>com.h2database</groupId>
3328
<artifactId>h2</artifactId>
@@ -41,19 +36,8 @@
4136
</dependency>
4237
<dependency>
4338
<groupId>io.springfox</groupId>
44-
<artifactId>springfox-swagger-ui</artifactId>
45-
<version>${springfox.version}</version>
46-
</dependency>
47-
<dependency>
48-
<groupId>io.springfox</groupId>
49-
<artifactId>springfox-swagger2</artifactId>
50-
<version>${springfox.version}</version>
51-
<exclusions>
52-
<exclusion>
53-
<artifactId>guava</artifactId>
54-
<groupId>com.google.guava</groupId>
55-
</exclusion>
56-
</exclusions>
39+
<artifactId>springfox-boot-starter</artifactId>
40+
<version>3.0.0-SNAPSHOT</version>
5741
</dependency>
5842
<dependency>
5943
<groupId>org.apache.commons</groupId>
@@ -78,6 +62,10 @@
7862
<groupId>org.springframework.boot</groupId>
7963
<artifactId>spring-boot-starter-data-jpa</artifactId>
8064
</dependency>
65+
<dependency>
66+
<groupId>org.hibernate.validator</groupId>
67+
<artifactId>hibernate-validator</artifactId>
68+
</dependency>
8169
<dependency>
8270
<groupId>org.springframework.boot</groupId>
8371
<artifactId>spring-boot-starter-test</artifactId>

‎httpsnippet-demo/src/main/java/io/github/atkawa7/httpsnippet/demo/config/DemoConfig.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@
1111
import org.springframework.core.env.Environment;
1212
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
1313

14-
import springfox.documentation.builders.ApiInfoBuilder;
15-
import springfox.documentation.builders.PathSelectors;
16-
import springfox.documentation.builders.RequestHandlerSelectors;
17-
import springfox.documentation.service.ApiInfo;
18-
import springfox.documentation.service.Contact;
19-
import springfox.documentation.service.Tag;
20-
import springfox.documentation.service.VendorExtension;
21-
import springfox.documentation.spi.DocumentationType;
22-
import springfox.documentation.spring.web.plugins.Docket;
23-
import springfox.documentation.swagger2.annotations.EnableSwagger2;
24-
2514
import io.github.atkawa7.httpsnippet.demo.domain.EntityMarker;
2615
import io.github.atkawa7.httpsnippet.demo.processors.SpeakerProcessor;
2716
import io.github.atkawa7.httpsnippet.demo.processors.SpeakerProcessorImpl;
@@ -34,11 +23,19 @@
3423
import io.github.atkawa7.httpsnippet.demo.swagger.extensions.LogoVendorExtension;
3524
import io.github.atkawa7.httpsnippet.demo.swagger.plugins.CodeSampleOperationBuilderPlugin;
3625
import io.github.atkawa7.httpsnippet.http.MediaType;
26+
import springfox.documentation.builders.ApiInfoBuilder;
27+
import springfox.documentation.builders.PathSelectors;
28+
import springfox.documentation.builders.RequestHandlerSelectors;
29+
import springfox.documentation.service.ApiInfo;
30+
import springfox.documentation.service.Contact;
31+
import springfox.documentation.service.Tag;
32+
import springfox.documentation.service.VendorExtension;
33+
import springfox.documentation.spi.DocumentationType;
34+
import springfox.documentation.spring.web.plugins.Docket;
3735

3836
@Configuration
3937
@EntityScan(basePackageClasses = EntityMarker.class)
4038
@EnableJpaRepositories(basePackageClasses = RepositoryMarker.class)
41-
@EnableSwagger2
4239
public class DemoConfig {
4340
@Bean
4441
public DemoProperties demoProperties(Environment environment) {
@@ -87,7 +84,7 @@ public Docket docket(DemoProperties demoProperties) {
8784
.extensions(apiInfoVendorExtensions)
8885
.build();
8986

90-
return new Docket(DocumentationType.SWAGGER_2)
87+
return new Docket(DocumentationType.OAS_30)
9188
.protocols(protocols)
9289
.apiInfo(apiInfo)
9390
.produces(Collections.singleton(MediaType.APPLICATION_JSON))

‎httpsnippet-demo/src/main/java/io/github/atkawa7/httpsnippet/demo/swagger/plugins/CodeSampleOperationBuilderPlugin.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,10 @@
1010
import org.springframework.core.annotation.Order;
1111
import org.springframework.http.HttpHeaders;
1212
import org.springframework.web.bind.annotation.RequestBody;
13-
import org.springframework.web.servlet.mvc.condition.NameValueExpression;
14-
15-
import springfox.documentation.service.ResolvedMethodParameter;
16-
import springfox.documentation.spi.DocumentationType;
17-
import springfox.documentation.spi.service.OperationBuilderPlugin;
18-
import springfox.documentation.spi.service.contexts.DocumentationContext;
19-
import springfox.documentation.spi.service.contexts.OperationContext;
20-
import springfox.documentation.swagger.common.SwaggerPluginSupport;
2113

2214
import com.fasterxml.classmate.ResolvedType;
2315
import com.fasterxml.jackson.core.JsonProcessingException;
2416
import com.github.javafaker.Faker;
25-
import com.google.common.base.Optional;
2617
import com.smartbear.har.builder.HarHeaderBuilder;
2718
import com.smartbear.har.builder.HarPostDataBuilder;
2819
import com.smartbear.har.builder.HarRequestBuilder;
@@ -38,6 +29,13 @@
3829
import io.github.atkawa7.httpsnippet.http.HttpVersion;
3930
import io.github.atkawa7.httpsnippet.http.MediaType;
4031
import io.github.atkawa7.httpsnippet.utils.HarUtils;
32+
import springfox.documentation.service.ResolvedMethodParameter;
33+
import springfox.documentation.spi.DocumentationType;
34+
import springfox.documentation.spi.service.OperationBuilderPlugin;
35+
import springfox.documentation.spi.service.contexts.DocumentationContext;
36+
import springfox.documentation.spi.service.contexts.OperationContext;
37+
import springfox.documentation.spring.wrapper.NameValueExpression;
38+
import springfox.documentation.swagger.common.SwaggerPluginSupport;
4139

4240
@Slf4j
4341
@Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER + 100)

‎httpsnippet/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.github.atkawa7</groupId>
66
<artifactId>httpsnippet-parent</artifactId>
7-
<version>0.0.1-SNAPSHOT</version>
7+
<version>0.0.2-SNAPSHOT</version>
88
</parent>
99
<artifactId>httpsnippet</artifactId>
1010
<packaging>jar</packaging>
@@ -208,6 +208,14 @@
208208
</execution>
209209
</executions>
210210
</plugin>
211+
<plugin>
212+
<groupId>org.apache.maven.plugins</groupId>
213+
<artifactId>maven-compiler-plugin</artifactId>
214+
<configuration>
215+
<source>8</source>
216+
<target>8</target>
217+
</configuration>
218+
</plugin>
211219
</plugins>
212220
</build>
213221
<reporting>

‎lombok.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
lombok.extern.findbugs.addSuppressFBWarnings=true
22
lombok.log.fieldName=logger
3-
lombok.addJavaxGeneratedAnnotation = true
3+
lombok.addJavaxGeneratedAnnotation = false
44
lombok.addLombokGeneratedAnnotation = true
55
lombok.equalsAndHashCode.callSuper=CALL
66
lombok.log.fieldIsStatic=true

‎pom.xml‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.github.atkawa7</groupId>
55
<artifactId>httpsnippet-parent</artifactId>
6-
<version>0.0.1-SNAPSHOT</version>
6+
<version>0.0.2-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Http Snippet Parent</name>
99
<description>An HTTP Request snippet generator for Springfox</description>
@@ -28,6 +28,27 @@
2828
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
2929
</snapshotRepository>
3030
</distributionManagement>
31+
32+
<repositories>
33+
<repository>
34+
<id>central</id>
35+
<url>https://repo1.maven.org/maven2/</url>
36+
</repository>
37+
<repository>
38+
<snapshots>
39+
<enabled>true</enabled>
40+
</snapshots>
41+
<id>jcenter-snapshots</id>
42+
<name>jcenter</name>
43+
<url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
44+
</repository>
45+
<repository>
46+
<id>jcenter-releases</id>
47+
<name>jcenter</name>
48+
<url>https://jcenter.bintray.com/</url>
49+
</repository>
50+
</repositories>
51+
3152
<properties>
3253
<animal-sniffer-maven-plugin.version>1.17</animal-sniffer-maven-plugin.version>
3354
<animal-sniffer-signature.version>1.0</animal-sniffer-signature.version>
@@ -62,7 +83,6 @@
6283
<github.repository>httpsnippet</github.repository>
6384
<github.username>atkawa7</github.username>
6485
<google.format.version>1.7</google.format.version>
65-
<guava.version>27.1-jre</guava.version>
6686
<h2.version>1.4.199</h2.version>
6787
<har-java.version>1.0.0</har-java.version>
6888
<jackson.version>2.9.9</jackson.version>
@@ -108,8 +128,8 @@
108128
<spotbugs-fb-contrib.version>7.4.3.sb</spotbugs-fb-contrib.version>
109129
<spotbugs-maven-plugin.version>3.1.11</spotbugs-maven-plugin.version>
110130
<spotless-maven-plugin.version>1.23.0</spotless-maven-plugin.version>
111-
<spring.boot.version>2.1.5.RELEASE</spring.boot.version>
112-
<springfox.version>2.9.2</springfox.version>
131+
<spring.boot.version>2.3.1.RELEASE</spring.boot.version>
132+
<springfox.version>3.0.0-SNAPSHOT</springfox.version>
113133
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
114134
<xml-format-maven-plugin.version>3.0.7</xml-format-maven-plugin.version>
115135
</properties>
@@ -140,13 +160,8 @@
140160
</dependency>
141161
<dependency>
142162
<groupId>io.springfox</groupId>
143-
<artifactId>springfox-swagger-ui</artifactId>
144-
<version>${springfox.version}</version>
145-
</dependency>
146-
<dependency>
147-
<groupId>io.springfox</groupId>
148-
<artifactId>springfox-swagger2</artifactId>
149-
<version>${springfox.version}</version>
163+
<artifactId>springfox-boot-starter</artifactId>
164+
<version>3.0.0-SNAPSHOT</version>
150165
</dependency>
151166
<dependency>
152167
<groupId>org.apache.commons</groupId>

0 commit comments

Comments
 (0)