diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java similarity index 83% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java index eab0654c0..ec19625a3 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owners; public class Owner { diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java similarity index 94% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java index 548889c7e..11be755b2 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owners; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.samples.petclinic.util.ResponseContext; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java similarity index 77% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java index e151f45e2..762ba5dc8 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owners; import java.util.Collection; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnersController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java similarity index 95% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnersController.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java index fe42ab02c..93fd5b9e7 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/OwnersController.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owners; import java.util.Collection; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/StubOwnerRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java similarity index 86% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/StubOwnerRepository.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java index b9da84907..5c3406bf0 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owner/StubOwnerRepository.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owners; import java.util.Collection; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java new file mode 100644 index 000000000..6691f557e --- /dev/null +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java @@ -0,0 +1,5 @@ +package org.springframework.samples.petclinic.owners.pets; + +public enum Gender { + MALE, FEMALE +} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Pet.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java similarity index 84% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Pet.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java index e0765ee4c..63f189d3a 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Pet.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.pet; +package org.springframework.samples.petclinic.owners.pets; import java.util.Date; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java similarity index 95% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetController.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java index 106754071..d789f9151 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetController.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.pet; +package org.springframework.samples.petclinic.owners.pets; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.samples.petclinic.util.ResponseContext; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java similarity index 63% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetRepository.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java index c3b52f4f1..76afff837 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/PetRepository.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.pet; +package org.springframework.samples.petclinic.owners.pets; public interface PetRepository { diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/StubPetRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java similarity index 79% rename from org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/StubPetRepository.java rename to org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java index 1c0e731a5..0dae2f563 100644 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/StubPetRepository.java +++ b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.pet; +package org.springframework.samples.petclinic.owners.pets; import org.springframework.stereotype.Repository; diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Gender.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Gender.java deleted file mode 100644 index e67a95aa6..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/pet/Gender.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.samples.petclinic.pet; - -public enum Gender { - MALE, FEMALE -}