From 63dadcc07f5f28e40afc02dca5e779d96dc018e6 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 3 Feb 2017 10:04:34 +0000
Subject: [PATCH] Make all entity fields private
Encapsulation is better that way (and tere is a getter for all of them
anyway).
---
.../samples/petclinic/model/BaseEntity.java | 2 +-
.../samples/petclinic/model/Person.java | 5 ++-
.../samples/petclinic/owner/Pet.java | 33 ++++++++++---------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
index d929997..86cc210 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
@@ -33,7 +33,7 @@ import javax.persistence.MappedSuperclass;
public class BaseEntity implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- protected Integer id;
+ private Integer id;
public Integer getId() {
return id;
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/src/main/java/org/springframework/samples/petclinic/model/Person.java
index d3e03c0..4cb7481 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Person.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/Person.java
@@ -30,11 +30,11 @@ public class Person extends BaseEntity {
@Column(name = "first_name")
@NotEmpty
- protected String firstName;
+ private String firstName;
@Column(name = "last_name")
@NotEmpty
- protected String lastName;
+ private String lastName;
public String getFirstName() {
return this.firstName;
@@ -52,5 +52,4 @@ public class Person extends BaseEntity {
this.lastName = lastName;
}
-
}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java
index 5b4e317..e8df85e 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java
@@ -15,11 +15,13 @@
*/
package org.springframework.samples.petclinic.owner;
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.samples.petclinic.model.NamedEntity;
-import org.springframework.samples.petclinic.visit.Visit;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@@ -29,16 +31,14 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
-
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+
+import org.springframework.beans.support.MutableSortDefinition;
+import org.springframework.beans.support.PropertyComparator;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.samples.petclinic.model.NamedEntity;
+import org.springframework.samples.petclinic.visit.Visit;
/**
* Simple business object representing a pet.
@@ -64,7 +64,7 @@ public class Pet extends NamedEntity {
@JoinColumn(name = "owner_id")
private Owner owner;
- @OneToMany(cascade = CascadeType.ALL, mappedBy="petId", fetch = FetchType.EAGER)
+ @OneToMany(cascade = CascadeType.ALL, mappedBy = "petId", fetch = FetchType.EAGER)
private Set<Visit> visits = new LinkedHashSet<>();
public void setBirthDate(Date birthDate) {
@@ -104,13 +104,14 @@ public class Pet extends NamedEntity {
public List<Visit> getVisits() {
List<Visit> sortedVisits = new ArrayList<>(getVisitsInternal());
- PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false));
+ PropertyComparator.sort(sortedVisits,
+ new MutableSortDefinition("date", false, false));
return Collections.unmodifiableList(sortedVisits);
}
public void addVisit(Visit visit) {
getVisitsInternal().add(visit);
- visit.setPetId(this.id);
+ visit.setPetId(this.getId());
}
}
--
GitLab