Arranged similar classes into packages and also made the controller classes public for accessibility in the test classes

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 <code>Owner</code> domain objects All method names are compliant

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;

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;

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";
 

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";
 

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;
 

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;

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;

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;
 

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;
 

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;

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;

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}

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;
 

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;

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.ownerModel.Pet;
-import org.springframework.samples.petclinic.owner.PetType;
+import org.springframework.samples.petclinic.owner.ownerModel.PetType;
-import org.springframework.samples.petclinic.owner.Visit;
+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;