Added the possibility to provide additional request parameters for getAll method

Author: Oleksandr Mandryk

src/main/java/com/icoderman/woocommerce/WooCommerce.java

@@ -1,5 +1,6 @@
 package com.icoderman.woocommerce;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -26,13 +27,24 @@ public interface WooCommerce {
      */
     Map get(String endpointBase, int id);
 
+    /**
+     * Retrieves all WooCommerce entities with request parameters
+     *
+     * @param endpointBase API endpoint base @see EndpointBaseType
+     * @param params additional request params
+     * @return List of retrieved entities
+     */
+    List getAll(String endpointBase, Map<String, String> params);
+
     /**
      * Retrieves all WooCommerce entities
      *
      * @param endpointBase API endpoint base @see EndpointBaseType
      * @return List of retrieved entities
      */
-    List getAll(String endpointBase);
+    default List getAll(String endpointBase) {
+        return getAll(endpointBase, Collections.emptyMap());
+    }
 
     /**
      * Updates WooCommerce entity

src/main/java/com/icoderman/woocommerce/WooCommerceAPI.java

@@ -35,9 +35,9 @@ public Map get(String endpointBase, int id) {
     }
 
     @Override
-    public List getAll(String endpointBase) {
+    public List getAll(String endpointBase, Map<String, String> params) {
         String url = String.format(API_URL_FORMAT, config.getUrl(), endpointBase);
-        String signature = OAuthSignature.getAsQueryString(config, url, HttpMethod.GET);
+        String signature = OAuthSignature.getAsQueryString(config, url, HttpMethod.GET, params);
         String securedUrl = String.format(URL_SECURED_FORMAT, url, signature);
         return client.getAll(securedUrl);
     }

src/main/java/com/icoderman/woocommerce/oauth/OAuthSignature.java

@@ -29,36 +29,44 @@ public class OAuthSignature {
 
     private OAuthSignature() {}
 
-    public static Map<String, String> getAsMap(OAuthConfig config, String endpoint, HttpMethod httpMethod) {
+    public static Map<String, String> getAsMap(OAuthConfig config, String endpoint, HttpMethod httpMethod, Map<String, String> params) {
         if (config == null || endpoint == null || httpMethod == null) {
             return Collections.emptyMap();
         }
-        Map<String,String> params = new HashMap<>();
-        params.put(OAuthHeader.OAUTH_CONSUMER_KEY.getValue(), config.getConsumerKey());
-        params.put(OAuthHeader.OAUTH_TIMESTAMP.getValue(), String.valueOf(System.currentTimeMillis() / 1000L));
-        params.put(OAuthHeader.OAUTH_NONCE.getValue(), UUID.randomUUID().toString());
-        params.put(OAuthHeader.OAUTH_SIGNATURE_METHOD.getValue(), SIGNATURE_METHOD_HMAC_SHA256);
+        Map<String,String> authParams = new HashMap<>();
+        authParams.put(OAuthHeader.OAUTH_CONSUMER_KEY.getValue(), config.getConsumerKey());
+        authParams.put(OAuthHeader.OAUTH_TIMESTAMP.getValue(), String.valueOf(System.currentTimeMillis() / 1000L));
+        authParams.put(OAuthHeader.OAUTH_NONCE.getValue(), UUID.randomUUID().toString());
+        authParams.put(OAuthHeader.OAUTH_SIGNATURE_METHOD.getValue(), SIGNATURE_METHOD_HMAC_SHA256);
+        authParams.putAll(params);
 
         // WooCommerce specified param
         if (HttpMethod.DELETE.equals(httpMethod)) {
-            params.put(DELETE_PARAM_FORCE, Boolean.TRUE.toString());
+            authParams.put(DELETE_PARAM_FORCE, Boolean.TRUE.toString());
         }
-        String oAuthSignature = generateOAuthSignature(config.getConsumerSecret(), endpoint, httpMethod, params);
-        params.put(OAuthHeader.OAUTH_SIGNATURE.getValue(), oAuthSignature);
-        return params;
+        String oAuthSignature = generateOAuthSignature(config.getConsumerSecret(), endpoint, httpMethod, authParams);
+        authParams.put(OAuthHeader.OAUTH_SIGNATURE.getValue(), oAuthSignature);
+        return authParams;
     }
 
-    public static String getAsQueryString(OAuthConfig config, String endpoint, HttpMethod httpMethod) {
+    public static Map<String, String> getAsMap(OAuthConfig config, String endpoint, HttpMethod httpMethod) {
+        return getAsMap(config, endpoint, httpMethod, Collections.emptyMap());
+    }
+
+    public static String getAsQueryString(OAuthConfig config, String endpoint, HttpMethod httpMethod, Map<String, String> params) {
         if (config == null || endpoint == null || httpMethod == null) {
             return "";
         }
-        Map<String, String> oauthParameters = getAsMap(config, endpoint, httpMethod);
+        Map<String, String> oauthParameters = getAsMap(config, endpoint, httpMethod, params);
         String encodedSignature = oauthParameters.get(OAuthHeader.OAUTH_SIGNATURE.getValue())
                 .replace(SpecialSymbol.PLUS.getPlain(), SpecialSymbol.PLUS.getEncoded());
         oauthParameters.put(OAuthHeader.OAUTH_SIGNATURE.getValue(), encodedSignature);
         return mapToString(oauthParameters, SpecialSymbol.EQUAL.getPlain(), SpecialSymbol.AMP.getPlain());
     }
 
+    public static String getAsQueryString(OAuthConfig config, String endpoint, HttpMethod httpMethod) {
+        return getAsQueryString(config, endpoint, httpMethod, Collections.emptyMap());
+    }
 
     private static String generateOAuthSignature(String customerSecret, String endpoint, HttpMethod httpMethod, Map<String, String> parameters) {
         String signatureBaseString = getSignatureBaseString(endpoint, httpMethod.name(), parameters);

src/test/java/com/icoderman/woocommerce/integration/WooCommerceClientTest.java

@@ -15,9 +15,9 @@
 
 public class WooCommerceClientTest {
 
-    private static final String CONSUMER_KEY = "ck_700a11f6fa9fb498a58dd3c252d8e52e93f3f073";
-    private static final String CONSUMER_SECRET = "cs_a2117031fd9283f995e9822f6a739e65486a0528";
-    private static final String WC_URL = "http://localhost:32789";
+    private static final String CONSUMER_KEY = "ck_d35e7be7cc695d87f23490729dd80e173f88c8f5";
+    private static final String CONSUMER_SECRET = "cs_53a835760712ebf0c8bcf2a21197af4b2323a052";
+    private static final String WC_URL = "http://localhost/index.php";
 
     private WooCommerce wooCommerce;
 
@@ -41,14 +41,17 @@ public void apiCreateProductTest() {
     @Ignore
     @Test
     public void apiGetAllProductsTest() {
-        Object products = wooCommerce.getAll(EndpointBaseType.PRODUCTS.getValue());
+        Map<String, String> params = new HashMap<>();
+        params.put("per_page","100");
+        params.put("offset","0");
+        Object products = wooCommerce.getAll(EndpointBaseType.PRODUCTS.getValue(), params);
         Assert.assertNotNull(products);
     }
 
     @Ignore
     @Test
     public void apiGetProductTest() {
-        Map product = wooCommerce.get(EndpointBaseType.PRODUCTS.getValue(), 10);
+        Map product = wooCommerce.get(EndpointBaseType.PRODUCTS.getValue(), 79);
         Assert.assertNotNull(product);
     }