From b34c5e8986f6e31f249054b524bc22e3cea34149 Mon Sep 17 00:00:00 2001
From: Miller <ivo.miller@hpe.com>
Date: Tue, 15 Dec 2015 10:21:18 +0000
Subject: [PATCH] CCUK-3473 Backport improvements from HOD client to IOD client
 :: Find 1.  0.2 predates the iod client so we need to update it explicitly

---
 pom.xml                                       |  2 +-
 .../find/configuration/AppConfiguration.java  | 21 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index bec5b7dcda..34cf7c9866 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>com.hp.autonomy.frontend.find</groupId>
     <artifactId>find</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>war</packaging>
 
     <properties>
diff --git a/src/main/java/com/hp/autonomy/frontend/find/configuration/AppConfiguration.java b/src/main/java/com/hp/autonomy/frontend/find/configuration/AppConfiguration.java
index e01ea2861c..868bd2c3c2 100644
--- a/src/main/java/com/hp/autonomy/frontend/find/configuration/AppConfiguration.java
+++ b/src/main/java/com/hp/autonomy/frontend/find/configuration/AppConfiguration.java
@@ -5,6 +5,7 @@
 
 package com.hp.autonomy.frontend.find.configuration;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.hp.autonomy.frontend.configuration.Authentication;
@@ -16,8 +17,12 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Collections;
+
 @Configuration
 public class AppConfiguration {
 
@@ -26,19 +31,27 @@ public RestTemplate restTemplate() {
         final HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
 
         httpClientBuilder
-            .setMaxConnPerRoute(20)
-            .setMaxConnTotal(120);
+                .setMaxConnPerRoute(20)
+                .setMaxConnTotal(120);
 
         final String proxyHost = System.getProperty("find.https.proxyHost");
 
-        if(proxyHost != null) {
+        if (proxyHost != null) {
             final Integer proxyPort = Integer.valueOf(System.getProperty("find.https.proxyPort", "80"));
             httpClientBuilder.setProxy(new HttpHost(proxyHost, proxyPort));
         }
 
         final ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClientBuilder.build());
 
-        return new RestTemplate(requestFactory);
+        final RestTemplate restTemplate = new RestTemplate(requestFactory);
+
+        final MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
+        final ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        jackson2HttpMessageConverter.setObjectMapper(objectMapper);
+        restTemplate.setMessageConverters(Collections.<HttpMessageConverter<?>>singletonList(jackson2HttpMessageConverter));
+
+        return restTemplate;
     }
 
     @Bean(name = "dispatcherObjectMapper")