From 4326c5322267ab47191a0b8ee418574c2a2b0011 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 14 Aug 2023 19:28:19 +0200 Subject: [PATCH] Polishing (cherry picked from commit 2ce75dc415c0c6d1a91b5d7d3fa37b5fb01c92f1) --- .../org/springframework/jdbc/core/BeanPropertyRowMapper.java | 2 +- .../annotation/support/PayloadMethodArgumentResolver.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java index cd51ba286b..47d4f4955f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java @@ -343,7 +343,7 @@ public class BeanPropertyRowMapper implements RowMapper { bw.setPropertyValue(pd.getName(), value); } catch (TypeMismatchException ex) { - if (value == null && this.primitivesDefaultedForNullValue) { + if (value == null && isPrimitivesDefaultedForNullValue()) { if (logger.isDebugEnabled()) { String propertyType = ClassUtils.getQualifiedName(pd.getPropertyType()); logger.debug(String.format( diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java index 2ced8c86cd..103a3c1b8e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2023 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. @@ -191,8 +191,7 @@ public class PayloadMethodArgumentResolver implements HandlerMethodArgumentResol /** * Validate the payload if applicable. *

The default implementation checks for {@code @javax.validation.Valid}, - * Spring's {@link Validated}, - * and custom annotations whose name starts with "Valid". + * Spring's {@link Validated}, and custom annotations whose name starts with "Valid". * @param message the currently processed message * @param parameter the method parameter * @param target the target payload object