Browse Source

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.
pull/73/head
Jens Schauder 8 years ago committed by Greg Turnquist
parent
commit
01478cc53d
No known key found for this signature in database
GPG Key ID: CB2FA4D512B5C413
  1. 2
      src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java
  2. 4
      src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java
  3. 2
      src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java
  4. 28
      src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java

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

@ -23,7 +23,7 @@ package org.springframework.data.jdbc.core; @@ -23,7 +23,7 @@ package org.springframework.data.jdbc.core;
*/
public interface JdbcAggregateOperations {
<T> void save(T instance, Class<T> domainType);
<T> void save(T instance);
<T> void deleteById(Object id, Class<T> domainType);

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

@ -64,10 +64,10 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { @@ -64,10 +64,10 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations {
}
@Override
public <T> void save(T instance, Class<T> domainType) {
public <T> void save(T instance) {
JdbcPersistentEntityInformation<T, ?> entityInformation = context
.getRequiredPersistentEntityInformation(domainType);
.getRequiredPersistentEntityInformation((Class<T>) instance.getClass());
AggregateChange change = createChange(instance);

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

@ -44,7 +44,7 @@ public class SimpleJdbcRepository<T, ID> implements CrudRepository<T, ID> { @@ -44,7 +44,7 @@ public class SimpleJdbcRepository<T, ID> implements CrudRepository<T, ID> {
@Override
public <S extends T> S save(S instance) {
entityOperations.save(instance, entityInformation.getJavaType());
entityOperations.save(instance);
return instance;
}

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

@ -57,7 +57,7 @@ public class JdbcEntityTemplateIntegrationTests { @@ -57,7 +57,7 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void saveAndLoadAnEntityWithReferencedEntityById() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
assertThat(legoSet.manual.id).describedAs("id of stored manual").isNotNull();
@ -78,7 +78,7 @@ public class JdbcEntityTemplateIntegrationTests { @@ -78,7 +78,7 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void saveAndLoadManyEntitiesWithReferencedEntity() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
Iterable<LegoSet> reloadedLegoSets = template.findAll(LegoSet.class);
@ -89,7 +89,7 @@ public class JdbcEntityTemplateIntegrationTests { @@ -89,7 +89,7 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void saveAndLoadManyEntitiesByIdWithReferencedEntity() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
Iterable<LegoSet> reloadedLegoSets = template.findAllById(singletonList(legoSet.getId()), LegoSet.class);
@ -102,7 +102,7 @@ public class JdbcEntityTemplateIntegrationTests { @@ -102,7 +102,7 @@ public class JdbcEntityTemplateIntegrationTests {
legoSet.setManual(null);
template.save(legoSet, LegoSet.class);
template.save(legoSet);
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
@ -112,7 +112,7 @@ public class JdbcEntityTemplateIntegrationTests { @@ -112,7 +112,7 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void saveAndDeleteAnEntityWithReferencedEntity() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
template.delete(legoSet, LegoSet.class);
@ -127,7 +127,7 @@ public class JdbcEntityTemplateIntegrationTests { @@ -127,7 +127,7 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void saveAndDeleteAllWithReferencedEntity() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
template.deleteAll(LegoSet.class);
@ -143,13 +143,13 @@ public class JdbcEntityTemplateIntegrationTests { @@ -143,13 +143,13 @@ public class JdbcEntityTemplateIntegrationTests {
public void updateReferencedEntityFromNull() {
legoSet.setManual(null);
template.save(legoSet, LegoSet.class);
template.save(legoSet);
Manual manual = new Manual(23L);
manual.setContent("Some content");
legoSet.setManual(manual);
template.save(legoSet, LegoSet.class);
template.save(legoSet);
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
@ -159,11 +159,11 @@ public class JdbcEntityTemplateIntegrationTests { @@ -159,11 +159,11 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void updateReferencedEntityToNull() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
legoSet.setManual(null);
template.save(legoSet, LegoSet.class);
template.save(legoSet);
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
@ -178,13 +178,13 @@ public class JdbcEntityTemplateIntegrationTests { @@ -178,13 +178,13 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void replaceReferencedEntity() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
Manual manual = new Manual(null);
manual.setContent("other content");
legoSet.setManual(manual);
template.save(legoSet, LegoSet.class);
template.save(legoSet);
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);
@ -199,11 +199,11 @@ public class JdbcEntityTemplateIntegrationTests { @@ -199,11 +199,11 @@ public class JdbcEntityTemplateIntegrationTests {
@Test // DATAJDBC-112
public void changeReferencedEntity() {
template.save(legoSet, LegoSet.class);
template.save(legoSet);
legoSet.manual.setContent("new content");
template.save(legoSet, LegoSet.class);
template.save(legoSet);
LegoSet reloadedLegoSet = template.findById(legoSet.getId(), LegoSet.class);

Loading…
Cancel
Save