- Petclinic uses XML configuration by default. In case you'd like to use Java Config instead, there is a Java Config branch available here. Thanks to Antoine Rey for his contribution.
-
+The Spring Petclinic "main" branch in the [spring-projects](https://github.com/spring-projects/spring-petclinic)
+GitHub org is the "canonical" implementation based on Spring Boot and Thymeleaf. There are
+[quite a few forks](https://spring-petclinic.github.io/docs/forks.html) in the GitHub org
+[spring-petclinic](https://github.com/spring-petclinic). If you are interested in using a different technology stack to implement the Pet Clinic, please join the community there.
## Interaction with other open source projects
-One of the best parts about working on the Spring Petclinic application is that we have the opportunity to work in direct contact with many Open Source projects. We found some bugs/suggested improvements on various topics such as Spring, Spring Data, Bean Validation and even Eclipse! In many cases, they've been fixed/implemented in just a few days.
+One of the best parts about working on the Spring Petclinic application is that we have the opportunity to work in direct contact with many Open Source projects. We found bugs/suggested improvements on various topics such as Spring, Spring Data, Bean Validation and even Eclipse! In many cases, they've been fixed/implemented in just a few days.
Here is a list of them:
-
-
-
Name
-
Issue
-
-
-
-
Spring JDBC: simplify usage of NamedParameterJdbcTemplate
+| Name | Issue |
+|------|-------|
+| Spring JDBC: simplify usage of NamedParameterJdbcTemplate | [SPR-10256](https://jira.springsource.org/browse/SPR-10256) and [SPR-10257](https://jira.springsource.org/browse/SPR-10257) |
+| Bean Validation / Hibernate Validator: simplify Maven dependencies and backward compatibility |[HV-790](https://hibernate.atlassian.net/browse/HV-790) and [HV-792](https://hibernate.atlassian.net/browse/HV-792) |
+| Spring Data: provide more flexibility when working with JPQL queries | [DATAJPA-292](https://jira.springsource.org/browse/DATAJPA-292) |
+# Contributing
+The [issue tracker](https://github.com/spring-projects/spring-petclinic/issues) is the preferred channel for bug reports, features requests and submitting pull requests.
+
+For pull requests, editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at . If you have not previously done so, please fill out and submit the [Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+
+# License
+
+The Spring PetClinic sample application is released under version 2.0 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0).
+
+[spring-petclinic]: https://github.com/spring-projects/spring-petclinic
+[spring-framework-petclinic]: https://github.com/spring-petclinic/spring-framework-petclinic
+[spring-petclinic-angularjs]: https://github.com/spring-petclinic/spring-petclinic-angularjs
+[javaconfig branch]: https://github.com/spring-petclinic/spring-framework-petclinic/tree/javaconfig
+[spring-petclinic-angular]: https://github.com/spring-petclinic/spring-petclinic-angular
+[spring-petclinic-microservices]: https://github.com/spring-petclinic/spring-petclinic-microservices
+[spring-petclinic-reactjs]: https://github.com/spring-petclinic/spring-petclinic-reactjs
+[spring-petclinic-graphql]: https://github.com/spring-petclinic/spring-petclinic-graphql
+[spring-petclinic-kotlin]: https://github.com/spring-petclinic/spring-petclinic-kotlin
+[spring-petclinic-rest]: https://github.com/spring-petclinic/spring-petclinic-rest
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..e60ee14fa
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'spring-petclinic'
diff --git a/src/checkstyle/nohttp-checkstyle-suppressions.xml b/src/checkstyle/nohttp-checkstyle-suppressions.xml
new file mode 100644
index 000000000..58da146fa
--- /dev/null
+++ b/src/checkstyle/nohttp-checkstyle-suppressions.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/checkstyle/nohttp-checkstyle.xml b/src/checkstyle/nohttp-checkstyle.xml
new file mode 100644
index 000000000..e6205127b
--- /dev/null
+++ b/src/checkstyle/nohttp-checkstyle.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
new file mode 100644
index 000000000..ac6e15030
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ImportRuntimeHints;
+
+/**
+ * PetClinic Spring Boot Application.
+ *
+ * @author Dave Syer
+ *
+ */
+@SpringBootApplication
+@ImportRuntimeHints(PetClinicRuntimeHints.class)
+public class PetClinicApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(PetClinicApplication.class, args);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicRuntimeHints.java b/src/main/java/org/springframework/samples/petclinic/PetClinicRuntimeHints.java
new file mode 100644
index 000000000..2ac7e02e9
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/PetClinicRuntimeHints.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic;
+
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+
+public class PetClinicRuntimeHints implements RuntimeHintsRegistrar {
+
+ @Override
+ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+ hints.resources().registerPattern("db/*"); // https://github.com/spring-projects/spring-boot/issues/32654
+ hints.resources().registerPattern("messages/*");
+ hints.resources().registerPattern("META-INF/resources/webjars/*");
+ }
+
+}
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 55b470e1e..3038bce3a 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,33 +15,37 @@
*/
package org.springframework.samples.petclinic.model;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
+
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
/**
- * Simple JavaBean domain object with an id property. Used as a base class for objects needing this property.
+ * Simple JavaBean domain object with an id property. Used as a base class for objects
+ * needing this property.
*
* @author Ken Krebs
* @author Juergen Hoeller
*/
@MappedSuperclass
-public class BaseEntity {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- protected Integer id;
+public class BaseEntity implements Serializable {
- public Integer getId() {
- return id;
- }
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Integer id;
- public void setId(Integer id) {
- this.id = id;
- }
+ public Integer getId() {
+ return id;
+ }
- public boolean isNew() {
- return (this.id == null);
- }
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public boolean isNew() {
+ return this.id == null;
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
index d66c97ae7..7c2ccb2d6 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +15,12 @@
*/
package org.springframework.samples.petclinic.model;
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
/**
- * Simple JavaBean domain object adds a name property to BaseEntity. Used as a base class for objects
- * needing these properties.
+ * Simple JavaBean domain object adds a name property to BaseEntity. Used as
+ * a base class for objects needing these properties.
*
* @author Ken Krebs
* @author Juergen Hoeller
@@ -29,20 +28,20 @@ import javax.persistence.MappedSuperclass;
@MappedSuperclass
public class NamedEntity extends BaseEntity {
- @Column(name = "name")
- private String name;
+ @Column(name = "name")
+ private String name;
- public String getName() {
- return this.name;
- }
+ public String getName() {
+ return this.name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- @Override
- public String toString() {
- return this.getName();
- }
+ @Override
+ public String toString() {
+ return this.getName();
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Owner.java b/src/main/java/org/springframework/samples/petclinic/model/Owner.java
deleted file mode 100644
index d0158d907..000000000
--- a/src/main/java/org/springframework/samples/petclinic/model/Owner.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.Digits;
-
-import org.hibernate.validator.constraints.NotEmpty;
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
-import org.springframework.core.style.ToStringCreator;
-
-/**
- * Simple JavaBean domain object representing an owner.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-@Entity
-@Table(name = "owners")
-public class Owner extends Person {
- @Column(name = "address")
- @NotEmpty
- private String address;
-
- @Column(name = "city")
- @NotEmpty
- private String city;
-
- @Column(name = "telephone")
- @NotEmpty
- @Digits(fraction = 0, integer = 10)
- private String telephone;
-
- @OneToMany(cascade = CascadeType.ALL, mappedBy = "owner")
- private Set pets;
-
-
- public String getAddress() {
- return this.address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getCity() {
- return this.city;
- }
-
- public void setCity(String city) {
- this.city = city;
- }
-
- public String getTelephone() {
- return this.telephone;
- }
-
- public void setTelephone(String telephone) {
- this.telephone = telephone;
- }
-
- protected Set getPetsInternal() {
- if (this.pets == null) {
- this.pets = new HashSet<>();
- }
- return this.pets;
- }
-
- protected void setPetsInternal(Set pets) {
- this.pets = pets;
- }
-
- public List getPets() {
- List sortedPets = new ArrayList<>(getPetsInternal());
- PropertyComparator.sort(sortedPets, new MutableSortDefinition("name", true, true));
- return Collections.unmodifiableList(sortedPets);
- }
-
- public void addPet(Pet pet) {
- getPetsInternal().add(pet);
- pet.setOwner(this);
- }
-
- /**
- * Return the Pet with the given name, or null if none found for this Owner.
- *
- * @param name to test
- * @return true if pet name is already in use
- */
- public Pet getPet(String name) {
- return getPet(name, false);
- }
-
- /**
- * Return the Pet with the given name, or null if none found for this Owner.
- *
- * @param name to test
- * @return true if pet name is already in use
- */
- public Pet getPet(String name, boolean ignoreNew) {
- name = name.toLowerCase();
- for (Pet pet : getPetsInternal()) {
- if (!ignoreNew || !pet.isNew()) {
- String compName = pet.getName();
- compName = compName.toLowerCase();
- if (compName.equals(name)) {
- return pet;
- }
- }
- }
- return null;
- }
-
- @Override
- public String toString() {
- return new ToStringCreator(this)
-
- .append("id", this.getId())
- .append("new", this.isNew())
- .append("lastName", this.getLastName())
- .append("firstName", this.getFirstName())
- .append("address", this.address)
- .append("city", this.city)
- .append("telephone", this.telephone)
- .toString();
- }
-}
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 d3e03c0dd..e41b6ba90 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Person.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/Person.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,9 @@
*/
package org.springframework.samples.petclinic.model;
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
-
-import org.hibernate.validator.constraints.NotEmpty;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.validation.constraints.NotEmpty;
/**
* Simple JavaBean domain object representing an person.
@@ -28,29 +27,28 @@ import org.hibernate.validator.constraints.NotEmpty;
@MappedSuperclass
public class Person extends BaseEntity {
- @Column(name = "first_name")
- @NotEmpty
- protected String firstName;
+ @Column(name = "first_name")
+ @NotEmpty
+ private String firstName;
- @Column(name = "last_name")
- @NotEmpty
- protected String lastName;
+ @Column(name = "last_name")
+ @NotEmpty
+ private String lastName;
- public String getFirstName() {
- return this.firstName;
- }
+ public String getFirstName() {
+ return this.firstName;
+ }
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
- public String getLastName() {
- return this.lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
+ public String getLastName() {
+ return this.lastName;
+ }
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Pet.java b/src/main/java/org/springframework/samples/petclinic/model/Pet.java
deleted file mode 100644
index 09eeb769e..000000000
--- a/src/main/java/org/springframework/samples/petclinic/model/Pet.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Type;
-import org.joda.time.DateTime;
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * Simple business object representing a pet.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- */
-@Entity
-@Table(name = "pets")
-public class Pet extends NamedEntity {
-
- @Column(name = "birth_date")
- @Type(type = "org.jadira.usertype.dateandtime.joda.PersistentDateTime")
- @DateTimeFormat(pattern = "yyyy/MM/dd")
- private DateTime birthDate;
-
- @ManyToOne
- @JoinColumn(name = "type_id")
- private PetType type;
-
- @ManyToOne
- @JoinColumn(name = "owner_id")
- private Owner owner;
-
- @OneToMany(cascade = CascadeType.ALL, mappedBy = "pet", fetch = FetchType.EAGER)
- private Set visits;
-
- public DateTime getBirthDate() {
- return this.birthDate;
- }
-
- public void setBirthDate(DateTime birthDate) {
- this.birthDate = birthDate;
- }
-
- public PetType getType() {
- return this.type;
- }
-
- public void setType(PetType type) {
- this.type = type;
- }
-
- public Owner getOwner() {
- return this.owner;
- }
-
- protected void setOwner(Owner owner) {
- this.owner = owner;
- }
-
- protected Set getVisitsInternal() {
- if (this.visits == null) {
- this.visits = new HashSet<>();
- }
- return this.visits;
- }
-
- protected void setVisitsInternal(Set visits) {
- this.visits = visits;
- }
-
- public List getVisits() {
- List sortedVisits = new ArrayList<>(getVisitsInternal());
- PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false));
- return Collections.unmodifiableList(sortedVisits);
- }
-
- public void addVisit(Visit visit) {
- getVisitsInternal().add(visit);
- visit.setPet(this);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vet.java b/src/main/java/org/springframework/samples/petclinic/model/Vet.java
deleted file mode 100644
index d93e14c46..000000000
--- a/src/main/java/org/springframework/samples/petclinic/model/Vet.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlElement;
-
-import org.springframework.beans.support.MutableSortDefinition;
-import org.springframework.beans.support.PropertyComparator;
-
-/**
- * Simple JavaBean domain object representing a veterinarian.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Arjen Poutsma
- */
-@Entity
-@Table(name = "vets")
-public class Vet extends Person {
-
- @ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
- inverseJoinColumns = @JoinColumn(name = "specialty_id"))
- private Set specialties;
-
- protected Set getSpecialtiesInternal() {
- if (this.specialties == null) {
- this.specialties = new HashSet<>();
- }
- return this.specialties;
- }
-
- protected void setSpecialtiesInternal(Set specialties) {
- this.specialties = specialties;
- }
-
- @XmlElement
- public List getSpecialties() {
- List sortedSpecs = new ArrayList<>(getSpecialtiesInternal());
- PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true));
- return Collections.unmodifiableList(sortedSpecs);
- }
-
- public int getNrOfSpecialties() {
- return getSpecialtiesInternal().size();
- }
-
- public void addSpecialty(Specialty specialty) {
- getSpecialtiesInternal().add(specialty);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Visit.java b/src/main/java/org/springframework/samples/petclinic/model/Visit.java
deleted file mode 100644
index ea03bde74..000000000
--- a/src/main/java/org/springframework/samples/petclinic/model/Visit.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Type;
-import org.hibernate.validator.constraints.NotEmpty;
-import org.joda.time.DateTime;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * Simple JavaBean domain object representing a visit.
- *
- * @author Ken Krebs
- */
-@Entity
-@Table(name = "visits")
-public class Visit extends BaseEntity {
-
- /**
- * Holds value of property date.
- */
- @Column(name = "visit_date")
- @Type(type = "org.jadira.usertype.dateandtime.joda.PersistentDateTime")
- @DateTimeFormat(pattern = "yyyy/MM/dd")
- private DateTime date;
-
- /**
- * Holds value of property description.
- */
- @NotEmpty
- @Column(name = "description")
- private String description;
-
- /**
- * Holds value of property pet.
- */
- @ManyToOne
- @JoinColumn(name = "pet_id")
- private Pet pet;
-
-
- /**
- * Creates a new instance of Visit for the current date
- */
- public Visit() {
- this.date = new DateTime();
- }
-
-
- /**
- * Getter for property date.
- *
- * @return Value of property date.
- */
- public DateTime getDate() {
- return this.date;
- }
-
- /**
- * Setter for property date.
- *
- * @param date New value of property date.
- */
- public void setDate(DateTime date) {
- this.date = date;
- }
-
- /**
- * Getter for property description.
- *
- * @return Value of property description.
- */
- public String getDescription() {
- return this.description;
- }
-
- /**
- * Setter for property description.
- *
- * @param description New value of property description.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Getter for property pet.
- *
- * @return Value of property pet.
- */
- public Pet getPet() {
- return this.pet;
- }
-
- /**
- * Setter for property pet.
- *
- * @param pet New value of property pet.
- */
- public void setPet(Pet pet) {
- this.pet = pet;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/src/main/java/org/springframework/samples/petclinic/model/package-info.java
index 2730958db..37d6295e8 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/package-info.java
+++ b/src/main/java/org/springframework/samples/petclinic/model/package-info.java
@@ -1,5 +1,20 @@
-/**
- * The classes in this package represent PetClinic's business layer.
- */
-package org.springframework.samples.petclinic.model;
-
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The classes in this package represent utilities used by the domain.
+ */
+package org.springframework.samples.petclinic.model;
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
new file mode 100644
index 000000000..ac556459d
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.core.style.ToStringCreator;
+import org.springframework.samples.petclinic.model.Person;
+import org.springframework.util.Assert;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotEmpty;
+
+/**
+ * Simple JavaBean domain object representing an owner.
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ * @author Oliver Drotbohm
+ */
+@Entity
+@Table(name = "owners")
+public class Owner extends Person {
+
+ @Column(name = "address")
+ @NotEmpty
+ private String address;
+
+ @Column(name = "city")
+ @NotEmpty
+ private String city;
+
+ @Column(name = "telephone")
+ @NotEmpty
+ @Digits(fraction = 0, integer = 10)
+ private String telephone;
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ @JoinColumn(name = "owner_id")
+ @OrderBy("name")
+ private List pets = new ArrayList<>();
+
+ public String getAddress() {
+ return this.address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getCity() {
+ return this.city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getTelephone() {
+ return this.telephone;
+ }
+
+ public void setTelephone(String telephone) {
+ this.telephone = telephone;
+ }
+
+ public List getPets() {
+ return this.pets;
+ }
+
+ public void addPet(Pet pet) {
+ if (pet.isNew()) {
+ getPets().add(pet);
+ }
+ }
+
+ /**
+ * Return the Pet with the given name, or null if none found for this Owner.
+ * @param name to test
+ * @return a pet if pet name is already in use
+ */
+ public Pet getPet(String name) {
+ return getPet(name, false);
+ }
+
+ /**
+ * Return the Pet with the given id, or null if none found for this Owner.
+ * @param id to test
+ * @return a pet if pet id is already in use
+ */
+ public Pet getPet(Integer id) {
+ for (Pet pet : getPets()) {
+ if (!pet.isNew()) {
+ Integer compId = pet.getId();
+ if (compId.equals(id)) {
+ return pet;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Return the Pet with the given name, or null if none found for this Owner.
+ * @param name to test
+ * @return a pet if pet name is already in use
+ */
+ public Pet getPet(String name, boolean ignoreNew) {
+ name = name.toLowerCase();
+ for (Pet pet : getPets()) {
+ if (!ignoreNew || !pet.isNew()) {
+ String compName = pet.getName();
+ compName = compName == null ? "" : compName.toLowerCase();
+ if (compName.equals(name)) {
+ return pet;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringCreator(this).append("id", this.getId())
+ .append("new", this.isNew())
+ .append("lastName", this.getLastName())
+ .append("firstName", this.getFirstName())
+ .append("address", this.address)
+ .append("city", this.city)
+ .append("telephone", this.telephone)
+ .toString();
+ }
+
+ /**
+ * Adds the given {@link Visit} to the {@link Pet} with the given identifier.
+ * @param petId the identifier of the {@link Pet}, must not be {@literal null}.
+ * @param visit the visit to add, must not be {@literal null}.
+ */
+ public void addVisit(Integer petId, Visit visit) {
+
+ Assert.notNull(petId, "Pet identifier must not be null!");
+ Assert.notNull(visit, "Visit must not be null!");
+
+ Pet pet = getPet(petId);
+
+ Assert.notNull(pet, "Invalid Pet identifier!");
+
+ pet.addVisit(visit);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
new file mode 100644
index 000000000..c91a94c93
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import jakarta.validation.Valid;
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ */
+@Controller
+class OwnerController {
+
+ private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
+ private final OwnerRepository owners;
+
+ public OwnerController(OwnerRepository clinicService) {
+ this.owners = clinicService;
+ }
+
+ @InitBinder
+ public void setAllowedFields(WebDataBinder dataBinder) {
+ dataBinder.setDisallowedFields("id");
+ }
+
+ @ModelAttribute("owner")
+ public Owner findOwner(@PathVariable(name = "ownerId", required = false) Integer ownerId) {
+ return ownerId == null ? new Owner() : this.owners.findById(ownerId);
+ }
+
+ @GetMapping("/owners/new")
+ public String initCreationForm(Map model) {
+ Owner owner = new Owner();
+ model.put("owner", owner);
+ return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+ }
+
+ @PostMapping("/owners/new")
+ public String processCreationForm(@Valid Owner owner, BindingResult result) {
+ if (result.hasErrors()) {
+ return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+ }
+
+ this.owners.save(owner);
+ return "redirect:/owners/" + owner.getId();
+ }
+
+ @GetMapping("/owners/find")
+ public String initFindForm() {
+ return "owners/findOwners";
+ }
+
+ @GetMapping("/owners")
+ public String processFindForm(@RequestParam(defaultValue = "1") int page, Owner owner, BindingResult result,
+ Model model) {
+ // allow parameterless GET request for /owners to return all records
+ if (owner.getLastName() == null) {
+ owner.setLastName(""); // empty string signifies broadest possible search
+ }
+
+ // find owners by last name
+ Page ownersResults = findPaginatedForOwnersLastName(page, owner.getLastName());
+ if (ownersResults.isEmpty()) {
+ // no owners found
+ result.rejectValue("lastName", "notFound", "not found");
+ return "owners/findOwners";
+ }
+
+ if (ownersResults.getTotalElements() == 1) {
+ // 1 owner found
+ owner = ownersResults.iterator().next();
+ return "redirect:/owners/" + owner.getId();
+ }
+
+ // multiple owners found
+ return addPaginationModel(page, model, ownersResults);
+ }
+
+ private String addPaginationModel(int page, Model model, Page paginated) {
+ model.addAttribute("listOwners", paginated);
+ List listOwners = paginated.getContent();
+ model.addAttribute("currentPage", page);
+ model.addAttribute("totalPages", paginated.getTotalPages());
+ model.addAttribute("totalItems", paginated.getTotalElements());
+ model.addAttribute("listOwners", listOwners);
+ return "owners/ownersList";
+ }
+
+ private Page findPaginatedForOwnersLastName(int page, String lastname) {
+ int pageSize = 5;
+ Pageable pageable = PageRequest.of(page - 1, pageSize);
+ return owners.findByLastName(lastname, pageable);
+ }
+
+ @GetMapping("/owners/{ownerId}/edit")
+ public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) {
+ Owner owner = this.owners.findById(ownerId);
+ model.addAttribute(owner);
+ return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+ }
+
+ @PostMapping("/owners/{ownerId}/edit")
+ public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result,
+ @PathVariable("ownerId") int ownerId) {
+ if (result.hasErrors()) {
+ return VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
+ }
+
+ owner.setId(ownerId);
+ this.owners.save(owner);
+ return "redirect:/owners/{ownerId}";
+ }
+
+ /**
+ * Custom handler for displaying an owner.
+ * @param ownerId the ID of the owner to display
+ * @return a ModelMap with the model attributes for the view
+ */
+ @GetMapping("/owners/{ownerId}")
+ public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) {
+ ModelAndView mav = new ModelAndView("owners/ownerDetails");
+ Owner owner = this.owners.findById(ownerId);
+ mav.addObject(owner);
+ return mav;
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
new file mode 100644
index 000000000..f44449439
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Repository class for Owner domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface OwnerRepository extends Repository {
+
+ /**
+ * Retrieve all {@link PetType}s from the data store.
+ * @return a Collection of {@link PetType}s.
+ */
+ @Query("SELECT ptype FROM PetType ptype ORDER BY ptype.name")
+ @Transactional(readOnly = true)
+ List findPetTypes();
+
+ /**
+ * Retrieve {@link Owner}s from the data store by last name, returning all owners
+ * whose last name starts with the given name.
+ * @param lastName Value to search for
+ * @return a Collection of matching {@link Owner}s (or an empty Collection if none
+ * found)
+ */
+
+ @Query("SELECT DISTINCT owner FROM Owner owner left join owner.pets WHERE owner.lastName LIKE :lastName% ")
+ @Transactional(readOnly = true)
+ Page findByLastName(@Param("lastName") String lastName, Pageable pageable);
+
+ /**
+ * Retrieve an {@link Owner} from the data store by id.
+ * @param id the id to search for
+ * @return the {@link Owner} if found
+ */
+ @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
+ @Transactional(readOnly = true)
+ Owner findById(@Param("id") Integer id);
+
+ /**
+ * Save an {@link Owner} to the data store, either inserting or updating it.
+ * @param owner the {@link Owner} to save
+ */
+ void save(Owner owner);
+
+ /**
+ * Returns all the owners from data store
+ **/
+ @Query("SELECT owner FROM Owner owner")
+ @Transactional(readOnly = true)
+ Page findAll(Pageable pageable);
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java
new file mode 100755
index 000000000..0b0c08ac6
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Pet.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.samples.petclinic.model.NamedEntity;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+
+/**
+ * Simple business object representing a pet.
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ */
+@Entity
+@Table(name = "pets")
+public class Pet extends NamedEntity {
+
+ @Column(name = "birth_date")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate birthDate;
+
+ @ManyToOne
+ @JoinColumn(name = "type_id")
+ private PetType type;
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+ @JoinColumn(name = "pet_id")
+ @OrderBy("visit_date ASC")
+ private Set visits = new LinkedHashSet<>();
+
+ public void setBirthDate(LocalDate birthDate) {
+ this.birthDate = birthDate;
+ }
+
+ public LocalDate getBirthDate() {
+ return this.birthDate;
+ }
+
+ public PetType getType() {
+ return this.type;
+ }
+
+ public void setType(PetType type) {
+ this.type = type;
+ }
+
+ public Collection getVisits() {
+ return this.visits;
+ }
+
+ public void addVisit(Visit visit) {
+ getVisits().add(visit);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
new file mode 100644
index 000000000..9d88f0399
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.util.Collection;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import jakarta.validation.Valid;
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ */
+@Controller
+@RequestMapping("/owners/{ownerId}")
+class PetController {
+
+ private static final String VIEWS_PETS_CREATE_OR_UPDATE_FORM = "pets/createOrUpdatePetForm";
+
+ private final OwnerRepository owners;
+
+ public PetController(OwnerRepository owners) {
+ this.owners = owners;
+ }
+
+ @ModelAttribute("types")
+ public Collection populatePetTypes() {
+ return this.owners.findPetTypes();
+ }
+
+ @ModelAttribute("owner")
+ public Owner findOwner(@PathVariable("ownerId") int ownerId) {
+ return this.owners.findById(ownerId);
+ }
+
+ @ModelAttribute("pet")
+ public Pet findPet(@PathVariable("ownerId") int ownerId,
+ @PathVariable(name = "petId", required = false) Integer petId) {
+ return petId == null ? new Pet() : this.owners.findById(ownerId).getPet(petId);
+ }
+
+ @InitBinder("owner")
+ public void initOwnerBinder(WebDataBinder dataBinder) {
+ dataBinder.setDisallowedFields("id");
+ }
+
+ @InitBinder("pet")
+ public void initPetBinder(WebDataBinder dataBinder) {
+ dataBinder.setValidator(new PetValidator());
+ }
+
+ @GetMapping("/pets/new")
+ public String initCreationForm(Owner owner, ModelMap model) {
+ Pet pet = new Pet();
+ owner.addPet(pet);
+ model.put("pet", pet);
+ return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
+ }
+
+ @PostMapping("/pets/new")
+ public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult result, ModelMap model) {
+ if (StringUtils.hasLength(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null) {
+ result.rejectValue("name", "duplicate", "already exists");
+ }
+
+ owner.addPet(pet);
+ if (result.hasErrors()) {
+ model.put("pet", pet);
+ return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
+ }
+
+ this.owners.save(owner);
+ return "redirect:/owners/{ownerId}";
+ }
+
+ @GetMapping("/pets/{petId}/edit")
+ public String initUpdateForm(Owner owner, @PathVariable("petId") int petId, ModelMap model) {
+ Pet pet = owner.getPet(petId);
+ model.put("pet", pet);
+ return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
+ }
+
+ @PostMapping("/pets/{petId}/edit")
+ public String processUpdateForm(@Valid Pet pet, BindingResult result, Owner owner, ModelMap model) {
+ if (result.hasErrors()) {
+ model.put("pet", pet);
+ return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
+ }
+
+ owner.addPet(pet);
+ this.owners.save(owner);
+ return "redirect:/owners/{ownerId}";
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/PetType.java b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java
similarity index 63%
rename from src/main/java/org/springframework/samples/petclinic/model/PetType.java
rename to src/main/java/org/springframework/samples/petclinic/owner/PetType.java
index f60a5cd27..eeea6a758 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/PetType.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetType.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,14 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.samples.petclinic.model;
+package org.springframework.samples.petclinic.owner;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import org.springframework.samples.petclinic.model.NamedEntity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
/**
- * @author Juergen Hoeller
- * Can be Cat, Dog, Hamster...
+ * @author Juergen Hoeller Can be Cat, Dog, Hamster...
*/
@Entity
@Table(name = "types")
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java b/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java
new file mode 100644
index 000000000..4fa18da91
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.Formatter;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.util.Collection;
+import java.util.Locale;
+
+/**
+ * Instructs Spring MVC on how to parse and print elements of type 'PetType'. Starting
+ * from Spring 3.0, Formatters have come as an improvement in comparison to legacy
+ * PropertyEditors. See the following links for more details: - The Spring ref doc:
+ * https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/core.html#format
+ *
+ * @author Mark Fisher
+ * @author Juergen Hoeller
+ * @author Michael Isvy
+ */
+@Component
+public class PetTypeFormatter implements Formatter {
+
+ private final OwnerRepository owners;
+
+ @Autowired
+ public PetTypeFormatter(OwnerRepository owners) {
+ this.owners = owners;
+ }
+
+ @Override
+ public String print(PetType petType, Locale locale) {
+ return petType.getName();
+ }
+
+ @Override
+ public PetType parse(String text, Locale locale) throws ParseException {
+ Collection findPetTypes = this.owners.findPetTypes();
+ for (PetType type : findPetTypes) {
+ if (type.getName().equals(text)) {
+ return type;
+ }
+ }
+ throw new ParseException("type not found: " + text, 0);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java b/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java
new file mode 100644
index 000000000..e1370b428
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import org.springframework.util.StringUtils;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+/**
+ * Validator for Pet forms.
+ *
+ * We're not using Bean Validation annotations here because it is easier to define such
+ * validation rule in Java.
+ *
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ */
+public class PetValidator implements Validator {
+
+ private static final String REQUIRED = "required";
+
+ @Override
+ public void validate(Object obj, Errors errors) {
+ Pet pet = (Pet) obj;
+ String name = pet.getName();
+ // name validation
+ if (!StringUtils.hasLength(name)) {
+ errors.rejectValue("name", REQUIRED, REQUIRED);
+ }
+
+ // type validation
+ if (pet.isNew() && pet.getType() == null) {
+ errors.rejectValue("type", REQUIRED, REQUIRED);
+ }
+
+ // birth date validation
+ if (pet.getBirthDate() == null) {
+ errors.rejectValue("birthDate", REQUIRED, REQUIRED);
+ }
+ }
+
+ /**
+ * This Validator validates *just* Pet instances
+ */
+ @Override
+ public boolean supports(Class clazz) {
+ return Pet.class.isAssignableFrom(clazz);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java b/src/main/java/org/springframework/samples/petclinic/owner/Visit.java
new file mode 100755
index 000000000..d052a4e8d
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Visit.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.time.LocalDate;
+
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.samples.petclinic.model.BaseEntity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotEmpty;
+
+/**
+ * Simple JavaBean domain object representing a visit.
+ *
+ * @author Ken Krebs
+ * @author Dave Syer
+ */
+@Entity
+@Table(name = "visits")
+public class Visit extends BaseEntity {
+
+ @Column(name = "visit_date")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate date;
+
+ @NotEmpty
+ private String description;
+
+ /**
+ * Creates a new instance of Visit for the current date
+ */
+ public Visit() {
+ this.date = LocalDate.now();
+ }
+
+ public LocalDate getDate() {
+ return this.date;
+ }
+
+ public void setDate(LocalDate date) {
+ this.date = date;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java b/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java
new file mode 100644
index 000000000..c823d91f2
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.owner;
+
+import java.util.Map;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import jakarta.validation.Valid;
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ * @author Dave Syer
+ */
+@Controller
+class VisitController {
+
+ private final OwnerRepository owners;
+
+ public VisitController(OwnerRepository owners) {
+ this.owners = owners;
+ }
+
+ @InitBinder
+ public void setAllowedFields(WebDataBinder dataBinder) {
+ dataBinder.setDisallowedFields("id");
+ }
+
+ /**
+ * Called before each and every @RequestMapping annotated method. 2 goals: - Make sure
+ * we always have fresh data - Since we do not use the session scope, make sure that
+ * Pet object always has an id (Even though id is not part of the form fields)
+ * @param petId
+ * @return Pet
+ */
+ @ModelAttribute("visit")
+ public Visit loadPetWithVisit(@PathVariable("ownerId") int ownerId, @PathVariable("petId") int petId,
+ Map model) {
+ Owner owner = this.owners.findById(ownerId);
+
+ Pet pet = owner.getPet(petId);
+ model.put("pet", pet);
+ model.put("owner", owner);
+
+ Visit visit = new Visit();
+ pet.addVisit(visit);
+ return visit;
+ }
+
+ // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is
+ // called
+ @GetMapping("/owners/{ownerId}/pets/{petId}/visits/new")
+ public String initNewVisitForm() {
+ return "pets/createOrUpdateVisitForm";
+ }
+
+ // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is
+ // called
+ @PostMapping("/owners/{ownerId}/pets/{petId}/visits/new")
+ public String processNewVisitForm(@ModelAttribute Owner owner, @PathVariable int petId, @Valid Visit visit,
+ BindingResult result) {
+ if (result.hasErrors()) {
+ return "pets/createOrUpdateVisitForm";
+ }
+
+ owner.addVisit(petId, visit);
+ this.owners.save(owner);
+ return "redirect:/owners/{ownerId}";
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java
deleted file mode 100644
index a0869d1e3..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository;
-
-import java.util.Collection;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.BaseEntity;
-import org.springframework.samples.petclinic.model.Owner;
-
-/**
- * Repository class for Owner domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface OwnerRepository {
-
- /**
- * Retrieve Owners from the data store by last name, returning all owners whose last name starts
- * with the given name.
- *
- * @param lastName Value to search for
- * @return a Collection of matching Owners (or an empty Collection if none
- * found)
- */
- Collection findByLastName(String lastName) throws DataAccessException;
-
- /**
- * Retrieve an Owner from the data store by id.
- *
- * @param id the id to search for
- * @return the Owner if found
- * @throws org.springframework.dao.DataRetrievalFailureException if not found
- */
- Owner findById(int id) throws DataAccessException;
-
-
- /**
- * Save an Owner to the data store, either inserting or updating it.
- *
- * @param owner the Owner to save
- * @see BaseEntity#isNew
- */
- void save(Owner owner) throws DataAccessException;
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java
deleted file mode 100644
index 1770e8555..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository;
-
-import java.util.List;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.BaseEntity;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-
-/**
- * Repository class for Pet domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface PetRepository {
-
- /**
- * Retrieve all PetTypes from the data store.
- *
- * @return a Collection of PetTypes
- */
- List findPetTypes() throws DataAccessException;
-
- /**
- * Retrieve a Pet from the data store by id.
- *
- * @param id the id to search for
- * @return the Pet if found
- * @throws org.springframework.dao.DataRetrievalFailureException if not found
- */
- Pet findById(int id) throws DataAccessException;
-
- /**
- * Save a Pet to the data store, either inserting or updating it.
- *
- * @param pet the Pet to save
- * @see BaseEntity#isNew
- */
- void save(Pet pet) throws DataAccessException;
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java
deleted file mode 100644
index 923c3c23d..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository;
-
-import java.util.Collection;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.Vet;
-
-/**
- * Repository class for Vet domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface VetRepository {
-
- /**
- * Retrieve all Vets from the data store.
- *
- * @return a Collection of Vets
- */
- Collection findAll() throws DataAccessException;
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java
deleted file mode 100644
index 96b7a208c..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository;
-
-import java.util.List;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.BaseEntity;
-import org.springframework.samples.petclinic.model.Visit;
-
-/**
- * Repository class for Visit domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data See here: http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public interface VisitRepository {
-
- /**
- * Save a Visit to the data store, either inserting or updating it.
- *
- * @param visit the Visit to save
- * @see BaseEntity#isNew
- */
- void save(Visit visit) throws DataAccessException;
-
- List findByPetId(Integer petId);
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java
deleted file mode 100644
index 45de1aee0..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
-import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-import org.springframework.samples.petclinic.util.EntityUtils;
-import org.springframework.stereotype.Repository;
-
-/**
- * A simple JDBC-based implementation of the {@link OwnerRepository} interface.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Sam Brannen
- * @author Thomas Risberg
- * @author Mark Fisher
- */
-@Repository
-public class JdbcOwnerRepositoryImpl implements OwnerRepository {
-
- private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
-
- private SimpleJdbcInsert insertOwner;
-
- @Autowired
- public JdbcOwnerRepositoryImpl(DataSource dataSource, NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
-
- this.insertOwner = new SimpleJdbcInsert(dataSource)
- .withTableName("owners")
- .usingGeneratedKeyColumns("id");
-
- this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
-
- }
-
-
- /**
- * Loads {@link Owner Owners} from the data store by last name, returning all owners whose last name starts with
- * the given name; also loads the {@link Pet Pets} and {@link Visit Visits} for the corresponding owners, if not
- * already loaded.
- */
- @Override
- public Collection findByLastName(String lastName) throws DataAccessException {
- Map params = new HashMap<>();
- params.put("lastName", lastName + "%");
- List owners = this.namedParameterJdbcTemplate.query(
- "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like :lastName",
- params,
- BeanPropertyRowMapper.newInstance(Owner.class)
- );
- loadOwnersPetsAndVisits(owners);
- return owners;
- }
-
- /**
- * Loads the {@link Owner} with the supplied id; also loads the {@link Pet Pets} and {@link Visit Visits}
- * for the corresponding owner, if not already loaded.
- */
- @Override
- public Owner findById(int id) throws DataAccessException {
- Owner owner;
- try {
- Map params = new HashMap<>();
- params.put("id", id);
- owner = this.namedParameterJdbcTemplate.queryForObject(
- "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id= :id",
- params,
- BeanPropertyRowMapper.newInstance(Owner.class)
- );
- } catch (EmptyResultDataAccessException ex) {
- throw new ObjectRetrievalFailureException(Owner.class, id);
- }
- loadPetsAndVisits(owner);
- return owner;
- }
-
- public void loadPetsAndVisits(final Owner owner) {
- Map params = new HashMap<>();
- params.put("id", owner.getId());
- final List pets = this.namedParameterJdbcTemplate.query(
- "SELECT pets.id, name, birth_date, type_id, owner_id, visits.id as visit_id, visit_date, description, pet_id FROM pets LEFT OUTER JOIN visits ON pets.id = pet_id WHERE owner_id=:id",
- params,
- new JdbcPetVisitExtractor()
- );
- Collection petTypes = getPetTypes();
- for (JdbcPet pet : pets) {
- pet.setType(EntityUtils.getById(petTypes, PetType.class, pet.getTypeId()));
- owner.addPet(pet);
- }
- }
-
- @Override
- public void save(Owner owner) throws DataAccessException {
- BeanPropertySqlParameterSource parameterSource = new BeanPropertySqlParameterSource(owner);
- if (owner.isNew()) {
- Number newKey = this.insertOwner.executeAndReturnKey(parameterSource);
- owner.setId(newKey.intValue());
- } else {
- this.namedParameterJdbcTemplate.update(
- "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " +
- "city=:city, telephone=:telephone WHERE id=:id",
- parameterSource);
- }
- }
-
- public Collection getPetTypes() throws DataAccessException {
- return this.namedParameterJdbcTemplate.query(
- "SELECT id, name FROM types ORDER BY name", new HashMap(),
- BeanPropertyRowMapper.newInstance(PetType.class));
- }
-
- /**
- * Loads the {@link Pet} and {@link Visit} data for the supplied {@link List} of {@link Owner Owners}.
- *
- * @param owners the list of owners for whom the pet and visit data should be loaded
- * @see #loadPetsAndVisits(Owner)
- */
- private void loadOwnersPetsAndVisits(List owners) {
- for (Owner owner : owners) {
- loadPetsAndVisits(owner);
- }
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java
deleted file mode 100644
index 4c266b931..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import org.springframework.samples.petclinic.model.Pet;
-
-/**
- * Subclass of Pet that carries temporary id properties which are only relevant for a JDBC implementation of the
- * PetRepository.
- *
- * @author Juergen Hoeller
- */
-class JdbcPet extends Pet {
-
- private int typeId;
-
- private int ownerId;
-
- public int getTypeId() {
- return this.typeId;
- }
-
- public void setTypeId(int typeId) {
- this.typeId = typeId;
- }
-
- public int getOwnerId() {
- return this.ownerId;
- }
-
- public void setOwnerId(int ownerId) {
- this.ownerId = ownerId;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
deleted file mode 100644
index 885c2bc2f..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
-import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-import org.springframework.samples.petclinic.repository.PetRepository;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-import org.springframework.samples.petclinic.util.EntityUtils;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Sam Brannen
- * @author Thomas Risberg
- * @author Mark Fisher
- */
-@Repository
-public class JdbcPetRepositoryImpl implements PetRepository {
-
- private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
-
- private SimpleJdbcInsert insertPet;
-
- private OwnerRepository ownerRepository;
-
- private VisitRepository visitRepository;
-
-
- @Autowired
- public JdbcPetRepositoryImpl(DataSource dataSource, OwnerRepository ownerRepository, VisitRepository visitRepository) {
- this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
-
- this.insertPet = new SimpleJdbcInsert(dataSource)
- .withTableName("pets")
- .usingGeneratedKeyColumns("id");
-
- this.ownerRepository = ownerRepository;
- this.visitRepository = visitRepository;
- }
-
- @Override
- public List findPetTypes() throws DataAccessException {
- Map params = new HashMap<>();
- return this.namedParameterJdbcTemplate.query(
- "SELECT id, name FROM types ORDER BY name",
- params,
- BeanPropertyRowMapper.newInstance(PetType.class));
- }
-
- @Override
- public Pet findById(int id) throws DataAccessException {
- JdbcPet pet;
- try {
- Map params = new HashMap<>();
- params.put("id", id);
- pet = this.namedParameterJdbcTemplate.queryForObject(
- "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=:id",
- params,
- new JdbcPetRowMapper());
- } catch (EmptyResultDataAccessException ex) {
- throw new ObjectRetrievalFailureException(Pet.class, id);
- }
- Owner owner = this.ownerRepository.findById(pet.getOwnerId());
- owner.addPet(pet);
- pet.setType(EntityUtils.getById(findPetTypes(), PetType.class, pet.getTypeId()));
-
- List visits = this.visitRepository.findByPetId(pet.getId());
- for (Visit visit : visits) {
- pet.addVisit(visit);
- }
- return pet;
- }
-
- @Override
- public void save(Pet pet) throws DataAccessException {
- if (pet.isNew()) {
- Number newKey = this.insertPet.executeAndReturnKey(
- createPetParameterSource(pet));
- pet.setId(newKey.intValue());
- } else {
- this.namedParameterJdbcTemplate.update(
- "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " +
- "owner_id=:owner_id WHERE id=:id",
- createPetParameterSource(pet));
- }
- }
-
- /**
- * Creates a {@link MapSqlParameterSource} based on data values from the supplied {@link Pet} instance.
- */
- private MapSqlParameterSource createPetParameterSource(Pet pet) {
- return new MapSqlParameterSource()
- .addValue("id", pet.getId())
- .addValue("name", pet.getName())
- .addValue("birth_date", pet.getBirthDate().toDate())
- .addValue("type_id", pet.getType().getId())
- .addValue("owner_id", pet.getOwner().getId());
- }
-
-}
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
deleted file mode 100644
index ad00a7163..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-
-import org.joda.time.DateTime;
-import org.springframework.jdbc.core.RowMapper;
-
-/**
- * {@link RowMapper} implementation mapping data from a {@link ResultSet} to the corresponding properties
- * of the {@link JdbcPet} class.
- */
-class JdbcPetRowMapper implements RowMapper {
-
- @Override
- public JdbcPet mapRow(ResultSet rs, int rownum) throws SQLException {
- JdbcPet pet = new JdbcPet();
- pet.setId(rs.getInt("pets.id"));
- pet.setName(rs.getString("name"));
- Date birthDate = rs.getDate("birth_date");
- pet.setBirthDate(new DateTime(birthDate));
- pet.setTypeId(rs.getInt("type_id"));
- pet.setOwnerId(rs.getInt("owner_id"));
- return pet;
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java
deleted file mode 100644
index 6a4ba62c3..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetVisitExtractor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import org.springframework.data.jdbc.core.OneToManyResultSetExtractor;
-import org.springframework.jdbc.core.ResultSetExtractor;
-import org.springframework.samples.petclinic.model.Visit;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * {@link ResultSetExtractor} implementation by using the
- * {@link OneToManyResultSetExtractor} of Spring Data Core JDBC Extensions.
- */
-public class JdbcPetVisitExtractor extends
- OneToManyResultSetExtractor {
-
- public JdbcPetVisitExtractor() {
- super(new JdbcPetRowMapper(), new JdbcVisitRowMapper());
- }
-
- @Override
- protected Integer mapPrimaryKey(ResultSet rs) throws SQLException {
- return rs.getInt("pets.id");
- }
-
- @Override
- protected Integer mapForeignKey(ResultSet rs) throws SQLException {
- if (rs.getObject("visits.pet_id") == null) {
- return null;
- } else {
- return rs.getInt("visits.pet_id");
- }
- }
-
- @Override
- protected void addChild(JdbcPet root, Visit child) {
- root.addVisit(child);
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java
deleted file mode 100644
index 0231275c1..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.samples.petclinic.model.Specialty;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.repository.VetRepository;
-import org.springframework.samples.petclinic.util.EntityUtils;
-import org.springframework.stereotype.Repository;
-
-/**
- * A simple JDBC-based implementation of the {@link VetRepository} interface.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Sam Brannen
- * @author Thomas Risberg
- * @author Mark Fisher
- * @author Michael Isvy
- */
-@Repository
-public class JdbcVetRepositoryImpl implements VetRepository {
-
- private JdbcTemplate jdbcTemplate;
-
- @Autowired
- public JdbcVetRepositoryImpl(JdbcTemplate jdbcTemplate) {
- this.jdbcTemplate = jdbcTemplate;
- }
-
- /**
- * Refresh the cache of Vets that the ClinicService is holding.
- */
- @Override
- public Collection findAll() throws DataAccessException {
- List vets = new ArrayList<>();
- // Retrieve the list of all vets.
- vets.addAll(this.jdbcTemplate.query(
- "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name",
- BeanPropertyRowMapper.newInstance(Vet.class)));
-
- // Retrieve the list of all possible specialties.
- final List specialties = this.jdbcTemplate.query(
- "SELECT id, name FROM specialties",
- BeanPropertyRowMapper.newInstance(Specialty.class));
-
- // Build each vet's list of specialties.
- for (Vet vet : vets) {
- final List vetSpecialtiesIds = this.jdbcTemplate.query(
- "SELECT specialty_id FROM vet_specialties WHERE vet_id=?",
- new BeanPropertyRowMapper() {
- @Override
- public Integer mapRow(ResultSet rs, int row) throws SQLException {
- return rs.getInt(1);
- }
- },
- vet.getId());
- for (int specialtyId : vetSpecialtiesIds) {
- Specialty specialty = EntityUtils.getById(specialties, Specialty.class, specialtyId);
- vet.addSpecialty(specialty);
- }
- }
- return vets;
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
deleted file mode 100644
index 330ca1a4c..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-import org.springframework.stereotype.Repository;
-
-import javax.sql.DataSource;
-import java.util.List;
-
-/**
- * A simple JDBC-based implementation of the {@link VisitRepository} interface.
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- * @author Rob Harrop
- * @author Sam Brannen
- * @author Thomas Risberg
- * @author Mark Fisher
- * @author Michael Isvy
- */
-@Repository
-public class JdbcVisitRepositoryImpl implements VisitRepository {
-
- private JdbcTemplate jdbcTemplate;
-
- private SimpleJdbcInsert insertVisit;
-
- @Autowired
- public JdbcVisitRepositoryImpl(DataSource dataSource) {
- this.jdbcTemplate = new JdbcTemplate(dataSource);
-
- this.insertVisit = new SimpleJdbcInsert(dataSource)
- .withTableName("visits")
- .usingGeneratedKeyColumns("id");
- }
-
-
- @Override
- public void save(Visit visit) throws DataAccessException {
- if (visit.isNew()) {
- Number newKey = this.insertVisit.executeAndReturnKey(
- createVisitParameterSource(visit));
- visit.setId(newKey.intValue());
- } else {
- throw new UnsupportedOperationException("Visit update not supported");
- }
- }
-
-
- /**
- * Creates a {@link MapSqlParameterSource} based on data values from the supplied {@link Visit} instance.
- */
- private MapSqlParameterSource createVisitParameterSource(Visit visit) {
- return new MapSqlParameterSource()
- .addValue("id", visit.getId())
- .addValue("visit_date", visit.getDate().toDate())
- .addValue("description", visit.getDescription())
- .addValue("pet_id", visit.getPet().getId());
- }
-
- @Override
- public List findByPetId(Integer petId) {
- return this.jdbcTemplate.query(
- "SELECT id as visit_id, visit_date, description FROM visits WHERE pet_id=?",
- new JdbcVisitRowMapper(), petId);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java
deleted file mode 100644
index 94069042b..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRowMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
-
-import org.joda.time.DateTime;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.samples.petclinic.model.Visit;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-
-/**
- * {@link RowMapper} implementation mapping data from a {@link ResultSet} to the corresponding properties
- * of the {@link Visit} class.
- */
-class JdbcVisitRowMapper implements RowMapper {
-
- @Override
- public Visit mapRow(ResultSet rs, int row) throws SQLException {
- Visit visit = new Visit();
- visit.setId(rs.getInt("visit_id"));
- Date visitDate = rs.getDate("visit_date");
- visit.setDate(new DateTime(visitDate));
- visit.setDescription(rs.getString("description"));
- return visit;
- }
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java
deleted file mode 100644
index 376da279f..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * The classes in this package represent the JDBC implementation
- * of PetClinic's persistence layer.
- */
-package org.springframework.samples.petclinic.repository.jdbc;
-
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java
deleted file mode 100644
index 3972dd349..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
-import java.util.Collection;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.springframework.orm.hibernate3.support.OpenSessionInViewFilter;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * JPA implementation of the {@link OwnerRepository} interface.
- *
- * @author Mike Keith
- * @author Rod Johnson
- * @author Sam Brannen
- * @author Michael Isvy
- * @since 22.4.2006
- */
-@Repository
-public class JpaOwnerRepositoryImpl implements OwnerRepository {
-
- @PersistenceContext
- private EntityManager em;
-
-
- /**
- * Important: in the current version of this method, we load Owners with all their Pets and Visits while
- * we do not need Visits at all and we only need one property from the Pet objects (the 'name' property).
- * There are some ways to improve it such as:
- * - creating a Ligtweight class (example here: https://community.jboss.org/wiki/LightweightClass)
- * - Turning on lazy-loading and using {@link OpenSessionInViewFilter}
- */
- @SuppressWarnings("unchecked")
- public Collection findByLastName(String lastName) {
- // using 'join fetch' because a single query should load both owners and pets
- // using 'left join fetch' because it might happen that an owner does not have pets yet
- Query query = this.em.createQuery("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName");
- query.setParameter("lastName", lastName + "%");
- return query.getResultList();
- }
-
- @Override
- public Owner findById(int id) {
- // using 'join fetch' because a single query should load both owners and pets
- // using 'left join fetch' because it might happen that an owner does not have pets yet
- Query query = this.em.createQuery("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id");
- query.setParameter("id", id);
- return (Owner) query.getSingleResult();
- }
-
-
- @Override
- public void save(Owner owner) {
- if (owner.getId() == null) {
- this.em.persist(owner);
- } else {
- this.em.merge(owner);
- }
-
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java
deleted file mode 100644
index 227140d96..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.repository.PetRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * JPA implementation of the {@link PetRepository} interface.
- *
- * @author Mike Keith
- * @author Rod Johnson
- * @author Sam Brannen
- * @author Michael Isvy
- * @since 22.4.2006
- */
-@Repository
-public class JpaPetRepositoryImpl implements PetRepository {
-
- @PersistenceContext
- private EntityManager em;
-
- @Override
- @SuppressWarnings("unchecked")
- public List findPetTypes() {
- return this.em.createQuery("SELECT ptype FROM PetType ptype ORDER BY ptype.name").getResultList();
- }
-
- @Override
- public Pet findById(int id) {
- return this.em.find(Pet.class, id);
- }
-
- @Override
- public void save(Pet pet) {
- if (pet.getId() == null) {
- this.em.persist(pet);
- } else {
- this.em.merge(pet);
- }
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java
deleted file mode 100644
index e4c222b65..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
-import java.util.Collection;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.repository.VetRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * JPA implementation of the {@link VetRepository} interface.
- *
- * @author Mike Keith
- * @author Rod Johnson
- * @author Sam Brannen
- * @author Michael Isvy
- * @since 22.4.2006
- */
-@Repository
-public class JpaVetRepositoryImpl implements VetRepository {
-
- @PersistenceContext
- private EntityManager em;
-
-
- @Override
- @Cacheable(value = "vets")
- @SuppressWarnings("unchecked")
- public Collection findAll() {
- return this.em.createQuery("SELECT distinct vet FROM Vet vet left join fetch vet.specialties ORDER BY vet.lastName, vet.firstName").getResultList();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
deleted file mode 100644
index 5d1d42a07..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * JPA implementation of the ClinicService interface using EntityManager.
- *
- *
The mappings are defined in "orm.xml" located in the META-INF directory.
- *
- * @author Mike Keith
- * @author Rod Johnson
- * @author Sam Brannen
- * @author Michael Isvy
- * @since 22.4.2006
- */
-@Repository
-public class JpaVisitRepositoryImpl implements VisitRepository {
-
- @PersistenceContext
- private EntityManager em;
-
-
- @Override
- public void save(Visit visit) {
- if (visit.getId() == null) {
- this.em.persist(visit);
- } else {
- this.em.merge(visit);
- }
- }
-
-
- @Override
- @SuppressWarnings("unchecked")
- public List findByPetId(Integer petId) {
- Query query = this.em.createQuery("SELECT visit FROM Visit v where v.pets.id= :id");
- query.setParameter("id", petId);
- return query.getResultList();
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java b/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
deleted file mode 100644
index 087dc15b6..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * The classes in this package represent the JPA implementation
- * of PetClinic's persistence layer.
- */
-package org.springframework.samples.petclinic.repository.jpa;
-
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
deleted file mode 100644
index 24c573eb7..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import java.util.Collection;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-
-/**
- * Spring Data JPA specialization of the {@link OwnerRepository} interface
- *
- * @author Michael Isvy
- * @since 15.1.2013
- */
-public interface SpringDataOwnerRepository extends OwnerRepository, Repository {
-
- @Override
- @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%")
- public Collection findByLastName(@Param("lastName") String lastName);
-
- @Override
- @Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
- public Owner findById(@Param("id") int id);
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java
deleted file mode 100644
index 56a413147..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import java.util.List;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.repository.PetRepository;
-
-/**
- * Spring Data JPA specialization of the {@link PetRepository} interface
- *
- * @author Michael Isvy
- * @since 15.1.2013
- */
-public interface SpringDataPetRepository extends PetRepository, Repository {
-
- @Override
- @Query("SELECT ptype FROM PetType ptype ORDER BY ptype.name")
- List findPetTypes() throws DataAccessException;
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java
deleted file mode 100644
index b8211b707..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.repository.VetRepository;
-
-/**
- * Spring Data JPA specialization of the {@link VetRepository} interface
- *
- * @author Michael Isvy
- * @since 15.1.2013
- */
-public interface SpringDataVetRepository extends VetRepository, Repository {
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java b/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java
deleted file mode 100644
index 84740224b..000000000
--- a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.repository.springdatajpa;
-
-import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-
-/**
- * Spring Data JPA specialization of the {@link VisitRepository} interface
- *
- * @author Michael Isvy
- * @since 15.1.2013
- */
-public interface SpringDataVisitRepository extends VisitRepository, Repository {
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java b/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java
deleted file mode 100644
index 936582129..000000000
--- a/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.service;
-
-import java.util.Collection;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.model.Visit;
-
-
-/**
- * Mostly used as a facade so all controllers have a single point of entry
- *
- * @author Michael Isvy
- */
-public interface ClinicService {
-
- Collection findPetTypes() throws DataAccessException;
-
- Owner findOwnerById(int id) throws DataAccessException;
-
- Pet findPetById(int id) throws DataAccessException;
-
- void savePet(Pet pet) throws DataAccessException;
-
- void saveVisit(Visit visit) throws DataAccessException;
-
- Collection findVets() throws DataAccessException;
-
- void saveOwner(Owner owner) throws DataAccessException;
-
- Collection findOwnerByLastName(String lastName) throws DataAccessException;
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java b/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
deleted file mode 100644
index 0d7ff4d0c..000000000
--- a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.service;
-
-import java.util.Collection;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.repository.OwnerRepository;
-import org.springframework.samples.petclinic.repository.PetRepository;
-import org.springframework.samples.petclinic.repository.VetRepository;
-import org.springframework.samples.petclinic.repository.VisitRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Mostly used as a facade for all Petclinic controllers
- * Also a placeholder for @Transactional and @Cacheable annotations
- *
- * @author Michael Isvy
- */
-@Service
-public class ClinicServiceImpl implements ClinicService {
-
- private PetRepository petRepository;
- private VetRepository vetRepository;
- private OwnerRepository ownerRepository;
- private VisitRepository visitRepository;
-
- @Autowired
- public ClinicServiceImpl(PetRepository petRepository, VetRepository vetRepository, OwnerRepository ownerRepository, VisitRepository visitRepository) {
- this.petRepository = petRepository;
- this.vetRepository = vetRepository;
- this.ownerRepository = ownerRepository;
- this.visitRepository = visitRepository;
- }
-
- @Override
- @Transactional(readOnly = true)
- public Collection findPetTypes() throws DataAccessException {
- return petRepository.findPetTypes();
- }
-
- @Override
- @Transactional(readOnly = true)
- public Owner findOwnerById(int id) throws DataAccessException {
- return ownerRepository.findById(id);
- }
-
- @Override
- @Transactional(readOnly = true)
- public Collection findOwnerByLastName(String lastName) throws DataAccessException {
- return ownerRepository.findByLastName(lastName);
- }
-
- @Override
- @Transactional
- public void saveOwner(Owner owner) throws DataAccessException {
- ownerRepository.save(owner);
- }
-
-
- @Override
- @Transactional
- public void saveVisit(Visit visit) throws DataAccessException {
- visitRepository.save(visit);
- }
-
-
- @Override
- @Transactional(readOnly = true)
- public Pet findPetById(int id) throws DataAccessException {
- return petRepository.findById(id);
- }
-
- @Override
- @Transactional
- public void savePet(Pet pet) throws DataAccessException {
- petRepository.save(pet);
- }
-
- @Override
- @Transactional(readOnly = true)
- @Cacheable(value = "vets")
- public Collection findVets() throws DataAccessException {
- return vetRepository.findAll();
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
new file mode 100755
index 000000000..f90679094
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.system;
+
+import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.cache.configuration.MutableConfiguration;
+
+/**
+ * Cache configuration intended for caches providing the JCache API. This configuration
+ * creates the used cache for the application and enables statistics that become
+ * accessible via JMX.
+ */
+@Configuration(proxyBeanMethods = false)
+@EnableCaching
+class CacheConfiguration {
+
+ @Bean
+ public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() {
+ return cm -> cm.createCache("vets", cacheConfiguration());
+ }
+
+ /**
+ * Create a simple configuration that enable statistics via the JCache programmatic
+ * configuration API.
+ *
+ * Within the configuration object that is provided by the JCache API standard, there
+ * is only a very limited set of configuration options. The really relevant
+ * configuration options (like the size limit) must be set via a configuration
+ * mechanism that is provided by the selected JCache implementation.
+ */
+ private javax.cache.configuration.Configuration cacheConfiguration() {
+ return new MutableConfiguration<>().setStatisticsEnabled(true);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/src/main/java/org/springframework/samples/petclinic/system/CrashController.java
new file mode 100644
index 000000000..2b28600fd
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/system/CrashController.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.system;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * Controller used to showcase what happens when an exception is thrown
+ *
+ * @author Michael Isvy
+ *
+ * Also see how a view that resolves to "error" has been added ("error.html").
+ */
+@Controller
+class CrashController {
+
+ @GetMapping("/oups")
+ public String triggerException() {
+ throw new RuntimeException(
+ "Expected: controller used to showcase what " + "happens when an exception is thrown");
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
new file mode 100644
index 000000000..9224015bc
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.system;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+class WelcomeController {
+
+ @GetMapping("/")
+ public String welcome() {
+ return "welcome";
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java b/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java
deleted file mode 100644
index fddf17dfa..000000000
--- a/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.util;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.jmx.export.annotation.ManagedAttribute;
-import org.springframework.jmx.export.annotation.ManagedOperation;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.util.StopWatch;
-
-/**
- * Simple aspect that monitors call count and call invocation time. It uses JMX annotations and therefore can be
- * monitored using any JMX console such as the jConsole
- *
- * This is only useful if you use JPA or JDBC. Spring-data-jpa doesn't have any correctly annotated classes to join on
- *
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @author Michael Isvy
- * @since 2.5
- */
-@ManagedResource("petclinic:type=CallMonitor")
-@Aspect
-public class CallMonitoringAspect {
-
- private boolean enabled = true;
-
- private int callCount = 0;
-
- private long accumulatedCallTime = 0;
-
- @ManagedAttribute
- public boolean isEnabled() {
- return enabled;
- }
-
- @ManagedAttribute
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- @ManagedOperation
- public void reset() {
- this.callCount = 0;
- this.accumulatedCallTime = 0;
- }
-
- @ManagedAttribute
- public int getCallCount() {
- return callCount;
- }
-
- @ManagedAttribute
- public long getCallTime() {
- if (this.callCount > 0)
- return this.accumulatedCallTime / this.callCount;
- else
- return 0;
- }
-
-
- @Around("within(@org.springframework.stereotype.Repository *)")
- public Object invoke(ProceedingJoinPoint joinPoint) throws Throwable {
- if (this.enabled) {
- StopWatch sw = new StopWatch(joinPoint.toShortString());
-
- sw.start("invoke");
- try {
- return joinPoint.proceed();
- } finally {
- sw.stop();
- synchronized (this) {
- this.callCount++;
- this.accumulatedCallTime += sw.getTotalTimeMillis();
- }
- }
- } else {
- return joinPoint.proceed();
- }
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java b/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java
deleted file mode 100644
index eee390694..000000000
--- a/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.util;
-
-import java.util.Collection;
-
-import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.samples.petclinic.model.BaseEntity;
-
-/**
- * Utility methods for handling entities. Separate from the BaseEntity class mainly because of dependency on the
- * ORM-associated ObjectRetrievalFailureException.
- *
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @see org.springframework.samples.petclinic.model.BaseEntity
- * @since 29.10.2003
- */
-public abstract class EntityUtils {
-
- /**
- * Look up the entity of the given class with the given id in the given collection.
- *
- * @param entities the collection to search
- * @param entityClass the entity class to look up
- * @param entityId the entity id to look up
- * @return the found entity
- * @throws ObjectRetrievalFailureException if the entity was not found
- */
- public static T getById(Collection entities, Class entityClass, int entityId)
- throws ObjectRetrievalFailureException {
- for (T entity : entities) {
- if (entity.getId() == entityId && entityClass.isInstance(entity)) {
- return entity;
- }
- }
- throw new ObjectRetrievalFailureException(entityClass, entityId);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Specialty.java b/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java
similarity index 70%
rename from src/main/java/org/springframework/samples/petclinic/model/Specialty.java
rename to src/main/java/org/springframework/samples/petclinic/vet/Specialty.java
index 6ea209cd4..b0b6315fc 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Specialty.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,10 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.samples.petclinic.model;
+package org.springframework.samples.petclinic.vet;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import org.springframework.samples.petclinic.model.NamedEntity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
/**
* Models a {@link Vet Vet's} specialty (for example, dentistry).
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
new file mode 100644
index 000000000..7a70155c3
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.vet;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.support.MutableSortDefinition;
+import org.springframework.beans.support.PropertyComparator;
+import org.springframework.samples.petclinic.model.Person;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+import jakarta.xml.bind.annotation.XmlElement;
+
+/**
+ * Simple JavaBean domain object representing a veterinarian.
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Arjen Poutsma
+ */
+@Entity
+@Table(name = "vets")
+public class Vet extends Person {
+
+ @ManyToMany(fetch = FetchType.EAGER)
+ @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
+ inverseJoinColumns = @JoinColumn(name = "specialty_id"))
+ private Set specialties;
+
+ protected Set getSpecialtiesInternal() {
+ if (this.specialties == null) {
+ this.specialties = new HashSet<>();
+ }
+ return this.specialties;
+ }
+
+ protected void setSpecialtiesInternal(Set specialties) {
+ this.specialties = specialties;
+ }
+
+ @XmlElement
+ public List getSpecialties() {
+ List sortedSpecs = new ArrayList<>(getSpecialtiesInternal());
+ PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true));
+ return Collections.unmodifiableList(sortedSpecs);
+ }
+
+ public int getNrOfSpecialties() {
+ return getSpecialtiesInternal().size();
+ }
+
+ public void addSpecialty(Specialty specialty) {
+ getSpecialtiesInternal().add(specialty);
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java b/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
new file mode 100644
index 000000000..69c3be985
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.vet;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author Juergen Hoeller
+ * @author Mark Fisher
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ */
+@Controller
+class VetController {
+
+ private final VetRepository vetRepository;
+
+ public VetController(VetRepository clinicService) {
+ this.vetRepository = clinicService;
+ }
+
+ @GetMapping("/vets.html")
+ public String showVetList(@RequestParam(defaultValue = "1") int page, Model model) {
+ // Here we are returning an object of type 'Vets' rather than a collection of Vet
+ // objects so it is simpler for Object-Xml mapping
+ Vets vets = new Vets();
+ Page paginated = findPaginated(page);
+ vets.getVetList().addAll(paginated.toList());
+ return addPaginationModel(page, paginated, model);
+
+ }
+
+ private String addPaginationModel(int page, Page paginated, Model model) {
+ List listVets = paginated.getContent();
+ model.addAttribute("currentPage", page);
+ model.addAttribute("totalPages", paginated.getTotalPages());
+ model.addAttribute("totalItems", paginated.getTotalElements());
+ model.addAttribute("listVets", listVets);
+ return "vets/vetList";
+ }
+
+ private Page findPaginated(int page) {
+ int pageSize = 5;
+ Pageable pageable = PageRequest.of(page - 1, pageSize);
+ return vetRepository.findAll(pageable);
+ }
+
+ @GetMapping({ "/vets" })
+ public @ResponseBody Vets showResourcesVetList() {
+ // Here we are returning an object of type 'Vets' rather than a collection of Vet
+ // objects so it is simpler for JSon/Object mapping
+ Vets vets = new Vets();
+ vets.getVetList().addAll(this.vetRepository.findAll());
+ return vets;
+ }
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
new file mode 100644
index 000000000..8b9e0823c
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.petclinic.vet;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+
+/**
+ * Repository class for Vet domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface VetRepository extends Repository {
+
+ /**
+ * Retrieve all Vets from the data store.
+ * @return a Collection of Vets
+ */
+ @Transactional(readOnly = true)
+ @Cacheable("vets")
+ Collection findAll() throws DataAccessException;
+
+ /**
+ * Retrieve all Vets from data store in Pages
+ * @param pageable
+ * @return
+ * @throws DataAccessException
+ */
+ @Transactional(readOnly = true)
+ @Cacheable("vets")
+ Page findAll(Pageable pageable) throws DataAccessException;
+
+}
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vets.java b/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
similarity index 56%
rename from src/main/java/org/springframework/samples/petclinic/model/Vets.java
rename to src/main/java/org/springframework/samples/petclinic/vet/Vets.java
index a6f05c606..9b672d25e 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Vets.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
@@ -1,11 +1,11 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,31 +13,31 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.samples.petclinic.model;
+package org.springframework.samples.petclinic.vet;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
/**
- * Simple domain object representing a list of veterinarians. Mostly here to be used for the 'vets' {@link
- * org.springframework.web.servlet.view.xml.MarshallingView}.
+ * Simple domain object representing a list of veterinarians. Mostly here to be used for
+ * the 'vets' {@link org.springframework.web.servlet.view.xml.MarshallingView}.
*
* @author Arjen Poutsma
*/
@XmlRootElement
public class Vets {
- private List vets;
+ private List vets;
- @XmlElement
- public List getVetList() {
- if (vets == null) {
- vets = new ArrayList<>();
- }
- return vets;
- }
+ @XmlElement
+ public List getVetList() {
+ if (vets == null) {
+ vets = new ArrayList<>();
+ }
+ return vets;
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/CrashController.java b/src/main/java/org/springframework/samples/petclinic/web/CrashController.java
deleted file mode 100644
index 29c55c1c0..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/CrashController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/**
- * Controller used to showcase what happens when an exception is thrown
- *
- * @author Michael Isvy
- *
- * Also see how the bean of type 'SimpleMappingExceptionResolver' has been declared inside
- * /WEB-INF/mvc-core-config.xml
- */
-@Controller
-public class CrashController {
-
- @RequestMapping(value = "/oups", method = RequestMethod.GET)
- public String triggerException() {
- throw new RuntimeException("Expected: controller used to showcase what " +
- "happens when an exception is thrown");
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
deleted file mode 100644
index c2d45bb8c..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-import java.util.Collection;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * @author Juergen Hoeller
- * @author Ken Krebs
- * @author Arjen Poutsma
- * @author Michael Isvy
- */
-@Controller
-public class OwnerController {
-
- private final ClinicService clinicService;
-
-
- @Autowired
- public OwnerController(ClinicService clinicService) {
- this.clinicService = clinicService;
- }
-
- @InitBinder
- public void setAllowedFields(WebDataBinder dataBinder) {
- dataBinder.setDisallowedFields("id");
- }
-
- @RequestMapping(value = "/owners/new", method = RequestMethod.GET)
- public String initCreationForm(Map model) {
- Owner owner = new Owner();
- model.put("owner", owner);
- return "owners/createOrUpdateOwnerForm";
- }
-
- @RequestMapping(value = "/owners/new", method = RequestMethod.POST)
- public String processCreationForm(@Valid Owner owner, BindingResult result) {
- if (result.hasErrors()) {
- return "owners/createOrUpdateOwnerForm";
- } else {
- this.clinicService.saveOwner(owner);
- return "redirect:/owners/" + owner.getId();
- }
- }
-
- @RequestMapping(value = "/owners/find", method = RequestMethod.GET)
- public String initFindForm(Map model) {
- model.put("owner", new Owner());
- return "owners/findOwners";
- }
-
- @RequestMapping(value = "/owners", method = RequestMethod.GET)
- public String processFindForm(Owner owner, BindingResult result, Map model) {
-
- // allow parameterless GET request for /owners to return all records
- if (owner.getLastName() == null) {
- owner.setLastName(""); // empty string signifies broadest possible search
- }
-
- // find owners by last name
- Collection results = this.clinicService.findOwnerByLastName(owner.getLastName());
- if (results.isEmpty()) {
- // no owners found
- result.rejectValue("lastName", "notFound", "not found");
- return "owners/findOwners";
- } else if (results.size() == 1) {
- // 1 owner found
- owner = results.iterator().next();
- return "redirect:/owners/" + owner.getId();
- } else {
- // multiple owners found
- model.put("selections", results);
- return "owners/ownersList";
- }
- }
-
- @RequestMapping(value = "/owners/{ownerId}/edit", method = RequestMethod.GET)
- public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) {
- Owner owner = this.clinicService.findOwnerById(ownerId);
- model.addAttribute(owner);
- return "owners/createOrUpdateOwnerForm";
- }
-
- @RequestMapping(value = "/owners/{ownerId}/edit", method = RequestMethod.POST)
- public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result) {
- if (result.hasErrors()) {
- return "owners/createOrUpdateOwnerForm";
- } else {
- this.clinicService.saveOwner(owner);
- return "redirect:/owners/{ownerId}";
- }
- }
-
- /**
- * Custom handler for displaying an owner.
- *
- * @param ownerId the ID of the owner to display
- * @return a ModelMap with the model attributes for the view
- */
- @RequestMapping("/owners/{ownerId}")
- public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) {
- ModelAndView mav = new ModelAndView("owners/ownerDetails");
- mav.addObject(this.clinicService.findOwnerById(ownerId));
- return mav;
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetController.java b/src/main/java/org/springframework/samples/petclinic/web/PetController.java
deleted file mode 100644
index 39c7f1cb3..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/PetController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Collection;
-
-/**
- * @author Juergen Hoeller
- * @author Ken Krebs
- * @author Arjen Poutsma
- */
-@Controller
-@RequestMapping("/owners/{ownerId}")
-public class PetController {
-
- private final ClinicService clinicService;
-
- @Autowired
- public PetController(ClinicService clinicService) {
- this.clinicService = clinicService;
- }
-
- @ModelAttribute("types")
- public Collection populatePetTypes() {
- return this.clinicService.findPetTypes();
- }
-
- @ModelAttribute("owner")
- public Owner findOwner(@PathVariable("ownerId") int ownerId) {
- Owner owner = this.clinicService.findOwnerById(ownerId);
- return owner;
- }
-
- @InitBinder("owner")
- public void initOwnerBinder(WebDataBinder dataBinder) {
- dataBinder.setDisallowedFields("id");
- }
-
- @InitBinder("pet")
- public void initPetBinder(WebDataBinder dataBinder) {
- dataBinder.setValidator(new PetValidator());
- }
-
- @RequestMapping(value = "/pets/new", method = RequestMethod.GET)
- public String initCreationForm(Owner owner, ModelMap model) {
- Pet pet = new Pet();
- owner.addPet(pet);
- model.put("pet", pet);
- return "pets/createOrUpdatePetForm";
- }
-
- @RequestMapping(value = "/pets/new", method = RequestMethod.POST)
- public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult result, ModelMap model) {
- if (StringUtils.hasLength(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null){
- result.rejectValue("name", "duplicate", "already exists");
- }
- if (result.hasErrors()) {
- model.put("pet", pet);
- return "pets/createOrUpdatePetForm";
- } else {
- owner.addPet(pet);
- this.clinicService.savePet(pet);
- return "redirect:/owners/{ownerId}";
- }
- }
-
- @RequestMapping(value = "/pets/{petId}/edit", method = RequestMethod.GET)
- public String initUpdateForm(@PathVariable("petId") int petId, ModelMap model) {
- Pet pet = this.clinicService.findPetById(petId);
- model.put("pet", pet);
- return "pets/createOrUpdatePetForm";
- }
-
- @RequestMapping(value = "/pets/{petId}/edit", method = RequestMethod.POST)
- public String processUpdateForm(@Valid Pet pet, Owner owner, BindingResult result, ModelMap model) {
- if (result.hasErrors()) {
- model.put("pet", pet);
- return "pets/createOrUpdatePetForm";
- } else {
- owner.addPet(pet);
- this.clinicService.savePet(pet);
- return "redirect:/owners/{ownerId}";
- }
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java b/src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java
deleted file mode 100644
index 3d47d2201..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-
-import java.text.ParseException;
-import java.util.Collection;
-import java.util.Locale;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.Formatter;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.service.ClinicService;
-
-/**
- * Instructs Spring MVC on how to parse and print elements of type 'PetType'. Starting from Spring 3.0, Formatters have
- * come as an improvement in comparison to legacy PropertyEditors. See the following links for more details: - The
- * Spring ref doc: http://static.springsource.org/spring/docs/current/spring-framework-reference/html/validation.html#format-Formatter-SPI
- * - A nice blog entry from Gordon Dickens: http://gordondickens.com/wordpress/2010/09/30/using-spring-3-0-custom-type-converter/
- *
- * Also see how the bean 'conversionService' has been declared inside /WEB-INF/mvc-core-config.xml
- *
- * @author Mark Fisher
- * @author Juergen Hoeller
- * @author Michael Isvy
- */
-public class PetTypeFormatter implements Formatter {
-
- private final ClinicService clinicService;
-
-
- @Autowired
- public PetTypeFormatter(ClinicService clinicService) {
- this.clinicService = clinicService;
- }
-
- @Override
- public String print(PetType petType, Locale locale) {
- return petType.getName();
- }
-
- @Override
- public PetType parse(String text, Locale locale) throws ParseException {
- Collection findPetTypes = this.clinicService.findPetTypes();
- for (PetType type : findPetTypes) {
- if (type.getName().equals(text)) {
- return type;
- }
- }
- throw new ParseException("type not found: " + text, 0);
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java b/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java
deleted file mode 100644
index d889d1af6..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.util.StringUtils;
-import org.springframework.validation.Errors;
-import org.springframework.validation.Validator;
-
-/**
- * Validator for Pet forms.
- *
- * We're not using Bean Validation annotations here because it is easier to define such validation rule in Java.
- *
- *
- * @author Ken Krebs
- * @author Juergen Hoeller
- */
-public class PetValidator implements Validator {
-
- @Override
- public void validate(Object obj, Errors errors) {
- Pet pet = (Pet) obj;
- String name = pet.getName();
- // name validation
- if (!StringUtils.hasLength(name)) {
- errors.rejectValue("name", "required", "required");
- }
-
- // type validation
- if (pet.isNew() && pet.getType() == null) {
- errors.rejectValue("type", "required", "required");
- }
-
- // birth date validation
- if (pet.getBirthDate() == null) {
- errors.rejectValue("birthDate", "required", "required");
- }
- }
-
- /**
- * This Validator validates *just* Pet instances
- */
- @Override
- public boolean supports(Class clazz) {
- return Pet.class.isAssignableFrom(clazz);
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetController.java b/src/main/java/org/springframework/samples/petclinic/web/VetController.java
deleted file mode 100644
index 3121e60e8..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/VetController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.samples.petclinic.model.Vets;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @author Juergen Hoeller
- * @author Mark Fisher
- * @author Ken Krebs
- * @author Arjen Poutsma
- */
-@Controller
-public class VetController {
-
- private final ClinicService clinicService;
-
-
- @Autowired
- public VetController(ClinicService clinicService) {
- this.clinicService = clinicService;
- }
-
- @RequestMapping(value = {"/vets.xml", "/vets.html"})
- public String showVetList(Map model) {
- // Here we are returning an object of type 'Vets' rather than a collection of Vet objects
- // so it is simpler for Object-Xml mapping
- Vets vets = new Vets();
- vets.getVetList().addAll(this.clinicService.findVets());
- model.put("vets", vets);
- return "vets/vetList";
- }
-
- @RequestMapping("/vets.json")
- public
- @ResponseBody
- Vets showResourcesVetList() {
- // Here we are returning an object of type 'Vets' rather than a collection of Vet objects
- // so it is simpler for JSon/Object mapping
- Vets vets = new Vets();
- vets.getVetList().addAll(this.clinicService.findVets());
- return vets;
- }
-
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/VisitController.java b/src/main/java/org/springframework/samples/petclinic/web/VisitController.java
deleted file mode 100644
index 144eba2d9..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/VisitController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.web;
-
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/**
- * @author Juergen Hoeller
- * @author Ken Krebs
- * @author Arjen Poutsma
- * @author Michael Isvy
- */
-@Controller
-public class VisitController {
-
- private final ClinicService clinicService;
-
-
- @Autowired
- public VisitController(ClinicService clinicService) {
- this.clinicService = clinicService;
- }
-
- @InitBinder
- public void setAllowedFields(WebDataBinder dataBinder) {
- dataBinder.setDisallowedFields("id");
- }
-
- /**
- * Called before each and every @RequestMapping annotated method.
- * 2 goals:
- * - Make sure we always have fresh data
- * - Since we do not use the session scope, make sure that Pet object always has an id
- * (Even though id is not part of the form fields)
- *
- * @param petId
- * @return Pet
- */
- @ModelAttribute("visit")
- public Visit loadPetWithVisit(@PathVariable("petId") int petId) {
- Pet pet = this.clinicService.findPetById(petId);
- Visit visit = new Visit();
- pet.addVisit(visit);
- return visit;
- }
-
- // Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is called
- @RequestMapping(value = "/owners/*/pets/{petId}/visits/new", method = RequestMethod.GET)
- public String initNewVisitForm(@PathVariable("petId") int petId, Map model) {
- return "pets/createOrUpdateVisitForm";
- }
-
- // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called
- @RequestMapping(value = "/owners/{ownerId}/pets/{petId}/visits/new", method = RequestMethod.POST)
- public String processNewVisitForm(@Valid Visit visit, BindingResult result) {
- if (result.hasErrors()) {
- return "pets/createOrUpdateVisitForm";
- } else {
- this.clinicService.saveVisit(visit);
- return "redirect:/owners/{ownerId}";
- }
- }
-
- @RequestMapping(value = "/owners/*/pets/{petId}/visits", method = RequestMethod.GET)
- public String showVisits(@PathVariable int petId, Map model) {
- model.put("visits", this.clinicService.findPetById(petId).getVisits());
- return "visitList";
- }
-
-}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/package-info.java b/src/main/java/org/springframework/samples/petclinic/web/package-info.java
deleted file mode 100644
index ca189f19a..000000000
--- a/src/main/java/org/springframework/samples/petclinic/web/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * The classes in this package represent PetClinic's web presentation layer.
- */
-package org.springframework.samples.petclinic.web;
-
diff --git a/src/main/java/overview.html b/src/main/java/overview.html
deleted file mode 100644
index df4f4d6b7..000000000
--- a/src/main/java/overview.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- The Spring Data Binding framework, an internal library used by Spring Web Flow.
-
-
-
\ No newline at end of file
diff --git a/src/main/java/test.html b/src/main/java/test.html
deleted file mode 100644
index 8c5cb2cf3..000000000
--- a/src/main/java/test.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
Organisation
-
-
Speakers
-
-
-
-
-
-
-
Sergiu Bodiu
-
-
Java Consultant at Bank of America
- Seasoned consultant experienced in large-scale e-commerce projects, passionate about
- providing innovative technology solutions to solve complex business problems, have extensive knowledge and
- experience delivering enterprise wide applications. He is skilled in software design, data modeling,
- stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement,
- test and maintain software product components with strong focus on design elegance and software reuse.
-
-
-
-
-
-
-
Sergiu Bodiu
-
-
Java Consultant at Bank of America
- Seasoned consultant experienced in large-scale e-commerce projects, passionate about
- providing innovative technology solutions to solve complex business problems, have extensive knowledge and
- experience delivering enterprise wide applications. He is skilled in software design, data modeling,
- stakeholder management, IT strategic planning, technical know-how and security. Able to design, implement,
- test and maintain software product components with strong focus on design elegance and software reuse.
-
-
-
-
diff --git a/src/main/webapp/WEB-INF/no-spring-config-files-there.txt b/src/main/webapp/WEB-INF/no-spring-config-files-there.txt
deleted file mode 100644
index 45fb7bf0a..000000000
--- a/src/main/webapp/WEB-INF/no-spring-config-files-there.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-All Spring config files (including Spring MVC ones) are inside src/main/resource.
-There are mostly 2 reasons to that:
-- All Spring config files are grouped into one single place
-- It is simpler to reference them from inside JUnit tests
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/inputField.tag b/src/main/webapp/WEB-INF/tags/inputField.tag
deleted file mode 100644
index 796dc91c0..000000000
--- a/src/main/webapp/WEB-INF/tags/inputField.tag
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ attribute name="name" required="true" rtexprvalue="true"
- description="Name of corresponding property in bean object" %>
-<%@ attribute name="label" required="true" rtexprvalue="true"
- description="Label appears in red color if input is considered as invalid after submission" %>
-
-
-
-
-
-
-
-
- ${status.errorMessage}
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/selectField.tag b/src/main/webapp/WEB-INF/tags/selectField.tag
deleted file mode 100644
index f93256ac8..000000000
--- a/src/main/webapp/WEB-INF/tags/selectField.tag
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ attribute name="name" required="true" rtexprvalue="true"
- description="Name of corresponding property in bean object" %>
-<%@ attribute name="label" required="true" rtexprvalue="true"
- description="Label appears in red color if input is considered as invalid after submission" %>
-<%@ attribute name="names" required="true" rtexprvalue="true" type="java.util.List"
- description="Names in the list" %>
-<%@ attribute name="size" required="true" rtexprvalue="true"
- description="Size of Select" %>
-
-
-
-
-
-
-
-
- ${status.errorMessage}
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ea965de25..000000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
- Spring PetClinic
- Spring PetClinic sample application
-
-
-
- spring.profiles.active
- jpa
-
-
-
-
-
-
-
-
-
-
-
- contextConfigLocation
- classpath:spring/business-config.xml, classpath:spring/tools-config.xml
-
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
-
-
- petclinic
- org.springframework.web.servlet.DispatcherServlet
-
- contextConfigLocation
- classpath:spring/mvc-core-config.xml
-
- 1
-
-
-
- petclinic
- /
-
-
-
-
- dandelionServlet
- com.github.dandelion.core.web.DandelionServlet
- 2
-
-
- dandelionServlet
- /dandelion-assets/*
-
-
-
-
- encodingFilter
- org.springframework.web.filter.CharacterEncodingFilter
-
- encoding
- UTF-8
-
-
- forceEncoding
- true
-
-
-
-
- encodingFilter
- /*
-
-
-
-
- dandelionFilter
- com.github.dandelion.core.web.DandelionFilter
-
-
- dandelionFilter
- /*
-
-
-
-
- datatables
- com.github.dandelion.datatables.core.web.filter.DatatablesFilter
-
-
- datatables
- /*
-
-
-
-
-
diff --git a/src/main/webapp/resources/images/banner-graphic.png b/src/main/webapp/resources/images/banner-graphic.png
deleted file mode 100644
index e6d01d588..000000000
Binary files a/src/main/webapp/resources/images/banner-graphic.png and /dev/null differ
diff --git a/src/main/webapp/resources/images/bullet-arrow.png b/src/main/webapp/resources/images/bullet-arrow.png
deleted file mode 100644
index 5909c25b3..000000000
Binary files a/src/main/webapp/resources/images/bullet-arrow.png and /dev/null differ
diff --git a/src/main/webapp/resources/images/pets.png b/src/main/webapp/resources/images/pets.png
deleted file mode 100644
index 0fe63c282..000000000
Binary files a/src/main/webapp/resources/images/pets.png and /dev/null differ
diff --git a/src/main/webapp/resources/images/spring-pivotal-logo.png b/src/main/webapp/resources/images/spring-pivotal-logo.png
deleted file mode 100644
index 1840af274..000000000
Binary files a/src/main/webapp/resources/images/spring-pivotal-logo.png and /dev/null differ
diff --git a/src/main/webapp/resources/images/springsource-logo.png b/src/main/webapp/resources/images/springsource-logo.png
deleted file mode 100644
index e170f8abf..000000000
Binary files a/src/main/webapp/resources/images/springsource-logo.png and /dev/null differ
diff --git a/src/main/webapp/resources/images/submit-bg.png b/src/main/webapp/resources/images/submit-bg.png
deleted file mode 100644
index 10a94371b..000000000
Binary files a/src/main/webapp/resources/images/submit-bg.png and /dev/null differ
diff --git a/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java
new file mode 100644
index 000000000..3bf1c0ca1
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.samples.petclinic.vet.VetRepository;
+import org.springframework.web.client.RestTemplate;
+
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+class PetClinicIntegrationTests {
+
+ @LocalServerPort
+ int port;
+
+ @Autowired
+ private VetRepository vets;
+
+ @Autowired
+ private RestTemplateBuilder builder;
+
+ @Test
+ void testFindAll() throws Exception {
+ vets.findAll();
+ vets.findAll(); // served from cache
+ }
+
+ @Test
+ void testOwnerDetails() {
+ RestTemplate template = builder.rootUri("http://localhost:" + port).build();
+ ResponseEntity result = template.exchange(RequestEntity.get("/owners/1").build(), String.class);
+ assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK);
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index b836d0cc2..683db21f6 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.springframework.samples.petclinic.model;
import static org.assertj.core.api.Assertions.assertThat;
@@ -5,41 +21,40 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Locale;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
+
/**
- * @author Michael Isvy
- * Simple test to make sure that Bean Validation is working
- * (useful when upgrading to a new version of Hibernate Validator/ Bean Validation)
+ * @author Michael Isvy Simple test to make sure that Bean Validation is working (useful
+ * when upgrading to a new version of Hibernate Validator/ Bean Validation)
*/
-public class ValidatorTests {
+class ValidatorTests {
- private Validator createValidator() {
- LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
- localValidatorFactoryBean.afterPropertiesSet();
- return localValidatorFactoryBean;
- }
+ private Validator createValidator() {
+ LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
+ localValidatorFactoryBean.afterPropertiesSet();
+ return localValidatorFactoryBean;
+ }
- @Test
- public void shouldNotValidateWhenFirstNameEmpty() {
+ @Test
+ void shouldNotValidateWhenFirstNameEmpty() {
- LocaleContextHolder.setLocale(Locale.ENGLISH);
- Person person = new Person();
- person.setFirstName("");
- person.setLastName("smith");
+ LocaleContextHolder.setLocale(Locale.ENGLISH);
+ Person person = new Person();
+ person.setFirstName("");
+ person.setLastName("smith");
- Validator validator = createValidator();
- Set> constraintViolations = validator.validate(person);
+ Validator validator = createValidator();
+ Set> constraintViolations = validator.validate(person);
- assertThat(constraintViolations.size()).isEqualTo(1);
- ConstraintViolation violation = constraintViolations.iterator().next();
- assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
- assertThat(violation.getMessage()).isEqualTo("may not be empty");
- }
+ assertThat(constraintViolations).hasSize(1);
+ ConstraintViolation violation = constraintViolations.iterator().next();
+ assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
+ assertThat(violation.getMessage()).isEqualTo("must not be empty");
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
new file mode 100644
index 000000000..5478de154
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.owner;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import org.assertj.core.util.Lists;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.test.web.servlet.MockMvc;
+
+/**
+ * Test class for {@link OwnerController}
+ *
+ * @author Colin But
+ */
+@WebMvcTest(OwnerController.class)
+class OwnerControllerTests {
+
+ private static final int TEST_OWNER_ID = 1;
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @MockBean
+ private OwnerRepository owners;
+
+ private Owner george() {
+ Owner george = new Owner();
+ george.setId(TEST_OWNER_ID);
+ george.setFirstName("George");
+ george.setLastName("Franklin");
+ george.setAddress("110 W. Liberty St.");
+ george.setCity("Madison");
+ george.setTelephone("6085551023");
+ Pet max = new Pet();
+ PetType dog = new PetType();
+ dog.setName("dog");
+ max.setType(dog);
+ max.setName("Max");
+ max.setBirthDate(LocalDate.now());
+ george.addPet(max);
+ max.setId(1);
+ return george;
+ };
+
+ @BeforeEach
+ void setup() {
+
+ Owner george = george();
+ given(this.owners.findByLastName(eq("Franklin"), any(Pageable.class)))
+ .willReturn(new PageImpl(Lists.newArrayList(george)));
+
+ given(this.owners.findAll(any(Pageable.class))).willReturn(new PageImpl(Lists.newArrayList(george)));
+
+ given(this.owners.findById(TEST_OWNER_ID)).willReturn(george);
+ Visit visit = new Visit();
+ visit.setDate(LocalDate.now());
+ george.getPet("Max").getVisits().add(visit);
+
+ }
+
+ @Test
+ void testInitCreationForm() throws Exception {
+ mockMvc.perform(get("/owners/new"))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeExists("owner"))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testProcessCreationFormSuccess() throws Exception {
+ mockMvc
+ .perform(post("/owners/new").param("firstName", "Joe")
+ .param("lastName", "Bloggs")
+ .param("address", "123 Caramel Street")
+ .param("city", "London")
+ .param("telephone", "01316761638"))
+ .andExpect(status().is3xxRedirection());
+ }
+
+ @Test
+ void testProcessCreationFormHasErrors() throws Exception {
+ mockMvc
+ .perform(post("/owners/new").param("firstName", "Joe").param("lastName", "Bloggs").param("city", "London"))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeHasErrors("owner"))
+ .andExpect(model().attributeHasFieldErrors("owner", "address"))
+ .andExpect(model().attributeHasFieldErrors("owner", "telephone"))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testInitFindForm() throws Exception {
+ mockMvc.perform(get("/owners/find"))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeExists("owner"))
+ .andExpect(view().name("owners/findOwners"));
+ }
+
+ @Test
+ void testProcessFindFormSuccess() throws Exception {
+ Page tasks = new PageImpl(Lists.newArrayList(george(), new Owner()));
+ Mockito.when(this.owners.findByLastName(anyString(), any(Pageable.class))).thenReturn(tasks);
+ mockMvc.perform(get("/owners?page=1")).andExpect(status().isOk()).andExpect(view().name("owners/ownersList"));
+ }
+
+ @Test
+ void testProcessFindFormByLastName() throws Exception {
+ Page tasks = new PageImpl(Lists.newArrayList(george()));
+ Mockito.when(this.owners.findByLastName(eq("Franklin"), any(Pageable.class))).thenReturn(tasks);
+ mockMvc.perform(get("/owners?page=1").param("lastName", "Franklin"))
+ .andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/" + TEST_OWNER_ID));
+ }
+
+ @Test
+ void testProcessFindFormNoOwnersFound() throws Exception {
+ Page tasks = new PageImpl(Lists.newArrayList());
+ Mockito.when(this.owners.findByLastName(eq("Unknown Surname"), any(Pageable.class))).thenReturn(tasks);
+ mockMvc.perform(get("/owners?page=1").param("lastName", "Unknown Surname"))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeHasFieldErrors("owner", "lastName"))
+ .andExpect(model().attributeHasFieldErrorCode("owner", "lastName", "notFound"))
+ .andExpect(view().name("owners/findOwners"));
+
+ }
+
+ @Test
+ void testInitUpdateOwnerForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/edit", TEST_OWNER_ID))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeExists("owner"))
+ .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin"))))
+ .andExpect(model().attribute("owner", hasProperty("firstName", is("George"))))
+ .andExpect(model().attribute("owner", hasProperty("address", is("110 W. Liberty St."))))
+ .andExpect(model().attribute("owner", hasProperty("city", is("Madison"))))
+ .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023"))))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testProcessUpdateOwnerFormSuccess() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID).param("firstName", "Joe")
+ .param("lastName", "Bloggs")
+ .param("address", "123 Caramel Street")
+ .param("city", "London")
+ .param("telephone", "01616291589"))
+ .andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessUpdateOwnerFormUnchangedSuccess() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID))
+ .andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessUpdateOwnerFormHasErrors() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID).param("firstName", "Joe")
+ .param("lastName", "Bloggs")
+ .param("address", "")
+ .param("telephone", ""))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeHasErrors("owner"))
+ .andExpect(model().attributeHasFieldErrors("owner", "address"))
+ .andExpect(model().attributeHasFieldErrors("owner", "telephone"))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testShowOwner() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}", TEST_OWNER_ID))
+ .andExpect(status().isOk())
+ .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin"))))
+ .andExpect(model().attribute("owner", hasProperty("firstName", is("George"))))
+ .andExpect(model().attribute("owner", hasProperty("address", is("110 W. Liberty St."))))
+ .andExpect(model().attribute("owner", hasProperty("city", is("Madison"))))
+ .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023"))))
+ .andExpect(model().attribute("owner", hasProperty("pets", not(empty()))))
+ .andExpect(model().attribute("owner", hasProperty("pets", new BaseMatcher>() {
+
+ @Override
+ public boolean matches(Object item) {
+ @SuppressWarnings("unchecked")
+ List pets = (List) item;
+ Pet pet = pets.get(0);
+ if (pet.getVisits().isEmpty()) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Max did not have any visits");
+ }
+ })))
+ .andExpect(view().name("owners/ownerDetails"));
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
new file mode 100755
index 000000000..bfaea848d
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.owner;
+
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+/**
+ * Test class for the {@link PetController}
+ *
+ * @author Colin But
+ */
+@WebMvcTest(value = PetController.class,
+ includeFilters = @ComponentScan.Filter(value = PetTypeFormatter.class, type = FilterType.ASSIGNABLE_TYPE))
+class PetControllerTests {
+
+ private static final int TEST_OWNER_ID = 1;
+
+ private static final int TEST_PET_ID = 1;
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @MockBean
+ private OwnerRepository owners;
+
+ @BeforeEach
+ void setup() {
+ PetType cat = new PetType();
+ cat.setId(3);
+ cat.setName("hamster");
+ given(this.owners.findPetTypes()).willReturn(Lists.newArrayList(cat));
+ Owner owner = new Owner();
+ Pet pet = new Pet();
+ owner.addPet(pet);
+ pet.setId(TEST_PET_ID);
+ given(this.owners.findById(TEST_OWNER_ID)).willReturn(owner);
+ }
+
+ @Test
+ void testInitCreationForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/pets/new", TEST_OWNER_ID))
+ .andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdatePetForm"))
+ .andExpect(model().attributeExists("pet"));
+ }
+
+ @Test
+ void testProcessCreationFormSuccess() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID).param("name", "Betty")
+ .param("type", "hamster")
+ .param("birthDate", "2015-02-12"))
+ .andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessCreationFormHasErrors() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID).param("name", "Betty")
+ .param("birthDate", "2015-02-12"))
+ .andExpect(model().attributeHasNoErrors("owner"))
+ .andExpect(model().attributeHasErrors("pet"))
+ .andExpect(model().attributeHasFieldErrors("pet", "type"))
+ .andExpect(model().attributeHasFieldErrorCode("pet", "type", "required"))
+ .andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdatePetForm"));
+ }
+
+ @Test
+ void testInitUpdateForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID))
+ .andExpect(status().isOk())
+ .andExpect(model().attributeExists("pet"))
+ .andExpect(view().name("pets/createOrUpdatePetForm"));
+ }
+
+ @Test
+ void testProcessUpdateFormSuccess() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID).param("name", "Betty")
+ .param("type", "hamster")
+ .param("birthDate", "2015-02-12"))
+ .andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessUpdateFormHasErrors() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID).param("name", "Betty")
+ .param("birthDate", "2015/02/12"))
+ .andExpect(model().attributeHasNoErrors("owner"))
+ .andExpect(model().attributeHasErrors("pet"))
+ .andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdatePetForm"));
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
new file mode 100644
index 000000000..0d50b44e7
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.owner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * Test class for {@link PetTypeFormatter}
+ *
+ * @author Colin But
+ */
+@ExtendWith(MockitoExtension.class)
+class PetTypeFormatterTests {
+
+ @Mock
+ private OwnerRepository pets;
+
+ private PetTypeFormatter petTypeFormatter;
+
+ @BeforeEach
+ void setup() {
+ this.petTypeFormatter = new PetTypeFormatter(pets);
+ }
+
+ @Test
+ void testPrint() {
+ PetType petType = new PetType();
+ petType.setName("Hamster");
+ String petTypeName = this.petTypeFormatter.print(petType, Locale.ENGLISH);
+ assertThat(petTypeName).isEqualTo("Hamster");
+ }
+
+ @Test
+ void shouldParse() throws ParseException {
+ given(this.pets.findPetTypes()).willReturn(makePetTypes());
+ PetType petType = petTypeFormatter.parse("Bird", Locale.ENGLISH);
+ assertThat(petType.getName()).isEqualTo("Bird");
+ }
+
+ @Test
+ void shouldThrowParseException() throws ParseException {
+ given(this.pets.findPetTypes()).willReturn(makePetTypes());
+ Assertions.assertThrows(ParseException.class, () -> {
+ petTypeFormatter.parse("Fish", Locale.ENGLISH);
+ });
+ }
+
+ /**
+ * Helper method to produce some sample pet types just for test purpose
+ * @return {@link Collection} of {@link PetType}
+ */
+ private List makePetTypes() {
+ List petTypes = new ArrayList<>();
+ petTypes.add(new PetType() {
+ {
+ setName("Dog");
+ }
+ });
+ petTypes.add(new PetType() {
+ {
+ setName("Bird");
+ }
+ });
+ return petTypes;
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
new file mode 100644
index 000000000..b687e0143
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.owner;
+
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.web.servlet.MockMvc;
+
+/**
+ * Test class for {@link VisitController}
+ *
+ * @author Colin But
+ */
+@WebMvcTest(VisitController.class)
+class VisitControllerTests {
+
+ private static final int TEST_OWNER_ID = 1;
+
+ private static final int TEST_PET_ID = 1;
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @MockBean
+ private OwnerRepository owners;
+
+ @BeforeEach
+ void init() {
+ Owner owner = new Owner();
+ Pet pet = new Pet();
+ owner.addPet(pet);
+ pet.setId(TEST_PET_ID);
+ given(this.owners.findById(TEST_OWNER_ID)).willReturn(owner);
+ }
+
+ @Test
+ void testInitNewVisitForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/pets/{petId}/visits/new", TEST_OWNER_ID, TEST_PET_ID))
+ .andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdateVisitForm"));
+ }
+
+ @Test
+ void testProcessNewVisitFormSuccess() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/pets/{petId}/visits/new", TEST_OWNER_ID, TEST_PET_ID)
+ .param("name", "George")
+ .param("description", "Visit Description"))
+ .andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessNewVisitFormHasErrors() throws Exception {
+ mockMvc
+ .perform(post("/owners/{ownerId}/pets/{petId}/visits/new", TEST_OWNER_ID, TEST_PET_ID).param("name",
+ "George"))
+ .andExpect(model().attributeHasErrors("visit"))
+ .andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdateVisitForm"));
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
deleted file mode 100644
index 0dd87379b..000000000
--- a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Collection;
-
-import org.joda.time.DateTime;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.util.EntityUtils;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- *
Base class for {@link ClinicService} integration tests.
Subclasses should specify Spring context
- * configuration using {@link ContextConfiguration @ContextConfiguration} annotation
- * AbstractclinicServiceTests and its subclasses benefit from the following services provided by the Spring
- * TestContext Framework:
Spring IoC container caching which spares us unnecessary set up
- * time between test execution.
Dependency Injection of test fixture instances, meaning that
- * we don't need to perform application context lookups. See the use of {@link Autowired @Autowired} on the {@link
- * AbstractClinicServiceTests#clinicService clinicService} instance variable, which uses autowiring by
- * type.
Transaction management, meaning each test method is executed in its own transaction,
- * which is automatically rolled back by default. Thus, even if tests insert or otherwise change database state, there
- * is no need for a teardown or cleanup script.
An {@link org.springframework.context.ApplicationContext
- * ApplicationContext} is also inherited and can be used for explicit bean lookup if necessary.
- *
- * @author Ken Krebs
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @author Michael Isvy
- */
-public abstract class AbstractClinicServiceTests {
-
- @Autowired
- protected ClinicService clinicService;
-
- @Test
- public void shouldFindOwnersByLastName() {
- Collection owners = this.clinicService.findOwnerByLastName("Davis");
- assertThat(owners.size()).isEqualTo(2);
-
- owners = this.clinicService.findOwnerByLastName("Daviss");
- assertThat(owners.isEmpty());
- }
-
- @Test
- public void shouldFindSingleOwnerWithPet() {
- Owner owner = this.clinicService.findOwnerById(1);
- assertThat(owner.getLastName()).startsWith("Franklin");
- assertThat(owner.getPets().size()).isEqualTo(1);
- assertThat(owner.getPets().get(0).getType()).isNotNull();
- assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
- }
-
- @Test
- @Transactional
- public void shouldInsertOwner() {
- Collection owners = this.clinicService.findOwnerByLastName("Schultz");
- int found = owners.size();
-
- Owner owner = new Owner();
- owner.setFirstName("Sam");
- owner.setLastName("Schultz");
- owner.setAddress("4, Evans Street");
- owner.setCity("Wollongong");
- owner.setTelephone("4444444444");
- this.clinicService.saveOwner(owner);
- assertThat(owner.getId().longValue()).isNotEqualTo(0);
-
- owners = this.clinicService.findOwnerByLastName("Schultz");
- assertThat(owners.size()).isEqualTo(found + 1);
- }
-
- @Test
- @Transactional
- public void shouldUpdateOwner() {
- Owner owner = this.clinicService.findOwnerById(1);
- String oldLastName = owner.getLastName();
- String newLastName = oldLastName + "X";
-
- owner.setLastName(newLastName);
- this.clinicService.saveOwner(owner);
-
- // retrieving new name from database
- owner = this.clinicService.findOwnerById(1);
- assertThat(owner.getLastName()).isEqualTo(newLastName);
- }
-
- @Test
- public void shouldFindPetWithCorrectId() {
- Pet pet7 = this.clinicService.findPetById(7);
- assertThat(pet7.getName()).startsWith("Samantha");
- assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
-
- }
-
- @Test
- public void shouldFindAllPetTypes() {
- Collection petTypes = this.clinicService.findPetTypes();
-
- PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1);
- assertThat(petType1.getName()).isEqualTo("cat");
- PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4);
- assertThat(petType4.getName()).isEqualTo("snake");
- }
-
- @Test
- @Transactional
- public void shouldInsertPetIntoDatabaseAndGenerateId() {
- Owner owner6 = this.clinicService.findOwnerById(6);
- int found = owner6.getPets().size();
-
- Pet pet = new Pet();
- pet.setName("bowser");
- Collection types = this.clinicService.findPetTypes();
- pet.setType(EntityUtils.getById(types, PetType.class, 2));
- pet.setBirthDate(new DateTime());
- owner6.addPet(pet);
- assertThat(owner6.getPets().size()).isEqualTo(found + 1);
-
- this.clinicService.savePet(pet);
- this.clinicService.saveOwner(owner6);
-
- owner6 = this.clinicService.findOwnerById(6);
- assertThat(owner6.getPets().size()).isEqualTo(found + 1);
- // checks that id has been generated
- assertThat(pet.getId()).isNotNull();
- }
-
- @Test
- @Transactional
- public void shouldUpdatePetName() throws Exception {
- Pet pet7 = this.clinicService.findPetById(7);
- String oldName = pet7.getName();
-
- String newName = oldName + "X";
- pet7.setName(newName);
- this.clinicService.savePet(pet7);
-
- pet7 = this.clinicService.findPetById(7);
- assertThat(pet7.getName()).isEqualTo(newName);
- }
-
- @Test
- public void shouldFindVets() {
- Collection vets = this.clinicService.findVets();
-
- Vet vet = EntityUtils.getById(vets, Vet.class, 3);
- assertThat(vet.getLastName()).isEqualTo("Douglas");
- assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
- assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
- assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
- }
-
- @Test
- @Transactional
- public void shouldAddNewVisitForPet() {
- Pet pet7 = this.clinicService.findPetById(7);
- int found = pet7.getVisits().size();
- Visit visit = new Visit();
- pet7.addVisit(visit);
- visit.setDescription("test");
- this.clinicService.saveVisit(visit);
- this.clinicService.savePet(pet7);
-
- pet7 = this.clinicService.findPetById(7);
- assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
- assertThat(visit.getId()).isNotNull();
- }
-
-
-}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java
deleted file mode 100644
index 74c5df7cf..000000000
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.samples.petclinic.service;
-
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- *
Integration test using the jdbc profile.
- *
- * @author Thomas Risberg
- * @author Michael Isvy
- * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details.
Integration test using the jpa profile.
- *
- * @author Rod Johnson
- * @author Sam Brannen
- * @author Michael Isvy
- * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details.
Integration test using the 'Spring Data' profile.
- *
- * @author Michael Isvy
- * @see AbstractClinicServiceTests AbstractClinicServiceTests for more details.
- */
-
-@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
-@RunWith(SpringJUnit4ClassRunner.class)
-@ActiveProfiles("spring-data-jpa")
-public class ClinicServiceSpringDataJpaTests extends AbstractClinicServiceTests {
-
-}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
new file mode 100644
index 000000000..d7240f351
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDate;
+import java.util.Collection;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.samples.petclinic.owner.Owner;
+import org.springframework.samples.petclinic.owner.OwnerRepository;
+import org.springframework.samples.petclinic.owner.Pet;
+import org.springframework.samples.petclinic.owner.PetType;
+import org.springframework.samples.petclinic.owner.Visit;
+import org.springframework.samples.petclinic.vet.Vet;
+import org.springframework.samples.petclinic.vet.VetRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Integration test of the Service and the Repository layer.
+ *
+ * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided
+ * by the Spring TestContext Framework:
+ *
+ *
+ *
Spring IoC container caching which spares us unnecessary set up
+ * time between test execution.
+ *
Dependency Injection of test fixture instances, meaning that we
+ * don't need to perform application context lookups. See the use of
+ * {@link Autowired @Autowired} on the instance variable, which uses
+ * autowiring by type.
+ *
Transaction management, meaning each test method is executed in
+ * its own transaction, which is automatically rolled back by default. Thus, even if tests
+ * insert or otherwise change database state, there is no need for a teardown or cleanup
+ * script.
+ *
An {@link org.springframework.context.ApplicationContext ApplicationContext} is
+ * also inherited and can be used for explicit bean lookup if necessary.
+ *
+ *
+ * @author Ken Krebs
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ * @author Dave Syer
+ */
+@DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class))
+// Ensure that if the mysql profile is active we connect to the real database:
+@AutoConfigureTestDatabase(replace = Replace.NONE)
+// @TestPropertySource("/application-postgres.properties")
+class ClinicServiceTests {
+
+ @Autowired
+ protected OwnerRepository owners;
+
+ @Autowired
+ protected VetRepository vets;
+
+ Pageable pageable;
+
+ @Test
+ void shouldFindOwnersByLastName() {
+ Page owners = this.owners.findByLastName("Davis", pageable);
+ assertThat(owners).hasSize(2);
+
+ owners = this.owners.findByLastName("Daviss", pageable);
+ assertThat(owners).isEmpty();
+ }
+
+ @Test
+ void shouldFindSingleOwnerWithPet() {
+ Owner owner = this.owners.findById(1);
+ assertThat(owner.getLastName()).startsWith("Franklin");
+ assertThat(owner.getPets()).hasSize(1);
+ assertThat(owner.getPets().get(0).getType()).isNotNull();
+ assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
+ }
+
+ @Test
+ @Transactional
+ void shouldInsertOwner() {
+ Page owners = this.owners.findByLastName("Schultz", pageable);
+ int found = (int) owners.getTotalElements();
+
+ Owner owner = new Owner();
+ owner.setFirstName("Sam");
+ owner.setLastName("Schultz");
+ owner.setAddress("4, Evans Street");
+ owner.setCity("Wollongong");
+ owner.setTelephone("4444444444");
+ this.owners.save(owner);
+ assertThat(owner.getId().longValue()).isNotEqualTo(0);
+
+ owners = this.owners.findByLastName("Schultz", pageable);
+ assertThat(owners.getTotalElements()).isEqualTo(found + 1);
+ }
+
+ @Test
+ @Transactional
+ void shouldUpdateOwner() {
+ Owner owner = this.owners.findById(1);
+ String oldLastName = owner.getLastName();
+ String newLastName = oldLastName + "X";
+
+ owner.setLastName(newLastName);
+ this.owners.save(owner);
+
+ // retrieving new name from database
+ owner = this.owners.findById(1);
+ assertThat(owner.getLastName()).isEqualTo(newLastName);
+ }
+
+ @Test
+ void shouldFindAllPetTypes() {
+ Collection petTypes = this.owners.findPetTypes();
+
+ PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1);
+ assertThat(petType1.getName()).isEqualTo("cat");
+ PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4);
+ assertThat(petType4.getName()).isEqualTo("snake");
+ }
+
+ @Test
+ @Transactional
+ void shouldInsertPetIntoDatabaseAndGenerateId() {
+ Owner owner6 = this.owners.findById(6);
+ int found = owner6.getPets().size();
+
+ Pet pet = new Pet();
+ pet.setName("bowser");
+ Collection types = this.owners.findPetTypes();
+ pet.setType(EntityUtils.getById(types, PetType.class, 2));
+ pet.setBirthDate(LocalDate.now());
+ owner6.addPet(pet);
+ assertThat(owner6.getPets().size()).isEqualTo(found + 1);
+
+ this.owners.save(owner6);
+
+ owner6 = this.owners.findById(6);
+ assertThat(owner6.getPets().size()).isEqualTo(found + 1);
+ // checks that id has been generated
+ pet = owner6.getPet("bowser");
+ assertThat(pet.getId()).isNotNull();
+ }
+
+ @Test
+ @Transactional
+ void shouldUpdatePetName() throws Exception {
+ Owner owner6 = this.owners.findById(6);
+ Pet pet7 = owner6.getPet(7);
+ String oldName = pet7.getName();
+
+ String newName = oldName + "X";
+ pet7.setName(newName);
+ this.owners.save(owner6);
+
+ owner6 = this.owners.findById(6);
+ pet7 = owner6.getPet(7);
+ assertThat(pet7.getName()).isEqualTo(newName);
+ }
+
+ @Test
+ void shouldFindVets() {
+ Collection vets = this.vets.findAll();
+
+ Vet vet = EntityUtils.getById(vets, Vet.class, 3);
+ assertThat(vet.getLastName()).isEqualTo("Douglas");
+ assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
+ assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
+ assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
+ }
+
+ @Test
+ @Transactional
+ void shouldAddNewVisitForPet() {
+ Owner owner6 = this.owners.findById(6);
+ Pet pet7 = owner6.getPet(7);
+ int found = pet7.getVisits().size();
+ Visit visit = new Visit();
+ visit.setDescription("test");
+
+ owner6.addVisit(pet7.getId(), visit);
+ this.owners.save(owner6);
+
+ owner6 = this.owners.findById(6);
+
+ assertThat(pet7.getVisits()) //
+ .hasSize(found + 1) //
+ .allMatch(value -> value.getId() != null);
+ }
+
+ @Test
+ void shouldFindVisitsByPetId() throws Exception {
+ Owner owner6 = this.owners.findById(6);
+ Pet pet7 = owner6.getPet(7);
+ Collection visits = pet7.getVisits();
+
+ assertThat(visits) //
+ .hasSize(2) //
+ .element(0)
+ .extracting(Visit::getDate)
+ .isNotNull();
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
new file mode 100644
index 000000000..7b7a5e64a
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.service;
+
+import org.springframework.orm.ObjectRetrievalFailureException;
+import org.springframework.samples.petclinic.model.BaseEntity;
+
+import java.util.Collection;
+
+/**
+ * Utility methods for handling entities. Separate from the BaseEntity class mainly
+ * because of dependency on the ORM-associated ObjectRetrievalFailureException.
+ *
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @see org.springframework.samples.petclinic.model.BaseEntity
+ * @since 29.10.2003
+ */
+public abstract class EntityUtils {
+
+ /**
+ * Look up the entity of the given class with the given id in the given collection.
+ * @param entities the collection to search
+ * @param entityClass the entity class to look up
+ * @param entityId the entity id to look up
+ * @return the found entity
+ * @throws ObjectRetrievalFailureException if the entity was not found
+ */
+ public static T getById(Collection entities, Class entityClass, int entityId)
+ throws ObjectRetrievalFailureException {
+ for (T entity : entities) {
+ if (entity.getId() == entityId && entityClass.isInstance(entity)) {
+ return entity;
+ }
+ }
+ throw new ObjectRetrievalFailureException(entityClass, entityId);
+ }
+
+}
diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerIntegrationTests.java
new file mode 100644
index 000000000..4edf2af92
--- /dev/null
+++ b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerIntegrationTests.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.samples.petclinic.system;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * Integration Test for {@link CrashController}.
+ *
+ * @author Alex Lutz
+ */
+// NOT Waiting https://github.com/spring-projects/spring-boot/issues/5574
+@SpringBootTest(webEnvironment = RANDOM_PORT,
+ properties = { "server.error.include-message=ALWAYS", "management.endpoints.enabled-by-default=false" })
+class CrashControllerIntegrationTests {
+
+ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class,
+ DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class })
+ static class TestConfiguration {
+
+ }
+
+ @Value(value = "${local.server.port}")
+ private int port;
+
+ @Autowired
+ private TestRestTemplate rest;
+
+ @Test
+ void testTriggerExceptionJson() {
+ ResponseEntity> resp = rest.exchange(
+ RequestEntity.get("http://localhost:" + port + "/oups").build(),
+ new ParameterizedTypeReference>() {
+ });
+ assertThat(resp).isNotNull();
+ assertThat(resp.getStatusCode().is5xxServerError());
+ assertThat(resp.getBody().containsKey("timestamp"));
+ assertThat(resp.getBody().containsKey("status"));
+ assertThat(resp.getBody().containsKey("error"));
+ assertThat(resp.getBody()).containsEntry("message",
+ "Expected: controller used to showcase what happens when an exception is thrown");
+ assertThat(resp.getBody()).containsEntry("path", "/oups");
+ }
+
+ @Test
+ void testTriggerExceptionHtml() {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setAccept(List.of(MediaType.TEXT_HTML));
+ ResponseEntity resp = rest.exchange("http://localhost:" + port + "/oups", HttpMethod.GET,
+ new HttpEntity<>(headers), String.class);
+ assertThat(resp).isNotNull();
+ assertThat(resp.getStatusCode().is5xxServerError());
+ assertThat(resp.getBody()).isNotNull();
+ // html:
+ assertThat(resp.getBody()).containsSubsequence("", "
+
+Or you can run it from Maven directly using the Spring Boot Maven plugin. If you do this, it will pick up changes that you make in the project immediately (changes to Java source files require a compile as well - most people use an IDE for this):
+
+```
+./mvnw spring-boot:run
+```
+
+> NOTE: If you prefer to use Gradle, you can build the app using `./gradlew build` and look for the jar file in `build/libs`.
+
+## Building a Container
+
+There is no `Dockerfile` in this project. You can build a container image (if you have a docker daemon) using the Spring Boot build plugin:
+
+```
+./mvnw spring-boot:build-image
+```
## In case you find a bug/suggested improvement for Spring Petclinic
-Our issue tracker is available here: https://github.com/spring-projects/spring-petclinic/issues
+Our issue tracker is available [here](https://github.com/spring-projects/spring-petclinic/issues)
## Database configuration
-In its default configuration, Petclinic uses an in-memory database (HSQLDB) which
-gets populated at startup with data. A similar setup is provided for MySql in case a persistent database configuration is needed.
-Note that whenever the database type is changed, the data-access.properties file needs to be updated and the mysql-connector-java artifact from the pom.xml needs to be uncommented.
+In its default configuration, Petclinic uses an in-memory database (H2) which
+gets populated at startup with data. The h2 console is exposed at `http://localhost:8080/h2-console`,
+and it is possible to inspect the content of the database using the `jdbc:h2:mem:testdb` url.
+
+A similar setup is provided for MySQL and PostgreSQL if a persistent database configuration is needed. Note that whenever the database type changes, the app needs to run with a different profile: `spring.profiles.active=mysql` for MySQL or `spring.profiles.active=postgres` for PostgreSQL.
-You may start a MySql database with docker:
+You can start MySQL or PostgreSQL locally with whatever installer works for your OS or use docker:
```
-docker run -e MYSQL_ROOT_PASSWORD=petclinic -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:5.7.8
+docker run -e MYSQL_USER=petclinic -e MYSQL_PASSWORD=petclinic -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=petclinic -p 3306:3306 mysql:8.0
```
-## Working with Petclinic in Eclipse/STS
+or
-### prerequisites
+```
+docker run -e POSTGRES_USER=petclinic -e POSTGRES_PASSWORD=petclinic -e POSTGRES_DB=petclinic -p 5432:5432 postgres:15.2
+```
+
+Further documentation is provided for [MySQL](https://github.com/spring-projects/spring-petclinic/blob/main/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt)
+and for [PostgreSQL](https://github.com/spring-projects/spring-petclinic/blob/main/src/main/resources/db/postgres/petclinic_db_setup_postgres.txt).
+
+## Compiling the CSS
+
+There is a `petclinic.css` in `src/main/resources/static/resources/css`. It was generated from the `petclinic.scss` source, combined with the [Bootstrap](https://getbootstrap.com/) library. If you make changes to the `scss`, or upgrade Bootstrap, you will need to re-compile the CSS resources using the Maven profile "css", i.e. `./mvnw package -P css`. There is no build profile for Gradle to compile the CSS.
+
+## Working with Petclinic in your IDE
+
+### Prerequisites
The following items should be installed in your system:
-* Maven 3 (http://www.sonatype.com/books/mvnref-book/reference/installation.html)
-* git command line tool (https://help.github.com/articles/set-up-git)
-* Eclipse with the m2e plugin (m2e is installed by default when using the STS (http://www.springsource.org/sts) distribution of Eclipse)
-
-Note: when m2e is available, there is an m2 icon in Help -> About dialog.
-If m2e is not there, just follow the install process here: http://eclipse.org/m2e/download/
-
+* Java 17 or newer (full JDK, not a JRE).
+* [git command line tool](https://help.github.com/articles/set-up-git)
+* Your preferred IDE
+ * Eclipse with the m2e plugin. Note: when m2e is available, there is an m2 icon in `Help -> About` dialog. If m2e is
+ not there, follow the install process [here](https://www.eclipse.org/m2e/)
+ * [Spring Tools Suite](https://spring.io/tools) (STS)
+ * [IntelliJ IDEA](https://www.jetbrains.com/idea/)
+ * [VS Code](https://code.visualstudio.com)
### Steps:
-1) In the command line
-```
-git clone https://github.com/spring-projects/spring-petclinic.git
-```
-2) Inside Eclipse
-```
-File -> Import -> Maven -> Existing Maven project
-```
+1) On the command line run:
+ ```
+ git clone https://github.com/spring-projects/spring-petclinic.git
+ ```
+2) Inside Eclipse or STS:
+ ```
+ File -> Import -> Maven -> Existing Maven project
+ ```
+
+ Then either build on the command line `./mvnw generate-resources` or use the Eclipse launcher (right click on project and `Run As -> Maven install`) to generate the css. Run the application main method by right-clicking on it and choosing `Run As -> Java Application`.
+
+3) Inside IntelliJ IDEA
+ In the main menu, choose `File -> Open` and select the Petclinic [pom.xml](pom.xml). Click on the `Open` button.
+
+ CSS files are generated from the Maven build. You can build them on the command line `./mvnw generate-resources` or right-click on the `spring-petclinic` project then `Maven -> Generates sources and Update Folders`.
+
+ A run configuration named `PetClinicApplication` should have been created for you if you're using a recent Ultimate version. Otherwise, run the application by right-clicking on the `PetClinicApplication` main class and choosing `Run 'PetClinicApplication'`.
+
+4) Navigate to Petclinic
+
+ Visit [http://localhost:8080](http://localhost:8080) in your browser.
## Looking for something in particular?
-
-
- 
+ 
+