From 92de6557e10b610f3ea6579a6be67c53c4f766bc Mon Sep 17 00:00:00 2001
From: Antoine Rey <antoine.rey@free.fr>
Date: Wed, 28 Oct 2015 08:57:42 +0100
Subject: [PATCH] Fix #111 For pet's birthday we are now using jodatime
LocalDate instead of DateTime
---
.../org/springframework/samples/petclinic/model/Pet.java | 9 +++++----
.../petclinic/repository/jdbc/JdbcPetRowMapper.java | 3 ++-
.../petclinic/service/AbstractClinicServiceTests.java | 3 ++-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Pet.java b/src/main/java/org/springframework/samples/petclinic/model/Pet.java
index 09eeb76..970cdcb 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Pet.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/Pet.java
@@ -32,6 +32,7 @@ import javax.persistence.Table;
import org.hibernate.annotations.Type;
import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
import org.springframework.beans.support.MutableSortDefinition;
import org.springframework.beans.support.PropertyComparator;
import org.springframework.format.annotation.DateTimeFormat;
@@ -48,9 +49,9 @@ import org.springframework.format.annotation.DateTimeFormat;
public class Pet extends NamedEntity {
@Column(name = "birth_date")
- @Type(type = "org.jadira.usertype.dateandtime.joda.PersistentDateTime")
+ @Type(type = "org.jadira.usertype.dateandtime.joda.PersistentLocalDate")
@DateTimeFormat(pattern = "yyyy/MM/dd")
- private DateTime birthDate;
+ private LocalDate birthDate;
@ManyToOne
@JoinColumn(name = "type_id")
@@ -63,11 +64,11 @@ public class Pet extends NamedEntity {
@OneToMany(cascade = CascadeType.ALL, mappedBy = "pet", fetch = FetchType.EAGER)
private Set<Visit> visits;
- public DateTime getBirthDate() {
+ public LocalDate getBirthDate() {
return this.birthDate;
}
- public void setBirthDate(DateTime birthDate) {
+ public void setBirthDate(LocalDate birthDate) {
this.birthDate = birthDate;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java
index ad00a71..6420df1 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java
@@ -20,6 +20,7 @@ import java.sql.SQLException;
import java.util.Date;
import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
import org.springframework.jdbc.core.RowMapper;
/**
@@ -34,7 +35,7 @@ class JdbcPetRowMapper implements RowMapper<JdbcPet> {
pet.setId(rs.getInt("pets.id"));
pet.setName(rs.getString("name"));
Date birthDate = rs.getDate("birth_date");
- pet.setBirthDate(new DateTime(birthDate));
+ pet.setBirthDate(new LocalDate(birthDate));
pet.setTypeId(rs.getInt("type_id"));
pet.setOwnerId(rs.getInt("owner_id"));
return pet;
diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
index 0dd8737..469c24b 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
@@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collection;
import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.samples.petclinic.model.Owner;
@@ -135,7 +136,7 @@ public abstract class AbstractClinicServiceTests {
pet.setName("bowser");
Collection<PetType> types = this.clinicService.findPetTypes();
pet.setType(EntityUtils.getById(types, PetType.class, 2));
- pet.setBirthDate(new DateTime());
+ pet.setBirthDate(new LocalDate());
owner6.addPet(pet);
assertThat(owner6.getPets().size()).isEqualTo(found + 1);
--
GitLab