From ee0e7429bff3092406497328b773998a92e462b4 Mon Sep 17 00:00:00 2001 From: Erik Smith Date: Wed, 11 Aug 2021 11:07:34 -0500 Subject: [PATCH 1/4] Update dependency spring-boot-dependencies to v2.3.12.RELEASE --- crnk-setup/crnk-setup-spring-boot2/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crnk-setup/crnk-setup-spring-boot2/build.gradle b/crnk-setup/crnk-setup-spring-boot2/build.gradle index 69ef3acd7..e5c5b0e08 100644 --- a/crnk-setup/crnk-setup-spring-boot2/build.gradle +++ b/crnk-setup/crnk-setup-spring-boot2/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'java' apply plugin: 'io.spring.dependency-management' dependencyManagement { imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:2.0.3.RELEASE' + mavenBom 'org.springframework.boot:spring-boot-dependencies:2.3.12.RELEASE' } } From a923c0f85ac1a4533d806796feb4d0b27e51d5bb Mon Sep 17 00:00:00 2001 From: Erik Smith Date: Wed, 11 Aug 2021 11:11:07 -0500 Subject: [PATCH 2/4] fix CrnkErrorController by using the new 'getErrorAttributes' method --- .../java/io/crnk/spring/setup/boot/mvc/CrnkErrorController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crnk-setup/crnk-setup-spring-boot2/src/main/java/io/crnk/spring/setup/boot/mvc/CrnkErrorController.java b/crnk-setup/crnk-setup-spring-boot2/src/main/java/io/crnk/spring/setup/boot/mvc/CrnkErrorController.java index 15e307f3b..e576c3072 100644 --- a/crnk-setup/crnk-setup-spring-boot2/src/main/java/io/crnk/spring/setup/boot/mvc/CrnkErrorController.java +++ b/crnk-setup/crnk-setup-spring-boot2/src/main/java/io/crnk/spring/setup/boot/mvc/CrnkErrorController.java @@ -37,7 +37,7 @@ public CrnkErrorController(ErrorAttributes errorAttributes, @ResponseBody public ResponseEntity errorToJsonApi(HttpServletRequest request) { Map body = getErrorAttributes(request, - isIncludeStackTrace(request, MediaType.ALL)); + getErrorAttributeOptions(request, MediaType.ALL)); HttpStatus status = getStatus(request); ErrorDataBuilder errorDataBuilder = ErrorData.builder(); From f6d8c06d7ae70951fcb6265fd74d22a7798129f7 Mon Sep 17 00:00:00 2001 From: Erik Smith Date: Wed, 11 Aug 2021 11:31:09 -0500 Subject: [PATCH 3/4] add validation starter as it is no longer included in the web starter --- crnk-setup/crnk-setup-spring-boot2/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crnk-setup/crnk-setup-spring-boot2/build.gradle b/crnk-setup/crnk-setup-spring-boot2/build.gradle index e5c5b0e08..742b38c60 100644 --- a/crnk-setup/crnk-setup-spring-boot2/build.gradle +++ b/crnk-setup/crnk-setup-spring-boot2/build.gradle @@ -29,6 +29,7 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.springframework.boot:spring-boot-configuration-processor' compileOnly 'org.springframework.boot:spring-boot-starter-actuator' + compileOnly 'org.springframework.boot:spring-boot-starter-validation' compileOnly 'org.springframework.security:spring-security-core' compileOnly 'org.springframework:spring-orm' @@ -49,6 +50,7 @@ dependencies { testCompile 'org.springframework.boot:spring-boot-starter-web' testCompile 'org.springframework.boot:spring-boot-starter-test' testCompile 'org.springframework.boot:spring-boot-starter-actuator' + testCompile 'org.springframework.boot:spring-boot-starter-validation' testCompile 'org.hibernate:hibernate-core' testCompile 'org.hibernate:hibernate-entitymanager' From b8eb6d3b9347372ee1eefe228bed421eadf36735 Mon Sep 17 00:00:00 2001 From: Erik Smith Date: Wed, 11 Aug 2021 17:36:23 -0500 Subject: [PATCH 4/4] fix broken test by setting the include-message property to 'always' --- .../src/test/java/io/crnk/spring/boot/BasicSpringBoot2Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crnk-setup/crnk-setup-spring-boot2/src/test/java/io/crnk/spring/boot/BasicSpringBoot2Test.java b/crnk-setup/crnk-setup-spring-boot2/src/test/java/io/crnk/spring/boot/BasicSpringBoot2Test.java index ce2a260f2..55d1466a5 100644 --- a/crnk-setup/crnk-setup-spring-boot2/src/test/java/io/crnk/spring/boot/BasicSpringBoot2Test.java +++ b/crnk-setup/crnk-setup-spring-boot2/src/test/java/io/crnk/spring/boot/BasicSpringBoot2Test.java @@ -68,7 +68,7 @@ import org.springframework.web.client.RestTemplate; @RunWith(SpringRunner.class) -@SpringBootTest(classes = BasicSpringBoot2Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@SpringBootTest(classes = BasicSpringBoot2Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "server.error.include-message=always") @DirtiesContext public class BasicSpringBoot2Test {