Index: trunk/src/oauth/signpost/http/HttpParameters.java
===================================================================
--- trunk/src/oauth/signpost/http/HttpParameters.java	(revision 6849)
+++ trunk/src/oauth/signpost/http/HttpParameters.java	(revision 10831)
@@ -30,10 +30,9 @@
  * A multi-map of HTTP request parameters. Each key references a
  * {@link SortedSet} of parameters collected from the request during message
- * signing. Parameter values are sorted as per {@linkplain http
- * ://oauth.net/core/1.0a/#anchor13}. Every key/value pair will be
- * percent-encoded upon insertion. This class has special semantics tailored to
- * being useful for message signing; it's not a general purpose collection class
- * to handle request parameters.
- * 
+ * signing. Parameter values are sorted as per {@linkplain http://oauth.net/core/1.0a/#anchor13}.
+ * Every key/value pair will be percent-encoded upon insertion.
+ * This class has special semantics tailored to being useful for message signing;
+ * it's not a general purpose collection class to handle request parameters.
+ *
  * @author Matthias Kaeppler
  */
@@ -41,6 +40,7 @@
 public class HttpParameters implements Map<String, SortedSet<String>>, Serializable {
 
-    private TreeMap<String, SortedSet<String>> wrappedMap = new TreeMap<String, SortedSet<String>>();
-
+    private TreeMap<String, SortedSet<String>> wrappedMap = new TreeMap<>();
+
+    @Override
     public SortedSet<String> put(String key, SortedSet<String> value) {
         return wrappedMap.put(key, value);
@@ -62,5 +62,5 @@
      * Convenience method to add a single value for the parameter specified by
      * 'key'.
-     * 
+     *
      * @param key
      *        the parameter name
@@ -76,5 +76,5 @@
      * Convenience method to add a single value for the parameter specified by
      * 'key'.
-     * 
+     *
      * @param key
      *        the parameter name
@@ -91,5 +91,5 @@
          SortedSet<String> values = wrappedMap.get(key);
          if (values == null) {
-             values = new TreeSet<String>();
+             values = new TreeSet<>();
              wrappedMap.put( key, values);
          }
@@ -105,5 +105,5 @@
      * Convenience method to allow for storing null values. {@link #put} doesn't
      * allow null values, because that would be ambiguous.
-     * 
+     *
      * @param key
      *        the parameter name
@@ -116,4 +116,5 @@
     }
 
+    @Override
     public void putAll(Map<? extends String, ? extends SortedSet<String>> m) {
         wrappedMap.putAll(m);
@@ -138,5 +139,5 @@
     /**
      * Convenience method to merge a Map<String, List<String>>.
-     * 
+     *
      * @param m
      *        the map
@@ -146,5 +147,5 @@
             SortedSet<String> vals = get(key);
             if (vals == null) {
-                vals = new TreeSet<String>();
+                vals = new TreeSet<>();
                 put(key, vals);
             }
@@ -153,4 +154,5 @@
     }
 
+    @Override
     public SortedSet<String> get(Object key) {
         return wrappedMap.get(key);
@@ -159,5 +161,5 @@
     /**
      * Convenience method for {@link #getFirst(key, false)}.
-     * 
+     *
      * @param key
      *        the parameter name (must be percent encoded if it contains unsafe
@@ -176,5 +178,5 @@
      * (that's because upon storing values in this map, keys get
      * percent-encoded).
-     * 
+     *
      * @param key
      *        the parameter name (must be percent encoded if it contains unsafe
@@ -196,5 +198,5 @@
      * Concatenates all values for the given key to a list of key/value pairs
      * suitable for use in a URL query string.
-     * 
+     *
      * @param key
      *        the parameter name
@@ -208,5 +210,5 @@
      * Concatenates all values for the given key to a list of key/value pairs
      * suitable for use in a URL query string.
-     * 
+     *
      * @param key
      *        the parameter name
@@ -237,5 +239,5 @@
         return sb.toString();
     }
-    
+
     public String getAsHeaderElement(String key) {
         String value = getFirst(key);
@@ -246,8 +248,10 @@
     }
 
+    @Override
     public boolean containsKey(Object key) {
         return wrappedMap.containsKey(key);
     }
 
+    @Override
     public boolean containsValue(Object value) {
         for (Set<String> values : wrappedMap.values()) {
@@ -259,4 +263,5 @@
     }
 
+    @Override
     public int size() {
         int count = 0;
@@ -267,24 +272,30 @@
     }
 
+    @Override
     public boolean isEmpty() {
         return wrappedMap.isEmpty();
     }
 
+    @Override
     public void clear() {
         wrappedMap.clear();
     }
 
+    @Override
     public SortedSet<String> remove(Object key) {
         return wrappedMap.remove(key);
     }
 
+    @Override
     public Set<String> keySet() {
         return wrappedMap.keySet();
     }
 
+    @Override
     public Collection<SortedSet<String>> values() {
         return wrappedMap.values();
     }
 
+    @Override
     public Set<Entry<String, SortedSet<String>>> entrySet() {
         return wrappedMap.entrySet();