http: Fix test dependency on hash order, which is about to change;

Documentation updates.
https://codereview.appspot.com/110050044/

Author: wonderfly

google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java

@@ -137,14 +137,14 @@ public void testValues() throws Exception {
     // delete one
     stringTyped.delete("k");
     assertNull(stringTyped.get("k"));
-    assertEquals(Arrays.asList("other"), stringTyped.values());
+    assertContentsAnyOrder(stringTyped.values(), "other");
     stringTyped.delete("k2");
     // boolean
     stringTyped.set("k", "v");
     assertTrue(boolTyped.values().isEmpty());
     boolTyped.set("k", true);
-    assertEquals(Arrays.asList("v"), stringTyped.values());
-    assertEquals(Arrays.asList(true), boolTyped.values());
+    assertContentsAnyOrder(stringTyped.values(), "v");
+    assertContentsAnyOrder(boolTyped.values(), true);
   }
 
   public void testKeySet() throws Exception {

google-http-client/src/main/java/com/google/api/client/json/Json.java

@@ -14,9 +14,6 @@
 
 package com.google.api.client.json;
 
-import com.google.api.client.http.HttpMediaType;
-import com.google.api.client.util.Charsets;
-
 /**
  * JSON utilities.
  *
@@ -29,11 +26,11 @@ public class Json {
    * {@code "application/json; charset=utf-8"} media type used as a default for JSON parsing.
    *
    * <p>
-   * Use {@link HttpMediaType#equalsIgnoreParameters} for comparing media types.
+   * Use {@link com.google.api.client.http.HttpMediaType#equalsIgnoreParameters} for comparing
+   * media types.
    * </p>
    *
    * @since 1.10
    */
-  public static final String MEDIA_TYPE =
-      new HttpMediaType("application/json").setCharsetParameter(Charsets.UTF_8).build();
+  public static final String MEDIA_TYPE = "application/json; charset=UTF-8";
 }

google-http-client/src/main/java/com/google/api/client/json/JsonParser.java

@@ -42,12 +42,19 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * Abstract low-level JSON parser.
+ * Abstract low-level JSON parser. See
+ * <a href="https://code.google.com/p/google-http-java-client/wiki/JSON">
+ * https://code.google.com/p/google-http-java-client/wiki/JSON</a>
  *
  * <p>
  * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
  * thread-safe.
  * </p>
+ * <p>
+ * <p>
+ * If a JSON map is encountered while using a destination class of type Map, then an
+ * {@link ArrayMap} is used by default for the parsed values.
+ * </p>
  *
  * @since 1.3
  * @author Yaniv Inbar
@@ -436,6 +443,8 @@ private void parse(
     ClassInfo classInfo = ClassInfo.of(destinationClass);
     boolean isGenericData = GenericData.class.isAssignableFrom(destinationClass);
     if (!isGenericData && Map.class.isAssignableFrom(destinationClass)) {
+      // The destination class is not a sub-class of GenericData but is of Map, so parse data
+      // using parseMap.
       @SuppressWarnings("unchecked")
       Map<String, Object> destinationMap = (Map<String, Object>) destination;
       parseMap(null, destinationMap, Types.getMapValueParameter(destinationClass), context,
@@ -472,7 +481,7 @@ private void parse(
         GenericData object = (GenericData) destination;
         object.set(key, parseValue(null, null, context, destination, customizeParser, true));
       } else {
-        // unrecognized field, skip value
+        // unrecognized field, skip value.
         if (customizeParser != null) {
           customizeParser.handleUnrecognizedKey(destination, key);
         }

google-http-client/src/main/java/com/google/api/client/util/Types.java

@@ -324,6 +324,9 @@ public static Type getMapValueParameter(Type mapType) {
 
   private static Type getActualParameterAtPosition(Type type, Class<?> superClass, int position) {
     ParameterizedType parameterizedType = Types.getSuperParameterizedType(type, superClass);
+    if (parameterizedType == null) {
+      return null;
+    }
     Type valueType = parameterizedType.getActualTypeArguments()[position];
     // this is normally a type variable, except in the case where the class of iterableType is
     // superClass, e.g. Iterable<String>

google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java

@@ -43,6 +43,11 @@ public void testBuild_parameters() {
     assertEquals("main/sub; aaa=1; bbb=\";/ \"", m.build());
   }
 
+  public void testBuild_json() {
+    HttpMediaType m = new HttpMediaType("application/json").setCharsetParameter(Charsets.UTF_8);
+    assertEquals("application/json; charset=UTF-8", m.build());
+  }
+
   public void testBuild_multipartSpec() {
     HttpMediaType m = new HttpMediaType("main", "sub");
     m.setParameter("bbb", "foo=/bar");

google-http-client/src/test/java/com/google/api/client/util/DataTest.java

@@ -89,7 +89,7 @@ public void testIsNull() {
     assertFalse(Data.isNull((byte) 0));
     assertFalse(Data.isNull((short) 0));
     assertFalse(Data.isNull(0));
-    assertFalse(Data.isNull(0l));
+    assertFalse(Data.isNull(0L));
     assertFalse(Data.isNull((float) 0));
     assertFalse(Data.isNull((double) 0));
     assertFalse(Data.isNull(BigDecimal.ZERO));