From 712271a974da870f01ec062010e5711bfad0b7e0 Mon Sep 17 00:00:00 2001
From: Karthik Chandraraj <karthik.chandraraj@sc.com>
Date: Mon, 7 Aug 2017 14:23:26 +0800
Subject: [PATCH] #448 : Support for content-type with charset

---
 .../client/internal/AbstractStub.java         |   3 +-
 .../client/internal/AbstractStubTest.java     | 101 ++++++++++++++++++
 2 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 katharsis-client/src/test/java/io/katharsis/client/internal/AbstractStubTest.java

diff --git a/katharsis-client/src/main/java/io/katharsis/client/internal/AbstractStub.java b/katharsis-client/src/main/java/io/katharsis/client/internal/AbstractStub.java
index 81e23b1a..6c2cea1b 100644
--- a/katharsis-client/src/main/java/io/katharsis/client/internal/AbstractStub.java
+++ b/katharsis-client/src/main/java/io/katharsis/client/internal/AbstractStub.java
@@ -19,6 +19,7 @@
 import io.katharsis.repository.request.HttpMethod;
 import io.katharsis.resource.Document;
 import io.katharsis.utils.Optional;
+import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
 
 public class AbstractStub {
 
@@ -87,7 +88,7 @@ private RuntimeException handleError(HttpAdapterResponse response) throws IOExce
 		ErrorResponse errorResponse = null;
 		String body = response.body();
 		String contentType = response.getResponseHeader("content-type");
-		if (body.length() > 0 && CONTENT_TYPE.equalsIgnoreCase(contentType)) {
+		if (body.length() > 0 && containsIgnoreCase(contentType, CONTENT_TYPE)) {
 
 			ObjectMapper objectMapper = client.getObjectMapper();
 			Document document = objectMapper.readValue(body, Document.class);
diff --git a/katharsis-client/src/test/java/io/katharsis/client/internal/AbstractStubTest.java b/katharsis-client/src/test/java/io/katharsis/client/internal/AbstractStubTest.java
new file mode 100644
index 00000000..68ee82d0
--- /dev/null
+++ b/katharsis-client/src/test/java/io/katharsis/client/internal/AbstractStubTest.java
@@ -0,0 +1,101 @@
+package io.katharsis.client.internal;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import io.katharsis.client.KatharsisClient;
+import io.katharsis.client.http.HttpAdapter;
+import io.katharsis.client.http.HttpAdapterRequest;
+import io.katharsis.client.http.HttpAdapterResponse;
+import io.katharsis.core.internal.exception.ExceptionMapperLookup;
+import io.katharsis.core.internal.exception.ExceptionMapperRegistry;
+import io.katharsis.core.internal.exception.ExceptionMapperRegistryBuilder;
+import io.katharsis.core.internal.jackson.JsonApiModuleBuilder;
+import io.katharsis.core.internal.utils.JsonApiUrlBuilder;
+import io.katharsis.errorhandling.exception.InternalServerErrorException;
+import io.katharsis.errorhandling.mapper.JsonApiExceptionMapper;
+import io.katharsis.repository.request.HttpMethod;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Set;
+
+import static io.katharsis.client.internal.AbstractStub.ResponseType.RESOURCE;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+public class AbstractStubTest {
+	@Mock
+	private KatharsisClient mockKatharsisClient;
+	@Mock
+	private JsonApiUrlBuilder mockJsonApiUrlBuilder;
+	@Mock
+	private HttpAdapter mockHttpAdapter;
+	@Mock
+	private HttpAdapterRequest mockHttpAdapterRequest;
+	@Mock
+	private HttpAdapterResponse mockHttpAdapterResponse;
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Before
+	public void setUp() {
+		initMocks(this);
+	}
+
+	@Test
+	public void shouldProcessErrorData_EvenIfContentTypeHasCharSet() throws IOException {
+		when(mockKatharsisClient.getHttpAdapter()).thenReturn(mockHttpAdapter);
+
+		when(mockKatharsisClient.getObjectMapper()).thenReturn(objectMapper());
+		when(mockKatharsisClient.getExceptionMapperRegistry()).thenReturn(exceptionMapperRegistry);
+
+		when(mockHttpAdapter.newRequest("/test", HttpMethod.GET, null)).thenReturn(mockHttpAdapterRequest);
+		when(mockHttpAdapterRequest.execute()).thenReturn(mockHttpAdapterResponse);
+
+		when(mockHttpAdapterResponse.isSuccessful()).thenReturn(false);
+		when(mockHttpAdapterResponse.code()).thenReturn(500);
+		when(mockHttpAdapterResponse.getResponseHeader("content-type")).thenReturn("application/vnd.api+json; charset=utf-8");
+		when(mockHttpAdapterResponse.body()).thenReturn(errorJson());
+
+		AbstractStub abstractStub = new AbstractStub(mockKatharsisClient, mockJsonApiUrlBuilder);
+		thrown.expect(InternalServerErrorException.class);
+		thrown.expectMessage("An error occurred. Please contact support.");
+
+		abstractStub.executeGet("/test", RESOURCE);
+	}
+
+	private ObjectMapper objectMapper() {
+		ObjectMapper objectMapper = new ObjectMapper();
+		JsonApiModuleBuilder moduleBuilder = new JsonApiModuleBuilder();
+		SimpleModule jsonApiModule = moduleBuilder.build(null, true);
+		objectMapper.registerModule(jsonApiModule);
+		return objectMapper;
+	}
+
+	private String errorJson() {
+		return "{\n" +
+				"    \"errors\": [\n" +
+				"        {\n" +
+				"            \"id\": \"7fc18d09-7b65-4047-9fc6-242f2e72ecb0\",\n" +
+				"            \"status\": \"500\",\n" +
+				"            \"code\": \"Test-100\",\n" +
+				"            \"title\": \"Error Occurred\",\n" +
+				"            \"detail\": \"An error occurred. Please contact support.\"\n" +
+				"        }\n" +
+				"    ]\n" +
+				"}";
+	}
+
+	private ExceptionMapperRegistry exceptionMapperRegistry = new ExceptionMapperRegistryBuilder().build(new ExceptionMapperLookup() {
+		@Override
+		public Set<JsonApiExceptionMapper> getExceptionMappers() {
+			return Collections.EMPTY_SET;
+		}
+	});
+}
\ No newline at end of file