From 420780dab3e2a16dcdb7d6018268f1e9ff770221 Mon Sep 17 00:00:00 2001
From: HuabingZhao <zhao.huabing@zte.com.cn>
Date: Mon, 21 Aug 2017 02:37:49 +0000
Subject: [PATCH] HTTP Client Refactory

Issue-Id: MSB-22
Change-Id: I1fab2a3b8cabf6da817fe57bc4ac71f63c5167a8
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
---
 .../org/onap/msb/sdk/example/client/ExampleClient.java  | 13 ++++++-------
 ...rofitServiceCreater.java => RestServiceCreater.java} | 17 +++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename src/main/java/org/onap/msb/sdk/httpclient/{RetrofitServiceCreater.java => RestServiceCreater.java} (88%)

diff --git a/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java b/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java
index 2bcbae1..4d7ea68 100644
--- a/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java
+++ b/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java
@@ -16,8 +16,7 @@ package org.onap.msb.sdk.example.client;
 import java.io.IOException;
 
 import org.onap.msb.sdk.example.common.Animal;
-import org.onap.msb.sdk.httpclient.RetrofitServiceCreater;
-import org.onap.msb.sdk.httpclient.conf.HttpClientConf;
+import org.onap.msb.sdk.httpclient.RestServiceCreater;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
 
 
@@ -31,14 +30,14 @@ public class ExampleClient {
     String MSB_IP="127.0.0.1";
     int MSB_Port=10081;
     
-    HttpClientConf globalHttpClientConf = new HttpClientConf();
     MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
-
-    RetrofitServiceCreater retrofitServiceCreater =
-        new RetrofitServiceCreater(globalHttpClientConf, msbClient);
+    
+    RestServiceCreater restServiceCreater =
+        new RestServiceCreater(msbClient);
 
     AnimalServiceClient implProxy =
-        retrofitServiceCreater.createRetrofitService(AnimalServiceClient.class);
+        restServiceCreater.createService(AnimalServiceClient.class);
+    
     Animal animal = implProxy.queryAnimal1("panda").execute().body();
     System.out.println("animal:" + animal);
   }
diff --git a/src/main/java/org/onap/msb/sdk/httpclient/RetrofitServiceCreater.java b/src/main/java/org/onap/msb/sdk/httpclient/RestServiceCreater.java
similarity index 88%
rename from src/main/java/org/onap/msb/sdk/httpclient/RetrofitServiceCreater.java
rename to src/main/java/org/onap/msb/sdk/httpclient/RestServiceCreater.java
index fba8518..fed85a9 100644
--- a/src/main/java/org/onap/msb/sdk/httpclient/RetrofitServiceCreater.java
+++ b/src/main/java/org/onap/msb/sdk/httpclient/RestServiceCreater.java
@@ -26,26 +26,27 @@ import org.onap.msb.sdk.httpclient.handler.RetrofitServiceHandlerContext;
 import org.onap.msb.sdk.httpclient.handler.RetrofitServiceHandlerFactory;
 import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
 
-public class RetrofitServiceCreater {
+public class RestServiceCreater {
 
 
   private RetrofitServiceHandlerFactory factory = new RetrofitServiceHandlerFactory();
 
   private MSBServiceClient msbClient;
 
+  public RestServiceCreater(MSBServiceClient msbClient) {
+    this(new HttpClientConf(), msbClient);
+  }
 
-  public RetrofitServiceCreater(HttpClientConf globalHttpClientConf,
+  public RestServiceCreater(HttpClientConf globalHttpClientConf,
       MSBServiceClient msbClient) {
 
     RetrofitServiceHandlerContext.setGlobalHttpClientConf(globalHttpClientConf);
     this.msbClient = msbClient;
 
     factory.init();
-
-
   }
 
-  public <T> T createRetrofitService(Class<T> retrofitSrvInterfaceClazz,
+  public <T> T createService(Class<T> retrofitSrvInterfaceClazz,
       ServiceHttpEndPointBeanObject serviceHttpEndPointBeanObject) {
 
     InvocationHandler handler = factory.buildInvocationHandler(retrofitSrvInterfaceClazz,
@@ -61,7 +62,7 @@ public class RetrofitServiceCreater {
   }
 
 
-  public <T> T createRetrofitService(Class<T> retrofitSrvInterfaceClazz,
+  public <T> T createService(Class<T> retrofitSrvInterfaceClazz,
       ServiceHttpEndPointBeanObject serviceHttpEndPointBeanObject, HttpClientConf httpClientConf) {
 
 
@@ -77,7 +78,7 @@ public class RetrofitServiceCreater {
     return (T) targetInterface;
   }
 
-  public <T> T createRetrofitService(Class<T> retrofitSrvInterfaceClazz,
+  public <T> T createService(Class<T> retrofitSrvInterfaceClazz,
       HttpClientConf httpClientConf) {
 
 
@@ -94,7 +95,7 @@ public class RetrofitServiceCreater {
   }
 
 
-  public <T> T createRetrofitService(Class<T> retrofitSrvInterfaceClazz) {
+  public <T> T createService(Class<T> retrofitSrvInterfaceClazz) {
 
 
     InvocationHandler handler =
-- 
2.16.6