Skip to content

Commit 8b6372a

Browse files
committed
Updated spring-webmvc to 5.3.3
1 parent 93a6378 commit 8b6372a

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The aim of this project is to meet this need and offer a mechanism to check spec
1717
+ [RAML 1.X](raml/README.md)
1818
+ [WADL](wadl/README.md)
1919
+ **Implementations**
20-
+ [Spring MVC 5.2.X](spring/README.md)
20+
+ [Spring MVC 5.3.X](spring/README.md)
2121
+ [Micronaut](micronaut/README.md)
2222
+ [JAX-RS 3.0.X](jax-rs/README.md)
2323
+ [Apache CXF](http://cxf.apache.org)

spring/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hikaku - Spring
22

3-
Supports Spring MVC 5.2.X.
3+
Supports Spring MVC 5.3.X.
44

55
## Feature Support
66

@@ -152,4 +152,4 @@ You will find a list of spring specific features that are supported below.
152152
+ _Example:_ `@RequestParam(produces = "!text/plain")`
153153

154154
+ Consumes using negated media type
155-
+ _Example:_ `@RequestParam(produces = "!text/plain")`
155+
+ _Example:_ `@RequestParam(produces = "!text/plain")`

spring/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group = 'de.codecentric.hikaku'
88
archivesBaseName = 'hikaku-spring'
99

1010
dependencies {
11-
api 'org.springframework:spring-webmvc:5.2.8.RELEASE'
11+
api 'org.springframework:spring-webmvc:5.3.3'
1212
api project(':core')
1313

1414
testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"

spring/src/main/kotlin/de/codecentric/hikaku/converters/spring/extensions/PathsSpringExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ package de.codecentric.hikaku.converters.spring.extensions
33
import org.springframework.web.servlet.mvc.method.RequestMappingInfo
44

55
internal fun RequestMappingInfo.paths(): Set<String> {
6-
return this.patternsCondition.patterns
7-
}
6+
return this.patternsCondition?.patterns ?: emptySet()
7+
}

spring/src/main/kotlin/de/codecentric/hikaku/converters/spring/extensions/ProducesSpringExtension.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ import java.lang.reflect.Method
1313
import kotlin.reflect.full.findAnnotation
1414
import kotlin.reflect.full.instanceParameter
1515
import kotlin.reflect.jvm.jvmErasure
16-
import kotlin.reflect.jvm.jvmName
1716
import kotlin.reflect.jvm.kotlinFunction
1817

1918
internal fun Map.Entry<RequestMappingInfo, HandlerMethod>.produces(): Set<String> {
20-
val isNotErrorPath = !this.key.patternsCondition.patterns.contains("/error")
19+
val isNotErrorPath = this.key.patternsCondition?.patterns?.contains("/error") == false
2120
val hasNoResponseBodyAnnotation = !this.value.providesResponseBodyAnnotation()
2221
val hasNoRestControllerAnnotation = !this.value.providesRestControllerAnnotation()
2322
val hasHttpServletResponseParam = this.value.hasHttpServletResponseParam()

0 commit comments

Comments
 (0)