remove customParameters from ValidationParameters Deprecated Validate use POST method

Author: yushkevich

include/netlicensing/validation_parameters.h

@@ -16,7 +16,6 @@ namespace netlicensing {
     String_t licenseeName_i;
     String_t licenseeSecret_i;
     std::map<std::string, std::map<std::string, std::string>> parameters_i;
-    std::map<std::string, std::string> customParameters_i;
 
   public:
     /**
@@ -70,15 +69,6 @@ namespace netlicensing {
     void setProductModuleValidationParameters(const String_t& productModuleNumber, const String_t& productModuleKey, const String_t& productModuleValue) {
       parameters_i[productModuleNumber][productModuleKey] = productModuleValue;
     }
-
-    const std::map<std::string, std::string>& getCustomParameters() const {
-      return customParameters_i;
-    }
-
-    void setCustomParameter(const String_t& key, const String_t& value) {
-      customParameters_i[key] = value;
-    }
-
   };
 }
 

src/netlicensing.cc

@@ -1,6 +1,7 @@
 #include "netlicensing/netlicensing.h"
 #include "netlicensing/service.h"
 #include "netlicensing/validation_parameters.h"
+#include <ctype.h>
 
 namespace netlicensing {
   /**
@@ -94,34 +95,36 @@ namespace netlicensing {
   }
 
   /**
-  * Validates active licenses of the licensee. See NetLicensingAPI for details:
-  * https://www.labs64.de/confluence/display/NLICPUB/Licensee+Services#LicenseeServices-Validatelicensee
-  */
+   * Validates active licenses of the licensee. See NetLicensingAPI for details:
+   * https://www.labs64.de/confluence/display/NLICPUB/Licensee+Services#LicenseeServices-Validatelicensee
+   */
   ValidationResult LicenseeService::validate(Context& ctx,
     const std::string& licenseeNumber,
     const std::string& productNumber/* = std::string()*/,
     const std::string& licenseeName/* = std::string()*/,
     const parameters_type& validationParameters) {
+      std::string endpoint = "licensee/" + escape_string(licenseeNumber) + "/validate";
+      parameters_type params;
+      if (!productNumber.empty()) params.push_back(std::make_pair("productNumber", escape_string(productNumber)));
+      if (!licenseeName.empty()) params.push_back(std::make_pair("licenseeName", escape_string(licenseeName)));
+
+      // Add licensing model specific validation parameters
+      for (parameters_type::const_iterator paramIt = validationParameters.begin();
+           paramIt != validationParameters.end(); ++paramIt) {
+        params.push_back(std::make_pair(escape_string(paramIt->first), escape_string(paramIt->second)));
+      }
+
+      long http_code;
+      std::string res = ctx.post(endpoint, params, http_code);
+      ValidationResult validationResult;
+      ValidationResultMapper vrm(validationResult);
+      traverse(vrm, res);
 
-    ValidationParameters vParams = ValidationParameters();
-    if (!productNumber.empty()) {
-      vParams.setProductNumber(productNumber);
-    }
-    if (!licenseeName.empty()) {
-      vParams.setLicenseeName(licenseeName);
-    }
-
-    for (parameters_type::const_iterator paramIt = validationParameters.begin();
-         paramIt != validationParameters.end(); ++paramIt) {
-
-      if (escape_string(paramIt->first) == "licenseeSecret") {
-        vParams.setLicenseeSecret(escape_string(paramIt->second));
-      } else {
-        vParams.setCustomParameter(escape_string(paramIt->first), escape_string(paramIt->second));
+      if (http_code != 200) {
+        throw RestException(vrm.getInfos(), http_code);
       }
-    }
 
-    return LicenseeService::validate(ctx, licenseeNumber, vParams);
+      return validationResult;
   }
 
   /**
@@ -158,11 +161,6 @@ namespace netlicensing {
         paramIt++;
       }
 
-      // Add licensing model specific validation parameters
-      for(auto const &ent3 : validationParameters.getCustomParameters()) {
-        params.push_back(std::make_pair(escape_string(ent3.first), escape_string(ent3.second)));
-      }
-
       long http_code;
       std::string res = ctx.post(endpoint, params, http_code);
       ValidationResult validationResult;