Merge pull request #18 from bliblidotcom/feature/API-7119

Feature/API-7119 Improve Http Request Client to Handle Multi Http Method

Author: mhmbillah

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>com.blibli.oss.sellerapi.client</groupId>
 	<artifactId>seller-api-client</artifactId>
-	<version>1.3.0-2-SNAPSHOT</version>
+	<version>1.4.0-1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>seller-api-client</name>
@@ -57,4 +57,4 @@
 		</repository>
 	</distributionManagement>
 
-</project>
+</project>

src/main/java/com/blibli/oss/sellerapi/client/AppBasicAuth.java

@@ -27,9 +27,9 @@ public static void main(String[] args) {
       //set this as global function of your framework, you need to pass this object for every request
       ApiConfig config = new ApiConfig();
       config.setApiClientId("mta-api-clientsdk-cc80f"); // your api client id
-      config.setApiClientKey("mta-api-ySvFBOwPHTTBhccx89y2QxORSyFEesT55H2ws95fbPs8fsNV9y"); // your api client key
-      config.setApiSellerKey("A41E26889F09320010A3C65620627EEB5C8424E95ACD2F2FC39D00CA609B0464"); // your api seller key
-      config.setSignatureKey("secret"); // put your secret key here to activate signature flow
+      config.setApiClientKey("mta-api-GUnrIlso6vPpbpn3ZyWLUwILCq6OxpAVcHj4hqeeppOVdNNVKZ"); // your api client key
+      config.setApiSellerKey("BFF3899A8A23C12D5AB0596450722B9F401DC058A06DE69E7BA9C4174DBD795E"); // your api seller key
+      config.setSignatureKey("12345678"); // put your secret key here to activate signature flow
       config.setBusinessPartnerCode("SDC-60001"); //your business partner code/merchant code
       config.setPlatformName("My Company Name"); //your company/platform name
       config.setTimeoutMs(15000); //your custom timeout in millisecond
@@ -52,7 +52,7 @@ public static void main(String[] args) {
       String resultGetResult = client.invokeGet(urlGetRequest, params, config);
       JsonNode resultGetResultJSON = mapper.readTree(resultGetResult);
       System.out.println(resultGetResult);
-      
+
       /**
        * #################################################################
        * ######                 POST REQUEST SAMPLE                 ######

src/main/java/com/blibli/oss/sellerapi/client/core/BlibliMerchantClient.java

@@ -33,11 +33,6 @@ public String invokePut(String apiUrl, Map<String, Object> params, Object reques
     return invokeRequest(Constant.HTTP_PUT, apiUrl, params, requestBody, config);
   }
 
-  public String invokePatch(String apiUrl, Map<String, Object> params, Object requestBody,
-      ApiConfig config) throws Exception {
-    return invokeRequest(Constant.HTTP_PATCH, apiUrl, params, requestBody, config);
-  }
-
   public String invokeDelete(String apiUrl, Map<String, Object> params, Object requestBody,
       ApiConfig config) throws Exception {
     return invokeRequest(Constant.HTTP_DELETE, apiUrl, params, requestBody, config);

src/main/java/com/blibli/oss/sellerapi/client/core/BlibliSellerBasicAuthClient.java

@@ -30,11 +30,6 @@ public String invokePut(String apiUrl, Map<String, Object> params, Object reques
     return invokeRequest(Constant.HTTP_PUT, apiUrl, params, requestBody, config);
   }
 
-  public String invokePatch(String apiUrl, Map<String, Object> params, Object requestBody,
-      ApiConfig config) throws Exception {
-    return invokeRequest(Constant.HTTP_PATCH, apiUrl, params, requestBody, config);
-  }
-
   public String invokeDelete(String apiUrl, Map<String, Object> params, Object requestBody,
       ApiConfig config) throws Exception {
     return invokeRequest(Constant.HTTP_DELETE, apiUrl, params, requestBody, config);

src/main/java/com/blibli/oss/sellerapi/client/core/SignatureGenerator.java

@@ -67,7 +67,7 @@ public void setMandatoryHeader(String apiUrl, String requestId, HttpURLConnectio
   }
 
   public void setMandatoryHeaderBasicAuth(String apiUrl, String requestId, HttpURLConnection con,
-      String methodType, ApiConfig config, Object requestBody) {
+      String methodType, ApiConfig config, Object requestBody) throws ProtocolException {
     if (config.getSignatureKey() != null) {
       Date date = new Date();
       String rawSignature = this.generateRawSignature(date, methodType, apiUrl, requestBody);
@@ -77,6 +77,10 @@ public void setMandatoryHeaderBasicAuth(String apiUrl, String requestId, HttpURL
       con.setRequestProperty("Signature-Time", String.valueOf(date.getTime()));
     }
 
+    con.setRequestMethod(methodType);
+    con.setConnectTimeout(config.getTimeoutMs());
+    con.setReadTimeout(config.getTimeoutMs());
+
     String encodedValue = generateBasicAuthValue(config.getApiClientId(), config.getApiClientKey());
     con.setRequestProperty("Authorization", "Basic " + encodedValue);
     con.setRequestProperty("Content-Type", Constant.APPLICATION_JSON);