Skip to content

Commit 01478cc

Browse files
schaudergregturn
authored andcommitted
DATAJDBC-143 - Removed domain type parameter form JdbcEntityOperations.save().
Such a parameter would only make sense with inheritance and we don't support inheritance at all in the moment. Anything we need in order to support inheritance should be added once we do support inheritance.
1 parent 387c3ec commit 01478cc

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
public interface JdbcAggregateOperations {
2525

26-
<T> void save(T instance, Class<T> domainType);
26+
<T> void save(T instance);
2727

2828
<T> void deleteById(Object id, Class<T> domainType);
2929

src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public JdbcAggregateTemplate(ApplicationEventPublisher publisher, JdbcMappingCon
6464
}
6565

6666
@Override
67-
public <T> void save(T instance, Class<T> domainType) {
67+
public <T> void save(T instance) {
6868

6969
JdbcPersistentEntityInformation<T, ?> entityInformation = context
70-
.getRequiredPersistentEntityInformation(domainType);
70+
.getRequiredPersistentEntityInformation((Class<T>) instance.getClass());
7171

7272
AggregateChange change = createChange(instance);
7373

src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class SimpleJdbcRepository<T, ID> implements CrudRepository<T, ID> {
4444
@Override
4545
public <S extends T> S save(S instance) {
4646

47-
entityOperations.save(instance, entityInformation.getJavaType());
47+
entityOperations.save(instance);
4848

4949
return instance;
5050
}

src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class JdbcEntityTemplateIntegrationTests {
5757
@Test // DATAJDBC-112
5858
public void saveAndLoadAnEntityWithReferencedEntityById() {
5959

60-
template.save(legoSet, LegoSet.class);
60+
template.save(legoSet);
6161

6262
assertThat(legoSet.manual.id).describedAs("id of stored manual").isNotNull();
6363

@@ -78,7 +78,7 @@ public void saveAndLoadAnEntityWithReferencedEntityById() {
7878
@Test // DATAJDBC-112
7979
public void saveAndLoadManyEntitiesWithReferencedEntity() {
8080

81-
template.save(legoSet, LegoSet.class);
81+
template.save(legoSet);
8282

8383
Iterable<LegoSet> reloadedLegoSets = template.findAll(LegoSet.class);
8484

@@ -89,7 +89,7 @@ public void saveAndLoadManyEntitiesWithReferencedEntity() {
8989
@Test // DATAJDBC-112
9090
public void saveAndLoadManyEntitiesByIdWithReferencedEntity() {
9191

92-
template.save(legoSet, LegoSet.class);
92+
template.save(legoSet);
9393

9494
Iterable<LegoSet> reloadedLegoSets = template.findAllById(singletonList(legoSet.getId()), LegoSet.class);
9595

@@ -102,7 +102,7 @@ public void saveAndLoadAnEntityWithReferencedNullEntity() {
102102

103103
legoSet.setManual(null);
104104

105-
template.save(legoSet, LegoSet.class);
105+
template.save(legoSet);
106106

107107
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
108108

@@ -112,7 +112,7 @@ public void saveAndLoadAnEntityWithReferencedNullEntity() {
112112
@Test // DATAJDBC-112
113113
public void saveAndDeleteAnEntityWithReferencedEntity() {
114114

115-
template.save(legoSet, LegoSet.class);
115+
template.save(legoSet);
116116

117117
template.delete(legoSet, LegoSet.class);
118118

@@ -127,7 +127,7 @@ public void saveAndDeleteAnEntityWithReferencedEntity() {
127127
@Test // DATAJDBC-112
128128
public void saveAndDeleteAllWithReferencedEntity() {
129129

130-
template.save(legoSet, LegoSet.class);
130+
template.save(legoSet);
131131

132132
template.deleteAll(LegoSet.class);
133133

@@ -143,13 +143,13 @@ public void saveAndDeleteAllWithReferencedEntity() {
143143
public void updateReferencedEntityFromNull() {
144144

145145
legoSet.setManual(null);
146-
template.save(legoSet, LegoSet.class);
146+
template.save(legoSet);
147147

148148
Manual manual = new Manual(23L);
149149
manual.setContent("Some content");
150150
legoSet.setManual(manual);
151151

152-
template.save(legoSet, LegoSet.class);
152+
template.save(legoSet);
153153

154154
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
155155

@@ -159,11 +159,11 @@ public void updateReferencedEntityFromNull() {
159159
@Test // DATAJDBC-112
160160
public void updateReferencedEntityToNull() {
161161

162-
template.save(legoSet, LegoSet.class);
162+
template.save(legoSet);
163163

164164
legoSet.setManual(null);
165165

166-
template.save(legoSet, LegoSet.class);
166+
template.save(legoSet);
167167

168168
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
169169

@@ -178,13 +178,13 @@ public void updateReferencedEntityToNull() {
178178
@Test // DATAJDBC-112
179179
public void replaceReferencedEntity() {
180180

181-
template.save(legoSet, LegoSet.class);
181+
template.save(legoSet);
182182

183183
Manual manual = new Manual(null);
184184
manual.setContent("other content");
185185
legoSet.setManual(manual);
186186

187-
template.save(legoSet, LegoSet.class);
187+
template.save(legoSet);
188188

189189
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
190190

@@ -199,11 +199,11 @@ public void replaceReferencedEntity() {
199199
@Test // DATAJDBC-112
200200
public void changeReferencedEntity() {
201201

202-
template.save(legoSet, LegoSet.class);
202+
template.save(legoSet);
203203

204204
legoSet.manual.setContent("new content");
205205

206-
template.save(legoSet, LegoSet.class);
206+
template.save(legoSet);
207207

208208
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
209209

0 commit comments

Comments
 (0)