Repackage classes to be in accordance with DDD guidance

readme.md

@@ -3,6 +3,11 @@
 ## Understanding the Spring Petclinic application with a few diagrams
 <a href="https://speakerdeck.com/michaelisvy/spring-petclinic-sample-application">See the presentation here</a>
 
+## Implementation of Domain Driven Desing based on following samples
+* https://github.com/VaughnVernon/IDDD_Samples
+* https://github.com/citerus/dddsample-core
+* https://github.com/BottegaIT/ddd-leaven-v2
+
 ## Running petclinic locally
 ```
 	git clone https://github.com/spring-projects/spring-petclinic.git

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java

@@ -3,13 +3,7 @@ package org.springframework.samples.petclinic;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.samples.petclinic.config.PetclinicProperties;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.WebRequestInterceptor;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.samples.petclinic.infrastructure.config.PetclinicProperties;
 
 @SpringBootApplication
 @EnableConfigurationProperties(PetclinicProperties.class)

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/OwnerResource.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/owner/OwnerResource.java

@@ -13,25 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.web;
-
-import java.util.Collection;
+package org.springframework.samples.petclinic.boundary.web.owner;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.samples.petclinic.model.Owner;
-import org.springframework.samples.petclinic.service.ClinicService;
+import org.springframework.samples.petclinic.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.domain.model.owner.OwnerService;
+import org.springframework.samples.petclinic.support.web.AbstractResourceController;
 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.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Collection;
 
 /**
  * @author Juergen Hoeller
@@ -42,21 +35,20 @@ import javax.validation.Valid;
 @RestController
 public class OwnerResource extends AbstractResourceController {
 
-    private final ClinicService clinicService;
-
+    private final OwnerService ownerService;
 
     @Autowired
-    public OwnerResource(ClinicService clinicService) {
-        this.clinicService = clinicService;
+    public OwnerResource(OwnerService ownerService) {
+        this.ownerService = ownerService;
     }
 
     @InitBinder
     public void setAllowedFields(WebDataBinder dataBinder) {
         dataBinder.setDisallowedFields("id");
     }
-    
+
     private Owner retrieveOwner(int ownerId) {
-        return this.clinicService.findOwnerById(ownerId);
+        return this.ownerService.findOwnerById(ownerId);
     }
 
     /**
@@ -65,9 +57,9 @@ public class OwnerResource extends AbstractResourceController {
     @RequestMapping(value = "/owner", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.CREATED)
     public void createOwner(@Valid @RequestBody Owner owner) {
-    	this.clinicService.saveOwner(owner);
+        this.ownerService.saveOwner(owner);
     }
-    
+
     /**
      * Read single Owner
      */
@@ -75,31 +67,30 @@ public class OwnerResource extends AbstractResourceController {
     public Owner findOwner(@PathVariable("ownerId") int ownerId) {
         return retrieveOwner(ownerId);
     }
-    
+
     /**
      * Read List of Owners
      */
     @GetMapping("/owner/list")
     public Collection<Owner> findAll() {
-        return clinicService.findAll();
+        return ownerService.findAll();
     }
-    
+
     /**
      * Update Owner
      */
     @RequestMapping(value = "/owner/{ownerId}", method = RequestMethod.PUT)
     public Owner updateOwner(@PathVariable("ownerId") int ownerId, @Valid @RequestBody Owner ownerRequest) {
-    	Owner ownerModel = retrieveOwner(ownerId);
-    	// This is done by hand for simplicity purpose. In a real life use-case we should consider using MapStruct.
-    	ownerModel.setFirstName(ownerRequest.getFirstName());
-    	ownerModel.setLastName(ownerRequest.getLastName());
-    	ownerModel.setCity(ownerRequest.getCity());
-    	ownerModel.setAddress(ownerRequest.getAddress());
-    	ownerModel.setTelephone(ownerRequest.getTelephone());
-        this.clinicService.saveOwner(ownerModel);
+        Owner ownerModel = retrieveOwner(ownerId);
+        // This is done by hand for simplicity purpose. In a real life use-case we should consider using MapStruct.
+        ownerModel.setFirstName(ownerRequest.getFirstName());
+        ownerModel.setLastName(ownerRequest.getLastName());
+        ownerModel.setCity(ownerRequest.getCity());
+        ownerModel.setAddress(ownerRequest.getAddress());
+        ownerModel.setTelephone(ownerRequest.getTelephone());
+        this.ownerService.saveOwner(ownerModel);
         return ownerModel;
     }
 
 
-
 }

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/PetResource.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/pet/PetResource.java

@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.web;
+package org.springframework.samples.petclinic.boundary.web.pet;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
-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.samples.petclinic.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.domain.model.owner.OwnerService;
+import org.springframework.samples.petclinic.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.domain.model.pet.PetService;
+import org.springframework.samples.petclinic.domain.model.pet.PetType;
+import org.springframework.samples.petclinic.support.web.AbstractResourceController;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.Size;
@@ -37,21 +39,24 @@ import java.util.Map;
 @RestController
 public class PetResource extends AbstractResourceController {
 
-    private final ClinicService clinicService;
+    private final PetService petService;
+
+    private final OwnerService ownerService;
 
     @Autowired
-    public PetResource(ClinicService clinicService) {
-        this.clinicService = clinicService;
+    public PetResource(PetService petService, OwnerService ownerService) {
+        this.petService = petService;
+        this.ownerService = ownerService;
     }
 
     @GetMapping("/petTypes")
     Object getPetTypes() {
-        return clinicService.findPetTypes();
+        return petService.findPetTypes();
     }
 
     @GetMapping("/owners/{ownerId}/pets/new")
     public String initCreationForm(@PathVariable("ownerId") int ownerId, Map<String, Object> model) {
-        Owner owner = this.clinicService.findOwnerById(ownerId);
+        Owner owner = this.ownerService.findOwnerById(ownerId);
         Pet pet = new Pet();
         owner.addPet(pet);
         model.put("pet", pet);
@@ -65,7 +70,7 @@ public class PetResource extends AbstractResourceController {
             @PathVariable("ownerId") int ownerId) {
 
         Pet pet = new Pet();
-        Owner owner = this.clinicService.findOwnerById(ownerId);
+        Owner owner = this.ownerService.findOwnerById(ownerId);
         owner.addPet(pet);
 
         save(pet, petRequest);
@@ -74,7 +79,7 @@ public class PetResource extends AbstractResourceController {
     @PutMapping("/owners/{ownerId}/pets/{petId}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void processUpdateForm(@RequestBody PetRequest petRequest) {
-        save(clinicService.findPetById(petRequest.getId()), petRequest);
+        save(petService.findPetById(petRequest.getId()), petRequest);
     }
 
     private void save(Pet pet, PetRequest petRequest) {
@@ -82,18 +87,18 @@ public class PetResource extends AbstractResourceController {
         pet.setName(petRequest.getName());
         pet.setBirthDate(petRequest.getBirthDate());
 
-        for (PetType petType : clinicService.findPetTypes()) {
+        for (PetType petType : petService.findPetTypes()) {
             if (petType.getId() == petRequest.getTypeId()) {
                 pet.setType(petType);
             }
         }
 
-        clinicService.savePet(pet);
+        petService.savePet(pet);
     }
 
     @GetMapping("/owner/*/pet/{petId}")
     public PetDetails findPet(@PathVariable("petId") int petId) {
-        Pet pet = this.clinicService.findPetById(petId);
+        Pet pet = this.petService.findPetById(petId);
         return new PetDetails(pet);
     }
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/pet/PetValidator.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.web;
+package org.springframework.samples.petclinic.boundary.web.pet;
 
-import org.springframework.samples.petclinic.model.Pet;
+import org.springframework.samples.petclinic.domain.model.pet.Pet;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.Errors;
 

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/VetResource.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/vet/VetResource.java

@@ -13,19 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.web;
-
-import java.util.Collection;
+package org.springframework.samples.petclinic.boundary.web.vet;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.samples.petclinic.model.Vet;
-import org.springframework.samples.petclinic.service.ClinicService;
+import org.springframework.samples.petclinic.domain.model.vet.Vet;
+import org.springframework.samples.petclinic.domain.model.vet.VetService;
+import org.springframework.samples.petclinic.support.web.AbstractResourceController;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collection;
+
 /**
  * @author Juergen Hoeller
  * @author Mark Fisher
@@ -35,15 +33,15 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class VetResource extends AbstractResourceController {
 
-    private final ClinicService clinicService;
+    private final VetService vetService;
 
     @Autowired
-    public VetResource(ClinicService clinicService) {
-        this.clinicService = clinicService;
+    public VetResource(VetService vetService) {
+        this.vetService = vetService;
     }
-    
+
     @GetMapping("/vets")
     public Collection<Vet> showResourcesVetList() {
-        return this.clinicService.findVets();
+        return this.vetService.findVets();
     }
 }

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/VisitResource.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/boundary/web/visit/VisitResource.java

@@ -13,18 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.web;
+package org.springframework.samples.petclinic.boundary.web.visit;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.samples.petclinic.model.Visit;
-import org.springframework.samples.petclinic.service.ClinicService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.samples.petclinic.domain.model.pet.PetService;
+import org.springframework.samples.petclinic.domain.model.visit.Visit;
+import org.springframework.samples.petclinic.domain.model.visit.VisitService;
+import org.springframework.samples.petclinic.support.web.AbstractResourceController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -37,11 +34,14 @@ import javax.validation.Valid;
 @RestController
 public class VisitResource extends AbstractResourceController {
 
-    private final ClinicService clinicService;
+    private final VisitService visitService;
+
+    private final PetService petService;
 
     @Autowired
-    public VisitResource(ClinicService clinicService) {
-        this.clinicService = clinicService;
+    public VisitResource(VisitService visitService, PetService petService) {
+        this.visitService = visitService;
+        this.petService = petService;
     }
 
     @PostMapping("/owners/{ownerId}/pets/{petId}/visits")
@@ -50,12 +50,12 @@ public class VisitResource extends AbstractResourceController {
             @Valid @RequestBody Visit visit,
             @PathVariable("petId") int petId) {
 
-        clinicService.findPetById(petId).addVisit(visit);
-        clinicService.saveVisit(visit);
+        petService.findPetById(petId).addVisit(visit);
+        visitService.saveVisit(visit);
     }
 
     @GetMapping("/owners/{ownerId}/pets/{petId}/visits")
     public Object visits(@PathVariable("petId") int petId) {
-        return clinicService.findPetById(petId).getVisits();
+        return petService.findPetById(petId).getVisits();
     }
 }

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Owner.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/owner/Owner.java

@@ -13,25 +13,18 @@
  * 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;
+package org.springframework.samples.petclinic.domain.model.owner;
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
 import org.springframework.core.style.ToStringCreator;
+import org.springframework.samples.petclinic.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.domain.shared.Person;
+
+import javax.persistence.*;
+import javax.validation.constraints.Digits;
+import java.util.*;
 
 /**
  * Simple JavaBean domain object representing an owner.

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/owner/OwnerRepository.java

@@ -13,17 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.repository;
+package org.springframework.samples.petclinic.domain.model.owner;
 
-import java.util.Collection;
-
-import org.springframework.dao.DataAccessException;
 import org.springframework.data.jpa.repository.JpaRepository;
-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.BaseEntity;
-import org.springframework.samples.petclinic.model.Owner;
 
 /**
  * Repository class for <code>Owner</code> domain objects All method names are compliant with Spring Data naming

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/owner/OwnerService.java

+package org.springframework.samples.petclinic.domain.model.owner;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+
+/**
+ * @author mszarlinski on 2016-10-30.
+ */
+@Service
+public class OwnerService {
+
+    private final OwnerRepository ownerRepository;
+
+    @Autowired
+    public OwnerService(OwnerRepository ownerRepository) {
+        this.ownerRepository = ownerRepository;
+    }
+
+    @Transactional(readOnly = true)
+    public Owner findOwnerById(int id) throws DataAccessException {
+        return ownerRepository.findOne(id);
+    }
+
+    @Transactional(readOnly = true)
+    public Collection<Owner> findAll() throws DataAccessException {
+        return ownerRepository.findAll();
+    }
+
+    @Transactional
+    public void saveOwner(Owner owner) throws DataAccessException {
+        ownerRepository.save(owner);
+    }
+
+}

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Pet.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/Pet.java

@@ -13,28 +13,17 @@
  * 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.domain.model.pet;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
+import org.springframework.samples.petclinic.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.domain.model.visit.Visit;
+import org.springframework.samples.petclinic.support.jpa.NamedEntity;
 
-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 javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import javax.persistence.*;
+import java.util.*;
 
 /**
  * Simple business object representing a pet.
@@ -80,7 +69,7 @@ public class Pet extends NamedEntity {
         return this.type;
     }
 
-    protected void setOwner(Owner owner) {
+    public void setOwner(Owner owner) {
         this.owner = owner;
     }
 
@@ -94,7 +83,7 @@ public class Pet extends NamedEntity {
 
     protected Set<Visit> getVisitsInternal() {
         if (this.visits == null) {
-            this.visits = new HashSet<Visit>();
+            this.visits = new HashSet<>();
         }
         return this.visits;
     }

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/PetRepository.java

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.repository;
+package org.springframework.samples.petclinic.domain.model.pet;
 
-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.BaseEntity;
-import org.springframework.samples.petclinic.model.Pet;
-import org.springframework.samples.petclinic.model.PetType;
+
+import java.util.List;
 
 /**
  * Repository class for <code>Pet</code> domain objects All method names are compliant with Spring Data naming

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/PetService.java

+package org.springframework.samples.petclinic.domain.model.pet;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+
+/**
+ * @author mszarlinski on 2016-10-30.
+ */
+@Service
+public class PetService {
+
+    private final PetRepository petRepository;
+
+    @Autowired
+    public PetService(PetRepository petRepository) {
+        this.petRepository = petRepository;
+    }
+
+    @Transactional(readOnly = true)
+    public Pet findPetById(int id) throws DataAccessException {
+        return petRepository.findById(id);
+    }
+
+    @Transactional
+    public void savePet(Pet pet) throws DataAccessException {
+        petRepository.save(pet);
+    }
+
+    @Transactional(readOnly = true)
+    public Collection<PetType> findPetTypes() throws DataAccessException {
+        return petRepository.findPetTypes();
+    }
+}

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/PetType.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/pet/PetType.java

@@ -13,7 +13,9 @@
  * 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.domain.model.pet;
+
+import org.springframework.samples.petclinic.support.jpa.NamedEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Specialty.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/vet/Specialty.java

@@ -13,7 +13,9 @@
  * 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.domain.model.vet;
+
+import org.springframework.samples.petclinic.support.jpa.NamedEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Vet.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/vet/Vet.java

@@ -13,7 +13,7 @@
  * 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.domain.model.vet;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlElement;
 
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
+import org.springframework.samples.petclinic.domain.shared.Person;
 
 /**
  * Simple JavaBean domain object representing a veterinarian.

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/vet/VetRepository.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.repository;
-
-import java.util.Collection;
+package org.springframework.samples.petclinic.domain.model.vet;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.repository.Repository;
-import org.springframework.samples.petclinic.model.Vet;
+
+import java.util.Collection;
 
 /**
  * Repository class for <code>Vet</code> domain objects All method names are compliant with Spring Data naming

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/vet/VetService.java

+package org.springframework.samples.petclinic.domain.model.vet;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.cache.annotation.CacheResult;
+import java.util.Collection;
+
+/**
+ * @author mszarlinski on 2016-10-30.
+ */
+@Service
+public class VetService {
+
+    private final VetRepository vetRepository;
+
+    @Autowired
+    public VetService(VetRepository vetRepository) {
+        this.vetRepository = vetRepository;
+    }
+
+    @Transactional(readOnly = true)
+    @CacheResult(cacheName = "vets")
+    public Collection<Vet> findVets() throws DataAccessException {
+        return vetRepository.findAll();
+    }
+}

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Vets.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/vet/Vets.java

@@ -14,7 +14,7 @@
  * 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.domain.model.vet;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +36,7 @@ public class Vets {
     @XmlElement
     public List<Vet> getVetList() {
         if (vets == null) {
-            vets = new ArrayList<Vet>();
+            vets = new ArrayList<>();
         }
         return vets;
     }

springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Visit.java → springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/domain/model/visit/Visit.java

@@ -13,18 +13,14 @@
  * 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.domain.model.visit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.samples.petclinic.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.support.jpa.BaseEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 import javax.validation.constraints.Size;
 import java.util.Date;