Re-define resource generic types

Author: tomxor

src/main/java/com/contentful/java/cda/CDAResource.java

@@ -7,7 +7,7 @@
 
 public abstract class CDAResource {
   @SerializedName("sys")
-  Map<String, ? super Object> attrs;
+  Map<String, ?> attrs;
 
   public String id() {
     return getAttribute("id");
@@ -18,7 +18,7 @@ public CDAType type() {
     return CDAType.valueOf(type.toUpperCase(LOCALE));
   }
 
-  public Map<String, ? super Object> attrs() {
+  public Map<String, ?> attrs() {
     return attrs;
   }
 

src/main/java/com/contentful/java/cda/LocalizedResource.java

@@ -8,9 +8,9 @@ public abstract class LocalizedResource extends CDAResource {
 
   String defaultLocale;
 
-  Map<String, ? super Object> fields;
+  Map<String, ?> fields;
 
-  Map<String, ? super Object> rawFields;
+  Map<String, ?> rawFields;
 
   /**
    * Extracts a field from the fields set of the active locale, result type is inferred.
@@ -32,7 +32,7 @@ public <T> T getField(String key) {
   }
 
   /** Raw unprocessed fields. */
-  public Map<String, ? super Object> rawFields() {
+  public Map<String, ?> rawFields() {
     return rawFields;
   }
 

src/main/java/com/contentful/java/cda/ResourceUtils.java

@@ -99,7 +99,7 @@ static void mergeIncludes(CDAArray array) {
   static void resolveArrayOfLinks(CDAEntry entry, CDAField field, ArrayResource array) {
     CDAType linkType =
         CDAType.valueOf(((String) field.items().get("linkType")).toUpperCase(LOCALE));
-    Map<String, ? super Object> value = (Map) entry.fields.get(field.id());
+    Map<String, Object> value = (Map) entry.fields.get(field.id());
     if (value == null) {
       return;
     }
@@ -126,7 +126,7 @@ static void resolveArrayOfLinks(CDAEntry entry, CDAField field, ArrayResource ar
   @SuppressWarnings("unchecked")
   static void resolveSingleLink(CDAEntry entry, CDAField field, ArrayResource array) {
     CDAType linkType = CDAType.valueOf(field.linkType().toUpperCase(LOCALE));
-    Map<String, ? super Object> value = (Map) entry.fields.get(field.id());
+    Map<String, Object> value = (Map) entry.fields.get(field.id());
     if (value == null) {
       return;
     }
@@ -237,13 +237,13 @@ static void localize(LocalizedResource resource, CDASpace space) {
   }
 
   static void normalizeFields(LocalizedResource resource) {
-    Map<String, ? super Object> fields = new HashMap<String, Object>();
+    Map<String, Object> fields = new HashMap<String, Object>();
     for (String key : resource.fields.keySet()) {
       Object value = resource.fields.get(key);
       if (value == null) {
         continue;
       }
-      Map<String, ? super Object> map = new HashMap<String, Object>();
+      Map<String, Object> map = new HashMap<String, Object>();
       map.put(resource.locale(), value);
       fields.put(key, map);
     }
@@ -261,9 +261,9 @@ static void setRawFields(ArrayResource array) {
 
   @SuppressWarnings("unchecked")
   private static void setRawFields(LocalizedResource resource) {
-    Map<String, ? super Object> rawFields = new HashMap<String, Object>();
+    Map<String, Object> rawFields = new HashMap<String, Object>();
     for (String key : resource.fields.keySet()) {
-      Map<String, ? super Object> map = new HashMap<String, Object>();
+      Map<String, Object> map = new HashMap<String, Object>();
       map.putAll((Map) resource.fields.get(key));
       rawFields.put(key, map);
     }