root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Clean up warnings and revise for consistency

This commit is contained in:
Sam Brannen 2025-06-29 16:47:53 +02:00
parent bb7c497bdd
commit 5513139ef5
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
spring-web/src/test/java/org/springframework/http/converter/DefaultHttpMessageConvertersTests.java
View File

@ -16,7 +16,6 @@
package org.springframework.http.converter; package org.springframework.http.converter;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
@ -29,7 +28,6 @@ import java.util.stream.StreamSupport;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.core.SmartClassLoader; import org.springframework.core.SmartClassLoader;
@ -54,17 +52,16 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
@SuppressWarnings("removal") @SuppressWarnings("removal")
class DefaultHttpMessageConvertersTests { class DefaultHttpMessageConvertersTests {
@ParameterizedTest @ParameterizedTest
@MethodSource("emptyMessageConverters") @MethodSource("emptyMessageConverters")
void emptyConverters(Iterable<HttpMessageConverter<?>> converters) { void emptyConverters(Iterable<HttpMessageConverter<?>> converters) {
assertThat(converters).isEmpty(); assertThat(converters).isEmpty();
} }
static Stream<Arguments> emptyMessageConverters() { static Stream<Iterable<HttpMessageConverter<?>>> emptyMessageConverters() {
return Stream.of( return Stream.of(
Arguments.of(HttpMessageConverters.create().build().forClient()), HttpMessageConverters.create().build().forClient(),
Arguments.of(HttpMessageConverters.create().build().forServer()) HttpMessageConverters.create().build().forServer()
); );
} }
@ -79,46 +76,47 @@ class DefaultHttpMessageConvertersTests {
@Test @Test
void failsWhenStringConverterDoesNotSupportMediaType() { void failsWhenStringConverterDoesNotSupportMediaType() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
HttpMessageConverters.create().stringMessageConverter(new CustomHttpMessageConverter()).build()) .isThrownBy(() -> HttpMessageConverters.create().stringMessageConverter(new CustomHttpMessageConverter()).build())
.withMessage("stringMessageConverter should support 'text/plain'"); .withMessage("stringMessageConverter should support 'text/plain'");
} }
@Test @Test
void failsWhenJsonConverterDoesNotSupportMediaType() { void failsWhenJsonConverterDoesNotSupportMediaType() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
HttpMessageConverters.create().jsonMessageConverter(new CustomHttpMessageConverter()).build()) .isThrownBy(() -> HttpMessageConverters.create().jsonMessageConverter(new CustomHttpMessageConverter()).build())
.withMessage("jsonMessageConverter should support 'application/json'"); .withMessage("jsonMessageConverter should support 'application/json'");
} }
@Test @Test
void failsWhenXmlConverterDoesNotSupportMediaType() { void failsWhenXmlConverterDoesNotSupportMediaType() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
HttpMessageConverters.create().xmlMessageConverter(new CustomHttpMessageConverter()).build()) .isThrownBy(() -> HttpMessageConverters.create().xmlMessageConverter(new CustomHttpMessageConverter()).build())
.withMessage("xmlMessageConverter should support 'text/xml'"); .withMessage("xmlMessageConverter should support 'text/xml'");
} }
@Test @Test
void failsWhenSmileConverterDoesNotSupportMediaType() { void failsWhenSmileConverterDoesNotSupportMediaType() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
HttpMessageConverters.create().smileMessageConverter(new CustomHttpMessageConverter()).build()) .isThrownBy(() -> HttpMessageConverters.create().smileMessageConverter(new CustomHttpMessageConverter()).build())
.withMessage("smileMessageConverter should support 'application/x-jackson-smile'"); .withMessage("smileMessageConverter should support 'application/x-jackson-smile'");
} }
@Test @Test
void failsWhenCborConverterDoesNotSupportMediaType() { void failsWhenCborConverterDoesNotSupportMediaType() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
HttpMessageConverters.create().cborMessageConverter(new CustomHttpMessageConverter()).build()) .isThrownBy(() -> HttpMessageConverters.create().cborMessageConverter(new CustomHttpMessageConverter()).build())
.withMessage("cborMessageConverter should support 'application/cbor'"); .withMessage("cborMessageConverter should support 'application/cbor'");
} }
@Test @Test
void failsWhenYamlConverterDoesNotSupportMediaType() { void failsWhenYamlConverterDoesNotSupportMediaType() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException()
HttpMessageConverters.create().yamlMessageConverter(new CustomHttpMessageConverter()).build()) .isThrownBy(() -> HttpMessageConverters.create().yamlMessageConverter(new CustomHttpMessageConverter()).build())
.withMessage("yamlMessageConverter should support 'application/yaml'"); .withMessage("yamlMessageConverter should support 'application/yaml'");
} }
@Nested @Nested
class ClientConvertersTests { class ClientConvertersTests {
@ -134,7 +132,6 @@ class DefaultHttpMessageConvertersTests {
AtomFeedHttpMessageConverter.class, RssChannelHttpMessageConverter.class); AtomFeedHttpMessageConverter.class, RssChannelHttpMessageConverter.class);
} }
@Test @Test
void multipartConverterContainsOtherConverters() { void multipartConverterContainsOtherConverters() {
var converters = HttpMessageConverters.withDefaults().build(); var converters = HttpMessageConverters.withDefaults().build();
@ -177,7 +174,7 @@ class DefaultHttpMessageConvertersTests {
@Test @Test
void shouldConfigureConverter() { void shouldConfigureConverter() {
CustomHttpMessageConverter customConverter = new CustomHttpMessageConverter(); CustomHttpMessageConverter customConverter = new CustomHttpMessageConverter();
var converters = HttpMessageConverters.withDefaults() HttpMessageConverters.withDefaults()
.additionalMessageConverter(customConverter) .additionalMessageConverter(customConverter)
.configureClient(configurer -> { .configureClient(configurer -> {
configurer.configureClientMessageConverters(converter -> { configurer.configureClientMessageConverters(converter -> {
@ -192,6 +189,7 @@ class DefaultHttpMessageConvertersTests {
} }
@Nested @Nested
class ServerConvertersTests { class ServerConvertersTests {
@ -250,7 +248,7 @@ class DefaultHttpMessageConvertersTests {
@Test @Test
void shouldConfigureConverter() { void shouldConfigureConverter() {
CustomHttpMessageConverter customConverter = new CustomHttpMessageConverter(); CustomHttpMessageConverter customConverter = new CustomHttpMessageConverter();
var converters = HttpMessageConverters.withDefaults() HttpMessageConverters.withDefaults()
.additionalMessageConverter(customConverter) .additionalMessageConverter(customConverter)
.configureServer(configurer -> { .configureServer(configurer -> {
configurer.configureServerMessageConverters(converter -> { configurer.configureServerMessageConverters(converter -> {