NLIC-2227: Allow custom properties for auto-created licensee

* allow custom properties for auto-created licensee

* allow custom properties for auto-created licensee

* cleanup

Author: v-rudkovskiy

NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/vo/ValidationParameters.java

@@ -3,11 +3,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.labs64.netlicensing.domain.Constants;
+
 public class ValidationParameters {
 
     private String productNumber;
-    private String licenseeName;
-    private String licenseeSecret;
+    private Map<String, String> licenseeProperties;
     private Boolean dryRun;
     private Boolean forOfflineUse;
     private Map<String, Map<String, String>> parameters;
@@ -26,6 +27,18 @@ public String getProductNumber() {
         return productNumber;
     }
 
+    public Map<String, String> getLicenseeProperties() {
+        if (licenseeProperties == null) {
+            licenseeProperties = new HashMap<>();
+        }
+        return licenseeProperties;
+    }
+
+    public void setLicenseeProperty(final String key, final String value) {
+        getLicenseeProperties().put(key, value);
+    }
+
+
     /**
      * Sets the name for the new licensee
      *
@@ -35,11 +48,11 @@ public String getProductNumber() {
      *            1000 characters.
      */
     public void setLicenseeName(final String licenseeName) {
-        this.licenseeName = licenseeName;
+        setLicenseeProperty(Constants.Licensee.PROP_LICENSEE_NAME, licenseeName);
     }
 
     public String getLicenseeName() {
-        return licenseeName;
+        return getLicenseeProperties().get(Constants.Licensee.PROP_LICENSEE_NAME);
     }
 
     /**
@@ -49,13 +62,14 @@ public String getLicenseeName() {
      *            licensee secret stored on the client side. Refer to Licensee Secret documentation for details.
      */
     public void setLicenseeSecret(final String licenseeSecret) {
-        this.licenseeSecret = licenseeSecret;
+        setLicenseeProperty(Constants.Licensee.PROP_LICENSEE_SECRET, licenseeSecret);
     }
 
     public String getLicenseeSecret() {
-        return licenseeSecret;
+        return getLicenseeProperties().get(Constants.Licensee.PROP_LICENSEE_SECRET);
     }
 
+
     /**
      * Sets the "dry run" mode
      *

NetLicensingClient/src/main/java/com/labs64/netlicensing/service/ValidationService.java

@@ -108,12 +108,14 @@ private static Form convertValidationParameters(final ValidationParameters valid
             if (StringUtils.isNotBlank(validationParameters.getProductNumber())) {
                 form.param(Constants.Product.PRODUCT_NUMBER, validationParameters.getProductNumber());
             }
-            if (StringUtils.isNotBlank(validationParameters.getLicenseeName())) {
-                form.param(Constants.Licensee.PROP_LICENSEE_NAME, validationParameters.getLicenseeName());
-            }
-            if (StringUtils.isNotBlank(validationParameters.getLicenseeSecret())) {
-                form.param(Constants.Licensee.PROP_LICENSEE_SECRET, validationParameters.getLicenseeSecret());
-            }
+
+            validationParameters.getLicenseeProperties()
+                    .forEach((k, v) -> {
+                        if (StringUtils.isNotBlank(k)) {
+                            form.param(k, v);
+                        }
+                    });
+
             if (Boolean.TRUE.equals(validationParameters.isDryRun())) {
                 form.param(Constants.Validation.DRY_RUN, Boolean.TRUE.toString());
             }

NetLicensingClient/src/test/java/com/labs64/netlicensing/service/LicenseeServiceTest.java

@@ -154,6 +154,7 @@ public void testValidate() throws Exception {
         final ValidationParameters validationParameters = new ValidationParameters();
         validationParameters.setLicenseeName("Test Licensee");
         validationParameters.setProductNumber(productNumber);
+        validationParameters.setLicenseeProperty("customProperty", "Licensee Custom Property");
         final ValidationResult result = LicenseeService.validate(context, licenseeNumber, validationParameters);
 
         assertNotNull(result);
@@ -237,7 +238,8 @@ public Response delete(final String licenseeNumber, final UriInfo uriInfo) {
         @Path("{licenseeNumber}/validate")
         public Response validateLicensee(@PathParam("licenseeNumber") final String licenseeNumber,
                 @FormParam("productNumber") final String productNumber,
-                @FormParam("licenseeName") final String licenseeName) {
+                @FormParam("licenseeName") final String licenseeName,
+                @FormParam("customProperty") final String licenseeCustomProperty) {
 
             if (!productNumber.equals(productNumber)) {
                 return unexpectedValueErrorResponse("productNumber");
@@ -246,6 +248,10 @@ public Response validateLicensee(@PathParam("licenseeNumber") final String licen
                 return unexpectedValueErrorResponse("licenseeName");
             }
 
+            if (!"Licensee Custom Property".equals(licenseeCustomProperty)) {
+                return unexpectedValueErrorResponse("customProperty");
+            }
+
             final Netlicensing netlicensing = JAXBUtils.readObject(TEST_CASE_BASE
                     + "netlicensing-licensee-validate.xml", Netlicensing.class);
             return Response.ok(netlicensing).build();