Validation (#36)

* lazy decoding

* java 8 compatible gppmodel tests

* rename missed multistate usp* methods to us*

* lazier decoding

* lazier decoding

* tests for null and empty string constructor arguments

* validation

* fix typo

* remove redundant validate call

* default validate

* remove empty validate method from header core segment

* fix usct validator

* deprecate multi-state usp* methods

* remove deprecated usp methods

* cleanup validators

* encodeSection lazy fix

---------

Co-authored-by: chad <[email protected]>

Author: chuff

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/AbstractEncodableBitStringDataType.java

@@ -1,12 +1,23 @@
 package com.iab.gpp.encoder.datatype;
 
+import java.util.Collection;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import com.iab.gpp.encoder.error.ValidationException;
+
 public abstract class AbstractEncodableBitStringDataType<T> implements EncodableDataType<T> {
+  protected Predicate<T> validator;
   protected T value;
 
   protected AbstractEncodableBitStringDataType() {
-
+    
   }
-
+  
+  public AbstractEncodableBitStringDataType<T> withValidator(Predicate<T> validator) {
+    this.validator = validator;
+    return this;
+  }
+  
   public boolean hasValue() {
     return this.value != null;
   }
@@ -17,7 +28,18 @@ public T getValue() {
 
   @SuppressWarnings("unchecked")
   public void setValue(Object value) {
-    this.value = (T) value;
+    T v = (T) value;
+    if (validator == null || validator.test(v)) {
+      this.value = v;
+    } else {
+      if (v instanceof Collection) {
+        throw new ValidationException("Invalid value '"
+            + ((Collection<?>) v).stream().map(i -> i.toString()).collect(Collectors.joining(",")) + "'");
+      } else {
+        throw new ValidationException("Invalid value '" + v + "'");
+      }
+    }
+
   }
 
   public abstract String substring(String str, int fromIndex);

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableBoolean.java

@@ -22,7 +22,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + 1);
   }
 }

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableDatetime.java

@@ -23,7 +23,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + 36);
   }
 }

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFibonacciIntegerRange.java

@@ -27,7 +27,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) throws DecodingException {
-    // TODO: add some validation
     int count = FixedIntegerEncoder.decode(bitString.substring(fromIndex, fromIndex + 12));
     int index = fromIndex + 12;
     for (int i = 0; i < count; i++) {

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedBitfield.java

@@ -28,7 +28,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + this.numElements);
   }
 

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedInteger.java

@@ -26,7 +26,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + this.bitStringLength);
   }
 }

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedIntegerList.java

@@ -31,7 +31,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + (this.elementBitStringLength * numElements));
   }
 

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedIntegerRange.java

@@ -26,7 +26,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: add some validation
     int count = FixedIntegerEncoder.decode(bitString.substring(fromIndex, fromIndex + 12));
     int index = fromIndex + 12;
     for (int i = 0; i < count; i++) {

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedString.java

@@ -26,7 +26,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + this.stringLength * 6);
   }
 }

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFlexibleBitfield.java

@@ -29,7 +29,6 @@ public void decode(String bitString) {
   }
 
   public String substring(String bitString, int fromIndex) {
-    // TODO: validate
     return bitString.substring(fromIndex, fromIndex + this.getLengthSupplier.getAsInt());
   }