Skip to content

Commit

Permalink
Specify generic type nullness in spring-r2dbc
Browse files Browse the repository at this point in the history
  • Loading branch information
sdeleuze committed Jan 14, 2025
1 parent 2f8ff7e commit 5be36ce
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
Expand Down Expand Up @@ -125,7 +125,7 @@ public BeanPropertyRowMapper(Class<T> mappedClass, ConversionService conversionS
* Remove the specified property from the mapped properties.
* @param propertyName the property name (as used by property descriptors)
*/
protected void suppressProperty(String propertyName) {
protected void suppressProperty(@Nullable String propertyName) {
this.mappedProperties.remove(lowerCaseName(propertyName));
this.mappedProperties.remove(underscoreName(propertyName));
}
Expand All @@ -136,7 +136,10 @@ protected void suppressProperty(String propertyName) {
* @param name the original name
* @return the converted name
*/
protected String lowerCaseName(String name) {
protected String lowerCaseName(@Nullable String name) {
if (!StringUtils.hasLength(name)) {
return "";
}
return name.toLowerCase(Locale.US);
}

Expand All @@ -147,7 +150,7 @@ protected String lowerCaseName(String name) {
* @return the converted name
* @see #lowerCaseName
*/
protected String underscoreName(String name) {
protected String underscoreName(@Nullable String name) {
if (!StringUtils.hasLength(name)) {
return "";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 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.
Expand All @@ -21,6 +21,7 @@

import io.r2dbc.spi.Readable;
import io.r2dbc.spi.ReadableMetadata;
import org.jspecify.annotations.Nullable;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.TypeConverter;
Expand Down Expand Up @@ -66,7 +67,7 @@ public class DataClassRowMapper<T> extends BeanPropertyRowMapper<T> {

private final Constructor<T> mappedConstructor;

private final String[] constructorParameterNames;
private final @Nullable String[] constructorParameterNames;

private final TypeDescriptor[] constructorParameterTypes;

Expand Down Expand Up @@ -98,7 +99,7 @@ public DataClassRowMapper(Class<T> mappedClass, ConversionService conversionServ

@Override
protected T constructMappedInstance(Readable readable, List<? extends ReadableMetadata> itemMetadatas, TypeConverter tc) {
Object[] args = new Object[this.constructorParameterNames.length];
@Nullable Object[] args = new Object[this.constructorParameterNames.length];
for (int i = 0; i < args.length; i++) {
String name = this.constructorParameterNames[i];
int index = findIndex(itemMetadatas, lowerCaseName(name));
Expand Down

0 comments on commit 5be36ce

Please sign in to comment.