introduce reuse of constructors everywhere

Author: therepanic

core/src/main/java/com/panic08/funpay4j/AuthorizedFunPayExecutor.java

@@ -72,25 +72,22 @@ public class AuthorizedFunPayExecutor extends FunPayExecutor {
      * Creates a new AuthorizedFunPayExecutor instance
      *
      * @param goldenKey golden key which will be used to authorize the user
+     * @param baseURL base URL of the primary server
+     * @param proxy proxy for forwarding requests
      */
-    public AuthorizedFunPayExecutor(@NonNull String goldenKey) {
-        super();
-
+    public AuthorizedFunPayExecutor(
+            @NonNull String goldenKey, @NonNull String baseURL, Proxy proxy) {
+        super(baseURL, proxy);
         this.goldenKey = goldenKey;
     }
 
     /**
      * Creates a new AuthorizedFunPayExecutor instance
      *
      * @param goldenKey golden key which will be used to authorize the user
-     * @param baseURL base URL of the primary server
-     * @param proxy proxy for forwarding requests
      */
-    public AuthorizedFunPayExecutor(
-            @NonNull String goldenKey, @NonNull String baseURL, @NonNull Proxy proxy) {
-        super(baseURL, proxy);
-
-        this.goldenKey = goldenKey;
+    public AuthorizedFunPayExecutor(@NonNull String goldenKey) {
+        this(goldenKey, FunPayURL.BASE_URL, null);
     }
 
     /**
@@ -100,9 +97,7 @@ public AuthorizedFunPayExecutor(
      * @param baseURL base URL of the primary server
      */
     public AuthorizedFunPayExecutor(@NonNull String goldenKey, @NonNull String baseURL) {
-        super(baseURL);
-
-        this.goldenKey = goldenKey;
+        this(goldenKey, baseURL, null);
     }
 
     /**
@@ -112,9 +107,7 @@ public AuthorizedFunPayExecutor(@NonNull String goldenKey, @NonNull String baseU
      * @param proxy proxy for forwarding requests
      */
     public AuthorizedFunPayExecutor(@NonNull String goldenKey, @NonNull Proxy proxy) {
-        super(proxy);
-
-        this.goldenKey = goldenKey;
+        this(goldenKey, FunPayURL.BASE_URL, proxy);
     }
 
     /**

core/src/main/java/com/panic08/funpay4j/FunPayExecutor.java

@@ -61,37 +61,37 @@ public class FunPayExecutor {
 
     @NonNull protected final FunPayClient funPayClient;
 
-    /** Creates a new FunPayExecutor instance */
-    public FunPayExecutor() {
-        OkHttpClient httpClient = new OkHttpClient();
-
-        this.funPayParser = new JsoupFunPayParser(httpClient, FunPayURL.BASE_URL);
-        this.funPayClient = new OkHttpFunPayClient(httpClient, FunPayURL.BASE_URL);
-    }
-
     /**
      * Creates a new FunPayExecutor instance
      *
      * @param baseURL base URL of the primary server
      * @param proxy proxy for forwarding requests
      */
-    public FunPayExecutor(@NonNull String baseURL, @NonNull Proxy proxy) {
-        OkHttpClient httpClient = new OkHttpClient.Builder().proxy(proxy).build();
+    public FunPayExecutor(@NonNull String baseURL, Proxy proxy) {
+        OkHttpClient httpClient;
+
+        if (proxy == null) {
+            httpClient = new OkHttpClient();
+        } else {
+            httpClient = new OkHttpClient.Builder().proxy(proxy).build();
+        }
 
         this.funPayParser = new JsoupFunPayParser(httpClient, baseURL);
         this.funPayClient = new OkHttpFunPayClient(httpClient, baseURL);
     }
 
+    /** Creates a new FunPayExecutor instance */
+    public FunPayExecutor() {
+        this(FunPayURL.BASE_URL, null);
+    }
+
     /**
      * Creates a new FunPayExecutor instance
      *
      * @param baseURL base URL of the primary server
      */
     public FunPayExecutor(@NonNull String baseURL) {
-        OkHttpClient httpClient = new OkHttpClient();
-
-        this.funPayParser = new JsoupFunPayParser(httpClient, baseURL);
-        this.funPayClient = new OkHttpFunPayClient(httpClient, baseURL);
+        this(baseURL, null);
     }
 
     /**
@@ -100,10 +100,7 @@ public FunPayExecutor(@NonNull String baseURL) {
      * @param proxy proxy for forwarding requests
      */
     public FunPayExecutor(@NonNull Proxy proxy) {
-        OkHttpClient httpClient = new OkHttpClient.Builder().proxy(proxy).build();
-
-        this.funPayParser = new JsoupFunPayParser(httpClient, FunPayURL.BASE_URL);
-        this.funPayClient = new OkHttpFunPayClient(httpClient, FunPayURL.BASE_URL);
+        this(FunPayURL.BASE_URL, proxy);
     }
 
     /**