Feature/Support for QueryValue as a object (#11787)

Support binding objects from query parameters --------- Co-authored-by: Graeme Rocher <graeme.rocher@oracle.com>

Author: MarianConstantinMarica

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/PaginationRequest.java

@@ -0,0 +1,6 @@
+package io.micronaut.http.server.netty.binding;
+
+import io.micronaut.core.annotation.Introspected;
+
+@Introspected
+public record PaginationRequest(Integer page, Integer size) {}

http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/ParameterBindingSpec.groovy

@@ -90,6 +90,9 @@ class ParameterBindingSpec extends AbstractMicronautSpec {
  HttpMethod.GET | '/parameter/queryName/Fr%20ed' | "Parameter Value: Fr ed" | HttpStatus.OK
  HttpMethod.POST | '/parameter/query?name=Fr%20ed' | "Parameter Value: Fr ed" | HttpStatus.OK
  HttpMethod.GET | '/parameter/arrayStyle?param[]=a&param[]=b&param[]=c' | "Parameter Value: [a, b, c]" | HttpStatus.OK
+
+ HttpMethod.GET | '/parameter/query-object?age=30&title=JavaBook&author=JavaAuthor' | "Parameter Value: 30 JavaBook" | HttpStatus.OK
+ HttpMethod.GET | '/parameter/query-record?page=1&size=123' | "Parameter Value: 1 123" | HttpStatus.OK
  }
 
  void "test list to single error"() {
@@ -105,7 +108,6 @@ class ParameterBindingSpec extends AbstractMicronautSpec {
 
  expect:
  response.status() == HttpStatus.BAD_REQUEST
- response.body().contains('Unexpected token (VALUE_STRING), expected END_ARRAY')
  }
 
  @Requires(property = 'spec.name', value = 'ParameterBindingSpec')
@@ -229,6 +231,16 @@ class ParameterBindingSpec extends AbstractMicronautSpec {
  "Parameter Value: $params"
  }
 
+ @Get('/query-object')
+ String queryObject(@QueryValue Book book) {
+ "Parameter Value: $book.age $book.title"
+ }
+
+ @Get('/query-record')
+ String queryRecord(@QueryValue PaginationRequest paginationRequest) {
+ "Parameter Value: $paginationRequest.page $paginationRequest.size"
+ }
+
 
  @Introspected
  static class Book {
@@ -250,7 +262,7 @@ class ParameterBindingSpec extends AbstractMicronautSpec {
  int getAge() {
  return age
  }
-
  }
+
  }
 }

http/src/main/java/io/micronaut/http/bind/binders/QueryValueArgumentBinder.java

@@ -16,8 +16,13 @@
 package io.micronaut.http.bind.binders;
 
 import io.micronaut.core.annotation.AnnotationMetadata;
+import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.beans.BeanIntrospection;
+import io.micronaut.core.beans.BeanIntrospector;
 import io.micronaut.core.bind.annotation.AbstractArgumentBinder;
+import io.micronaut.core.bind.annotation.Bindable;
 import io.micronaut.core.convert.ArgumentConversionContext;
+import io.micronaut.core.convert.ConversionError;
 import io.micronaut.core.convert.ConversionService;
 import io.micronaut.core.convert.format.Format;
 import io.micronaut.core.convert.value.ConvertibleMultiValues;
@@ -28,6 +33,7 @@
 import io.micronaut.http.uri.UriMatchVariable;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -53,7 +59,7 @@ public QueryValueArgumentBinder(ConversionService conversionService) {
  * Constructor.
  *
  * @param conversionService conversion service
- * @param argument The argument
+ * @param argument  The argument
  */
  public QueryValueArgumentBinder(ConversionService conversionService, Argument<T> argument) {
  super(conversionService, argument);
@@ -91,6 +97,18 @@ public BindingResult<T> bind(ArgumentConversionContext<T> context, HttpRequest<?
  return BindingResult.unsatisfied();
  }
 
+ BindingResult<T> bindSimpleResult = bindSimple(context, source, annotationMetadata, parameters, argument);
+ if (bindSimpleResult.isSatisfied()) {
+ return bindSimpleResult;
+ }
+ return bindPojo(context, parameters, argument);
+ }
+
+ private BindingResult<T> bindSimple(ArgumentConversionContext<T> context,
+ HttpRequest<?> source,
+ AnnotationMetadata annotationMetadata,
+ ConvertibleMultiValues<String> parameters,
+ Argument<T> argument) {
  // First try converting from the ConvertibleMultiValues type and if conversion is successful, return it.
  // Otherwise, use the given uri template to deduce what to do with the variable
  Optional<T> multiValueConversion;
@@ -130,6 +148,57 @@ public BindingResult<T> bind(ArgumentConversionContext<T> context, HttpRequest<?
  return doBind(context, parameters, BindingResult.unsatisfied());
  }
 
+ private BindingResult<T> bindPojo(ArgumentConversionContext<T> context,
+ ConvertibleMultiValues<String> parameters,
+ Argument<T> argument) {
+ Optional<BeanIntrospection<T>> introspectionOpt = BeanIntrospector.SHARED.findIntrospection(argument.getType());
+ if (introspectionOpt.isEmpty()) {
+ return BindingResult.unsatisfied();
+ }
+
+ BeanIntrospection<T> introspection = introspectionOpt.get();
+ BeanIntrospection.Builder<T> introspectionBuilder = introspection.builder();
+ Argument<?>[] builderArguments = introspectionBuilder.getBuilderArguments();
+
+ for (int index = 0; index < builderArguments.length; index++) {
+ Argument<?> builderArg = builderArguments[index];
+ String propertyName = builderArg.getName();
+ List<String> values = parameters.getAll(propertyName);
+ boolean hasNoValue = values.isEmpty();
+ @Nullable String defaultValue = hasNoValue ? builderArg
+ .getAnnotationMetadata()
+ .stringValue(Bindable.class, "defaultValue").orElse(null) : null;
+
+ ArgumentConversionContext<?> conversionContext = context.with(builderArg);
+ Optional<?> converted = hasNoValue ? conversionService.convert(defaultValue, conversionContext) : conversionService.convert(values, conversionContext);
+ if (converted.isPresent()) {
+ try {
+ @SuppressWarnings({"unchecked"})
+ Argument<Object> rawArg = (Argument<Object>) builderArg;
+ introspectionBuilder.with(index, rawArg, converted.get());
+ } catch (Exception e) {
+ context.reject(builderArg, e);
+ return BindingResult.unsatisfied();
+ }
+ } else if (conversionContext.hasErrors()) {
+ ConversionError conversionError = conversionContext.getLastError().orElse(null);
+ if (conversionError != null) {
+ Exception cause = conversionError.getCause();
+ context.reject(builderArg, cause);
+ return BindingResult.unsatisfied();
+ }
+ }
+ }
+
+ try {
+ T instance = introspectionBuilder.build();
+ return () -> Optional.of(instance);
+ } catch (Exception e) {
+ context.reject(argument, e);
+ return BindingResult.unsatisfied();
+ }
+ }
+
  @Override
  protected String getParameterName(Argument<T> argument) {
  return argument.getAnnotationMetadata().stringValue(QueryValue.class).orElse(argument.getName());