fix empty fields on assets in preview mode

closes #145

Author: Mario Bodemann

CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version [3.2.1] - 2018-05-28
+- Fix: ignore empty asset fields
+
 ## Version [3.2.0] - 2018-04-24
 - Change: use https for asset urls.
 - Change: Use CDA SDK 10.0.0 and throw if environments are used.
@@ -128,7 +131,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## Version 0.9.0 - 2015-05-18
 Initial release.
 
-[unreleased]: https://github.com/contentful/vault/compare/vault-parent-3.2.0...HEAD
+[unreleased]: https://github.com/contentful/vault/compare/vault-parent-3.2.1...HEAD
+[3.2.0]: https://github.com/contentful/vault/compare/vault-parent-3.2.0...vault-parent-3.2.1
 [3.2.0]: https://github.com/contentful/vault/compare/vault-parent-3.1.1...vault-parent-3.2.0
 [3.1.1]: https://github.com/contentful/vault/compare/vault-parent-3.1.0...vault-parent-3.1.1
 [3.1.0]: https://github.com/contentful/vault/compare/vault-parent-3.0.2...vault-parent-3.1.0

README.md

@@ -16,24 +16,24 @@ Grab via Maven:
 <dependency>
   <groupId>com.contentful.vault</groupId>
   <artifactId>compiler</artifactId>
-  <version>3.2.0</version>
+  <version>3.2.1</version>
 </dependency>
 <dependency>
   <groupId>com.contentful.vault</groupId>
   <artifactId>core</artifactId>
-  <version>3.2.0</version>
+  <version>3.2.1</version>
 </dependency>
 ```
 or Gradle:
 ```groovy
-apt 'com.contentful.vault:compiler:3.2.0'
-compile 'com.contentful.vault:core:3.2.0'
+apt 'com.contentful.vault:compiler:3.2.1'
+compile 'com.contentful.vault:core:3.2.1'
 ```
 or Gradle 3.+:
 ```groovy
-annotationProcessor 'com.contentful.vault:compiler:3.2.0'
-annotationProcessor 'com.contentful.vault:core:3.2.0'
-compile 'com.contentful.vault:core:3.2.0'
+annotationProcessor 'com.contentful.vault:compiler:3.2.1'
+annotationProcessor 'com.contentful.vault:core:3.2.1'
+compile 'com.contentful.vault:core:3.2.1'
 ```
 
 Note for Gradle users, make sure to use the [android-apt][apt] Gradle plugin, which lets you configure compile-time only dependencies.

core/src/main/java/com/contentful/vault/Sql.java

@@ -72,8 +72,8 @@ static String createLinks(String locale) {
   static String createAssets(String locale) {
     return "CREATE TABLE " + escape(localizeName(TABLE_ASSETS, locale)) + " ("
         + StringUtils.join(RESOURCE_COLUMNS, ", ") + ","
-        + declareField(Asset.Fields.URL, "STRING", false, ", ")
-        + declareField(Asset.Fields.MIME_TYPE, "STRING", false, ", ")
+        + declareField(Asset.Fields.URL, "STRING", true, ", ")
+        + declareField(Asset.Fields.MIME_TYPE, "STRING", true, ", ")
         + declareField(Asset.Fields.TITLE, "STRING", true, ", ")
         + declareField(Asset.Fields.DESCRIPTION, "STRING", true, ", ")
         + declareField(Asset.Fields.FILE, "BLOB", true, null)

core/src/main/java/com/contentful/vault/SyncRunnable.java

@@ -220,8 +220,10 @@ private void saveAsset(CDAAsset asset) {
       putResourceFields(asset, values);
       final LocalizedResource.Localizer localizer = asset.localize(locale);
       final Map<String, Object> file = localizer.getField("file");
-      values.put(Asset.Fields.URL, "https:" + file.get("url"));
-      values.put(Asset.Fields.MIME_TYPE, (String) file.get("contentType"));
+      if (file != null) {
+        values.put(Asset.Fields.URL, "https:" + file.get("url"));
+        values.put(Asset.Fields.MIME_TYPE, (String) file.get("contentType"));
+      }
       values.put(Asset.Fields.TITLE, localizer.<String>getField("title"));
       values.put(Asset.Fields.DESCRIPTION, localizer.<String>getField("description"));
 

tests-integration/src/test/java/com/contentful/vaultintegration/SyncTest.java

@@ -42,6 +42,28 @@ public class SyncTest extends SyncBase {
     assertThat(request.getPath()).isEqualTo("/spaces/space/sync?initial=true");
   }
 
+  @Test public void testAssetsInDraft() throws Exception {
+    enqueue("assets/locales.json");
+    enqueue("assets/types.json");
+    enqueue("assets/empty.json");
+    sync();
+
+    server.takeRequest(); // ignore locales request
+    server.takeRequest(); // ignore content types request
+    RecordedRequest request = server.takeRequest(); // analyse empty asset response
+    assertThat(request.getPath()).isEqualTo("/spaces/space/sync?initial=true");
+
+
+    List<Asset> assets = vault.fetch(Asset.class).all();
+
+    assertThat(assets).isNotNull();
+    assertThat(assets).hasSize(1);
+
+    Asset asset = assets.get(0);
+    assertThat(asset).isNotNull();
+    assertThat(asset.file()).isNull();
+  }
+
   @Test public void testSync() throws Exception {
     // Initial
     enqueueInitial();

tests-integration/src/test/resources/assets/empty.json

@@ -0,0 +1,32 @@
+{
+  "sys": {
+    "type": "Array"
+  },
+  "items": [
+    {
+      "sys": {
+        "space": {
+          "sys": {
+            "type": "Link",
+            "linkType": "Space",
+            "id": "cfexampleapi"
+          },
+          "environment": {
+            "sys": {
+              "id": "staging",
+              "type": "Link",
+              "linkType": "Environment"
+            }
+          }
+        },
+        "type": "Asset",
+        "id": "id",
+        "revision": 6,
+        "createdAt": "2018-05-06T09:45:10.000Z",
+        "updatedAt": "2018-06-18T13:27:14.917Z"
+      },
+      "fields": {}
+    }
+  ],
+  "nextSyncUrl": "http://cdn.contentful.com/spaces/cfexampleapi/sync?sync_token=st1"
+}