Minor code cleanup

Author: Tom Reznik

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

@@ -108,7 +108,7 @@ public T call() throws Exception {
 
   private void setLocalizedFields(ResourceWithMap res) {
     Map rawFields = res.getRawFields();
-    HashMap<String, Map> localizedFieldsMap = res.getLocalizedFieldsMap();
+    Map<String, Map> localizedFieldsMap = res.getLocalizedFieldsMap();
 
     // Create a map for every locale
     for (CDALocale locale : context.spaceWrapper.get().getLocales()) {
@@ -138,7 +138,7 @@ private void setLocalizedFields(ResourceWithMap res) {
   @SuppressWarnings("unchecked")
   private void resolveResourceLinks(ResourceWithMap res, HashMap<String, CDAResource> assets,
       HashMap<String, CDAResource> entries) {
-    HashMap<String, Map> localizedFields = res.getLocalizedFieldsMap();
+    Map<String, Map> localizedFields = res.getLocalizedFieldsMap();
 
     for (Map fields : localizedFields.values()) {
       HashSet removeFromFields = new HashSet();

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

@@ -24,7 +24,7 @@ private Constants() {
     throw new UnsupportedOperationException();
   }
 
-  public static enum CDAResourceType {
+  public enum CDAResourceType {
     Array,
     Asset,
     ContentType,
@@ -35,7 +35,7 @@ public static enum CDAResourceType {
     Space
   }
 
-  public static enum CDAFieldType {
+  public enum CDAFieldType {
     Array,
     Boolean,
     Date,

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

@@ -25,8 +25,8 @@
  * SDK utilities
  */
 class Utils {
-  static Decoder decoder = new Decoder() {
-    @Override public String decode(String url) throws UnsupportedEncodingException {
+  static final Decoder decoder = new Decoder() {
+    public String decode(String url) throws UnsupportedEncodingException {
       return URLDecoder.decode(url, "UTF-8");
     }
   };
@@ -82,7 +82,7 @@ interface Decoder {
   }
 
   static class SynchronousExecutor implements Executor {
-    @Override public void execute(Runnable runnable) {
+    public void execute(Runnable runnable) {
       runnable.run();
     }
   }

src/main/java/com/contentful/java/cda/model/CDAContentType.java

@@ -23,9 +23,12 @@
  * Class representing a single Content Type resource.
  */
 public class CDAContentType extends ResourceWithList<Map> {
-  private String displayField;
-  private String name;
-  @SerializedName("description") private String userDescription;
+  private final String displayField;
+
+  private final String name;
+
+  @SerializedName("description")
+  private String userDescription;
 
   public CDAContentType(String displayField, String name, String userDescription) {
     this.displayField = displayField;

src/main/java/com/contentful/java/cda/model/CDASpace.java

@@ -22,9 +22,11 @@
  * Class representing a single Space resource.
  */
 public class CDASpace extends CDAResource {
-  private String defaultLocale;
-  private ArrayList<CDALocale> locales;
-  private String name;
+  private final String defaultLocale;
+
+  private final ArrayList<CDALocale> locales;
+
+  private final String name;
 
   public CDASpace(String defaultLocale, ArrayList<CDALocale> locales, String name) {
     this.defaultLocale = defaultLocale;

src/main/java/com/contentful/java/cda/model/ResourceWithMap.java

@@ -27,7 +27,7 @@ public class ResourceWithMap extends CDAResource {
   private Map<String, Object> rawFields;
 
   // Custom map prepared out of the original fields sectioned by different locales.
-  private HashMap<String, Map> localizedFieldsMap = new HashMap<String, Map>();
+  private final Map<String, Map> localizedFieldsMap = new HashMap<String, Map>();
 
   /**
    * Sets the raw fields map of this resource.
@@ -52,7 +52,7 @@ public Map<String, Object> getRawFields() {
    *
    * @return A custom map prepared out of the original fields sectioned by different locales.
    */
-  public HashMap<String, Map> getLocalizedFieldsMap() {
+  public Map<String, Map> getLocalizedFieldsMap() {
     return localizedFieldsMap;
   }
 

src/test/kotlin/com/contentful/java/cda/AssetTests.kt

@@ -33,7 +33,7 @@ class AssetTests : BaseTest() {
                 client!!.assets().async().fetchAll(TestCallback()))
 
         assertEquals(1, result.getTotal())
-        assertEquals(1, result.getItems().size)
+        assertEquals(1, result.getItems().size())
 
         assertTrue(result.getItems()[0] is CDAAsset)
         val jake = result.getItems()[0] as CDAAsset

src/test/kotlin/com/contentful/java/cda/EntryTests.kt

@@ -146,7 +146,7 @@ class EntryTests : BaseTest() {
             assertEquals(2, result.getTotal())
             assertEquals(0, result.getSkip())
             assertEquals(100, result.getLimit())
-            assertEquals(2, result.getItems().size)
+            assertEquals(2, result.getItems().size())
 
             assertTrue(result.getItems()[0] is CDAEntry)
             val jake = result.getItems()[0] as CDAEntry
@@ -162,7 +162,7 @@ class EntryTests : BaseTest() {
                     image.getUrl())
             assertEquals("image/png", image.getMimeType())
             assertEquals("Jake", image.getFields().get("title"))
-            assertEquals(4, (image.getFields().get("file") as Map<*, *>).size)
+            assertEquals(4, (image.getFields().get("file") as Map<*, *>).size())
 
             // Entry Link
             assertTrue(fields.get("entry") is CDAEntry)

src/test/kotlin/com/contentful/java/cda/SpaceTests.kt

@@ -40,7 +40,7 @@ class SpaceTests : BaseTest() {
         assertEquals("en-US", result.getDefaultLocale())
 
         val locales = result.getLocales()
-        assertEquals(2, locales.size)
+        assertEquals(2, locales.size())
         assertEquals("en-US", locales[0].getCode())
         assertEquals("English", locales[0].getName())
         assertTrue(locales[0].isDefault())

src/test/kotlin/com/contentful/java/cda/SyncTests.kt

@@ -78,7 +78,7 @@ class SyncTests : BaseTest() {
 
     fun verifySyncFirst(result: CDASyncedSpace, request: RecordedRequest) {
         val items = result.getItems()
-        assertEquals(4, items.size)
+        assertEquals(4, items.size())
 
         assertTrue(items[0] is CDAEntry)
         assertTrue(items[1] is CDAEntry)
@@ -110,7 +110,7 @@ class SyncTests : BaseTest() {
 
     fun verifySyncSecond(result: CDASyncedSpace, request: RecordedRequest) {
         val items = result.getItems()
-        assertEquals(3, items.size)
+        assertEquals(3, items.size())
 
         assertTrue(items[0] is CDAEntry)
         assertTrue(items[1] is CDAEntry)