From 90c209ae9a4b1af56fdcd1a7f7b8340eac2ff03b Mon Sep 17 00:00:00 2001 From: Janssen Batista Date: Sun, 30 Jun 2024 15:36:01 -0300 Subject: [PATCH 1/4] refactor: update url reference in image test --- 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..d152d66 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://images.prismic.io/test-public/9f5f4e8a5d95c7259108e9cfdde953b5e60dcbb6.jpg?auto=compress,format"; Assert.assertEquals("\"some", img.asHtml(linkResolver)); } From f6b029a74d6fdc6ee1205a5d5c1ec5c285fd90c9 Mon Sep 17 00:00:00 2001 From: Janssen Batista Date: Sun, 30 Jun 2024 18:08:23 -0300 Subject: [PATCH 2/4] fix: nullpointer exception in HttpClient --- 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..d1e33a4 100644 --- a/src/main/java/io/prismic/core/HttpClient.java +++ b/src/main/java/io/prismic/core/HttpClient.java @@ -59,7 +59,7 @@ public static JsonNode fetch(String url, Logger logger, Cache cache, Proxy proxy String errorText = "Unknown error"; JsonNode errorJson = new ObjectMapper().readTree(httpConnection.getErrorStream()); if (errorJson != null) { - errorText = errorJson.get("error").asText(); + errorText = errorJson.get("message").asText(); } switch (httpConnection.getResponseCode()) { case 401: From 58e8232d83b69a3acaba2905861fe72415ba4cf8 Mon Sep 17 00:00:00 2001 From: Janssen Batista Date: Sun, 30 Jun 2024 18:17:08 -0300 Subject: [PATCH 3/4] test: update assertion in groupFragments function --- src/test/java/io/prismic/AppTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/io/prismic/AppTest.java b/src/test/java/io/prismic/AppTest.java index 3221300..7ac4dbf 100644 --- a/src/test/java/io/prismic/AppTest.java +++ b/src/test/java/io/prismic/AppTest.java @@ -164,8 +164,8 @@ public String resolve(Fragment.DocumentLink link) { }); String docchapter_expected = "

Using with other projects

\n" +"

As advertised, meta-micro knows how to stay out of the way of the rest of your application. Here are some cases of how to use it with some of the most used open-source projects in JavaScript.

\n" - +"
500.0
\n" - +"
with-jquery
with-bootstrap
"; + +"
with-jquery
with-bootstrap
\n" + +"
500.0
"; Assert.assertEquals( "HTML serialization of docchapter \"Using meta-micro\"", docchapter_expected, From 683e8893ac31d1f5f385a2f90550d0f73b02a932 Mon Sep 17 00:00:00 2001 From: Janssen Batista Date: Sun, 30 Jun 2024 18:20:08 -0300 Subject: [PATCH 4/4] chore: update versions of libraries that contained vulnerabilities --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7c3909e..08d990f 100644 --- a/pom.xml +++ b/pom.xml @@ -131,17 +131,17 @@ com.fasterxml.jackson.core jackson-databind - 2.9.3 + 2.13.4.1 org.apache.commons commons-collections4 - 4.1 + 4.3 commons-io commons-io - 2.6 + 2.7 javax.servlet @@ -151,7 +151,7 @@ junit junit - 4.12 + 4.13.1 test