DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-15 20:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed JPA issue when updating existing owners/pets

Browse source
This commit is contained in:
Mic 2013-05-09 01:09:21 +08:00
parent e308871591
commit 5bf31dbe5a
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java
View file

@ -70,7 +70,12 @@ public class JpaOwnerRepositoryImpl implements OwnerRepository {
@Override @Override
public void save(Owner owner) { public void save(Owner owner) {
this.em.persist(owner); if (owner.getId() == null) {
this.em.persist(owner);
}
else {
this.em.merge(owner);
}
} }

7
src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java
View file

@ -53,7 +53,12 @@ public class JpaPetRepositoryImpl implements PetRepository {
@Override @Override
public void save(Pet pet) { public void save(Pet pet) {
this.em.persist(pet); if (pet.getId() == null) {
this.em.persist(pet);
}
else {
this.em.merge(pet);
}
} }
} }

7
src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
View file

@ -45,7 +45,12 @@ public class JpaVisitRepositoryImpl implements VisitRepository {
@Override @Override
public void save(Visit visit) { public void save(Visit visit) {
this.em.persist(visit); if (visit.getId() == null) {
this.em.persist(visit);
}
else {
this.em.merge(visit);
}
} }

2
src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
View file

@ -89,8 +89,8 @@ public abstract class AbstractClinicServiceTests {
owner.setCity("Wollongong"); owner.setCity("Wollongong");
owner.setTelephone("4444444444"); owner.setTelephone("4444444444");
this.clinicService.saveOwner(owner); this.clinicService.saveOwner(owner);
Assert.assertNotEquals("Owner Id should have been generated", owner.getId().longValue(), 0);
owners = this.clinicService.findOwnerByLastName("Schultz"); owners = this.clinicService.findOwnerByLastName("Schultz");
assertNotNull("Owner Id should have been generated", owner.getId());
assertEquals("Verifying number of owners after inserting a new one.", found + 1, owners.size()); assertEquals("Verifying number of owners after inserting a new one.", found + 1, owners.size());
} }