ovkhasch · ovkhasch · Aug 23, 2024 · Aug 23, 2024 · Aug 23, 2024 · Aug 23, 2024
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
@@ -33,9 +33,7 @@ class CacheConfiguration {
 
     @Bean
     public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() {
-        return cm -> {
-            cm.createCache("vets", cacheConfiguration());
-        };
+        return cm -> cm.createCache("vets", cacheConfiguration());
     }
 
     /**

diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java b/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
@@ -30,14 +30,14 @@
 @XmlRootElement
 public class Vets {
 
-    private List<Vet> vets;
+    private List<Vet> veterinarianList;
 
     @XmlElement
     public List<Vet> getVetList() {
-        if (vets == null) {
-            vets = new ArrayList<>();
+        if (veterinarianList == null) {
+            veterinarianList = new ArrayList<>();
         }
-        return vets;
+        return veterinarianList;
     }
 
 }
diff --git a/src/main/less/header.less b/src/main/less/header.less
@@ -36,8 +36,6 @@
   font-family: "montserratregular", sans-serif;
   text-shadow: none;
   font-size: 14px;
-
-/* line-height: 14px; */
   padding: 28px 20px;
   transition: all 0.15s;
   -webkit-transition: all 0.15s;

diff --git a/src/main/less/petclinic.less b/src/main/less/petclinic.less
@@ -192,8 +192,6 @@ table td.action-column {
 .deployment-status-deploying {
   .label-info
 }
-.deployment-status-na {
-}
 
 .container-details-table th {
   background-color: lighten(@spring-brown, 3%);

diff --git a/src/main/resources/application-mysql.properties b/src/main/resources/application-mysql.properties
@@ -2,6 +2,6 @@
 database=mysql
 spring.datasource.url=jdbc:mysql://localhost/petclinic
 spring.datasource.username=root
-spring.datasource.password=petclinic
+spring.datasource.password=${DB_PASSWORD}
 # Uncomment this the first time the app runs
 # spring.datasource.initialization-mode=always
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
@@ -1,11 +1,14 @@
 <!DOCTYPE html>
 
-<html xmlns:th="https://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'error')}">
+<html lang="en" xmlns:th="https://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'error')}">
 
+  <head>
+    <title>Error Page</title>
+  </head>
   <body>
-    <img src="../static/resources/images/pets.png" th:src="@{/resources/images/pets.png}"/>
+    <img src="../static/resources/images/pets.png" th:src="@{/resources/images/pets.png}" alt="Pets Image"/>
     <h2>Something happened...</h2>
     <p th:text="${message}">Exception message</p>
   </body>
 
-</html>
+</html>
diff --git a/src/main/resources/templates/fragments/inputField.html b/src/main/resources/templates/fragments/inputField.html
@@ -5,13 +5,16 @@
       <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">
             <div th:switch="${type}">
-                <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))"/>
+                <label class="col-sm-2 control-label" th:text="${label}">
+                    <input th:case="'text'" class="form-control" type="text" th:field="*{__${name}__}" />
+                </label>
+                <label class="col-sm-2 control-label" th:text="${label}">
+                    <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))"/>
+                </label>
             </div>
           <span th:if="${valid}"
             class="glyphicon glyphicon-ok form-control-feedback"

diff --git a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html b/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html xmlns:th="https://www.thymeleaf.org"
   th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
 

diff --git a/src/main/resources/templates/owners/ownerDetails.html b/src/main/resources/templates/owners/ownerDetails.html
@@ -41,7 +41,7 @@ <h2>Pets and Visits</h2>
     <table class="table table-striped">
 
       <tr th:each="pet : ${owner.pets}">
-        <td valign="top">
+        <td style="vertical-align: top;">
           <dl class="dl-horizontal">
             <dt>Name</dt>
             <dd th:text="${pet.name}" /></dd>
@@ -56,22 +56,24 @@ <h2>Pets and Visits</h2>
           <table class="table-condensed">
             <thead>
               <tr>
-                <th>Visit Date</th>
-                <th>Description</th>
+                <th scope="col">Visit Date</th>
+                <th scope="col">Description</th>
               </tr>
             </thead>
-            <tr th:each="visit : ${pet.visits}">
-              <td th:text="${#temporals.format(visit.date, 'yyyy-MM-dd')}"></td>
-              <td th:text="${visit?.description}"></td>
-            </tr>
-            <tr>
-              <td><a
-                th:href="@{{ownerId}/pets/{petId}/edit(ownerId=${owner.id},petId=${pet.id})}">Edit
-                  Pet</a></td>
-              <td><a
-                th:href="@{{ownerId}/pets/{petId}/visits/new(ownerId=${owner.id},petId=${pet.id})}">Add
-                  Visit</a></td>
-            </tr>
+            <tbody>
+              <tr th:each="visit : ${pet.visits}">
+                <td th:text="${#temporals.format(visit.date, 'yyyy-MM-dd')}"></td>
+                <td th:text="${visit?.description}"></td>
+              </tr>
+              <tr>
+                <td><a
+                  th:href="@{{ownerId}/pets/{petId}/edit(ownerId=${owner.id},petId=${pet.id})}">Edit
+                    Pet</a></td>
+                <td><a
+                  th:href="@{{ownerId}/pets/{petId}/visits/new(ownerId=${owner.id},petId=${pet.id})}">Add
+                    Visit</a></td>
+              </tr>
+            </tbody>
           </table>
         </td>
       </tr>

diff --git a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
@@ -32,7 +32,7 @@ public class PetclinicIntegrationTests {
     private VetRepository vets;
 
     @Test
-    public void testFindAll() throws Exception {
+    public void testFindAll() throws PetclinicTestException {
         vets.findAll();
         vets.findAll(); // served from cache
     }

diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
@@ -55,6 +55,7 @@
 public class PetControllerTests {
 
     private static final int TEST_OWNER_ID = 1;
+    private static final String PETS_NEW_URL = "/owners/{ownerId}/pets/new";
     private static final int TEST_PET_ID = 1;
 
 
@@ -80,15 +81,15 @@ public void setup() {
 
     @Test
     public void testInitCreationForm() throws Exception {
-        mockMvc.perform(get("/owners/{ownerId}/pets/new", TEST_OWNER_ID))
+        mockMvc.perform(get(PETS_NEW_URL, TEST_OWNER_ID))
             .andExpect(status().isOk())
             .andExpect(view().name("pets/createOrUpdatePetForm"))
             .andExpect(model().attributeExists("pet"));
     }
 
     @Test
     public void testProcessCreationFormSuccess() throws Exception {
-        mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID)
+        mockMvc.perform(post(PETS_NEW_URL, TEST_OWNER_ID)
             .param("name", "Betty")
             .param("type", "hamster")
             .param("birthDate", "2015-02-12")

diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
@@ -77,16 +77,13 @@ public void shouldThrowParseException() throws ParseException {
      */
     private List<PetType> makePetTypes() {
         List<PetType> petTypes = new ArrayList<>();
-        petTypes.add(new PetType() {
-            {
-                setName("Dog");
-            }
-        });
-        petTypes.add(new PetType() {
-            {
-                setName("Bird");
-            }
-        });
+        PetType dog = new PetType();
+        dog.setName("Dog");
+        petTypes.add(dog);
+
+        PetType bird = new PetType();
+        bird.setName("Bird");
+        petTypes.add(bird);
         return petTypes;
     }
 

diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
@@ -97,8 +97,8 @@ public void shouldFindSingleOwnerWithPet() {
     @Test
     @Transactional
     public void shouldInsertOwner() {
-        Collection<Owner> owners = this.owners.findByLastName("Schultz");
-        int found = owners.size();
+        Collection<Owner> foundOwners = this.owners.findByLastName("Schultz");
+        int found = foundOwners.size();
 
         Owner owner = new Owner();
         owner.setFirstName("Sam");
@@ -109,8 +109,8 @@ public void shouldInsertOwner() {
         this.owners.save(owner);
         assertThat(owner.getId().longValue()).isNotEqualTo(0);
 
-        owners = this.owners.findByLastName("Schultz");
-        assertThat(owners.size()).isEqualTo(found + 1);
+        foundOwners = this.owners.findByLastName("Schultz");
+        assertThat(foundOwners.size()).isEqualTo(found + 1);
     }
 
     @Test

diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
@@ -32,15 +32,9 @@
  */
 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
-     */
+    private EntityUtils() {
+        throw new IllegalStateException("Utility class");
+    }
     public static <T extends BaseEntity> T getById(Collection<T> entities, Class<T> entityClass, int entityId)
         throws ObjectRetrievalFailureException {
         for (T entity : entities) {