Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 42b8900

Browse files
AndreasKlJoGir
AndreasKl
authored and
JoGir
committed
springfox#2932: Minor version upgrades of spring dependencies. Aligned contract tests with Spring HATEOAS 1.x. Fixed wrong client encoding used in tests.
1 parent 82bd50c commit 42b8900

14 files changed

Lines changed: 358 additions & 583 deletions

File tree

‎gradle/dependencies.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ ext {
1818
slf4j = "1.7.25"
1919
snakeyaml = '1.23'
2020
spock = "1.3-RC1-groovy-2.5"
21-
spring = "5.2.0.RELEASE"
22-
springIntegration = "5.2.0.RELEASE"
23-
springHateoas = "1.0.0.RELEASE"
24-
springDataRest = "3.2.0.RELEASE"
21+
spring = "5.2.2.RELEASE"
22+
springIntegration = "5.2.2.RELEASE"
23+
springHateoas = "1.0.2.RELEASE"
24+
springDataRest = "3.2.3.RELEASE"
2525
springPluginVersion = "2.0.0.RELEASE"
2626
swagger2Core = "1.5.20"
27-
springBoot = "2.2.0.RELEASE"
27+
springBoot = "2.2.2.RELEASE"
2828
springfoxRfc6570Version = "1.0.0"
2929
undercouch = "3.4.3"
3030
validationApiVersion = '2.0.1.Final'

‎springfox-schema/src/test/groovy/springfox/documentation/schema/AlternateTypeProviderSpec.groovy‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,20 @@ class AlternateTypeProviderSpec extends Specification {
5757
sut.alternateFor(resolvedSource) == resolver.resolve(expectedAlternate)
5858

5959
where:
60-
rule | source | expectedAlternate
61-
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
62-
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(ComplexType) | genericClassOfType(ComplexType)
63-
newRule(genericClassOfType(WildcardType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
64-
newRule(genericClassOfType(WildcardType), ComplexType) | genericClassOfType(SimpleType) | ComplexType
65-
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(SimpleType) | SimpleType
66-
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(ComplexType) | ComplexType
67-
newRule(genericClassOfType(WildcardType), WildcardType) | ComplexType | ComplexType
68-
newRule(genericClassOfType(WildcardType), WildcardType) | Void | Void
69-
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(String) | String
70-
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | SimpleType
71-
mismatchedNestedGenericRule() | nestedGenericType(SimpleType) | nestedGenericType(nestedGenericType(SimpleType))
72-
newRule(genericClassOfType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | resolver.resolve(ResponseEntity, SimpleType)
73-
hateoasCollectionModelRule() | resources(SimpleTypeResource) | resolver.resolve(List, SimpleType)
60+
rule | source | expectedAlternate
61+
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
62+
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(ComplexType) | genericClassOfType(ComplexType)
63+
newRule(genericClassOfType(WildcardType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
64+
newRule(genericClassOfType(WildcardType), ComplexType) | genericClassOfType(SimpleType) | ComplexType
65+
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(SimpleType) | SimpleType
66+
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(ComplexType) | ComplexType
67+
newRule(genericClassOfType(WildcardType), WildcardType) | ComplexType | ComplexType
68+
newRule(genericClassOfType(WildcardType), WildcardType) | Void | Void
69+
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(String) | String
70+
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | SimpleType
71+
mismatchedNestedGenericRule() | nestedGenericType(SimpleType) | nestedGenericType(nestedGenericType(SimpleType))
72+
newRule(genericClassOfType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | resolver.resolve(ResponseEntity, SimpleType)
73+
hateoasCollectionModelRule() | resources(SimpleTypeEntityModel) | resolver.resolve(List, SimpleType)
7474
}
7575

7676
@Unroll
@@ -84,27 +84,26 @@ class AlternateTypeProviderSpec extends Specification {
8484
sut.alternateFor(resolvedSource) == resolver.resolve(expectedAlternate)
8585

8686
where:
87-
rule | source | expectedAlternate
88-
89-
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
90-
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(ComplexType) | genericClassOfType(ComplexType)
91-
newRule(genericClassOfType(WildcardType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
92-
newRule(genericClassOfType(WildcardType), ComplexType) | genericClassOfType(SimpleType) | ComplexType
93-
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(SimpleType) | SimpleType
94-
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(ComplexType) | ComplexType
95-
newRule(genericClassOfType(WildcardType), WildcardType) | ComplexType | ComplexType
96-
newRule(genericClassOfType(WildcardType), WildcardType) | Void | Void
97-
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(String) | String
98-
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | SimpleType
99-
mismatchedNestedGenericRule() | nestedGenericType(SimpleType) | nestedGenericType(nestedGenericType(SimpleType))
100-
newRule(genericClassOfType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | resolver.resolve(ResponseEntity, SimpleType)
101-
hateoasCollectionModelRule() | resources(SimpleTypeResource) | resolver.resolve(List, SimpleType)
87+
rule | source | expectedAlternate
88+
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
89+
newRule(genericClassOfType(SimpleType), SimpleType) | genericClassOfType(ComplexType) | genericClassOfType(ComplexType)
90+
newRule(genericClassOfType(WildcardType), SimpleType) | genericClassOfType(SimpleType) | SimpleType
91+
newRule(genericClassOfType(WildcardType), ComplexType) | genericClassOfType(SimpleType) | ComplexType
92+
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(SimpleType) | SimpleType
93+
newRule(genericClassOfType(WildcardType), WildcardType) | genericClassOfType(ComplexType) | ComplexType
94+
newRule(genericClassOfType(WildcardType), WildcardType) | ComplexType | ComplexType
95+
newRule(genericClassOfType(WildcardType), WildcardType) | Void | Void
96+
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(String) | String
97+
newRule(nestedGenericType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | SimpleType
98+
mismatchedNestedGenericRule() | nestedGenericType(SimpleType) | nestedGenericType(nestedGenericType(SimpleType))
99+
newRule(genericClassOfType(WildcardType), WildcardType) | nestedGenericType(SimpleType) | resolver.resolve(ResponseEntity, SimpleType)
100+
hateoasCollectionModelRule() | resources(SimpleTypeEntityModel) | resolver.resolve(List, SimpleType)
102101
}
103102

104103
AlternateTypeRule hateoasCollectionModelRule() {
105104
def typeResolver = new TypeResolver()
106105
newRule(
107-
typeResolver.resolve(CollectionModel.class, SimpleTypeResource.class),
106+
typeResolver.resolve(CollectionModel.class, SimpleTypeEntityModel.class),
108107
typeResolver.resolve(List.class, SimpleType.class))
109108
}
110109

‎springfox-schema/src/test/groovy/springfox/documentation/schema/GenericTypeSpec.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class GenericTypeSpec extends SchemaSpecification {
7878
genericCollectionWithEnum() | "List" | "List«string»" | "java.util.Collection<springfox.documentation.schema.ExampleEnum>"
7979
genericTypeWithPrimitiveArray() | "Array" | "Array«byte»" | "byte"
8080
genericTypeWithComplexArray() | "Array" | "Array«SimpleType»" | null
81-
genericEntityModel() | "List" | "SubclassOfResourceSupport" | null
81+
genericEntityModel() | "List" | "SubclassOfRepresentationModel" | null
8282
}
8383

8484
@Unroll

‎springfox-schema/src/test/groovy/springfox/documentation/schema/mixins/TypesForTestingSupport.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class TypesForTestingSupport {
211211
}
212212

213213
def ResolvedType genericEntityModel() {
214-
resolver.resolve(EntityModel, SubclassOfResourceSupport.class)
214+
resolver.resolve(EntityModel, SubclassOfRepresentationModel.class)
215215
}
216216

217217
static def nestedMaps() {

springfox-schema/src/test/java/springfox/documentation/schema/SimpleTypeResource.java renamed to springfox-schema/src/test/java/springfox/documentation/schema/SimpleTypeEntityModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.springframework.hateoas.Link;
2222
import org.springframework.hateoas.EntityModel;
2323

24-
public class SimpleTypeResource extends EntityModel<SimpleType> {
25-
public SimpleTypeResource(SimpleType content, Link... links) {
24+
public class SimpleTypeEntityModel extends EntityModel<SimpleType> {
25+
public SimpleTypeEntityModel(SimpleType content, Link... links) {
2626
super(content, links);
2727
}
2828
}

springfox-schema/src/test/java/springfox/documentation/schema/SubclassOfResourceSupport.java renamed to springfox-schema/src/test/java/springfox/documentation/schema/SubclassOfRepresentationModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020

2121
import org.springframework.hateoas.RepresentationModel;
2222

23-
public class SubclassOfResourceSupport extends RepresentationModel {
23+
public class SubclassOfRepresentationModel extends RepresentationModel {
2424
}

‎swagger-contract-tests-webflux/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.2.0.RELEASE'
3+
springBootVersion = '2.2.2.RELEASE'
44
}
55
repositories {
66
mavenCentral()

‎swagger-contract-tests/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
springBootVersion = '2.2.0.RELEASE'
3+
springBootVersion = '2.2.2.RELEASE'
44
}
55
repositories {
66
mavenCentral()

‎swagger-contract-tests/src/test/groovy/springfox/test/contract/swaggertests/FunctionContractSpec.groovy‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,24 @@ import org.skyscreamer.jsonassert.JSONAssert
2525
import org.springframework.beans.factory.annotation.Value
2626
import org.springframework.boot.test.context.SpringBootTest
2727
import org.springframework.boot.test.web.client.TestRestTemplate
28+
import org.springframework.boot.web.client.RestTemplateBuilder
2829
import org.springframework.context.annotation.Bean
2930
import org.springframework.context.annotation.ComponentScan
3031
import org.springframework.context.annotation.Configuration
3132
import org.springframework.context.annotation.Import
3233
import org.springframework.http.HttpStatus
3334
import org.springframework.http.MediaType
3435
import org.springframework.http.RequestEntity
36+
import org.springframework.http.converter.StringHttpMessageConverter
3537
import org.springframework.test.context.ContextConfiguration
36-
import spock.lang.Ignore
3738
import spock.lang.Shared
3839
import spock.lang.Specification
3940
import spock.lang.Unroll
4041
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration
4142
import springfox.documentation.schema.AlternateTypeRuleConvention
4243
import springfox.documentation.spring.web.plugins.JacksonSerializerConvention
4344

45+
import static java.nio.charset.StandardCharsets.UTF_8
4446
import static org.skyscreamer.jsonassert.JSONCompareMode.*
4547
import static org.springframework.boot.test.context.SpringBootTest.*
4648

@@ -49,7 +51,7 @@ import static org.springframework.boot.test.context.SpringBootTest.*
4951
class FunctionContractSpec extends Specification implements FileAccess {
5052

5153
@Shared
52-
def http = new TestRestTemplate()
54+
def http = new TestRestTemplate(new RestTemplateBuilder().additionalMessageConverters(new StringHttpMessageConverter(UTF_8)))
5355

5456
@Value('${local.server.port}')
5557
int port
@@ -100,7 +102,6 @@ class FunctionContractSpec extends Specification implements FileAccess {
100102

101103
def "should list swagger resources for swagger 2.0"() {
102104
given:
103-
def http = new TestRestTemplate()
104105
RequestEntity<Void> request = RequestEntity.get(new URI("http://localhost:$port/swagger-resources"))
105106
.accept(MediaType.APPLICATION_JSON)
106107
.build()
@@ -130,7 +131,6 @@ class FunctionContractSpec extends Specification implements FileAccess {
130131

131132
def 'should honor swagger resource listing'() {
132133
given:
133-
def http = new TestRestTemplate()
134134
RequestEntity<Void> request = RequestEntity.get(new URI("http://localhost:$port/api-docs"))
135135
.accept(MediaType.APPLICATION_JSON)
136136
.build()
@@ -148,7 +148,6 @@ class FunctionContractSpec extends Specification implements FileAccess {
148148
@Unroll
149149
def 'should honor api v1.2 contract [#contractFile] at endpoint [#declarationPath]'() {
150150
given:
151-
def http = new TestRestTemplate()
152151
RequestEntity<Void> request = RequestEntity.get(new URI("http://localhost:$port/api-docs${declarationPath}"))
153152
.accept(MediaType.APPLICATION_JSON)
154153
.build()
@@ -182,7 +181,6 @@ class FunctionContractSpec extends Specification implements FileAccess {
182181

183182
def "should list swagger resources for swagger 1.2"() {
184183
given:
185-
def http = new TestRestTemplate()
186184
RequestEntity<Void> request = RequestEntity.get(new URI("http://localhost:$port/swagger-resources"))
187185
.accept(MediaType.APPLICATION_JSON)
188186
.build()

0 commit comments

Comments
 (0)