Merge branch '2.7.x'

This commit is contained in:
Stephane Nicoll 2022-03-08 12:34:30 +01:00
commit 37ccc52b8a
4 changed files with 15 additions and 15 deletions

View File

@ -18,9 +18,9 @@ package org.springframework.boot.docs.data.nosql.couchbase.repositories
import org.springframework.core.convert.converter.Converter import org.springframework.core.convert.converter.Converter
internal class MyConverter : Converter<CouchbaseProperties?, Boolean> { internal class MyConverter : Converter<CouchbaseProperties, Boolean> {
override fun convert(value: CouchbaseProperties?): Boolean { override fun convert(value: CouchbaseProperties): Boolean {
return true return true
} }

View File

@ -22,12 +22,12 @@ import org.springframework.amqp.support.converter.MessageConverter
internal class MyMessageConverter : MessageConverter { internal class MyMessageConverter : MessageConverter {
override fun toMessage(`object`: Any, messageProperties: MessageProperties): Message? { override fun toMessage(`object`: Any, messageProperties: MessageProperties): Message {
return null return Message(byteArrayOf())
} }
override fun fromMessage(message: Message): Any? { override fun fromMessage(message: Message): Any {
return null return Any()
} }
} }

View File

@ -22,12 +22,12 @@ import org.springframework.jms.support.converter.MessageConverter
internal class MyMessageConverter : MessageConverter { internal class MyMessageConverter : MessageConverter {
override fun toMessage(`object`: Any, session: Session): Message? { override fun toMessage(`object`: Any, session: Session): Message {
return null return session.createObjectMessage()
} }
override fun fromMessage(message: Message): Any? { override fun fromMessage(message: Message): Any {
return null return Any()
} }
} }

View File

@ -23,19 +23,19 @@ import org.springframework.http.converter.HttpMessageNotReadableException
import org.springframework.http.converter.HttpMessageNotWritableException import org.springframework.http.converter.HttpMessageNotWritableException
import java.io.IOException import java.io.IOException
open class AdditionalHttpMessageConverter : AbstractHttpMessageConverter<Any?>() { open class AdditionalHttpMessageConverter : AbstractHttpMessageConverter<Any>() {
override fun supports(clazz: Class<*>?): Boolean { override fun supports(clazz: Class<*>): Boolean {
return false return false
} }
@Throws(IOException::class, HttpMessageNotReadableException::class) @Throws(IOException::class, HttpMessageNotReadableException::class)
override fun readInternal(clazz: Class<*>?, inputMessage: HttpInputMessage): Any? { override fun readInternal(clazz: Class<*>, inputMessage: HttpInputMessage): Any {
return null return Any()
} }
@Throws(IOException::class, HttpMessageNotWritableException::class) @Throws(IOException::class, HttpMessageNotWritableException::class)
override fun writeInternal(t: Any?, outputMessage: HttpOutputMessage) { override fun writeInternal(t: Any, outputMessage: HttpOutputMessage) {
} }
} }