mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.7.x'
This commit is contained in:
commit
37ccc52b8a
@ -18,9 +18,9 @@ package org.springframework.boot.docs.data.nosql.couchbase.repositories
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
|
@ -22,12 +22,12 @@ import org.springframework.amqp.support.converter.MessageConverter
|
||||
|
||||
internal class MyMessageConverter : MessageConverter {
|
||||
|
||||
override fun toMessage(`object`: Any, messageProperties: MessageProperties): Message? {
|
||||
return null
|
||||
override fun toMessage(`object`: Any, messageProperties: MessageProperties): Message {
|
||||
return Message(byteArrayOf())
|
||||
}
|
||||
|
||||
override fun fromMessage(message: Message): Any? {
|
||||
return null
|
||||
override fun fromMessage(message: Message): Any {
|
||||
return Any()
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -22,12 +22,12 @@ import org.springframework.jms.support.converter.MessageConverter
|
||||
|
||||
internal class MyMessageConverter : MessageConverter {
|
||||
|
||||
override fun toMessage(`object`: Any, session: Session): Message? {
|
||||
return null
|
||||
override fun toMessage(`object`: Any, session: Session): Message {
|
||||
return session.createObjectMessage()
|
||||
}
|
||||
|
||||
override fun fromMessage(message: Message): Any? {
|
||||
return null
|
||||
override fun fromMessage(message: Message): Any {
|
||||
return Any()
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -23,19 +23,19 @@ import org.springframework.http.converter.HttpMessageNotReadableException
|
||||
import org.springframework.http.converter.HttpMessageNotWritableException
|
||||
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
|
||||
}
|
||||
|
||||
@Throws(IOException::class, HttpMessageNotReadableException::class)
|
||||
override fun readInternal(clazz: Class<*>?, inputMessage: HttpInputMessage): Any? {
|
||||
return null
|
||||
override fun readInternal(clazz: Class<*>, inputMessage: HttpInputMessage): Any {
|
||||
return Any()
|
||||
}
|
||||
|
||||
@Throws(IOException::class, HttpMessageNotWritableException::class)
|
||||
override fun writeInternal(t: Any?, outputMessage: HttpOutputMessage) {
|
||||
override fun writeInternal(t: Any, outputMessage: HttpOutputMessage) {
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user