From fc55c53abc2b06d13177279d828df203fa9c6e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 10 Jan 2025 17:48:48 +0100 Subject: [PATCH 1/2] Avoid usage of JsonExpectationsHelper#assertEquals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This has been deprecated in Spring Framework 6.2. Closes gh-1107 Signed-off-by: Stéphane Nicoll --- .../graphql/test/tester/DefaultGraphQlTester.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java index 1c58a5ef..75c5f600 100644 --- a/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java +++ b/spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.TypeRef; +import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ResolvableType; @@ -42,7 +43,6 @@ import org.springframework.graphql.support.DefaultGraphQlRequest; import org.springframework.graphql.support.DocumentSource; import org.springframework.lang.Nullable; import org.springframework.test.util.AssertionErrors; -import org.springframework.test.util.JsonExpectationsHelper; import org.springframework.test.util.JsonPathExpectationsHelper; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -469,7 +469,7 @@ final class DefaultGraphQlTester implements GraphQlTester { this.delegate.doAssert(() -> { String actual = this.delegate.jsonContent(this.jsonPath); try { - new JsonExpectationsHelper().assertJsonEqual(expected, actual, strict); + JSONAssert.assertEquals(expected, actual, strict); } catch (AssertionError ex) { throw new AssertionError(ex.getMessage() + "\n\n" + "Expected JSON content:\n'" + expected + "'\n\n" From 2ef7fa214fb5ab345105e12592afe0877e06fb0c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 9 Jan 2025 10:03:29 +0000 Subject: [PATCH 2/2] Update Antora Spring UI to v0.4.18 Closes gh-1106 Closes gh-1105 --- spring-graphql-docs/antora-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-graphql-docs/antora-playbook.yml b/spring-graphql-docs/antora-playbook.yml index a967a16b..1e1fb3f0 100644 --- a/spring-graphql-docs/antora-playbook.yml +++ b/spring-graphql-docs/antora-playbook.yml @@ -31,7 +31,7 @@ urls: redirect_facility: httpd ui: bundle: - url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.17/ui-bundle.zip + url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.18/ui-bundle.zip runtime: log: failure_level: warn