Using the codec library shipped with Android

shuklaalok7 · shuklaalok7 · commit f6e085ef154a · 2017-01-13T07:49:58.000+05:30
diff --git a/client/src/main/java/in/clayfish/printful/clients/CountryStateCodeApiClient.java b/client/src/main/java/in/clayfish/printful/clients/CountryStateCodeApiClient.java
@@ -2,8 +2,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
-
 import java.io.IOException;
 import java.lang.reflect.Type;
 
@@ -37,7 +35,7 @@ public CountryStateCodeApiClient(String apiKey) {
      * @param configuration
      */
     public CountryStateCodeApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/EComPlatformSyncApiClient.java b/client/src/main/java/in/clayfish/printful/clients/EComPlatformSyncApiClient.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -42,7 +41,7 @@ public EComPlatformSyncApiClient(String apiKey) {
      * @param configuration configuration object
      */
     public EComPlatformSyncApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/FileLibraryApiClient.java b/client/src/main/java/in/clayfish/printful/clients/FileLibraryApiClient.java
@@ -3,7 +3,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -40,7 +39,7 @@ public FileLibraryApiClient(String apiKey) {
      * @param configuration
      */
     public FileLibraryApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/OrdersApiClient.java b/client/src/main/java/in/clayfish/printful/clients/OrdersApiClient.java
@@ -4,7 +4,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -44,7 +43,7 @@ public OrdersApiClient(String apiKey) {
      * @param configuration
      */
     public OrdersApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/ProductCatalogApiClient.java b/client/src/main/java/in/clayfish/printful/clients/ProductCatalogApiClient.java
@@ -4,8 +4,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
-
 import java.io.IOException;
 import java.lang.reflect.Type;
 
@@ -42,7 +40,7 @@ public ProductCatalogApiClient(String apiKey) {
      * @param configuration
      */
     public ProductCatalogApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/ShippingRateApiClient.java b/client/src/main/java/in/clayfish/printful/clients/ShippingRateApiClient.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -39,7 +38,7 @@ public ShippingRateApiClient(String apiKey) {
      * @param configuration
      */
     public ShippingRateApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/StoreInfoApiClient.java b/client/src/main/java/in/clayfish/printful/clients/StoreInfoApiClient.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -39,7 +38,7 @@ public StoreInfoApiClient(String apiKey) {
      * @param configuration
      */
     public StoreInfoApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/TaxRateApiClient.java b/client/src/main/java/in/clayfish/printful/clients/TaxRateApiClient.java
@@ -3,7 +3,6 @@
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -41,7 +40,7 @@ public TaxRateApiClient(String apiKey) {
      * @param configuration
      */
     public TaxRateApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/clients/WebhookApiClient.java b/client/src/main/java/in/clayfish/printful/clients/WebhookApiClient.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.reflect.TypeToken;
 
-import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 
 import java.io.IOException;
@@ -38,7 +37,7 @@ public WebhookApiClient(String apiKey) {
      * @param configuration Configuration object
      */
     public WebhookApiClient(String apiKey, Configuration configuration) {
-        this.base64Key = Base64.encodeBase64String(apiKey.getBytes());
+        this.base64Key = LibUtils.encodeToBase64(apiKey);
         this.configuration = configuration;
     }
 
diff --git a/client/src/main/java/in/clayfish/printful/utils/LibUtils.java b/client/src/main/java/in/clayfish/printful/utils/LibUtils.java
@@ -7,6 +7,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
+import org.apache.commons.codec.binary.Base64;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 
@@ -222,4 +223,12 @@ public static <T> T getFromJson(JsonObject jsonObject, String key, Class<? exten
         }
         return null;
     }
+
+    /**
+     * @param str The string to encode
+     * @return Base64 encoded string
+     */
+    public static String encodeToBase64(String str) {
+        return new String(Base64.encodeBase64(str.getBytes()));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import com.google.gson.JsonObject;`
`8`	`8`	`import com.google.gson.JsonPrimitive;`
`9`	`9`
	`10`	`+import org.apache.commons.codec.binary.Base64;`
`10`	`11`	`import org.jsoup.Connection;`
`11`	`12`	`import org.jsoup.Jsoup;`
`12`	`13`
`@@ -222,4 +223,12 @@ public static <T> T getFromJson(JsonObject jsonObject, String key, Class<? exten`
`222`	`223`	`}`
`223`	`224`	`return null;`
`224`	`225`	`}`
	`226`	`+`
	`227`	`+ /**`
	`228`	`+ * @param str The string to encode`
	`229`	`+ * @return Base64 encoded string`
	`230`	`+ */`
	`231`	`+ public static String encodeToBase64(String str) {`
	`232`	`+ return new String(Base64.encodeBase64(str.getBytes()));`
	`233`	`+ }`
`225`	`234`	`}`