NLIC-2417: return licensee custom properties in the offline validation results (#43)

* add licensee custom properties to validation result

* add licensee custom properties to validation result

* changes

* revert

---------

Co-authored-by: Viacheslav Rudkovskyi <[email protected]>

Author: v-rudkovskiy

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

@@ -19,21 +19,38 @@
 import java.util.TimeZone;
 
 import com.labs64.netlicensing.domain.Constants;
+import com.labs64.netlicensing.domain.entity.Licensee;
+import com.labs64.netlicensing.domain.entity.impl.LicenseeImpl;
 
 public class ValidationResult implements Serializable {
 
     private static final long serialVersionUID = -4160421171524379008L;
 
-    private String licenseeNumber;
     private Calendar ttl;
     private Map<String, Composition> validations;
 
+    private Licensee licensee;
+
+    public void setLicensee(final Licensee licensee) {
+        this.licensee = licensee;
+    }
+
+    public Licensee getLicensee() {
+        return this.licensee;
+    }
+
+    @Deprecated
     public void setLicenseeNumber(final String licenseeNumber) {
-        this.licenseeNumber = licenseeNumber;
+        if (this.licensee == null) {
+            this.licensee = new LicenseeImpl();
+        }
+
+        this.licensee.setNumber(licenseeNumber);
     }
 
+    @Deprecated
     public String getLicenseeNumber() {
-        return licenseeNumber;
+        return (this.licensee != null) ? this.licensee.getNumber() : null;
     }
 
     public void setTtl(final Calendar ttl) {
@@ -52,7 +69,6 @@ public Map<String, Composition> getValidations() {
     }
 
     public ValidationResult() {
-        licenseeNumber = null;
         ttl = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         ttl.add(Calendar.MINUTE, Constants.ValidationResult.DEFAULT_TTL_MINUTES);
     }
@@ -74,8 +90,8 @@ public void put(final String productModuleNumber, final String key, final String
     public String toString() {
         final StringBuilder builder = new StringBuilder();
         builder.append("ValidationResult");
-        if (licenseeNumber != null) {
-            builder.append("(").append(licenseeNumber).append(")");
+        if (licensee != null && licensee.getNumber() != null) {
+            builder.append("(").append(licensee.getNumber()).append(")");
         }
         builder.append(" [");
         boolean first = true;

NetLicensingClient/src/main/java/com/labs64/netlicensing/schema/converter/ItemsToValidationResultConverter.java

@@ -2,6 +2,7 @@
 
 import com.labs64.netlicensing.domain.Constants;
 import com.labs64.netlicensing.domain.Constants.Licensee;
+import com.labs64.netlicensing.domain.entity.impl.LicenseeImpl;
 import com.labs64.netlicensing.domain.vo.Composition;
 import com.labs64.netlicensing.domain.vo.ValidationResult;
 import com.labs64.netlicensing.exception.ConversionException;
@@ -32,15 +33,20 @@ public ValidationResult convert(final Netlicensing source) throws ConversionExce
             return target;
         }
 
-        String licenseeNumber = null;
         for (final Item item : source.getItems().getItem()) {
             if (Licensee.class.getSimpleName().equals(item.getType())) {
+                LicenseeImpl licensee = new LicenseeImpl();
+
                 for (final Property property : item.getProperty()) {
                     if (Constants.Licensee.LICENSEE_NUMBER.equals(property.getName())) {
-                        licenseeNumber = property.getValue();
-                        break;
+                        licensee.setNumber(property.getValue());
+                        continue;
                     }
+
+                    licensee.getProperties().put(property.getName(), property.getValue());
                 }
+
+                target.setLicensee(licensee);
                 continue;
             }
 
@@ -74,7 +80,6 @@ public ValidationResult convert(final Netlicensing source) throws ConversionExce
 
             target.setProductModuleValidation(productModuleNumber, composition);
         }
-        target.setLicenseeNumber(licenseeNumber);
         return target;
     }