From d8191b48088b0ac2843b64beac861ddfcb99d9dd Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 7 Sep 2021 14:23:58 +0200 Subject: [PATCH] Polish contribution See gh-26984 --- .../MessageBodyClientHttpResponseWrapper.java | 4 +-- ...ageBodyClientHttpResponseWrapperTests.java | 27 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java index 85e1c8f1b7..6565adc45f 100644 --- a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java +++ b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2021 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. @@ -42,7 +42,7 @@ class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse { private PushbackInputStream pushbackInputStream; - public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) throws IOException { + public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) { this.response = response; } diff --git a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java index 2c116ac5a9..1956891067 100644 --- a/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapperTests.java @@ -13,43 +13,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.web.client; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + import org.junit.jupiter.api.Test; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; + import org.springframework.http.client.ClientHttpResponse; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; - /** - * Unit tests for {MessageBodyClientHttpResponseWrapper}. + * Unit tests for {@link MessageBodyClientHttpResponseWrapper}. * + * @since 5.3.10 * @author Yin-Jui Liao */ class MessageBodyClientHttpResponseWrapperTests { private final ClientHttpResponse response = mock(ClientHttpResponse.class); + private final MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response); + + @Test - void testMessageBodyNotExist() throws IOException { + void messageBodyDoesNotExist() throws Exception { given(response.getBody()).willReturn(null); - MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response); assertThat(responseWrapper.hasEmptyMessageBody()).isTrue(); } @Test - void testMessageBodyExist() throws IOException { - String body = "Accepted request"; - InputStream stream = new ByteArrayInputStream(body.getBytes()); + void messageBodyExists() throws Exception { + InputStream stream = new ByteArrayInputStream("content".getBytes()); given(response.getBody()).willReturn(stream); - MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response); assertThat(responseWrapper.hasEmptyMessageBody()).isFalse(); } + }