Compare revisions

92257938 · 92257938 · 92257938 · 92257938 · 92257938 · 92257938
--- a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
 /*
- * 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,
@@ -23,7 +23,8 @@ import org.springframework.samples.petclinic.model.BaseEntity;
 /**
 * Repository class for <code>Visit</code> 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
+ * 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

--- a/src/main/less/petclinic.less
+++ b/src/main/less/petclinic.less
@@ -3,7 +3,7 @@
 *
 * 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,

--- a/src/main/resources/application-mysql.properties
+++ b/src/main/resources/application-mysql.properties
+# database init, supports mysql too
+database=mysql
+spring.datasource.url=jdbc:mysql://localhost/petclinic
+spring.datasource.username=root
+spring.datasource.password=petclinic
+# Uncomment this the first time the app runs
+# spring.datasource.initialization-mode=always
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -13,11 +13,13 @@ spring.jpa.hibernate.ddl-auto=none
 spring.messages.basename=messages/messages
 # Actuator / Management
-management.contextPath=/manage
+management.endpoints.web.base-path=/manage
+management.endpoints.web.exposure.include=*
 # Logging
 logging.level.org.springframework=INFO
-logging.level.org.springframework.web=DEBUG
+# logging.level.org.springframework.web=DEBUG
+# logging.level.org.springframework.context.annotation=TRACE
-# Active Spring profiles
+# Maximum time static resources should be cached
-spring.profiles.active=production
+spring.resources.cache.cachecontrol.max-age=12h
--- a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
+++ b/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
@@ -4,21 +4,14 @@
 @author Sam Brannen
 @author Costin Leau
+@author Dave Syer
 --------------------------------------------------------------------------------
 1) Download and install the MySQL database (e.g., MySQL Community Server 5.1.x),
-   which can be found here: http://dev.mysql.com/downloads/
+   which can be found here: https://dev.mysql.com/downloads/. Or run the
+   "docker-compose.yml" from the root of the project (if you have docker installed
+   locally).
-2) Download Connector/J, the MySQL JDBC driver (e.g., Connector/J 5.1.x), which
+2) Create the PetClinic database and user by executing the "db/mysql/{schema,data}.sql"
-   can be found here: http://dev.mysql.com/downloads/connector/j/
+   scripts (or set "spring.datasource.initialize=true" the first time you run the app).
-   Copy the Connector/J JAR file (e.g., mysql-connector-java-5.1.5-bin.jar) into
-   the db/mysql directory. Alternatively, uncomment the mysql-connector from the
-   Petclinic pom.
-3) Create the PetClinic database and user by executing the "db/mysql/initDB.sql"
-   script.
-4) Open "src/main/resources/spring/data-access.properties"; comment out all properties in the
-   "HSQL Settings" section; uncomment all properties in the "MySQL Settings"
-   section.
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'error')}">
+<html xmlns:th="https://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'error')}">
  <body>
    <img src="../static/resources/images/pets.png" th:src="@{/resources/images/pets.png}"/>

--- a/src/main/resources/templates/fragments/inputField.html
+++ b/src/main/resources/templates/fragments/inputField.html
 <html>
 <body>
  <form>
-    <th:block th:fragment="input (label, name)">
+    <th:block th:fragment="input (label, name, type)">
      <div th:with="valid=${!#fields.hasErrors(name)}"
        th:class="${'form-group' + (valid ? '' : ' has-error')}"
        class="form-group">
        <label class="col-sm-2 control-label" th:text="${label}">Label</label>
        <div class="col-sm-10">
-          <input class="form-control" type="text"
+            <div th:switch="${type}">
-            th:field="*{__${name}__}" />
+                <input th:case="'text'" class="form-control" type="text" th:field="*{__${name}__}" />
+                <input th:case="'date'" class="form-control" type="text" th:field="*{__${name}__}"
+                        placeholder="YYYY-MM-DD" title="Enter a date in this format: YYYY-MM-DD"
+                        pattern="(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))"/>
+            </div>
          <span th:if="${valid}"
            class="glyphicon glyphicon-ok form-control-feedback"
            aria-hidden="true"></span>

--- a/src/main/resources/templates/fragments/layout.html
+++ b/src/main/resources/templates/fragments/layout.html
@@ -71,7 +71,7 @@
  <div class="container-fluid">
      <div class="container xd-container">
-          <div th:replace="${template}"/>
+          <th:block th:include="${template}"/>
        <br/>
        <br/>

--- a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
+++ b/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
-<html xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="https://www.thymeleaf.org"
  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
 <body>
@@ -7,15 +7,15 @@
  <form th:object="${owner}" class="form-horizontal" id="add-owner-form" method="post">
    <div class="form-group has-feedback">
      <input
-        th:replace="~{fragments/inputField :: input ('First Name', 'firstName')}" />
+        th:replace="~{fragments/inputField :: input ('First Name', 'firstName', 'text')}" />
      <input
-        th:replace="~{fragments/inputField :: input ('Last Name', 'lastName')}" />
+        th:replace="~{fragments/inputField :: input ('Last Name', 'lastName', 'text')}" />
      <input
-        th:replace="~{fragments/inputField :: input ('Address', 'address')}" />
+        th:replace="~{fragments/inputField :: input ('Address', 'address', 'text')}" />
      <input
-        th:replace="~{fragments/inputField :: input ('City', 'city')}" />
+        th:replace="~{fragments/inputField :: input ('City', 'city', 'text')}" />
      <input
-        th:replace="~{fragments/inputField :: input ('Telephone', 'telephone')}" />
+        th:replace="~{fragments/inputField :: input ('Telephone', 'telephone', 'text')}" />
    </div>
    <div class="form-group">
      <div class="col-sm-offset-2 col-sm-10">

--- a/src/main/resources/templates/owners/findOwners.html
+++ b/src/main/resources/templates/owners/findOwners.html
-<html xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="https://www.thymeleaf.org"
  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
 <body>
@@ -8,7 +8,7 @@
  <form th:object="${owner}" th:action="@{/owners}" method="get"
    class="form-horizontal" id="search-owner-form">
    <div class="form-group">
-      <div class="control-group" id="lastName">
+      <div class="control-group" id="lastNameGroup">
        <label class="col-sm-2 control-label">Last name </label>
        <div class="col-sm-10">
          <input class="form-control" th:field="*{lastName}" size="30"

--- a/src/main/resources/templates/owners/ownerDetails.html
+++ b/src/main/resources/templates/owners/ownerDetails.html
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="https://www.thymeleaf.org"
  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
  <body>
@@ -47,7 +47,7 @@
            <dd th:text="${pet.name}" /></dd>
            <dt>Birth Date</dt>
            <dd
-              th:text="${#calendars.format(pet.birthDate, 'yyyy-MM-dd')}" /></dd>
+              th:text="${#temporals.format(pet.birthDate, 'yyyy-MM-dd')}" /></dd>
            <dt>Type</dt>
            <dd th:text="${pet.type}" /></dd>
          </dl>
@@ -61,7 +61,7 @@
              </tr>
            </thead>
            <tr th:each="visit : ${pet.visits}">
-              <td th:text="${#calendars.format(visit.date, 'yyyy-MM-dd')}"></td>
+              <td th:text="${#temporals.format(visit.date, 'yyyy-MM-dd')}"></td>
              <td th:text="${visit?.description}"></td>
            </tr>
            <tr>
@@ -80,4 +80,4 @@
  </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/owners/ownersList.html
+++ b/src/main/resources/templates/owners/ownersList.html
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
+<html xmlns:th="https://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
  <body>
@@ -19,7 +19,7 @@
        <tbody>
          <tr th:each="owner : ${selections}">
              <td>
-                  <a th:href="@{owners/__${owner.id}__}" th:text="${owner.firstName + ' ' + owner.lastName}"/></a>
+                  <a th:href="@{/owners/__${owner.id}__}" th:text="${owner.firstName + ' ' + owner.lastName}"/></a>
              </td>
              <td th:text="${owner.address}"/>
              <td th:text="${owner.city}"/>

--- a/src/main/resources/templates/pets/createOrUpdatePetForm.html
+++ b/src/main/resources/templates/pets/createOrUpdatePetForm.html
-<html xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="https://www.thymeleaf.org"
  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
 <body>
@@ -17,16 +17,16 @@
        </div>
      </div>
      <input
-        th:replace="~{fragments/inputField :: input ('Name', 'name')}" />
+        th:replace="~{fragments/inputField :: input ('Name', 'name', 'text')}" />
      <input
-        th:replace="~{fragments/inputField :: input ('Birth Date', 'birthDate')}" />
+        th:replace="~{fragments/inputField :: input ('Birth Date', 'birthDate', 'date')}" />
      <input
        th:replace="~{fragments/selectField :: select ('Type', 'type', ${types})}" />
    </div>
    <div class="form-group">
      <div class="col-sm-offset-2 col-sm-10">
        <button
-          th:with="text=${owner['new']} ? 'Add Pet' : 'Update Pet'"
+          th:with="text=${pet['new']} ? 'Add Pet' : 'Update Pet'"
          class="btn btn-default" type="submit" th:text="${text}">Add
          Pet</button>
      </div>

--- a/src/main/resources/templates/pets/createOrUpdateVisitForm.html
+++ b/src/main/resources/templates/pets/createOrUpdateVisitForm.html
-<html xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="https://www.thymeleaf.org"
  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
 <body>
@@ -21,7 +21,7 @@
    <tr>
      <td th:text="${pet.name}" /></td>
      <td
-        th:text="${#calendars.format(pet.birthDate, 'yyyy-MM-dd')}" /></td>
+        th:text="${#temporals.format(pet.birthDate, 'yyyy-MM-dd')}" /></td>
      <td th:text="${pet.type}" /></td>
      <td
        th:text="${pet.owner?.firstName + ' ' + pet.owner?.lastName}" /></td>
@@ -31,9 +31,9 @@
  <form th:object="${visit}" class="form-horizontal" method="post">
    <div class="form-group has-feedback">
      <input
-        th:replace="~{fragments/inputField :: input ('Date', 'date')}" />
+        th:replace="~{fragments/inputField :: input ('Date', 'date', 'date')}"  />
      <input
-        th:replace="~{fragments/inputField :: input ('Description', 'description')}" />
+        th:replace="~{fragments/inputField :: input ('Description', 'description', 'text')}" />
    </div>
    <div class="form-group">
@@ -52,10 +52,10 @@
      <th>Description</th>
    </tr>
    <tr th:if="${!visit['new']}" th:each="visit : ${pet.visits}">
-      <td th:text="${#calendars.format(visit.date, 'yyyy-MM-dd')}" /></td>
+      <td th:text="${#temporals.format(visit.date, 'yyyy-MM-dd')}" /></td>
      <td th:text=" ${visit.description}" /></td>
    </tr>
  </table>
 </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/vets/vetList.html
+++ b/src/main/resources/templates/vets/vetList.html
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
+<html xmlns:th="https://www.thymeleaf.org"
  th:replace="~{fragments/layout :: layout (~{::body},'vets')}">
 <body>
@@ -23,13 +23,5 @@
      </tr>
    </tbody>
  </table>
-  <table class="table-buttons">
-    <tr>
-      <td><a th:href="@{/vets.xml}">View as XML</a></td>
-      <td><a th:href="@{/vets.json}">View as JSON</a></td>
-    </tr>
-  </table>
 </body>
 </html>
--- a/src/main/resources/templates/welcome.html
+++ b/src/main/resources/templates/welcome.html
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'home')}">
+<html xmlns:th="https://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'home')}">
  <body>

--- a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
+/*
+ * 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.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.samples.petclinic.vet.VetRepository;
+import org.springframework.test.context.junit4.SpringRunner;
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class PetclinicIntegrationTests {
+    @Autowired
+    private VetRepository vets;
+    @Test
+    public void testFindAll() throws Exception {
+        vets.findAll();
+        vets.findAll(); // served from cache
+    }
+}
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
-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.
+ */
-import static org.assertj.core.api.Assertions.assertThat;
+package org.springframework.samples.petclinic.model;
 import java.util.Locale;
 import java.util.Set;
@@ -9,13 +23,15 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 import org.junit.Test;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+import static org.assertj.core.api.Assertions.assertThat;
 /**
- * @author Michael Isvy
+ * @author Michael Isvy Simple test to make sure that Bean Validation is working (useful
- *         Simple test to make sure that Bean Validation is working
+ * when upgrading to a new version of Hibernate Validator/ Bean Validation)
- *         (useful when upgrading to a new version of Hibernate Validator/ Bean Validation)
 */
 public class ValidatorTests {
@@ -34,12 +50,13 @@ public class ValidatorTests {
        person.setLastName("smith");
        Validator validator = createValidator();
-        Set<ConstraintViolation<Person>> constraintViolations = validator.validate(person);
+        Set<ConstraintViolation<Person>> constraintViolations = validator
+                .validate(person);
        assertThat(constraintViolations.size()).isEqualTo(1);
        ConstraintViolation<Person> violation = constraintViolations.iterator().next();
        assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
-        assertThat(violation.getMessage()).isEqualTo("may not be empty");
+        assertThat(violation.getMessage()).isEqualTo("must not be empty");
    }
 }
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
+/*
+ * 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.hasProperty;

--- a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
+/*
+ * 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;
@@ -75,7 +91,7 @@ public class PetControllerTests {
        mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID)
            .param("name", "Betty")
            .param("type", "hamster")
-            .param("birthDate", "2015/02/12")
+            .param("birthDate", "2015-02-12")
        )
            .andExpect(status().is3xxRedirection())
            .andExpect(view().name("redirect:/owners/{ownerId}"));
@@ -83,12 +99,14 @@ public class PetControllerTests {
    @Test
    public void testProcessCreationFormHasErrors() throws Exception {
-        mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID)
+        mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID)
            .param("name", "Betty")
-            .param("birthDate", "2015/02/12")
+            .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"));
    }
@@ -106,7 +124,7 @@ public class PetControllerTests {
        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")
+            .param("birthDate", "2015-02-12")
        )
            .andExpect(status().is3xxRedirection())
            .andExpect(view().name("redirect:/owners/{ownerId}"));
No results found