Update to record

Author: mattbertolini

spring-annotated-data-binder-core/src/main/java/com/mattbertolini/spring/web/bind/introspect/ResolvedPropertyData.java

@@ -17,51 +17,7 @@
 
 import com.mattbertolini.spring.web.bind.resolver.RequestPropertyResolverBase;
 
-import java.util.Objects;
-
-public final class ResolvedPropertyData {
-    private final String propertyName;
-    private final BindingProperty bindingProperty;
-    private final RequestPropertyResolverBase<?, ?> resolver;
-
-    public ResolvedPropertyData(
-        String propertyName,
-        BindingProperty bindingProperty,
-        RequestPropertyResolverBase<?, ?> resolver
-    ) {
-        this.propertyName = propertyName;
-        this.bindingProperty = bindingProperty;
-        this.resolver = resolver;
-    }
-
-    public String getPropertyName() {
-        return propertyName;
-    }
-
-    public BindingProperty getBindingProperty() {
-        return bindingProperty;
-    }
-
-    public RequestPropertyResolverBase<?, ?> getResolver() {
-        return resolver;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof ResolvedPropertyData)) {
-            return false;
-        }
-        ResolvedPropertyData that = (ResolvedPropertyData) o;
-        return Objects.equals(propertyName, that.propertyName) &&
-            Objects.equals(bindingProperty, that.bindingProperty) &&
-            Objects.equals(resolver, that.resolver);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(propertyName, bindingProperty, resolver);
-    }
-}
+public record ResolvedPropertyData(
+    String propertyName,
+    BindingProperty bindingProperty,
+    RequestPropertyResolverBase<?, ?> resolver) {}

spring-annotated-data-binder-core/src/test/java/com/mattbertolini/spring/web/bind/introspect/DefaultAnnotatedRequestBeanIntrospectorTest.java

@@ -52,7 +52,7 @@ void returnsResolversForType() {
         Collection<ResolvedPropertyData> resolvers = introspector.getResolversFor(SimpleType.class);
         assertThat(resolvers).hasSize(1);
         ResolvedPropertyData data = resolvers.iterator().next();
-        assertThat(data.getPropertyName()).isEqualTo("data");
+        assertThat(data.propertyName()).isEqualTo("data");
     }
 
     @Test
@@ -62,7 +62,7 @@ void returnsResolversUsingNestedTypes() {
         Collection<ResolvedPropertyData> resolvers = introspector.getResolversFor(OuterBean.class);
         assertThat(resolvers).hasSize(1);
         ResolvedPropertyData data = resolvers.iterator().next();
-        assertThat(data.getPropertyName()).isEqualTo("innerBean.inner");
+        assertThat(data.propertyName()).isEqualTo("innerBean.inner");
     }
 
     private static class FakeResolver implements RequestPropertyResolverBase<Void, Object> {

spring-annotated-data-binder-core/src/test/java/com/mattbertolini/spring/web/bind/introspect/ResolvedPropertyDataTest.java

@@ -39,20 +39,20 @@ void setUp() throws Exception {
 
     @Test
     void returnsPropertyName() {
-        assertThat(propertyData.getPropertyName()).isEqualTo("name");
+        assertThat(propertyData.propertyName()).isEqualTo("name");
     }
 
     @Test
     void returnsBindingProperty() throws Exception {
         BindingProperty expected = BindingProperty.forPropertyDescriptor(
             new PropertyDescriptor("property", TestingClass.class));
-        assertThat(propertyData.getBindingProperty()).isEqualTo(expected);
+        assertThat(propertyData.bindingProperty()).isEqualTo(expected);
     }
 
     @Test
     void returnsResolver() {
-        assertThat(propertyData.getResolver()).isNotNull();
-        assertThat(propertyData.getResolver()).isInstanceOf(StubResolver.class);
+        assertThat(propertyData.resolver()).isNotNull();
+        assertThat(propertyData.resolver()).isInstanceOf(StubResolver.class);
     }
 
     @Test

spring-webflux-annotated-data-binder/src/main/java/com/mattbertolini/spring/web/reactive/bind/BeanParameterMethodArgumentResolver.java

@@ -78,9 +78,9 @@ protected Mono<Void> bindRequestParameters(WebExchangeDataBinder binder, ServerW
 
     private Mono<Map<String, Object>> getValuesToBind(Collection<ResolvedPropertyData> propertyData, ServerWebExchange exchange) {
         return Flux.fromIterable(propertyData).flatMap(data -> {
-            BindingProperty bindingProperty = data.getBindingProperty();
-            RequestPropertyResolver resolver = (RequestPropertyResolver) data.getResolver();
-            return resolver.resolve(bindingProperty, exchange).map(resolvedValue -> Tuples.of(data.getPropertyName(), resolvedValue));
+            BindingProperty bindingProperty = data.bindingProperty();
+            RequestPropertyResolver resolver = (RequestPropertyResolver) data.resolver();
+            return resolver.resolve(bindingProperty, exchange).map(resolvedValue -> Tuples.of(data.propertyName(), resolvedValue));
         }).collectMap(Tuple2::getT1, Tuple2::getT2)
             .onErrorMap(e -> new RequestPropertyBindingException("Unable to resolve property. " + e.getMessage(), e))
             .doOnSuccess(valuesMap -> valuesMap.values().removeIf(Objects::isNull));

spring-webmvc-annotated-data-binder/src/main/java/com/mattbertolini/spring/web/servlet/mvc/bind/BeanParameterMethodArgumentResolver.java

@@ -84,11 +84,11 @@ private Map<String, Object> getValuesToBind(Class<?> targetType, NativeWebReques
         Map<String, Object> values = new HashMap<>();
         Collection<ResolvedPropertyData> propertyData = introspector.getResolversFor(targetType);
         for (ResolvedPropertyData data : propertyData) {
-            RequestPropertyResolver resolver = (RequestPropertyResolver) data.getResolver();
+            RequestPropertyResolver resolver = (RequestPropertyResolver) data.resolver();
             try {
-                Object value = resolver.resolve(data.getBindingProperty(), request);
+                Object value = resolver.resolve(data.bindingProperty(), request);
                 if (value != null) {
-                    String propertyName = data.getPropertyName();
+                    String propertyName = data.propertyName();
                     values.put(propertyName, value);
                 }
             } catch (Exception e) {