diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java index f94f173cc..edd5fa9ee 100644 --- a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java +++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java @@ -23,7 +23,7 @@ package org.springframework.data.jdbc.core; */ public interface JdbcAggregateOperations { - void save(T instance, Class domainType); + void save(T instance); void deleteById(Object id, Class domainType); diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java index 5e5305dc5..d3a4442d0 100644 --- a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java +++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java @@ -64,10 +64,10 @@ public class JdbcAggregateTemplate implements JdbcAggregateOperations { } @Override - public void save(T instance, Class domainType) { + public void save(T instance) { JdbcPersistentEntityInformation entityInformation = context - .getRequiredPersistentEntityInformation(domainType); + .getRequiredPersistentEntityInformation((Class) instance.getClass()); AggregateChange change = createChange(instance); diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java index 5003be419..905b8e822 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java @@ -44,7 +44,7 @@ public class SimpleJdbcRepository implements CrudRepository { @Override public S save(S instance) { - entityOperations.save(instance, entityInformation.getJavaType()); + entityOperations.save(instance); return instance; } diff --git a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java index cbcc45cd1..5c7425b08 100644 --- a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java @@ -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 { @Test // DATAJDBC-112 public void saveAndLoadManyEntitiesWithReferencedEntity() { - template.save(legoSet, LegoSet.class); + template.save(legoSet); Iterable reloadedLegoSets = template.findAll(LegoSet.class); @@ -89,7 +89,7 @@ public class JdbcEntityTemplateIntegrationTests { @Test // DATAJDBC-112 public void saveAndLoadManyEntitiesByIdWithReferencedEntity() { - template.save(legoSet, LegoSet.class); + template.save(legoSet); Iterable reloadedLegoSets = template.findAllById(singletonList(legoSet.getId()), LegoSet.class); @@ -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 { @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 { @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 { 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 { @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 { @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 { @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);