Add gremlin-based pagination to aai-common

[aai/aai-common.git] / aai-rest / src / main / java / org / onap / aai / restclient / NoAuthRestClient.java

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 47fe99d..b558546 100644 (file)
--- a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
+++ b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java
@@ -17,37 +17,47 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.restclient;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+import javax.annotation.PostConstruct;
+
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.onap.aai.aailog.filter.RestClientLoggingInterceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.PostConstruct;
+public abstract class NoAuthRestClient extends RestClient {
+
+    private static Logger logger = LoggerFactory.getLogger(NoAuthRestClient.class);
 
-public abstract class NoAuthRestClient extends RestClient{
+    protected RestTemplate restTemplate;
 
-       private static EELFLogger logger = EELFManager.getInstance().getLogger(NoAuthRestClient.class);
+    @PostConstruct
+    public void init() throws Exception {
+        restTemplate = new RestTemplate();
+        restTemplate.setRequestFactory(this.getHttpRequestFactory());
+        restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
+        RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor();
+        restTemplate.getInterceptors().add(loggingInterceptor);
 
-       protected RestTemplate restTemplate;
+    }
 
-       @PostConstruct
-       public void init () throws Exception {
-               HttpClient client = HttpClients.createDefault();
-               restTemplate = new RestTemplateBuilder()
-                               .requestFactory(new HttpComponentsClientHttpRequestFactory(client))
-                               .build();
+    protected HttpComponentsClientHttpRequestFactory getHttpRequestFactory() throws Exception {
+        return new HttpComponentsClientHttpRequestFactory(this.getClient());
+    }
 
-               restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
-       }
+    protected HttpClient getClient() throws Exception {
+        HttpClient client = HttpClients.createDefault();
+        return client;
+    }
 
-       @Override
-       public RestTemplate getRestTemplate() {
-               return restTemplate;
-       }
+    @Override
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
 
 }