From 0a79d9b1e5545cf02c62ba3fc8f31de7260b6879 Mon Sep 17 00:00:00 2001 From: Ibraheem Ahmad Date: Sat, 4 Jan 2025 22:01:41 +0100 Subject: [PATCH] Arranged similar classes into packages and also made the controller classes public for accessibility in the test classes --- .../samples/petclinic/owner/OwnerRepository.java | 3 ++- .../samples/petclinic/owner/PetTypeFormatter.java | 1 + .../samples/petclinic/owner/PetValidator.java | 1 + .../petclinic/owner/{ => controller}/OwnerController.java | 6 ++++-- .../petclinic/owner/{ => controller}/PetController.java | 8 ++++++-- .../petclinic/owner/{ => controller}/VisitController.java | 8 ++++++-- .../samples/petclinic/owner/{ => ownerModel}/Owner.java | 2 +- .../samples/petclinic/owner/{ => ownerModel}/Pet.java | 2 +- .../samples/petclinic/owner/{ => ownerModel}/PetType.java | 2 +- .../samples/petclinic/owner/{ => ownerModel}/Visit.java | 2 +- .../samples/petclinic/owner/OwnerControllerTests.java | 5 +++++ .../samples/petclinic/owner/PetControllerTests.java | 4 ++++ .../samples/petclinic/owner/PetTypeFormatterTests.java | 1 + .../samples/petclinic/owner/PetValidatorTests.java | 2 ++ .../samples/petclinic/owner/VisitControllerTests.java | 3 +++ .../samples/petclinic/service/ClinicServiceTests.java | 8 ++++---- 16 files changed, 43 insertions(+), 15 deletions(-) rename src/main/java/org/springframework/samples/petclinic/owner/{ => controller}/OwnerController.java (96%) rename src/main/java/org/springframework/samples/petclinic/owner/{ => controller}/PetController.java (93%) rename src/main/java/org/springframework/samples/petclinic/owner/{ => controller}/VisitController.java (89%) rename src/main/java/org/springframework/samples/petclinic/owner/{ => ownerModel}/Owner.java (98%) rename src/main/java/org/springframework/samples/petclinic/owner/{ => ownerModel}/Pet.java (97%) rename src/main/java/org/springframework/samples/petclinic/owner/{ => ownerModel}/PetType.java (93%) rename src/main/java/org/springframework/samples/petclinic/owner/{ => ownerModel}/Visit.java (96%) diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java index 5d7a40fbb..6b03faf59 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java @@ -23,7 +23,8 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; /** * Repository class for Owner domain objects All method names are compliant diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java b/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java index 4fa18da91..099b261c1 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java @@ -17,6 +17,7 @@ package org.springframework.samples.petclinic.owner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.Formatter; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; import org.springframework.stereotype.Component; import java.text.ParseException; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java b/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java index 6422aa8db..c157a48be 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/PetValidator.java @@ -15,6 +15,7 @@ */ package org.springframework.samples.petclinic.owner; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/owner/controller/OwnerController.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java rename to src/main/java/org/springframework/samples/petclinic/owner/controller/OwnerController.java index fa3506456..c2ce8eee1 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/controller/OwnerController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.controller; import java.util.List; import java.util.Optional; @@ -21,6 +21,8 @@ import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.OwnerRepository; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -44,7 +46,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; * @author Wick Dynex */ @Controller -class OwnerController { +public class OwnerController { private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/controller/PetController.java similarity index 93% rename from src/main/java/org/springframework/samples/petclinic/owner/PetController.java rename to src/main/java/org/springframework/samples/petclinic/owner/controller/PetController.java index fcf431bff..0b4469d1d 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/controller/PetController.java @@ -13,12 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.controller; import java.time.LocalDate; import java.util.Collection; import java.util.Optional; +import org.springframework.samples.petclinic.owner.*; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.util.StringUtils; @@ -42,7 +46,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; */ @Controller @RequestMapping("/owners/{ownerId}") -class PetController { +public class PetController { private static final String VIEWS_PETS_CREATE_OR_UPDATE_FORM = "pets/createOrUpdatePetForm"; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java b/src/main/java/org/springframework/samples/petclinic/owner/controller/VisitController.java similarity index 89% rename from src/main/java/org/springframework/samples/petclinic/owner/VisitController.java rename to src/main/java/org/springframework/samples/petclinic/owner/controller/VisitController.java index b546f609a..40fc41a9a 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/controller/VisitController.java @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.controller; import java.util.Map; import java.util.Optional; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.OwnerRepository; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; +import org.springframework.samples.petclinic.owner.ownerModel.Visit; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.WebDataBinder; @@ -39,7 +43,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; * @author Wick Dynex */ @Controller -class VisitController { +public class VisitController { private final OwnerRepository owners; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Owner.java similarity index 98% rename from src/main/java/org/springframework/samples/petclinic/owner/Owner.java rename to src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Owner.java index 675b2140e..94af16b52 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Owner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.ownerModel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Pet.java similarity index 97% rename from src/main/java/org/springframework/samples/petclinic/owner/Pet.java rename to src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Pet.java index 1fdc77cec..6d7f4717d 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Pet.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Pet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.ownerModel; import java.time.LocalDate; import java.util.Collection; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/PetType.java similarity index 93% rename from src/main/java/org/springframework/samples/petclinic/owner/PetType.java rename to src/main/java/org/springframework/samples/petclinic/owner/ownerModel/PetType.java index eeea6a758..9a2ac0bcb 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/PetType.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/PetType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.ownerModel; import org.springframework.samples.petclinic.model.NamedEntity; diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Visit.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/owner/Visit.java rename to src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Visit.java index 35569bdaa..27833b649 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/Visit.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/ownerModel/Visit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.owner; +package org.springframework.samples.petclinic.owner.ownerModel; import java.time.LocalDate; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java index 426ca5c24..223010329 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java @@ -25,6 +25,11 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; +import org.springframework.samples.petclinic.owner.controller.OwnerController; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; +import org.springframework.samples.petclinic.owner.ownerModel.Visit; import org.springframework.test.context.aot.DisabledInAotMode; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java index 9a6134cbb..a24231601 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java @@ -25,6 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.FilterType; +import org.springframework.samples.petclinic.owner.controller.PetController; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; import org.springframework.test.context.aot.DisabledInAotMode; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java index 0295b4788..ecebda41d 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java @@ -32,6 +32,7 @@ import org.junit.jupiter.api.condition.DisabledInNativeImage; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; /** * Test class for {@link PetTypeFormatter} diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetValidatorTests.java index 1a153bcbc..42c1102f7 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetValidatorTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/PetValidatorTests.java @@ -22,6 +22,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledInNativeImage; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; import org.springframework.validation.Errors; import org.springframework.validation.MapBindingResult; diff --git a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java index e42e75034..40f32f9d0 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java @@ -28,6 +28,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledInNativeImage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.samples.petclinic.owner.controller.VisitController; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; +import org.springframework.samples.petclinic.owner.ownerModel.Pet; import org.springframework.test.context.aot.DisabledInAotMode; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; 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 17360278f..117ca0f75 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java @@ -29,11 +29,11 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabas import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.springframework.samples.petclinic.owner.Owner; +import org.springframework.samples.petclinic.owner.ownerModel.Owner; 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.owner.ownerModel.Pet; +import org.springframework.samples.petclinic.owner.ownerModel.PetType; +import org.springframework.samples.petclinic.owner.ownerModel.Visit; import org.springframework.samples.petclinic.vet.Vet; import org.springframework.samples.petclinic.vet.VetRepository; import org.springframework.transaction.annotation.Transactional;