Polish Kotlin nullable support
This commit polishes Kotlin nullable support by reusing MethodParameter#isOptional() instead of adding a new MethodParameter#isNullable() method, adds Kotlin tests and introduces Spring Web Reactive support. Issue: SPR-14165
This commit is contained in:
Sebastien Deleuze
@@ -98,7 +98,7 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
|
||||
if (namedValueInfo.defaultValue != null) {
|
||||
arg = resolveStringValue(namedValueInfo.defaultValue);
|
||||
}
|
||||
else if (namedValueInfo.required && !nestedParameter.isOptional() && !nestedParameter.isNullable()) {
|
||||
else if (namedValueInfo.required && !nestedParameter.isOptional()) {
|
||||
handleMissingValue(namedValueInfo.name, nestedParameter, message);
|
||||
}
|
||||
arg = handleNullValue(namedValueInfo.name, arg, nestedParameter.getNestedParameterType());
|
||||
|
||||
@@ -0,0 +1,197 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.messaging.simp.annotation.support
|
||||
|
||||
import java.util.Collections
|
||||
import java.util.HashMap
|
||||
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.mockito.Mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
|
||||
import org.springframework.context.support.StaticApplicationContext
|
||||
import org.springframework.messaging.Message
|
||||
import org.springframework.messaging.MessageChannel
|
||||
import org.springframework.messaging.SubscribableChannel
|
||||
import org.springframework.messaging.converter.MessageConverter
|
||||
import org.springframework.messaging.handler.annotation.Header
|
||||
import org.springframework.messaging.handler.annotation.MessageMapping
|
||||
import org.springframework.messaging.simp.SimpMessageHeaderAccessor
|
||||
import org.springframework.messaging.simp.SimpMessageSendingOperations
|
||||
import org.springframework.messaging.simp.SimpMessagingTemplate
|
||||
import org.springframework.messaging.support.MessageBuilder
|
||||
import org.springframework.stereotype.Controller
|
||||
|
||||
import org.junit.Assert.*
|
||||
import org.springframework.messaging.MessageHandlingException
|
||||
import org.springframework.messaging.handler.annotation.MessageExceptionHandler
|
||||
|
||||
/**
|
||||
* Kotlin test fixture for [SimpAnnotationMethodMessageHandler].
|
||||
*
|
||||
* @author Sebastien Deleuze
|
||||
*/
|
||||
class SimpAnnotationMethodMessageHandlerKotlinTests {
|
||||
|
||||
|
||||
lateinit var messageHandler: TestSimpAnnotationMethodMessageHandler
|
||||
|
||||
lateinit var testController: TestController
|
||||
|
||||
@Mock
|
||||
lateinit var channel: SubscribableChannel
|
||||
|
||||
@Mock
|
||||
lateinit var converter: MessageConverter
|
||||
|
||||
@Before
|
||||
fun setup() {
|
||||
MockitoAnnotations.initMocks(this)
|
||||
val brokerTemplate = SimpMessagingTemplate(channel)
|
||||
brokerTemplate.messageConverter = converter
|
||||
messageHandler = TestSimpAnnotationMethodMessageHandler(brokerTemplate, channel, channel)
|
||||
messageHandler.applicationContext = StaticApplicationContext()
|
||||
messageHandler.afterPropertiesSet()
|
||||
testController = TestController()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nullableHeaderWithHeader() {
|
||||
val message = createMessage("/nullableHeader", Collections.singletonMap("foo", "bar"))
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertNull(testController.exception)
|
||||
assertEquals("bar", testController.header)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nullableHeaderWithoutHeader() {
|
||||
val message = createMessage("/nullableHeader", Collections.emptyMap())
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertNull(testController.exception)
|
||||
assertNull(testController.header)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nonNullableHeaderWithHeader() {
|
||||
val message = createMessage("/nonNullableHeader", Collections.singletonMap("foo", "bar"))
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertEquals("bar", testController.header)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nonNullableHeaderWithoutHeader() {
|
||||
val message = createMessage("/nonNullableHeader", Collections.emptyMap())
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertNotNull(testController.exception)
|
||||
assertTrue(testController.exception is MessageHandlingException)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nullableHeaderNotRequiredWithHeader() {
|
||||
val message = createMessage("/nullableHeaderNotRequired", Collections.singletonMap("foo", "bar"))
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertNull(testController.exception)
|
||||
assertEquals("bar", testController.header)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nullableHeaderNotRequiredWithoutHeader() {
|
||||
val message = createMessage("/nullableHeaderNotRequired", Collections.emptyMap())
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertNull(testController.exception)
|
||||
assertNull(testController.header)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nonNullableHeaderNotRequiredWithHeader() {
|
||||
val message = createMessage("/nonNullableHeaderNotRequired", Collections.singletonMap("foo", "bar"))
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertEquals("bar", testController.header)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun nonNullableHeaderNotRequiredWithoutHeader() {
|
||||
val message = createMessage("/nonNullableHeaderNotRequired", Collections.emptyMap())
|
||||
messageHandler.registerHandler(testController)
|
||||
messageHandler.handleMessage(message)
|
||||
assertNotNull(testController.exception)
|
||||
assertTrue(testController.exception is IllegalArgumentException)
|
||||
}
|
||||
|
||||
private fun createMessage(destination: String, headers: Map<String, String?>): Message<ByteArray> {
|
||||
val accessor = SimpMessageHeaderAccessor.create()
|
||||
accessor.sessionId = "session1"
|
||||
accessor.sessionAttributes = HashMap()
|
||||
accessor.destination = destination
|
||||
for (entry in headers.entries) accessor.setHeader(entry.key, entry.value)
|
||||
|
||||
return MessageBuilder.withPayload(ByteArray(0)).setHeaders(accessor).build()
|
||||
}
|
||||
|
||||
class TestSimpAnnotationMethodMessageHandler(brokerTemplate: SimpMessageSendingOperations,
|
||||
clientInboundChannel: SubscribableChannel,
|
||||
clientOutboundChannel: MessageChannel) :
|
||||
SimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerTemplate) {
|
||||
|
||||
fun registerHandler(handler: Any?) {
|
||||
super.detectHandlerMethods(handler)
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("unused")
|
||||
@Controller
|
||||
@MessageMapping
|
||||
class TestController {
|
||||
|
||||
var header: String? = null
|
||||
var exception: Throwable? = null
|
||||
|
||||
@MessageMapping("/nullableHeader")
|
||||
fun nullableHeader(@Header("foo") foo: String?) {
|
||||
header = foo
|
||||
}
|
||||
|
||||
@MessageMapping("/nonNullableHeader")
|
||||
fun nonNullableHeader(@Header("foo") foo: String) {
|
||||
header = foo
|
||||
}
|
||||
|
||||
@MessageMapping("/nullableHeaderNotRequired")
|
||||
fun nullableHeaderNotRequired(@Header("foo", required = false) foo: String?) {
|
||||
header = foo
|
||||
}
|
||||
|
||||
@MessageMapping("/nonNullableHeaderNotRequired")
|
||||
fun nonNullableHeaderNotRequired(@Header("foo", required = false) foo: String) {
|
||||
header = foo
|
||||
}
|
||||
|
||||
@MessageExceptionHandler
|
||||
fun handleIllegalArgumentException(exception: Throwable) {
|
||||
this.exception = exception
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user