From 08b37773932e85aec1b4f67502a6774d44df7a4c 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 | 30 +++++++++++-------- 2 files changed, 19 insertions(+), 13 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 8bb19d712a8a..c82e9ed9064b 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-2018 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 6af10a00a7c8..950f3929958f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 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. @@ -275,8 +275,10 @@ public void encoderDecoderOverrides() { @Test public void cloneEmptyCustomCodecs() { this.configurer.registerDefaults(false); - CodecConfigurer clone = this.configurer.clone(); + assertEquals(0, this.configurer.getReaders().size()); + assertEquals(0, this.configurer.getWriters().size()); + CodecConfigurer clone = this.configurer.clone(); clone.customCodecs().register(new Jackson2JsonEncoder()); clone.customCodecs().register(new Jackson2JsonDecoder()); clone.customCodecs().register(new ServerSentEventHttpMessageReader()); @@ -290,16 +292,20 @@ public void cloneEmptyCustomCodecs() { @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(); - assertEquals(2, from.getReaders().size()); - assertEquals(2, from.getWriters().size()); + this.configurer.registerDefaults(false); + assertEquals(0, this.configurer.getReaders().size()); + assertEquals(0, this.configurer.getWriters().size()); + + this.configurer.customCodecs().register(new Jackson2JsonEncoder()); + this.configurer.customCodecs().register(new Jackson2JsonDecoder()); + this.configurer.customCodecs().register(new ServerSentEventHttpMessageReader()); + this.configurer.customCodecs().register(new ServerSentEventHttpMessageWriter()); + assertEquals(2, this.configurer.getReaders().size()); + assertEquals(2, this.configurer.getWriters().size()); + + CodecConfigurer clone = this.configurer.clone(); + assertEquals(2, this.configurer.getReaders().size()); + assertEquals(2, this.configurer.getWriters().size()); assertEquals(2, clone.getReaders().size()); assertEquals(2, clone.getWriters().size()); }