API additions/refactoring

.gitignore

@@ -0,0 +1,2 @@
+target/
+.idea/

src/main/java/org/greenbytes/http/sfv/BooleanItem.java

@@ -22,15 +22,20 @@ private BooleanItem(boolean value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.BOOLEAN;
+    }
+
     /**
      * Creates a {@link BooleanItem} instance representing the specified
      * {@code boolean} value.
-     * 
+     *
      * @param value
      *            a {@code boolean} value.
      * @return a {@link BooleanItem} representing {@code value}.
      */
-    public static BooleanItem valueOf(boolean value) {
+    public static BooleanItem of(boolean value) {
         return value ? TRUE : FALSE;
     }
 
@@ -44,6 +49,11 @@ public BooleanItem withParams(Parameters params) {
         return new BooleanItem(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public BooleanItem withParamValuesOf(Object... obs) {
+        return new BooleanItem(this.value, Parameters.valueOf(obs));
+    }
+
     @Override
     public StringBuilder serializeTo(StringBuilder sb) {
         sb.append(value ? "?1" : "?0");

src/main/java/org/greenbytes/http/sfv/ByteSequenceItem.java

@@ -24,6 +24,11 @@ private ByteSequenceItem(byte[] value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.BYTESEQUENCE;
+    }
+
     /**
      * Creates a {@link ByteSequenceItem} instance representing the specified
      * {@code byte[]} value.
@@ -41,6 +46,11 @@ public ByteSequenceItem withParams(Parameters params) {
         return new ByteSequenceItem(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public ByteSequenceItem withParamValuesOf(Object... obs) {
+        return new ByteSequenceItem(this.value, Parameters.valueOf(obs));
+    }
+
     @Override
     public Parameters getParams() {
         return params;

src/main/java/org/greenbytes/http/sfv/DateItem.java

@@ -25,6 +25,11 @@ private DateItem(long value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.DATE;
+    }
+
     /**
      * Creates an {@link DateItem} instance representing the specified
      * {@code long} value.
@@ -42,12 +47,17 @@ public DateItem withParams(Parameters params) {
         return new DateItem(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public DateItem withParamValuesOf(Object... obs) {
+        return new DateItem(this.value, Parameters.valueOf(obs));
+    }
+
     @Override
     public Parameters getParams() {
         return params;
     }
 
-    public StringBuilder serializeToNoParams(StringBuilder sb) {
+    private StringBuilder serializeToNoParams(StringBuilder sb) {
         return sb.append('@').append(value);
     }
 
@@ -61,6 +71,7 @@ public String serialize() {
         return serializeTo(new StringBuilder()).toString();
     }
 
+    @Override
     public StringBuilder serializeToForDebug(StringBuilder sb, int indentLevel, Function<Class, String> formatter) {
         String indent = indentLevel != 0 ? String.format("%" + indentLevel + "s", "") : "";
         String classn = formatter.apply(this.getClass());

src/main/java/org/greenbytes/http/sfv/DecimalItem.java

@@ -36,6 +36,11 @@ private DecimalItem(long value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.DECIMAL;
+    }
+
     /**
      * Creates a {@link DecimalItem} instance representing the specified
      * {@code long} value, where the implied divisor is {@code 1000}.
@@ -61,17 +66,34 @@ public static DecimalItem valueOf(BigDecimal value) {
         return valueOf(permille.longValue());
     }
 
+    /**
+     * Creates a {@link DecimalItem} instance representing the specified
+     * {@code Double} value, with potential rounding.
+     *
+     * @param value
+     *            a {@code Double} value.
+     * @return a {@link DecimalItem} representing {@code value}.
+     */
+    public static DecimalItem valueOf(double value) {
+        return valueOf(BigDecimal.valueOf(value));
+    }
+
     @Override
     public DecimalItem withParams(Parameters params) {
         return new DecimalItem(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public DecimalItem withParamValuesOf(Object... obs) {
+        return new DecimalItem(this.value, Parameters.valueOf(obs));
+    }
+
     @Override
     public Parameters getParams() {
         return params;
     }
 
-    public StringBuilder serializeToNoParams(StringBuilder sb) {
+    private StringBuilder serializeToNoParams(StringBuilder sb) {
 
         String sign = value < 0 ? "-" : "";
 
@@ -105,6 +127,7 @@ public String serialize() {
         return serializeTo(new StringBuilder(20)).toString();
     }
 
+    @Override
     public StringBuilder serializeToForDebug(StringBuilder sb, int indentLevel, Function<Class, String> formatter) {
         String indent = indentLevel != 0 ? String.format("%" + indentLevel + "s", "") : "";
         String classn = formatter.apply(this.getClass());

src/main/java/org/greenbytes/http/sfv/Dictionary.java

@@ -1,7 +1,9 @@
 package org.greenbytes.http.sfv;
 
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 
 /**
@@ -19,6 +21,11 @@ private Dictionary(Map<String, ListElement<?>> value) {
         this.value = Collections.unmodifiableMap(Utils.checkKeys(value));
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.DICTIONARY;
+    }
+
     /**
      * Creates a {@link Dictionary} instance representing the specified
      * {@code Map<String, Item>} value.
@@ -31,10 +38,39 @@ private Dictionary(Map<String, ListElement<?>> value) {
      *            a {@code Map<String, Item>} value
      * @return a {@link Dictionary} representing {@code value}.
      */
-    public static Dictionary valueOf(Map<String, ListElement<?>> value) {
+    public static Dictionary of(Map<String, ListElement<?>> value) {
         return new Dictionary(value);
     }
 
+    /**
+     * Creates a {@link Dictionary} instance representing the values
+     * (key/value pairs)
+     *
+     * @param obs
+     *            a sequence of key/value pairs
+     * @return a {@link Dictionary} representing the {@code values}.
+     */
+    public static Dictionary valueOf(Object... obs) {
+        if (obs.length % 2 != 0) {
+            throw new IllegalArgumentException("requires even number of arguments, got: " + obs.length);
+        } else {
+            Map<String, ListElement<?>> map = new LinkedHashMap<>();
+            for (int i = 0; i < obs.length; i += 2) {
+                String key = obs[i].toString();
+                Object value = obs[i + 1];
+                if (map.containsKey(key)) {
+                    throw new IllegalArgumentException("key " + key + " already exists");
+                }
+                if (value instanceof ListElement) {
+                    map.put(key, (ListElement<?>) value);
+                } else {
+                    map.put(key, Utils.asItem(obs[i + 1]));
+                }
+            }
+            return of(map);
+        }
+    }
+
     @Override
     public Map<String, ListElement<?>> get() {
         return value;
@@ -79,4 +115,19 @@ public StringBuilder serializeToForDebug(StringBuilder sb, int indentLevel, Func
         }
         return sb;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof Dictionary)) {
+            return false;
+        } else {
+            Dictionary that = (Dictionary) o;
+            return Objects.equals(value, that.value);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(value);
+    }
 }

src/main/java/org/greenbytes/http/sfv/DisplayStringItem.java

@@ -20,6 +20,11 @@ private DisplayStringItem(String value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.DISPLAYSTRING;
+    }
+
     /**
      * Creates a {@link DisplayStringItem} instance representing the specified
      * {@code String} value.
@@ -37,6 +42,11 @@ public DisplayStringItem withParams(Parameters params) {
         return new DisplayStringItem(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public DisplayStringItem withParamValuesOf(Object... obs) {
+        return new DisplayStringItem(this.value, Parameters.valueOf(obs));
+    }
+
     @Override
     public Parameters getParams() {
         return params;

src/main/java/org/greenbytes/http/sfv/InnerList.java

@@ -1,8 +1,10 @@
 package org.greenbytes.http.sfv;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * Represents an Inner List.
@@ -21,23 +23,56 @@ private InnerList(List<Item<?>> value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.INNERLIST;
+    }
+
     /**
      * Creates an {@link InnerList} instance representing the specified
      * {@code List<Item>} value.
-     * 
+     *
      * @param value
      *            a {@code List<Item>} value.
      * @return a {@link InnerList} representing {@code value}.
      */
-    public static InnerList valueOf(List<Item<?>> value) {
+    public static InnerList of(List<Item<?>> value) {
         return new InnerList(value, Parameters.EMPTY);
     }
 
+    /**
+     * Creates an {@link InnerList} instance representing the specified
+     * {@code Item} values.
+     *
+     * @param values
+     *            {@code Item} values.
+     * @return a {@link InnerList} representing {@code values}.
+     */
+    public static InnerList of(Item<?>... values) {
+        return of(Arrays.stream(values).collect(Collectors.toList()));
+    }
+
+    /**
+     * Creates an {@link InnerList} instance representing the specified
+     * {@linkplain Object} values after best-effort conversion to {@linkplain Item}s.
+     *
+     * @param values {@link Object}s to populate the list with
+     * @return a {@link InnerList} representing {@code values}.
+     */
+    public static InnerList valueOf(Object... values) {
+        return of(Arrays.stream(values).map(Utils::asItem).collect(Collectors.toList()));
+    }
+
     @Override
     public InnerList withParams(Parameters params) {
         return new InnerList(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public InnerList withParamValuesOf(Object... obs) {
+        return new InnerList(this.value, Parameters.valueOf(obs));
+    }
+
     private StringBuilder serializeToNoParams(StringBuilder sb) {
         String separator = "";
 
@@ -59,6 +94,7 @@ public StringBuilder serializeTo(StringBuilder sb) {
        return params.serializeTo(serializeToNoParams(sb));
     }
 
+    @Override
     public StringBuilder serializeToForDebug(StringBuilder sb, int indentLevel, Function<Class, String> formatter) {
         String indent = indentLevel != 0 ? String.format("%" + indentLevel + "s", "") : "";
         String classn = formatter.apply(this.getClass());

src/main/java/org/greenbytes/http/sfv/IntegerItem.java

@@ -25,15 +25,20 @@ private IntegerItem(long value, Parameters params) {
         this.params = Objects.requireNonNull(params, "params must not be null");
     }
 
+    @Override
+    public SfDataType getType() {
+        return SfDataType.INTEGER;
+    }
+
     /**
      * Creates an {@link IntegerItem} instance representing the specified
      * {@code long} value.
-     * 
+     *
      * @param value
      *            a {@code long} value.
      * @return a {@link IntegerItem} representing {@code value}.
      */
-    public static IntegerItem valueOf(long value) {
+    public static IntegerItem of(long value) {
         return new IntegerItem(value, Parameters.EMPTY);
     }
 
@@ -42,6 +47,11 @@ public IntegerItem withParams(Parameters params) {
         return new IntegerItem(this.value, Objects.requireNonNull(params, "params must not be null"));
     }
 
+    @Override
+    public IntegerItem withParamValuesOf(Object... obs) {
+        return new IntegerItem(this.value, Parameters.valueOf(obs));
+    }
+
     @Override
     public Parameters getParams() {
         return params;