diff --git a/src/main/java/org/springframework/samples/petclinic/infrastructure/controller/VetController.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/controller/VetController.java index 064a29925..98f4836f2 100644 --- a/src/main/java/org/springframework/samples/petclinic/infrastructure/controller/VetController.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/controller/VetController.java @@ -20,8 +20,8 @@ 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.samples.petclinic.vet.Vet; -import org.springframework.samples.petclinic.vet.VetRepository; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.VetRepository; import org.springframework.samples.petclinic.infrastructure.view.Vets; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/Specialty.java similarity index 92% rename from src/main/java/org/springframework/samples/petclinic/vet/Specialty.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/Specialty.java index 876fe7ac8..dabc56891 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Specialty.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/Specialty.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package org.springframework.samples.petclinic.infrastructure.persistence.vet; import org.springframework.samples.petclinic.infrastructure.persistence.model.NamedEntity; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/Vet.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/vet/Vet.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/Vet.java index 093a2a1bb..e22423666 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/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.vet; +package org.springframework.samples.petclinic.infrastructure.persistence.vet; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/VetRepository.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java rename to src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/VetRepository.java index 8b9e0823c..01747f682 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/persistence/vet/VetRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.vet; +package org.springframework.samples.petclinic.infrastructure.persistence.vet; import org.springframework.cache.annotation.Cacheable; import org.springframework.dao.DataAccessException; diff --git a/src/main/java/org/springframework/samples/petclinic/infrastructure/view/Vets.java b/src/main/java/org/springframework/samples/petclinic/infrastructure/view/Vets.java index ce791e7d5..581831961 100644 --- a/src/main/java/org/springframework/samples/petclinic/infrastructure/view/Vets.java +++ b/src/main/java/org/springframework/samples/petclinic/infrastructure/view/Vets.java @@ -20,7 +20,7 @@ import java.util.List; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; -import org.springframework.samples.petclinic.vet.Vet; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet; /** * Simple domain object representing a list of veterinarians. Mostly here to be used for diff --git a/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java index 3bf1c0ca1..16dd5ba88 100644 --- a/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java +++ b/src/test/java/org/springframework/samples/petclinic/PetClinicIntegrationTests.java @@ -27,7 +27,7 @@ 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.samples.petclinic.infrastructure.persistence.vet.VetRepository; import org.springframework.web.client.RestTemplate; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) diff --git a/src/test/java/org/springframework/samples/petclinic/infrastructure/controller/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/infrastructure/controller/VetControllerTests.java index d640e7980..cae775775 100644 --- a/src/test/java/org/springframework/samples/petclinic/infrastructure/controller/VetControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/infrastructure/controller/VetControllerTests.java @@ -25,10 +25,9 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.http.MediaType; -import org.springframework.samples.petclinic.infrastructure.controller.VetController; -import org.springframework.samples.petclinic.vet.Specialty; -import org.springframework.samples.petclinic.vet.Vet; -import org.springframework.samples.petclinic.vet.VetRepository; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.Specialty; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.VetRepository; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java index d7240f351..e30748c00 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java @@ -34,8 +34,8 @@ 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.samples.petclinic.infrastructure.persistence.vet.Vet; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.VetRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java index d8df78b85..137d32a51 100644 --- a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java +++ b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java @@ -16,6 +16,7 @@ package org.springframework.samples.petclinic.vet; import org.junit.jupiter.api.Test; +import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet; import org.springframework.util.SerializationUtils; import static org.assertj.core.api.Assertions.assertThat;