Fix CME for invalid links on multiple locales field

Author: tomxor

CHANGELOG.md

@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Version [5.0.1][unreleased] - (in development)
-- TBA.
+- Fixed: ConcurrentModificationException when localized link field points to invalid entry.
 
 ## Version [5.0.0] - (2015-10-27)
 - Changed: `CDAArray.items()` now contains ONLY top level resources (no linked resources). All resources are available via `CDAArray.assets()` and `CDAArray.entries()` by ID.

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

@@ -119,18 +119,22 @@ static void resolveSingleLink(CDAEntry entry, CDAField field, ArrayResource arra
     if (value == null) {
       return;
     }
+    Set<String> toRemove = new HashSet<String>();
     for (String locale : value.keySet()) {
       String linkId = getLinkId(value.get(locale));
       if (linkId == null) {
         continue;
       }
       CDAResource resource = findLinkedResource(array, linkType, linkId);
       if (resource == null) {
-        value.remove(locale);
+        toRemove.add(locale);
       } else {
         value.put(locale, resource);
       }
     }
+    for (String locale : toRemove) {
+      value.remove(locale);
+    }
   }
 
   static String getLinkId(Object link) {

src/test/java/com/contentful/java/cda/SyncTest.java

@@ -129,4 +129,17 @@ public void testRawFields() throws Exception {
     assertThat(rawArray).isNotNull();
     assertThat(rawArray.get("en-US").get(0)).containsKey("sys");
   }
+
+  @Test
+  @Enqueue(
+      defaults = { },
+      value = {
+          "links_invalid/space.json",
+          "links_invalid/content_types.json",
+          "links_invalid/sync_initial.json"
+      }
+  )
+  public void invalidLinkDoesNotThrow() throws Exception {
+    client.sync().fetch();
+  }
 }

src/test/resources/links_invalid/content_types.json

@@ -0,0 +1,64 @@
+{
+  "sys": {
+    "type": "Array"
+  },
+  "total": 2,
+  "skip": 0,
+  "limit": 100,
+  "items": [
+    {
+      "name": "child",
+      "fields": [
+        {
+          "name": "name",
+          "id": "name",
+          "type": "Symbol",
+          "localized": false
+        }
+      ],
+      "description": "",
+      "displayField": "name",
+      "sys": {
+        "space": {
+          "sys": {
+            "type": "Link",
+            "linkType": "Space",
+            "id": "dc9j5zkjikxm"
+          }
+        },
+        "type": "ContentType",
+        "id": "71tYS0GavSkUMsokUWmAW4",
+        "revision": 1,
+        "createdAt": "2015-10-22T20:53:20.595Z",
+        "updatedAt": "2015-10-22T20:53:20.595Z"
+      }
+    },
+    {
+      "name": "parent",
+      "fields": [
+        {
+          "name": "child",
+          "id": "child",
+          "type": "Link",
+          "linkType": "Entry",
+          "localized": true
+        }
+      ],
+      "description": "",
+      "sys": {
+        "space": {
+          "sys": {
+            "type": "Link",
+            "linkType": "Space",
+            "id": "dc9j5zkjikxm"
+          }
+        },
+        "type": "ContentType",
+        "id": "59TAIUBW5OaOSS4WgE8M4s",
+        "revision": 1,
+        "createdAt": "2015-10-28T17:47:44.061Z",
+        "updatedAt": "2015-10-28T17:47:44.061Z"
+      }
+    }
+  ]
+}

src/test/resources/links_invalid/space.json

@@ -0,0 +1,19 @@
+{
+  "sys": {
+    "type": "Space",
+    "id": "dc9j5zkjikxm"
+  },
+  "name": "sp",
+  "locales": [
+    {
+      "code": "en-US",
+      "default": true,
+      "name": "U.S. English"
+    },
+    {
+      "code": "es",
+      "default": false,
+      "name": "Spanish"
+    }
+  ]
+}

src/test/resources/links_invalid/sync_initial.json

@@ -0,0 +1,77 @@
+{
+  "sys": {
+    "type": "Array"
+  },
+  "items": [
+    {
+      "sys": {
+        "space": {
+          "sys": {
+            "type": "Link",
+            "linkType": "Space",
+            "id": "dc9j5zkjikxm"
+          }
+        },
+        "type": "Entry",
+        "contentType": {
+          "sys": {
+            "type": "Link",
+            "linkType": "ContentType",
+            "id": "59TAIUBW5OaOSS4WgE8M4s"
+          }
+        },
+        "id": "2PovwSgHUce0AsokOswsqA",
+        "revision": 1,
+        "createdAt": "2015-10-28T17:48:13.629Z",
+        "updatedAt": "2015-10-28T17:48:13.629Z"
+      },
+      "fields": {
+        "child": {
+          "en-US": {
+            "sys": {
+              "type": "Link",
+              "linkType": "Entry",
+              "id": "INVALID"
+            }
+          },
+          "es": {
+            "sys": {
+              "type": "Link",
+              "linkType": "Entry",
+              "id": "51oWCPywfKyAs62gk66GUk"
+            }
+          }
+        }
+      }
+    },
+    {
+      "sys": {
+        "space": {
+          "sys": {
+            "type": "Link",
+            "linkType": "Space",
+            "id": "dc9j5zkjikxm"
+          }
+        },
+        "type": "Entry",
+        "contentType": {
+          "sys": {
+            "type": "Link",
+            "linkType": "ContentType",
+            "id": "71tYS0GavSkUMsokUWmAW4"
+          }
+        },
+        "id": "51oWCPywfKyAs62gk66GUk",
+        "revision": 1,
+        "createdAt": "2015-10-28T17:47:56.133Z",
+        "updatedAt": "2015-10-28T17:47:56.133Z"
+      },
+      "fields": {
+        "name": {
+          "en-US": "foo"
+        }
+      }
+    }
+  ],
+  "nextSyncUrl": "https://cdn.contentful.com/spaces/dc9j5zkjikxm/sync?sync_token=w5ZGw6JFwqZmVcKsE8Kow4grw45QdyYXJj7CgcO3PzMvSsO7MHrCgQNTwo0mNcKzwqRmMMKWfcKdwrzCug9iLSZwwptrw4fDjUrDicKJwqkywr_DlRYwchTDscOSw4spXTLCpX5twpvCmMKewqEZwo7Cm8Oz"
+}