update Rest

Author: xlorne

springboot-starter/src/main/java/com/codingapi/springboot/framework/rest/RestClient.java

@@ -5,95 +5,108 @@
 import com.codingapi.springboot.framework.rest.properties.HttpProxyProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 
 @Slf4j
 public class RestClient {
 
+    private final HttpHeaders httpHeaders;
+
     private final HttpClient httpClient;
 
-    private final static int RETRY_COUNT = 5;
+    private final int retryCount;
 
-    private final static String EMPTY = "{}";
+    private final String emptyResponse;
 
     private final String baseUrl;
 
-    public RestClient(HttpProxyProperties httpProxyProperties, String baseUrl) {
+    public RestClient(HttpProxyProperties httpProxyProperties, String baseUrl,int retryCount,String emptyResponse) {
         this.baseUrl = baseUrl;
+        this.retryCount = retryCount;
         this.httpClient = new HttpClient(httpProxyProperties);
+        this.httpHeaders = new HttpHeaders();
+        this.emptyResponse = emptyResponse;
+        this.initHeaders();
     }
 
     public RestClient(String baseUrl) {
-       this(null,baseUrl);
+        this(null, baseUrl,5,"{}");
+    }
+
+    private void initHeaders() {
+        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
     }
 
     private String toUrl(String api) {
         return baseUrl + api;
     }
+
     private String _get(String api, RestParamBuilder paramBuilder) {
-        return _get(api,new HttpHeaders(),paramBuilder);
+        return _get(api, httpHeaders, paramBuilder);
     }
 
-    private String _get(String api,HttpHeaders headers, RestParamBuilder paramBuilder) {
-        return httpClient.get(toUrl(api), headers,paramBuilder!=null?paramBuilder.toFormRequest():null);
+    private String _get(String api, HttpHeaders headers, RestParamBuilder paramBuilder) {
+        return httpClient.get(toUrl(api), headers, paramBuilder != null ? paramBuilder.toFormRequest() : null);
     }
 
-    public String get(String api,HttpHeaders headers, RestParamBuilder paramBuilder) {
-        for(int i=0; i< RETRY_COUNT; i++){
+    public String get(String api, HttpHeaders headers, RestParamBuilder paramBuilder) {
+        for (int i = 0; i < retryCount; i++) {
             try {
-                return _get(api,headers, paramBuilder);
-            }catch (Exception e){
-                log.warn("api:{},error:{}",api,e.getMessage());
+                return _get(api, headers, paramBuilder);
+            } catch (Exception e) {
+                log.warn("api:{},error:{}", api, e.getMessage());
                 sleep();
             }
         }
-        return EMPTY;
+        return emptyResponse;
     }
+
     public String get(String api, RestParamBuilder paramBuilder) {
-        return get(api,new HttpHeaders(),paramBuilder);
+        return get(api, new HttpHeaders(), paramBuilder);
     }
 
     public String get(String api) {
-        return get(api,new HttpHeaders(),null);
+        return get(api, httpHeaders, null);
     }
 
-    public String get(String api,HttpHeaders headers) {
-        return get(api,headers,null);
+    public String get(String api, HttpHeaders headers) {
+        return get(api, headers, null);
     }
 
     private String _post(String api, JSONObject requestBody) {
-        return _post(api,new HttpHeaders(),requestBody);
+        return _post(api, new HttpHeaders(), requestBody);
     }
 
     private String _post(String api, HttpHeaders headers, JSONObject requestBody) {
-        return httpClient.post(toUrl(api),headers, requestBody);
+        return httpClient.post(toUrl(api), headers, requestBody);
     }
 
     public String post(String api, JSONObject requestBody) {
-        return post(api,new HttpHeaders(),requestBody);
+        return post(api, new HttpHeaders(), requestBody);
     }
 
     public String post(String api, RestParamBuilder paramBuilder) {
-        return post(api,new HttpHeaders(),paramBuilder.toJsonRequest());
+        return post(api, httpHeaders, paramBuilder.toJsonRequest());
     }
 
-    public String post(String api,HttpHeaders headers, JSONObject requestBody) {
-        for (int i=0;i< RETRY_COUNT;i++){
+    public String post(String api, HttpHeaders headers, JSONObject requestBody) {
+        for (int i = 0; i < retryCount; i++) {
             try {
                 return _post(api, headers, requestBody);
-            }catch (Exception e){
-                log.warn("api:{},error:{}",api,e.getMessage());
+            } catch (Exception e) {
+                log.warn("api:{},error:{}", api, e.getMessage());
                 sleep();
             }
         }
-        return EMPTY;
+        return emptyResponse;
     }
 
-    public String post(String api,HttpHeaders headers, RestParamBuilder paramBuilder) {
-       return post(api, headers, paramBuilder.toJsonRequest());
+    public String post(String api, HttpHeaders headers, RestParamBuilder paramBuilder) {
+        return post(api, headers, paramBuilder.toJsonRequest());
     }
 
 
-    private void sleep(){
+    private void sleep() {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException ex) {