ProductDiscount interface/implementation fixed; Added currency code 'NONE'.

Author: kkorotkov

NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/Product.java

@@ -16,10 +16,8 @@
 import java.util.List;
 import java.util.Map;
 
-import com.labs64.netlicensing.domain.entity.impl.ProductDiscount;
-
 /**
- * Product entity used internally by NetLicensing.
+ * NetLicensing Product entity.
  * <p/>
  * Properties visible via NetLicensing API:
  * <p/>

NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/ProductDiscount.java

@@ -0,0 +1,27 @@
+package com.labs64.netlicensing.domain.entity;
+
+import java.math.BigDecimal;
+
+public interface ProductDiscount extends Comparable<ProductDiscount> {
+
+    void setProduct(final Product product);
+
+    Product getProduct();
+
+    void setTotalPrice(final BigDecimal totalPrice);
+
+    BigDecimal getTotalPrice();
+
+    void setCurrency(final String currency);
+
+    String getCurrency();
+
+    void setAmountFix(final BigDecimal amountFix);
+
+    BigDecimal getAmountFix();
+
+    void setAmountPercent(final BigDecimal amountPercent);
+
+    BigDecimal getAmountPercent();
+
+}

…/domain/entity/impl/ProductDiscount.java …ain/entity/impl/ProductDiscountImpl.javaNetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/impl/ProductDiscount.java renamed to NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/impl/ProductDiscountImpl.java NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/impl/ProductDiscount.java renamed to NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/impl/ProductDiscountImpl.java

@@ -19,13 +19,14 @@
 
 import com.labs64.netlicensing.domain.Constants;
 import com.labs64.netlicensing.domain.entity.Product;
+import com.labs64.netlicensing.domain.entity.ProductDiscount;
 import com.labs64.netlicensing.domain.vo.Currency;
 import com.labs64.netlicensing.domain.vo.Money;
 
 /**
  * Represents discount step as a discount amount (absolute or percentage) after total price reaches the given threshold.
  */
-public class ProductDiscount implements Comparable<ProductDiscount>, Serializable {
+public class ProductDiscountImpl implements ProductDiscount, Serializable {
 
     private static final long serialVersionUID = -8665112497261365879L;
 
@@ -39,51 +40,61 @@ public class ProductDiscount implements Comparable<ProductDiscount>, Serializabl
 
     private BigDecimal amountPercent;
 
-    public Product getProduct() {
-        return product;
-    }
-
+    @Override
     public void setProduct(final Product product) {
         this.product = product;
     }
 
-    public BigDecimal getTotalPrice() {
-        return totalPrice;
+    @Override
+    public Product getProduct() {
+        return product;
     }
 
+    @Override
     public void setTotalPrice(final BigDecimal totalPrice) {
         this.totalPrice = totalPrice;
     }
 
-    public String getCurrency() {
-        return currency;
+    @Override
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
     }
 
+    @Override
     public void setCurrency(final String currency) {
         this.currency = currency;
     }
 
-    public BigDecimal getAmountFix() {
-        return amountFix;
+    @Override
+    public String getCurrency() {
+        return currency;
     }
 
+    @Override
     public void setAmountFix(final BigDecimal amountFix) {
         this.amountFix = amountFix;
         amountPercent = null;
     }
 
-    public BigDecimal getAmountPercent() {
-        return amountPercent;
+    @Override
+    public BigDecimal getAmountFix() {
+        return amountFix;
     }
 
+    @Override
     public void setAmountPercent(final BigDecimal amountPercent) {
         this.amountPercent = amountPercent;
         amountFix = null;
     }
 
+    @Override
+    public BigDecimal getAmountPercent() {
+        return amountPercent;
+    }
+
     /**
      * Gets the discount amount as string, with '%' sign at the end indicating discount is given in percent.
-     * 
+     *
      * @return the string amount
      */
     public String getStringAmount() {
@@ -98,7 +109,7 @@ public String getStringAmount() {
 
     /**
      * Sets the discount amount from string, '%' sign at the end indicates discount is provided in percent.
-     * 
+     *
      * @param amount
      *            discount amount as string
      */
@@ -145,7 +156,7 @@ public String toString() {
 
     @Override
     public int compareTo(final ProductDiscount productDiscount) {
-        return productDiscount.totalPrice.compareTo(totalPrice); // reverse order!
+        return productDiscount.getTotalPrice().compareTo(totalPrice); // reverse order!
     }
 
 }

NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/entity/impl/ProductImpl.java

@@ -21,6 +21,7 @@
 import com.labs64.netlicensing.domain.Constants;
 import com.labs64.netlicensing.domain.entity.Licensee;
 import com.labs64.netlicensing.domain.entity.Product;
+import com.labs64.netlicensing.domain.entity.ProductDiscount;
 import com.labs64.netlicensing.domain.entity.ProductModule;
 
 /**

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

@@ -12,18 +12,22 @@
  */
 package com.labs64.netlicensing.domain.vo;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * NetLicensing supported currencies.
  */
 public enum Currency {
 
+    NONE(""),
+
     EUR("EUR");
 
     private final String value;
 
     /**
      * Instantiates a new currency.
-     * 
+     *
      * @param currency
      *            currency value
      */
@@ -33,7 +37,7 @@ public enum Currency {
 
     /**
      * Get enum value.
-     * 
+     *
      * @return enum value
      */
     public String value() {
@@ -42,7 +46,7 @@ public String value() {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Enum#toString()
      */
     @Override
@@ -52,7 +56,7 @@ public String toString() {
 
     /**
      * Parse currency value to {@link Currency} enum.
-     * 
+     *
      * @param value
      *            currency value
      * @return {@link Currency} enum object or throws {@link IllegalArgumentException} if no corresponding
@@ -64,20 +68,23 @@ public static Currency parseValue(final String value) {
                 return currency;
             }
         }
+        if (value != null && StringUtils.isBlank(value)) {
+            return NONE;
+        }
         throw new IllegalArgumentException(value);
     }
 
     /**
-     * Gets the enum safe.
-     * 
+     * Parse currency value to {@link Currency} enum, nothrow version.
+     *
      * @param value
-     *            currency value
-     * @return the enum safe
+     *            licenseType value as string
+     * @return {@link Currency} enum object or {@code null} if argument doesn't match any of the enum values
      */
     public static Currency parseValueSafe(final String value) {
         try {
             return parseValue(value);
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             return null;
         }
     }

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

@@ -33,7 +33,7 @@ public enum LicenseType {
 
     /**
      * Instantiates a new license type.
-     * 
+     *
      * @param licenseTypeValue
      *            licenseType value
      */
@@ -43,7 +43,7 @@ public enum LicenseType {
 
     /**
      * Get enum value.
-     * 
+     *
      * @return enum value
      */
     public String value() {
@@ -52,7 +52,7 @@ public String value() {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Enum#toString()
      */
     @Override
@@ -62,7 +62,7 @@ public String toString() {
 
     /**
      * Parse license type value to {@link LicenseType} enum.
-     * 
+     *
      * @param value
      *            licenseType value
      * @return {@link LicenseType} enum object or throws {@link IllegalArgumentException} if no corresponding
@@ -78,16 +78,16 @@ public static LicenseType parseValue(final String value) {
     }
 
     /**
-     * Gets the enum safe.
-     * 
-     * @param val
-     *            the val
-     * @return the enum safe
+     * Parse license type value to {@link LicenseType} enum, nothrow version.
+     *
+     * @param value
+     *            licenseType value as string
+     * @return {@link LicenseType} enum object or {@code null} if argument doesn't match any of the enum values
      */
-    public static LicenseType parseValueSafe(final String val) {
+    public static LicenseType parseValueSafe(final String value) {
         try {
-            return parseValue(val);
-        } catch (IllegalArgumentException e) {
+            return parseValue(value);
+        } catch (final IllegalArgumentException e) {
             return null;
         }
     }

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

@@ -18,7 +18,7 @@
 
 import com.labs64.netlicensing.domain.Constants;
 import com.labs64.netlicensing.domain.entity.Product;
-import com.labs64.netlicensing.domain.entity.impl.ProductDiscount;
+import com.labs64.netlicensing.domain.entity.impl.ProductDiscountImpl;
 import com.labs64.netlicensing.domain.entity.impl.ProductImpl;
 import com.labs64.netlicensing.domain.vo.Money;
 import com.labs64.netlicensing.exception.ConversionException;
@@ -46,7 +46,7 @@ public Product convert(final Item source) throws ConversionException {
 
         for (final com.labs64.netlicensing.schema.context.List list : source.getList()) {
             if (Constants.DISCOUNT.equals(list.getName())) {
-                final ProductDiscount productDiscount = new ProductDiscount();
+                final ProductDiscountImpl productDiscount = new ProductDiscountImpl();
                 final Money price = convertPrice(list.getProperty(), Constants.Product.Discount.TOTAL_PRICE);
                 productDiscount.setTotalPrice(price.getAmount());
                 productDiscount.setCurrency(price.getCurrencyCode());