Skip to content

Fix writing collections where first element is null #2218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tamland wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −10
Open

Fix writing collections where first element is null #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .../springframework/data/jdbc/repository/JdbcRepositoryCustomConversionIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.math.BigDecimal;
import java.sql.JDBCType;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -182,6 +183,19 @@ void saveAndLoadListOfDirectionsAsArray() {
assertThat(reloaded).isEqualTo(saved);
}

@Test
@EnabledOnFeature(TestDatabaseFeatures.Feature.SUPPORTS_ARRAYS)
void saveAndLoadListOfNullAsArray() {
var list = new ArrayList<Direction>();
list.add(null);

EntityWithDirections saved = repositoryWithDirections.save(new EntityWithDirections(null, list));

EntityWithDirections reloaded = repositoryWithDirections.findById(saved.id).orElseThrow();

assertThat(reloaded).isEqualTo(saved);
}

interface EntityWithStringyBigDecimalRepository extends CrudRepository<EntityWithStringyBigDecimal, CustomId> {

@Query("SELECT * FROM ENTITY_WITH_STRINGY_BIG_DECIMAL WHERE DIRECTION IN (:types)")
Expand Down
11 changes: 1 addition & 10 deletions .../java/org/springframework/data/relational/core/conversion/MappingRelationalConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,16 +809,7 @@ private Object writeCollection(Iterable<?> value, TypeInformation<?> type) {
return mapped;
}

// if we succeeded converting the members of the collection, we actually ignore the fallback targetType since that
// was derived without considering custom conversions.
Class<?> targetType = type.getType();
if (!mapped.isEmpty()) {

Class<?> targetComponentType = mapped.get(0).getClass();
targetType = Array.newInstance(targetComponentType, 0).getClass();
}

Object converted = getConversionService().convert(mapped, targetType);
Object converted = getConversionService().convert(mapped, type.getType());

Assert.state(converted != null, "Converted must not be null");

Expand Down