From 55e33badadceed12b8e127afe4a0a16234a6b757 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 28 May 2020 14:37:18 +0200 Subject: [PATCH] Polish contribution See gh-25149 --- .../codec/support/BaseCodecConfigurer.java | 2 +- .../codec/support/CodecConfigurerTests.java | 62 ++++++++++--------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/BaseCodecConfigurer.java b/spring-web/src/main/java/org/springframework/http/codec/support/BaseCodecConfigurer.java index 327e818e17f2..017a96a3564a 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/support/BaseCodecConfigurer.java +++ b/spring-web/src/main/java/org/springframework/http/codec/support/BaseCodecConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. diff --git a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java index f044185e2f25..a25690155ca3 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java @@ -67,7 +67,7 @@ * @author Rossen Stoyanchev * @author Sebastien Deleuze */ -public class CodecConfigurerTests { +class CodecConfigurerTests { private final CodecConfigurer configurer = new TestCodecConfigurer(); @@ -75,7 +75,7 @@ public class CodecConfigurerTests { @Test - public void defaultReaders() { + void defaultReaders() { List> readers = this.configurer.getReaders(); assertThat(readers.size()).isEqualTo(11); assertThat(getNextDecoder(readers).getClass()).isEqualTo(ByteArrayDecoder.class); @@ -92,7 +92,7 @@ public void defaultReaders() { } @Test - public void defaultWriters() { + void defaultWriters() { List> writers = this.configurer.getWriters(); assertThat(writers.size()).isEqualTo(10); assertThat(getNextEncoder(writers).getClass()).isEqualTo(ByteArrayEncoder.class); @@ -108,7 +108,7 @@ public void defaultWriters() { } @Test - public void defaultAndCustomReaders() { + void defaultAndCustomReaders() { Decoder customDecoder1 = mock(Decoder.class); Decoder customDecoder2 = mock(Decoder.class); @@ -148,7 +148,7 @@ public void defaultAndCustomReaders() { } @Test - public void defaultAndCustomWriters() { + void defaultAndCustomWriters() { Encoder customEncoder1 = mock(Encoder.class); Encoder customEncoder2 = mock(Encoder.class); @@ -187,7 +187,7 @@ public void defaultAndCustomWriters() { } @Test - public void defaultsOffCustomReaders() { + void defaultsOffCustomReaders() { Decoder customDecoder1 = mock(Decoder.class); Decoder customDecoder2 = mock(Decoder.class); @@ -218,7 +218,7 @@ public void defaultsOffCustomReaders() { } @Test - public void defaultsOffWithCustomWriters() { + void defaultsOffWithCustomWriters() { Encoder customEncoder1 = mock(Encoder.class); Encoder customEncoder2 = mock(Encoder.class); @@ -249,7 +249,7 @@ public void defaultsOffWithCustomWriters() { } @Test - public void encoderDecoderOverrides() { + void encoderDecoderOverrides() { Jackson2JsonDecoder jacksonDecoder = new Jackson2JsonDecoder(); Jackson2JsonEncoder jacksonEncoder = new Jackson2JsonEncoder(); Jackson2SmileDecoder smileDecoder = new Jackson2SmileDecoder(); @@ -279,39 +279,45 @@ public void encoderDecoderOverrides() { } @Test - public void cloneEmptyCustomCodecs() { + void cloneEmptyCustomCodecs() { this.configurer.registerDefaults(false); - CodecConfigurer clone = this.configurer.clone(); + assertThat(this.configurer.getReaders()).isEmpty(); + assertThat(this.configurer.getWriters()).isEmpty(); + CodecConfigurer clone = this.configurer.clone(); clone.customCodecs().register(new Jackson2JsonEncoder()); clone.customCodecs().register(new Jackson2JsonDecoder()); clone.customCodecs().register(new ServerSentEventHttpMessageReader()); clone.customCodecs().register(new ServerSentEventHttpMessageWriter()); - assertThat(this.configurer.getReaders().size()).isEqualTo(0); - assertThat(this.configurer.getWriters().size()).isEqualTo(0); - assertThat(clone.getReaders().size()).isEqualTo(2); - assertThat(clone.getWriters().size()).isEqualTo(2); + assertThat(this.configurer.getReaders()).isEmpty(); + assertThat(this.configurer.getWriters()).isEmpty(); + assertThat(clone.getReaders()).hasSize(2); + assertThat(clone.getWriters()).hasSize(2); } @Test - public void cloneCustomCodecs() { - CodecConfigurer from = new TestCodecConfigurer(); - from.registerDefaults(false); - from.customCodecs().register(new Jackson2JsonEncoder()); - from.customCodecs().register(new Jackson2JsonDecoder()); - from.customCodecs().register(new ServerSentEventHttpMessageReader()); - from.customCodecs().register(new ServerSentEventHttpMessageWriter()); - - CodecConfigurer clone = from.clone(); - assertThat(from.getReaders().size()).isEqualTo(2); - assertThat(from.getWriters().size()).isEqualTo(2); - assertThat(clone.getReaders().size()).isEqualTo(2); - assertThat(clone.getWriters().size()).isEqualTo(2); + void cloneCustomCodecs() { + this.configurer.registerDefaults(false); + assertThat(this.configurer.getReaders()).isEmpty(); + assertThat(this.configurer.getWriters()).isEmpty(); + + this.configurer.customCodecs().register(new Jackson2JsonEncoder()); + this.configurer.customCodecs().register(new Jackson2JsonDecoder()); + this.configurer.customCodecs().register(new ServerSentEventHttpMessageReader()); + this.configurer.customCodecs().register(new ServerSentEventHttpMessageWriter()); + assertThat(this.configurer.getReaders()).hasSize(2); + assertThat(this.configurer.getWriters()).hasSize(2); + + CodecConfigurer clone = this.configurer.clone(); + assertThat(this.configurer.getReaders()).hasSize(2); + assertThat(this.configurer.getWriters()).hasSize(2); + assertThat(clone.getReaders()).hasSize(2); + assertThat(clone.getWriters()).hasSize(2); } @Test - public void cloneDefaultCodecs() { + void cloneDefaultCodecs() { CodecConfigurer clone = this.configurer.clone(); Jackson2JsonDecoder jacksonDecoder = new Jackson2JsonDecoder();