From 493d2d8123072e5283d9498faff58bf1090f293b Mon Sep 17 00:00:00 2001 From: Damien Beaufils Date: Thu, 22 Mar 2018 10:30:24 +0100 Subject: [PATCH 1/3] Bump version to 2.0.1-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c3909e..14eb03b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.prismic java-kit jar - 2.0.0 + 2.0.1-SNAPSHOT java-kit The developer kit to access Prismic.io repositories using the Java language. http://maven.apache.org From a7fc0c00e8e04b0aab352d34abb8fdf5807860ca Mon Sep 17 00:00:00 2001 From: Damien Beaufils Date: Thu, 22 Mar 2018 10:29:07 +0100 Subject: [PATCH 2/3] Fix: avoid NullPointerException when error stream does not contain error json field --- src/main/java/io/prismic/core/HttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/prismic/core/HttpClient.java b/src/main/java/io/prismic/core/HttpClient.java index 4364ee5..0f67494 100644 --- a/src/main/java/io/prismic/core/HttpClient.java +++ b/src/main/java/io/prismic/core/HttpClient.java @@ -58,7 +58,7 @@ public static JsonNode fetch(String url, Logger logger, Cache cache, Proxy proxy String body; String errorText = "Unknown error"; JsonNode errorJson = new ObjectMapper().readTree(httpConnection.getErrorStream()); - if (errorJson != null) { + if (errorJson != null && errorJson.get("error") != null) { errorText = errorJson.get("error").asText(); } switch (httpConnection.getResponseCode()) { From c26365b949acaf774e75584b791ec32a58869db5 Mon Sep 17 00:00:00 2001 From: Damien Beaufils Date: Thu, 22 Mar 2018 10:32:36 +0100 Subject: [PATCH 3/3] Fix: update image url in failing test because of default CDN activation --- src/test/java/io/prismic/DocumentTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/io/prismic/DocumentTest.java b/src/test/java/io/prismic/DocumentTest.java index 60c0944..a38ab95 100644 --- a/src/test/java/io/prismic/DocumentTest.java +++ b/src/test/java/io/prismic/DocumentTest.java @@ -170,7 +170,7 @@ public void image() { .query(Predicates.at("document.id", "Uyr9sgEAAGVHNoFZ")) .submit().getResults().get(0); Fragment.Image.View img = doc.getImage("article.illustration", "icon"); - String url = "https://prismic-io.s3.amazonaws.com/test-public/9f5f4e8a5d95c7259108e9cfdde953b5e60dcbb6.jpg"; + String url = "https://test-public.cdn.prismic.io/test-public/9f5f4e8a5d95c7259108e9cfdde953b5e60dcbb6.jpg"; Assert.assertEquals("\"some", img.asHtml(linkResolver)); }