From e906d6d66499551c328c07f4a3f7ba3457bec3a5 Mon Sep 17 00:00:00 2001 From: Florian Cramer Date: Sat, 10 Apr 2021 22:47:08 +0200 Subject: [PATCH] #545 - Support for implicitly not required request parameters --- .../org/springframework/hateoas/server/core/WebHandler.java | 2 +- .../hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/hateoas/server/core/WebHandler.java b/src/main/java/org/springframework/hateoas/server/core/WebHandler.java index ff96e8fec..19009a6ca 100644 --- a/src/main/java/org/springframework/hateoas/server/core/WebHandler.java +++ b/src/main/java/org/springframework/hateoas/server/core/WebHandler.java @@ -459,7 +459,7 @@ public Object getVerifiedValue(Object[] values) { RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class); - if (!(annotation != null && annotation.required()) || parameter.isOptional()) { + if (!isRequired() || parameter.isOptional()) { return SKIP_VALUE; } diff --git a/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java index 34cd8cef1..19c1e5ff2 100644 --- a/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/server/mvc/WebMvcLinkBuilderUnitTest.java @@ -473,7 +473,7 @@ void linksToMethodWithRequestParamImplicitlySetToFalse() { Link link = linkTo(methodOn(ControllerWithMethods.class).methodForOptionalSizeWithDefaultValue(null)).withSelfRel(); - assertThat(link.getHref()).endsWith("/bar"); + assertThat(link.getHref()).endsWith("/bar{?size}"); } /**