Get rid of soft-delete

Author: kkorotkov

NetLicensingClient/src/main/java/com/labs64/netlicensing/domain/Constants.java

@@ -27,7 +27,6 @@ private Constants() {
     public static final String NUMBER = "number";
     public static final String NAME = "name";
     public static final String VERSION = "version";
-    public static final String DELETED = "deleted";
     public static final String CASCADE = "forceCascade";
     public static final String PRICE = "price";
     public static final String DISCOUNT = "discount";

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

@@ -31,8 +31,8 @@
  * <b>active</b> - If set to false, the license is disabled. License can be re-enabled, but as long as it is disabled,
  * the license is excluded from the validation process.
  * <p>
- * <b>price</b> - price for the license. If more than 0, it must always be accompanied by the currency specification. Read-only,
- * set from license template on creation.
+ * <b>price</b> - price for the license. If more than 0, it must always be accompanied by the currency specification.
+ * Read-only, set from license template on creation.
  * <p>
  * <b>currency</b> - specifies currency for the license price. Check data types to discover which currencies are
  * supported. Read-only, set from license template on creation.
@@ -41,7 +41,7 @@
  * template on creation, if not specified explicitly.
  * <p>
  * Arbitrary additional user properties of string type may be associated with each license. The name of user property
- * must not be equal to any of the fixed property names listed above and must be none of <b>id, deleted, licenseeNumber,
+ * must not be equal to any of the fixed property names listed above and must be none of <b>id, licenseeNumber,
  * licenseTemplateNumber</b>. See {@link com.labs64.netlicensing.schema.context.Property} for details.
  */
 public interface License extends BaseEntity {

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

@@ -28,8 +28,7 @@
  * disabled (tbd).
  * <p>
  * Arbitrary additional user properties of string type may be associated with each licensee. The name of user property
- * must not be equal to any of the fixed property names listed above and must be none of <b>id, deleted,
- * productNumber</b>.
+ * must not be equal to any of the fixed property names listed above and must be none of <b>id, productNumber</b>.
  */
 public interface Licensee extends BaseEntity {
 

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

@@ -38,7 +38,7 @@
  * <b>licensingInfo</b> - Licensing information. Optional.
  * <p>
  * Arbitrary additional user properties of string type may be associated with each product. The name of user property
- * must not be equal to any of the fixed property names listed above and must be none of <b>id, deleted</b>.
+ * must not be equal to any of the fixed property names listed above and must not be <b>id</b>.
  */
 public interface Product extends BaseEntity {
 

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

@@ -52,7 +52,6 @@ public static List<String> getReservedProps() {
         reserved.add(Constants.ID);
         reserved.add(Constants.NUMBER);
         reserved.add(Constants.ACTIVE);
-        reserved.add(Constants.DELETED);
         return reserved;
     }
 
@@ -130,7 +129,7 @@ protected String toString(final MultivaluedMap<String, Object> propMap) {
         boolean firstProp = true;
         for (final String propKey : propMap.keySet()) {
             final Object propValue = propMap.get(propKey);
-            if (propValue != null && (!(propValue instanceof Collection<?>) || ((Collection<?>) propValue).size() > 0)) {
+            if ((propValue != null) && (!(propValue instanceof Collection<?>) || (((Collection<?>) propValue).size() > 0))) {
                 builder.append(firstProp ? "" : ", ");
                 firstProp = false;