Merge branch '6.0.x'

spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt

@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test
  *
  * @author Sebastien Deleuze
  */
-class KotlinResponseEntityTests {
+class ResponseEntityKotlinTests {
 
 	@Test
 	fun ofNullable() {

spring-web/src/test/kotlin/org/springframework/http/codec/cbor/KotlinSerializationCborEncoderTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -40,7 +40,6 @@ import org.springframework.http.codec.ServerSentEvent
  * @author Sebastien Deleuze
  * @author Iain Henderson
  */
-@Suppress("UsePropertyAccessSyntax")
 @ExperimentalSerializationApi
 class KotlinSerializationCborEncoderTests : AbstractEncoderTests<KotlinSerializationCborEncoder>(KotlinSerializationCborEncoder()) {
 

spring-web/src/test/kotlin/org/springframework/http/codec/protobuf/KotlinSerializationProtobufDecoderTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -39,8 +39,8 @@ import reactor.test.StepVerifier.FirstStep
  * @author Iain Henderson
  */
 @ExperimentalSerializationApi
-class KotlinSerializationCborDecoderTests : AbstractDecoderTests<KotlinSerializationProtobufDecoder>(KotlinSerializationProtobufDecoder()) {
-	@Suppress("UsePropertyAccessSyntax")
+class KotlinSerializationProtobufDecoderTests : AbstractDecoderTests<KotlinSerializationProtobufDecoder>(KotlinSerializationProtobufDecoder()) {
+
 	@Test
 	override fun canDecode() {
 		for (mimeType in listOf(MediaType.APPLICATION_PROTOBUF, MediaType.APPLICATION_OCTET_STREAM, MediaType("application", "vnd.google.protobuf"))) {

spring-web/src/test/kotlin/org/springframework/web/service/invoker/HttpServiceMethodKotlinTests.kt

@@ -31,7 +31,7 @@ import org.springframework.web.service.annotation.GetExchange
  *
  * @author Sebastien Deleuze
  */
-class KotlinHttpServiceMethodTests {
+class HttpServiceMethodKotlinTests {
 
 	private val client = TestHttpClientAdapter()
 	private val proxyFactory = HttpServiceProxyFactory.builder(client).build()