Added FilterUtilsr for filter parameter in list services methods

src/netlicensing-client.js

@@ -33,6 +33,7 @@ import ValidationResults from './vo/ValidationResults';
 // Utils
 import CastsUtils from './util/CastsUtils';
 import CheckUtils from './util/CheckUtils';
+import FilterUtils from './util/FilterUtils';
 
 
 // Create the default instance to be exported
@@ -73,6 +74,7 @@ const NetLicensing = {
     // Expose Utils
     CastsUtils,
     CheckUtils,
+    FilterUtils,
 };
 
 module.exports = NetLicensing;

src/services/LicenseService.js

@@ -10,6 +10,7 @@ import License from '../entities/License';
 import CheckUtils from '../util/CheckUtils';
 import Constants from '../Constants';
 import Service from './Service';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the License Service. See NetLicensingAPI for details:
@@ -121,7 +122,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/LicenseTemplateService.js

@@ -10,6 +10,7 @@ import LicenseTemplate from '../entities/LicenseTemplate';
 import CheckUtils from '../util/CheckUtils';
 import Constants from '../Constants';
 import Service from './Service';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the ProductModule Service. See NetLicensingAPI for details:
@@ -107,7 +108,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/LicenseeService.js

@@ -8,6 +8,7 @@
 import Context from '../vo/Context';
 import Licensee from '../entities/Licensee';
 import CheckUtils from '../util/CheckUtils';
+import FilterUtils from '../util/FilterUtils';
 import Constants from '../Constants';
 import Service from './Service';
 import ValidationParameters from '../vo/ValidationParameters';
@@ -105,7 +106,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/PaymentMethodService.js

@@ -10,6 +10,7 @@ import PaymentMethod from '../entities/PaymentMethod';
 import Constants from '../Constants';
 import CheckUtils from '../util/CheckUtils';
 import Service from './Service';
+import FilterUtils from '../util/FilterUtils';
 
 export default {
     /**
@@ -64,7 +65,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/ProductModuleService.js

@@ -10,6 +10,7 @@ import ProductModule from '../entities/ProductModule';
 import CheckUtils from '../util/CheckUtils';
 import Constants from '../Constants';
 import Service from './Service';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the ProductModule Service. See NetLicensingAPI for details:
@@ -107,7 +108,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/ProductService.js

@@ -10,6 +10,7 @@ import Context from '../vo/Context';
 import Product from '../entities/Product';
 import Constants from '../Constants';
 import CheckUtils from '../util/CheckUtils';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the Product Service. See NetLicensingAPI for details:
@@ -101,7 +102,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/TokenService.js

@@ -10,6 +10,7 @@ import Token from '../entities/Token';
 import Constants from '../Constants';
 import Service from './Service';
 import CheckUtils from '../util/CheckUtils';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the Token Service. See NetLicensingAPI for details:
@@ -93,7 +94,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/TransactionService.js

@@ -10,6 +10,7 @@ import Transaction from '../entities/Transaction';
 import Constants from '../Constants';
 import Service from './Service';
 import CheckUtils from '../util/CheckUtils';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the Transaction Service. See NetLicensingAPI for details:
@@ -108,7 +109,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/services/UtilityService.js

@@ -10,6 +10,7 @@ import Constants from '../Constants';
 import Service from './Service';
 import CheckUtils from '../util/CheckUtils';
 import Country from '../entities/Country';
+import FilterUtils from '../util/FilterUtils';
 
 /**
  * JS representation of the Utility Service. See NetLicensingAPI for details:
@@ -87,7 +88,7 @@ export default {
             if (!CheckUtils.isValid(filter)) {
                 throw new TypeError(`filter has bad value ${filter}`);
             }
-            queryParams.filter = filter;
+            queryParams.filter = typeof filter === 'string' ? filter : FilterUtils.encode(filter);
         }
 
         return Service

src/util/FilterUtils.js

@@ -0,0 +1,22 @@
+export default {
+    FILTER_DELIMITER: ';',
+    FILTER_PAIR_DELIMITER: '=',
+    encode(filter = {}) {
+        const query = [];
+        const has = Object.prototype.hasOwnProperty;
+        Object.keys(filter).forEach((key) => {
+            if (has.call(filter, key)) {
+                query.push(`${encodeURIComponent(key)}${this.FILTER_PAIR_DELIMITER}${encodeURIComponent(filter[key])}`);
+            }
+        });
+        return query.join(this.FILTER_DELIMITER);
+    },
+    decode(query = '') {
+        const filter = {};
+        query.split(this.FILTER_DELIMITER).forEach((v) => {
+            const [name, value] = v.split(this.FILTER_PAIR_DELIMITER);
+            filter[name] = value;
+        });
+        return filter;
+    },
+};