Optional support for lists

hjmikkon · hjmikkon · commit bbe68e48cc71 · 2018-11-09T15:22:26.000+02:00
diff --git a/src/main/java/org/oidc/msg/validator/ArrayClaimValidator.java b/src/main/java/org/oidc/msg/validator/ArrayClaimValidator.java
@@ -16,25 +16,58 @@
 
 package org.oidc.msg.validator;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.oidc.msg.InvalidClaimException;
 
 /**
- * A {@link ClaimValidator} for an array of strings or space separated strings.
+ * A {@link ClaimValidator} for an array of strings or space separated strings. Optionally also
+ * supports a list of strings, which is disabled by default.
  */
 public class ArrayClaimValidator implements ClaimValidator<String> {
+  
+  /** The flag to accept also list of strings in addition to the array. Defaults to false. */
+  private boolean acceptLists;
+  
+  /**
+   * Constructor.
+   */
+  public ArrayClaimValidator() {
+    this(false);
+  }
+  
+  /**
+   * Constructor.
+   * @param lists The flag to accept also list of strings in addition to the arrays.
+   */
+  public ArrayClaimValidator(boolean lists) {
+    acceptLists = lists;
+  }
 
+  @SuppressWarnings("unchecked")
   @Override
   public String validate(Object value) throws InvalidClaimException {
     if (value instanceof String) {
       return (String) value;
     }
     if (!(value instanceof String[]) || ((String[]) value).length == 0) {
+      if (acceptLists && (value instanceof List) && !((List<?>) value).isEmpty()) {
+        List<?> list = (List<?>) value;
+        if (list.get(0) instanceof String) {
+          return buildFromList((List<String>) value);
+        }
+      }
       throw new InvalidClaimException(
           String.format("Parameter '%s' is not of expected type", value));
     }
+    return buildFromList(Arrays.asList((String[]) value));
+  }
+  
+  protected String buildFromList(List<String> list) {
     String spaceSeparatedString = "";
-    for (String item : (String[]) value) {
-      spaceSeparatedString += spaceSeparatedString.length() > 0 ? " " + item : item;
+    for (String item : list) {
+      spaceSeparatedString += spaceSeparatedString.length() > 0 ? " " + item : item;      
     }
     return spaceSeparatedString;
   }
diff --git a/src/test/java/org/oidc/msg/validator/ArrayClaimValidatorTest.java b/src/test/java/org/oidc/msg/validator/ArrayClaimValidatorTest.java
@@ -16,6 +16,9 @@
 
 package org.oidc.msg.validator;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +41,13 @@ public void testPlainString() throws InvalidClaimException {
   }
 
   @Test(expected = InvalidClaimException.class)
-  public void testEmptyArray() throws InvalidClaimException {
+  public void testEmptyArrayWithoutListsEnabled() throws InvalidClaimException {
+    validator.validate(new String[0]);
+  }
+  
+  @Test(expected = InvalidClaimException.class)
+  public void testEmptyArrayWithListsEnabled() throws InvalidClaimException {
+    validator = new ArrayClaimValidator(true);
     validator.validate(new String[0]);
   }
 
@@ -53,5 +62,27 @@ public void testNonEmptyArray() throws InvalidClaimException {
   public void testEmptyString() throws InvalidClaimException {
     Assert.assertEquals("", validator.validate(""));
   }
+  
+  @Test(expected = InvalidClaimException.class)
+  public void testListWithoutEnablingLists() throws InvalidClaimException {
+    validator.validate(Arrays.asList("string1", "string2"));
+  }
+  
+  @Test(expected = InvalidClaimException.class)
+  public void testEmptyListWithEnablingLists() throws InvalidClaimException {
+    validator.validate(new ArrayList<>());
+  }
+
+  @Test(expected = InvalidClaimException.class)
+  public void testInvalidListWithEnablingLists() throws InvalidClaimException {
+    validator.validate(Arrays.asList(1, 2));
+  }
+  
+  @Test
+  public void testListWithEnablingLists() throws InvalidClaimException {
+    validator = new ArrayClaimValidator(true);
+    Assert.assertEquals("string", validator.validate(Arrays.asList("string")));
+    Assert.assertEquals("string1 string2", validator.validate(Arrays.asList("string1 string2")));
+  }
 
 }
