Merge pull request #95 from contentful/wildcard-return-types

Fix wildcard return types

Author: tomxor

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

@@ -23,7 +23,7 @@ public String mimeType() {
   @SuppressWarnings("unchecked")
   public <T> T fileField(String key) {
     T result = null;
-    Map<?, ?> file = getField("file");
+    Map<String, Object> file = getField("file");
     if (file != null) {
       result = (T) file.get(key);
     }

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

@@ -18,9 +18,9 @@ public final class CDAField {
 
   boolean localized;
 
-  Map<?, ?> items;
+  Map<String, Object> items;
 
-  Map<?, ?> validations;
+  Map<String, Object> validations;
 
   public String name() {
     return name;
@@ -50,11 +50,11 @@ public boolean isLocalized() {
     return localized;
   }
 
-  public Map<?, ?> items() {
+  public Map<String, Object> items() {
     return items;
   }
 
-  public Map<?, ?> validations() {
+  public Map<String, Object> validations() {
     return validations;
   }
 }

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

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

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

@@ -77,7 +77,7 @@ static CDAType typeForClass(Class<? extends CDAResource> clazz) {
   }
 
   @SuppressWarnings("unchecked")
-  static <T> T extractNested(Map<?, ?> source, String... keys) {
+  static <T> T extractNested(Map<?, ?> source, Object... keys) {
     Map<?, ?> curr = source;
     for (int i = 0; i < keys.length; i++) {
       if (i == keys.length - 1) {