reproduces bug SPR-16781

SPR-16781/pom.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.example</groupId>
+	<artifactId>demo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>demo</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.1.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+				<dependency>
+		     <groupId>org.mock-server</groupId>
+		     <artifactId>mockserver-netty</artifactId>
+		     <version>5.1.1</version>
+		     <scope>test</scope>
+		</dependency>
+
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>

SPR-16781/src/main/java/com/example/demo/DemoApplication.java

@@ -0,0 +1,12 @@
+package com.example.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DemoApplication.class, args);
+	}
+}

SPR-16781/src/test/java/com/example/demo/DemoApplicationTests.java

@@ -0,0 +1,153 @@
+package com.example.demo;
+
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockserver.integration.ClientAndServer;
+import org.mockserver.model.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.ResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class DemoApplicationTests {
+    private static final Logger log = LoggerFactory.getLogger(DemoApplicationTests.class);
+
+	@Autowired
+	private RestTemplateBuilder restTemplateBuilder;
+
+	private ClientAndServer mockServer;
+
+
+	@Before
+	public void before() throws IOException {
+
+
+		mockServer = startClientAndServer(0);
+		mockServer.when(
+				request()
+					.withMethod("POST")			
+					.withPath("/someservice")
+					)
+			.respond(
+					response()
+					.withStatusCode(401)
+					.withHeaders(
+							new Header("Content-Type", "application/json; charset=utf-8")
+							)
+					.withBody("{\"some\":\"json\"}")
+
+					);
+
+
+	}
+
+
+	@Test(expected=HttpClientErrorException.class)
+	public void error401_withdefaulthandler() {
+		RestTemplate rt = restTemplateBuilder
+				.errorHandler(new DefaultResponseErrorHandler())
+				.build();
+
+		ResponseEntity<Map<String,Object>> response = rt.exchange("http://localhost:" + mockServer.getPort() + "/someservice", 
+				HttpMethod.POST,
+				new HttpEntity<>(new HashMap<String,Object>()), 
+				new ParameterizedTypeReference<Map<String,Object>>(){});
+
+		log.info("got response {}", response);
+
+
+	}
+
+
+	@Test(expected=HttpClientErrorException.class)
+	public void error401_noHandler() {
+		RestTemplate rt = restTemplateBuilder
+				.build();
+
+
+
+		ResponseEntity<Map<String,Object>> response = rt.exchange("http://localhost:" + mockServer.getPort() + "/someservice", 
+				HttpMethod.POST,
+				new HttpEntity<>(new HashMap<String,Object>()), 
+				new ParameterizedTypeReference<Map<String,Object>>(){});
+
+		log.info("got response {}", response);
+
+
+
+	}
+
+
+
+	@Test
+	public void error401_withcustomhandler_noerrors() {
+		RestTemplate rt = restTemplateBuilder
+				.errorHandler(new ResponseErrorHandler(){
+					@Override
+					public boolean hasError(ClientHttpResponse response) throws IOException {
+						return false;
+					}
+					@Override
+					public void handleError(ClientHttpResponse response) throws IOException {
+					}})
+				.build();
+
+		ResponseEntity<Map<String,Object>> response = rt.exchange("http://localhost:" + mockServer.getPort() + "/someservice", 
+				HttpMethod.POST,
+				new HttpEntity<>(new HashMap<String,Object>()), 
+				new ParameterizedTypeReference<Map<String,Object>>(){});
+
+		log.info("got response {}", response);
+
+
+	}
+
+
+	@Test(expected=HttpClientErrorException.class)
+	public void error401_withcustomhandler_allerrors() {
+		RestTemplate rt = restTemplateBuilder
+				.errorHandler(new ResponseErrorHandler(){
+					@Override
+					public boolean hasError(ClientHttpResponse response) throws IOException {
+						return true;
+					}
+					@Override
+					public void handleError(ClientHttpResponse response) throws IOException {
+						throw new HttpClientErrorException(HttpStatus.UNAUTHORIZED, "unauthorized");
+					}})
+				.build();
+
+
+		ResponseEntity<Map<String,Object>> response = rt.exchange("http://localhost:" + mockServer.getPort() + "/someservice", 
+				HttpMethod.POST,
+				new HttpEntity<>(new HashMap<String,Object>()), 
+				new ParameterizedTypeReference<Map<String,Object>>(){});
+
+		log.info("got response {}", response);
+
+
+	}
+}