Revert skipLinks() for CDAClient

Author: Tom Reznik

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

@@ -94,12 +94,10 @@ public T call() throws Exception {
       }
     }
 
-    if (!context.skipLinks) {
-      // Iterate through all entries and attempt to resolve contained links.
-      for (CDAResource resource : entries.values()) {
-        if (resource instanceof ResourceWithMap) {
-          resolveResourceLinks((ResourceWithMap) resource, assets, entries);
-        }
+    // Iterate through all entries and attempt to resolve contained links.
+    for (CDAResource resource : entries.values()) {
+      if (resource instanceof ResourceWithMap) {
+        resolveResourceLinks((ResourceWithMap) resource, assets, entries);
       }
     }
 

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

@@ -56,15 +56,14 @@ public class CDAClient {
   final Gson gson;
   final SpaceWrapper spaceWrapper;
   final Executor callbackExecutor;
-  final boolean skipLinks;
+  final boolean nullifyUnresolved;
 
   // Modules
   final ModuleAssets moduleAssets;
   final ModuleContentTypes moduleContentTypes;
   final ModuleEntries moduleEntries;
   final ModuleSpaces moduleSpaces;
   final ModuleSync moduleSync;
-  final boolean nullifyUnresolved;
 
   private CDAClient(Builder builder) {
     if (builder.accessToken == null) {
@@ -84,7 +83,6 @@ private CDAClient(Builder builder) {
     this.callbackExecutor = createCallbackExecutor(builder);
     this.gson = createGson();
     this.service = createRetrofitService(builder);
-    this.skipLinks = builder.skipLinks;
     this.nullifyUnresolved = builder.nullifyUnresolved;
 
     ClientContext context = createContext();
@@ -103,7 +101,6 @@ private ClientContext createContext() {
           .setGson(gson)
           .setSpaceWrapper(spaceWrapper)
           .setCustomTypesMap(classMap)
-          .setSkipLinks(skipLinks)
           .setNullifyUnresolved(nullifyUnresolved)
           .build();
   }
@@ -286,7 +283,6 @@ public static class Builder {
     Map<String, Class<?>> classMap;
     boolean secure;
     boolean nullifyUnresolved;
-    boolean skipLinks;
 
     private Builder() {
       // Defaults
@@ -448,16 +444,6 @@ public Builder preview() {
       return setEndpoint(Constants.ENDPOINT_PREVIEW);
     }
 
-    /**
-     * Sets the behavior of this client to never resolve any links.
-     *
-     * @return this {@code Builder} instance
-     */
-    public Builder skipLinks() {
-      this.skipLinks = true;
-      return this;
-    }
-
     /**
      * By default, unresolved links will point to a {@code Map} instance containing all the links
      * details. This changes the default behaviour to remove any unresolved links.

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

@@ -30,7 +30,6 @@ final class ClientContext {
   final Gson gson;
   final SpaceWrapper spaceWrapper;
   final Map<String, Class<?>> customTypesMap;
-  final boolean skipLinks;
   final boolean nullifyUnresolved;
 
   private ClientContext() {
@@ -44,7 +43,6 @@ public ClientContext(Builder builder) {
     this.gson = builder.gson;
     this.spaceWrapper = builder.spaceWrapper;
     this.customTypesMap = builder.customTypesMap;
-    this.skipLinks = builder.skipLinks;
     this.nullifyUnresolved = builder.nullifyUnresolved;
   }
 
@@ -59,7 +57,6 @@ static class Builder {
     private Gson gson;
     private SpaceWrapper spaceWrapper;
     private Map<String, Class<?>> customTypesMap;
-    private boolean skipLinks;
     private boolean nullifyUnresolved;
 
     private Builder() {
@@ -95,11 +92,6 @@ public Builder setCustomTypesMap(Map<String, Class<?>> customTypesMap) {
       return this;
     }
 
-    public Builder setSkipLinks(boolean skipLinks) {
-      this.skipLinks = skipLinks;
-      return this;
-    }
-
     public Builder setNullifyUnresolved(boolean nullifyUnresolved) {
       this.nullifyUnresolved = nullifyUnresolved;
       return this;

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

@@ -38,26 +38,6 @@ import org.junit.Test as test
  * Client Tests.
  */
 class ClientTests : BaseTest() {
-    test fun testDontResolveLinks() {
-        enqueue("space_fetch_response.json")
-        enqueue("entry_fetch_all_response.json")
-
-        val cli = CDAClient.builder()
-                .setAccessToken("token")
-                .setSpaceKey("spaceid")
-                .setEndpoint(getServerUrl())
-                .setLogLevel(RestAdapter.LogLevel.FULL)
-                .skipLinks()
-                .noSSL()
-                .build()
-
-        val array = cli.entries().fetchAll()
-        var jake = array.getItems()[0] as? CDAEntry
-        assertNotNull(jake)
-        assertEquals("Jake", jake!!.getFields()["name"])
-        assertFalse(jake!!.getFields()["image"] is CDAResource)
-    }
-
     test fun testCancelledCallback() {
         enqueue("space_fetch_response.json")