Skip to content

Commit db3c2b3

Browse files
sdeleuzesdeleuze
committed
Remove HttpHeaders#asMultiValueMap usages from Kotlin tests
Closes gh-34327
1 parent 36cd069 commit db3c2b3

File tree

3 files changed

+18
-35
lines changed

3 files changed

+18
-35
lines changed

‎spring-web/src/test/kotlin/org/springframework/http/converter/cbor/KotlinSerializationCborHttpMessageConverterTests.kt

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -170,8 +170,7 @@ class KotlinSerializationCborHttpMessageConverterTests {
170170

171171
this.converter.write(serializableBean, null, outputMessage)
172172

173-
@Suppress("DEPRECATION")
174-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/cbor"))
173+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/cbor")).isTrue()
175174
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
176175
}
177176

@@ -182,8 +181,7 @@ class KotlinSerializationCborHttpMessageConverterTests {
182181

183182
this.converter.write(serializableBean, null, outputMessage)
184183

185-
@Suppress("DEPRECATION")
186-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/cbor"))
184+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/cbor")).isTrue()
187185
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
188186
}
189187

@@ -193,8 +191,7 @@ class KotlinSerializationCborHttpMessageConverterTests {
193191

194192
this.converter.write(serializableBeanArray, null, outputMessage)
195193

196-
@Suppress("DEPRECATION")
197-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/cbor"))
194+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/cbor")).isTrue()
198195
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
199196
}
200197

@@ -205,8 +202,7 @@ class KotlinSerializationCborHttpMessageConverterTests {
205202

206203
this.converter.write(listOf(serializableBean), ResolvableType.forType(typeOf<List<SerializableBean>>().javaType), null, outputMessage, null)
207204

208-
@Suppress("DEPRECATION")
209-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/cbor"))
205+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/cbor")).isTrue()
210206
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
211207
}
212208

‎spring-web/src/test/kotlin/org/springframework/http/converter/json/KotlinSerializationJsonHttpMessageConverterTests.kt

+8-16
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
255255

256256
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
257257

258-
@Suppress("DEPRECATION")
259-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
258+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
260259
assertThat(result)
261260
.contains("\"bytes\":[1,2]")
262261
.contains("\"array\":[\"Foo\",\"Bar\"]")
@@ -275,8 +274,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
275274

276275
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
277276

278-
@Suppress("DEPRECATION")
279-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
277+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
280278
assertThat(result)
281279
.contains("\"bytes\":[1,2]")
282280
.contains("\"array\":[\"Foo\",\"Bar\"]")
@@ -298,8 +296,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
298296

299297
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
300298

301-
@Suppress("DEPRECATION")
302-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
299+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
303300
assertThat(result).isEqualTo(expectedJson)
304301
}
305302

@@ -317,8 +314,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
317314

318315
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
319316

320-
@Suppress("DEPRECATION")
321-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
317+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
322318
assertThat(result).isEqualTo(expectedJson)
323319
}
324320

@@ -332,8 +328,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
332328

333329
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_16BE)
334330

335-
@Suppress("DEPRECATION")
336-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf(contentType.toString()))
331+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", contentType.toString())).isTrue()
337332
assertThat(result).isEqualTo("\"H\u00e9llo W\u00f6rld\"")
338333
}
339334

@@ -369,8 +364,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
369364

370365
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
371366

372-
@Suppress("DEPRECATION")
373-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
367+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
374368
assertThat(result).isEqualTo("1.0")
375369
}
376370

@@ -387,8 +381,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
387381

388382
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
389383

390-
@Suppress("DEPRECATION")
391-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
384+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
392385
assertThat(result).isEqualTo(expectedJson)
393386
}
394387

@@ -401,8 +394,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
401394
this.converter.write(value, ResolvableType.forMethodParameter(methodParameter), null, outputMessage, null)
402395
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
403396

404-
@Suppress("DEPRECATION")
405-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/json"))
397+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/json")).isTrue()
406398
assertThat(result).isEqualTo("42")
407399
}
408400

‎spring-web/src/test/kotlin/org/springframework/http/converter/protobuf/KotlinSerializationProtobufHttpMessageConverterTests.kt

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -186,8 +186,7 @@ class KotlinSerializationProtobufHttpMessageConverterTests {
186186

187187
this.converter.write(serializableBean, null, outputMessage)
188188

189-
@Suppress("DEPRECATION")
190-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/x-protobuf"))
189+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/x-protobuf")).isTrue()
191190
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
192191
}
193192

@@ -197,9 +196,7 @@ class KotlinSerializationProtobufHttpMessageConverterTests {
197196
val serializableBean = SerializableBean(byteArrayOf(0x1, 0x2), arrayOf("Foo", "Bar"), 42, null, true, 42.0f)
198197

199198
this.converter.write(serializableBean, null, outputMessage)
200-
201-
@Suppress("DEPRECATION")
202-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/x-protobuf"))
199+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/x-protobuf")).isTrue()
203200
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
204201
}
205202

@@ -209,8 +206,7 @@ class KotlinSerializationProtobufHttpMessageConverterTests {
209206

210207
this.converter.write(serializableBeanArray, null, outputMessage)
211208

212-
@Suppress("DEPRECATION")
213-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/x-protobuf"))
209+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/x-protobuf")).isTrue()
214210
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
215211
}
216212

@@ -221,8 +217,7 @@ class KotlinSerializationProtobufHttpMessageConverterTests {
221217

222218
this.converter.write(listOf(serializableBean), ResolvableType.forType(typeOf<List<SerializableBean>>().javaType), null, outputMessage, null)
223219

224-
@Suppress("DEPRECATION")
225-
assertThat(outputMessage.headers.asMultiValueMap()).containsEntry("Content-Type", listOf("application/x-protobuf"))
220+
assertThat(outputMessage.headers.containsHeaderValue("Content-Type", "application/x-protobuf")).isTrue()
226221
assertThat(outputMessage.bodyAsBytes.isNotEmpty()).isTrue()
227222
}
228223

0 commit comments

Comments
 (0)