From ed992e01c17d5677dfa0e1d0a76a7f9bc12c2a90 Mon Sep 17 00:00:00 2001
From: Jimmy Forsyth <jf2512@att.com>
Date: Tue, 10 Mar 2020 15:21:02 -0400
Subject: Reenable spring-boot2 in aai-common

Issue-ID: AAI-2831
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I9f3f1d8d1d9ef45786d0f17afa5c824e90c77263
---
 aai-rest/pom.xml                                                     | 2 +-
 aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java | 5 +++--
 .../src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java   | 4 ++--
 .../src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java   | 5 ++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'aai-rest')

diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index 89d3d3c2..d89fe0a7 100644
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.10-SNAPSHOT</version>
+        <version>1.6.11-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>
diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
index 68ff3e5e..b11b0333 100644
--- a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
@@ -26,6 +26,7 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.onap.aai.aailog.filter.RestClientLoggingInterceptor;
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
@@ -39,8 +40,8 @@ public abstract class NoAuthRestClient extends RestClient {
 
     @PostConstruct
     public void init() throws Exception {
-        restTemplate =
-            new RestTemplateBuilder().requestFactory(this.getHttpRequestFactory()).build();
+        restTemplate = new RestTemplate();
+        restTemplate.setRequestFactory(this.getHttpRequestFactory());
         restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
         RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor();
         restTemplate.getInterceptors().add(loggingInterceptor);
diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java
index b2534f57..5c359e27 100644
--- a/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java
@@ -42,8 +42,8 @@ public abstract class OneWaySSLRestClient extends RestClient {
 
     @PostConstruct
     public void init() throws Exception {
-        restTemplate =
-            new RestTemplateBuilder().requestFactory(this.getHttpRequestFactory()).build();
+        restTemplate = new RestTemplate();
+        restTemplate.setRequestFactory(this.getHttpRequestFactory());
 
         restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
         RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor();
diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java
index 58ee79f1..f43d21c8 100644
--- a/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java
@@ -48,9 +48,8 @@ public abstract class TwoWaySSLRestClient extends RestClient {
 
     @PostConstruct
     public void init() throws Exception {
-        restTemplate =
-                new RestTemplateBuilder().requestFactory(this.getHttpRequestFactory()).build();
-
+        restTemplate = new RestTemplate();
+        restTemplate.setRequestFactory(this.getHttpRequestFactory());
         restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
         RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor();
         restTemplate.getInterceptors().add(loggingInterceptor);
-- 
cgit 1.2.3-korg