Updating to work with java 1.6

Author: sk02241994

src/main/java/org/json/JSONObject.java

@@ -3500,7 +3500,7 @@ else if (!rawType.isPrimitive() && !rawType.isEnum() && value instanceof JSONObj
      */
     private Map<?, ?> convertToMap(JSONObject jsonMap, Type keyType, Type valueType, Class<?> mapType) throws JSONException {
         try {
-            InstanceCreator<?> creator = collectionMapping.getOrDefault(mapType, new InstanceCreator<Map>() {
+            InstanceCreator<?> creator = collectionMapping.get(mapType) != null ? collectionMapping.get(mapType) : new InstanceCreator<Map>() {
                     public Map create() {
                         return new HashMap();
                     }
@@ -3526,7 +3526,7 @@ public Map create() {
     /**
      * Converts a String to an Enum value.
      */
-    private <E extends Enum<E>> E stringToEnum(Class<?> enumClass, String value) throws JSONException {
+    private <E extends Enum<E>> E stringToEnum(Class<E> enumClass, String value) throws JSONException {
         try {
             @SuppressWarnings("unchecked")
             Method valueOfMethod = enumClass.getMethod("valueOf", String.class);
@@ -3543,7 +3543,7 @@ private <E extends Enum<E>> E stringToEnum(Class<?> enumClass, String value) thr
     @SuppressWarnings("unchecked")
     private <T> Collection<T> fromJsonArray(JSONArray jsonArray, Class<?> collectionType, Type elementType) throws JSONException {
         try {
-            InstanceCreator<?> creator = collectionMapping.getOrDefault(collectionType, new InstanceCreator<List>() {
+            InstanceCreator<?> creator = collectionMapping.get(collectionType) != null ? collectionMapping.get(collectionType) : new InstanceCreator<List>() {
                     public List create() {
                         return new ArrayList();
                     }