Skip to content

Commit 5398b94

Browse files
mp911deschauder
authored andcommitted
Deprecate Basic…Converter infrastructure.
Merge basic converters into Mapping…Converters and introduce deprecated variant to provide guidance for migration off the deprecated types. Cleanup no longer required code. Original pull request #1618 See #1554
1 parent 4e3120e commit 5398b94

File tree

35 files changed

+1150
-1632
lines changed

35 files changed

+1150
-1632
lines changed

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
*/
1616
package org.springframework.data.jdbc.core;
1717

18-
import java.util.*;
18+
import java.util.ArrayList;
19+
import java.util.Arrays;
20+
import java.util.Collections;
21+
import java.util.HashMap;
22+
import java.util.HashSet;
23+
import java.util.LinkedHashMap;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.Optional;
27+
import java.util.Set;
1928
import java.util.function.BiConsumer;
2029
import java.util.stream.Collectors;
2130

@@ -33,7 +42,6 @@
3342
import org.springframework.data.relational.core.conversion.DbActionExecutionResult;
3443
import org.springframework.data.relational.core.conversion.IdValueSource;
3544
import org.springframework.data.relational.core.mapping.AggregatePath;
36-
import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
3745
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
3846
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
3947
import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
@@ -188,7 +196,8 @@ private Identifier getParentKeys(DbAction.WithDependingOn<?> action, JdbcConvert
188196

189197
private Object getParentId(DbAction.WithDependingOn<?> action) {
190198

191-
DbAction.WithEntity<?> idOwningAction = getIdOwningAction(action, context.getAggregatePath(action.getPropertyPath()).getIdDefiningParentPath());
199+
DbAction.WithEntity<?> idOwningAction = getIdOwningAction(action,
200+
context.getAggregatePath(action.getPropertyPath()).getIdDefiningParentPath());
192201

193202
return getPotentialGeneratedIdFrom(idOwningAction);
194203
}

0 commit comments

Comments
 (0)