Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Eliminate potential NoSuchElementException from unchecked Optional.get usage. Simplify stream. Return Staged value, fix Nullability annotations.

See #1907
Original pull request: #1920
This commit is contained in:
Mark Paluch
2024-10-25 14:54:33 +02:00
parent 75073429ef
commit 19c983f2f7
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java
View File

@@ -49,6 +49,7 @@ import org.springframework.util.Assert;
* @author Umut Erturk
* @author Myeonghyeon Lee
* @author Chirag Tailor
* @author Mark Paluch
*/
@SuppressWarnings("rawtypes")
class JdbcAggregateChangeExecutionContext {
@@ -268,12 +269,10 @@ class JdbcAggregateChangeExecutionContext {
cascadingValues.stage(insert.getDependingOn(), insert.getPropertyPath(),
qualifierValue, newEntity);
} else if (insert.getPropertyPath().getLeafProperty().isCollectionLike()) {
cascadingValues.gather(insert.getDependingOn(), insert.getPropertyPath(),
qualifierValue, newEntity);
}
}
}
@@ -289,6 +288,7 @@ class JdbcAggregateChangeExecutionContext {
return roots;
}
@SuppressWarnings("unchecked")
private <S> Object setIdAndCascadingProperties(DbAction.WithEntity<S> action, @Nullable Object generatedId,
StagedValues cascadingValues) {
@@ -328,6 +328,7 @@ class JdbcAggregateChangeExecutionContext {
throw new IllegalArgumentException(String.format("DbAction of type %s is not supported", action.getClass()));
}
@SuppressWarnings("unchecked")
private <T> RelationalPersistentEntity<T> getRequiredPersistentEntity(Class<T> type) {
return (RelationalPersistentEntity<T>) context.getRequiredPersistentEntity(type);
}
@@ -358,7 +359,7 @@ class JdbcAggregateChangeExecutionContext {
*/
private static class StagedValues {
static final List<MultiValueAggregator> aggregators = Arrays.asList(SetAggregator.INSTANCE, MapAggregator.INSTANCE,
static final List<MultiValueAggregator<?>> aggregators = Arrays.asList(SetAggregator.INSTANCE, MapAggregator.INSTANCE,
ListAggregator.INSTANCE, SingleElementAggregator.INSTANCE);
Map<DbAction, Map<PersistentPropertyPath, StagedValue>> values = new HashMap<>();
@@ -374,13 +375,14 @@ class JdbcAggregateChangeExecutionContext {
* be {@literal null}.
* @param value The value to be set. Must not be {@literal null}.
*/
@SuppressWarnings("unchecked")
<T> void stage(DbAction<?> action, PersistentPropertyPath path, @Nullable Object qualifier, Object value) {
gather(action, path, qualifier, value);
values.get(action).get(path).isStaged = true;
void stage(DbAction<?> action, PersistentPropertyPath path, @Nullable Object qualifier, Object value) {
StagedValue gather = gather(action, path, qualifier, value);
gather.isStaged = true;
}
<T> void gather(DbAction<?> action, PersistentPropertyPath path, @Nullable Object qualifier, Object value) {
@SuppressWarnings("unchecked")
<T> StagedValue gather(DbAction<?> action, PersistentPropertyPath path, @Nullable Object qualifier, Object value) {
MultiValueAggregator<T> aggregator = getAggregatorFor(path);
@@ -391,19 +393,20 @@ class JdbcAggregateChangeExecutionContext {
persistentPropertyPath -> new StagedValue(aggregator.createEmptyInstance()));
T currentValue = (T) stagedValue.value;
Object newValue = aggregator.add(currentValue, qualifier, value);
stagedValue.value = newValue;
stagedValue.value = aggregator.add(currentValue, qualifier, value);
valuesForPath.put(path, stagedValue);
return stagedValue;
}
private MultiValueAggregator getAggregatorFor(PersistentPropertyPath path) {
@SuppressWarnings("unchecked")
private <T> MultiValueAggregator<T> getAggregatorFor(PersistentPropertyPath path) {
PersistentProperty property = path.getLeafProperty();
for (MultiValueAggregator aggregator : aggregators) {
for (MultiValueAggregator<?> aggregator : aggregators) {
if (aggregator.handles(property)) {
return aggregator;
return (MultiValueAggregator<T>) aggregator;
}
}
@@ -427,10 +430,10 @@ class JdbcAggregateChangeExecutionContext {
}
private static class StagedValue {
Object value;
@Nullable Object value;
boolean isStaged;
public StagedValue(Object value) {
public StagedValue(@Nullable Object value) {
this.value = value;
}
}

9
spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java
View File

@@ -482,16 +482,21 @@ public interface DbAction<T> {
default Pair<PersistentPropertyPath<RelationalPersistentProperty>, Object> getQualifier() {
Map<PersistentPropertyPath<RelationalPersistentProperty>, Object> qualifiers = getQualifiers();
if (qualifiers.size() == 0) {
return null;
}
Set<Map.Entry<PersistentPropertyPath<RelationalPersistentProperty>, Object>> entries = qualifiers.entrySet();
Map.Entry<PersistentPropertyPath<RelationalPersistentProperty>, Object> entry = entries.stream().sorted(Comparator.comparing(e -> -e.getKey().getLength())).findFirst().get();
Optional<Map.Entry<PersistentPropertyPath<RelationalPersistentProperty>, Object>> optionalEntry = entries.stream()
.filter(e -> e.getValue() != null).min(Comparator.comparing(e -> -e.getKey().getLength()));
if (entry.getValue() == null) {
Map.Entry<PersistentPropertyPath<RelationalPersistentProperty>, Object> entry = optionalEntry.orElse(null);
if (entry == null) {
return null;
}
return Pair.of(entry.getKey(), entry.getValue());
}