From 5694967a71be80a263585938c2c063f0f11331af Mon Sep 17 00:00:00 2001 From: PEDSF Date: Wed, 2 Dec 2020 17:59:49 +0100 Subject: [PATCH] refactoring controllers in common and business --- .../{system => configuration}/CacheConfiguration.java | 2 +- .../controller/{ => business}/OwnerController.java | 3 ++- .../petclinic/controller/{ => business}/PetController.java | 3 ++- .../petclinic/controller/{ => business}/VetController.java | 3 ++- .../controller/{ => business}/VisitController.java | 3 ++- .../{system => controller/common}/CrashController.java | 2 +- .../petclinic/controller/{ => common}/UserController.java | 3 ++- .../petclinic/controller/{ => common}/WebSocketSender.java | 2 +- .../{system => controller/common}/WelcomeController.java | 2 +- .../{ => business}/OwnerControllerIntegrationTest.java | 4 +++- .../controller/{ => business}/OwnerControllerTest.java | 5 ++++- .../{ => business}/PetControllerIntegrationTest.java | 4 +++- .../controller/{ => business}/PetControllerTest.java | 7 +++---- .../{ => business}/VetControllerIntegrationTest.java | 4 +++- .../controller/{ => business}/VetControllerTest.java | 4 +++- .../{ => business}/VisitControllerIntegrationTest.java | 3 ++- .../controller/{ => business}/VisitControllerTest.java | 4 +++- .../{system => controller/common}/CrashControllerTest.java | 3 ++- 18 files changed, 40 insertions(+), 21 deletions(-) rename src/main/java/org/springframework/samples/petclinic/{system => configuration}/CacheConfiguration.java (96%) mode change 100755 => 100644 rename src/main/java/org/springframework/samples/petclinic/controller/{ => business}/OwnerController.java (97%) rename src/main/java/org/springframework/samples/petclinic/controller/{ => business}/PetController.java (96%) rename src/main/java/org/springframework/samples/petclinic/controller/{ => business}/VetController.java (94%) rename src/main/java/org/springframework/samples/petclinic/controller/{ => business}/VisitController.java (96%) rename src/main/java/org/springframework/samples/petclinic/{system => controller/common}/CrashController.java (94%) rename src/main/java/org/springframework/samples/petclinic/controller/{ => common}/UserController.java (98%) rename src/main/java/org/springframework/samples/petclinic/controller/{ => common}/WebSocketSender.java (95%) rename src/main/java/org/springframework/samples/petclinic/{system => controller/common}/WelcomeController.java (92%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/OwnerControllerIntegrationTest.java (95%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/OwnerControllerTest.java (98%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/PetControllerIntegrationTest.java (96%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/PetControllerTest.java (97%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/VetControllerIntegrationTest.java (93%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/VetControllerTest.java (95%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/VisitControllerIntegrationTest.java (96%) rename src/test/java/org/springframework/samples/petclinic/controller/{ => business}/VisitControllerTest.java (96%) rename src/test/java/org/springframework/samples/petclinic/{system => controller/common}/CrashControllerTest.java (94%) diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/configuration/CacheConfiguration.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java rename to src/main/java/org/springframework/samples/petclinic/configuration/CacheConfiguration.java index 51ba24f22..040419475 --- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java +++ b/src/main/java/org/springframework/samples/petclinic/configuration/CacheConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.configuration; import javax.cache.configuration.MutableConfiguration; diff --git a/src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java b/src/main/java/org/springframework/samples/petclinic/controller/business/OwnerController.java similarity index 97% rename from src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java rename to src/main/java/org/springframework/samples/petclinic/controller/business/OwnerController.java index 8f5bfef83..d8fa50824 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/OwnerController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/business/OwnerController.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import org.springframework.samples.petclinic.common.*; +import org.springframework.samples.petclinic.controller.common.WebSocketSender; import org.springframework.samples.petclinic.dto.business.OwnerDTO; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.service.business.OwnerService; diff --git a/src/main/java/org/springframework/samples/petclinic/controller/PetController.java b/src/main/java/org/springframework/samples/petclinic/controller/business/PetController.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/controller/PetController.java rename to src/main/java/org/springframework/samples/petclinic/controller/business/PetController.java index d325bfee1..86c9d2bfe 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/PetController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/business/PetController.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.samples.petclinic.common.*; +import org.springframework.samples.petclinic.controller.common.WebSocketSender; import org.springframework.samples.petclinic.dto.business.OwnerDTO; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.PetTypeDTO; diff --git a/src/main/java/org/springframework/samples/petclinic/controller/VetController.java b/src/main/java/org/springframework/samples/petclinic/controller/business/VetController.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/controller/VetController.java rename to src/main/java/org/springframework/samples/petclinic/controller/business/VetController.java index b75960553..3342c5386 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/VetController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/business/VetController.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; import org.springframework.samples.petclinic.common.CommonWebSocket; +import org.springframework.samples.petclinic.controller.common.WebSocketSender; import org.springframework.samples.petclinic.dto.business.VetsDTO; import org.springframework.samples.petclinic.service.business.VetService; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/springframework/samples/petclinic/controller/VisitController.java b/src/main/java/org/springframework/samples/petclinic/controller/business/VisitController.java similarity index 96% rename from src/main/java/org/springframework/samples/petclinic/controller/VisitController.java rename to src/main/java/org/springframework/samples/petclinic/controller/business/VisitController.java index 02bf901c1..12a94dff9 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/VisitController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/business/VisitController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import java.util.Map; @@ -23,6 +23,7 @@ import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; import org.springframework.samples.petclinic.common.CommonWebSocket; +import org.springframework.samples.petclinic.controller.common.WebSocketSender; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.VisitDTO; import org.springframework.samples.petclinic.service.business.PetService; diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/src/main/java/org/springframework/samples/petclinic/controller/common/CrashController.java similarity index 94% rename from src/main/java/org/springframework/samples/petclinic/system/CrashController.java rename to src/main/java/org/springframework/samples/petclinic/controller/common/CrashController.java index 2b28600fd..3648b2721 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/common/CrashController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.controller.common; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/springframework/samples/petclinic/controller/UserController.java b/src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java similarity index 98% rename from src/main/java/org/springframework/samples/petclinic/controller/UserController.java rename to src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java index 47c2358fc..df89a09c6 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/UserController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/common/UserController.java @@ -1,10 +1,11 @@ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.common; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ResolvableType; import org.springframework.data.repository.query.Param; import org.springframework.samples.petclinic.common.*; +import org.springframework.samples.petclinic.controller.common.WebSocketSender; import org.springframework.samples.petclinic.dto.common.CredentialDTO; import org.springframework.samples.petclinic.dto.common.MessageDTO; import org.springframework.samples.petclinic.dto.common.UserDTO; diff --git a/src/main/java/org/springframework/samples/petclinic/controller/WebSocketSender.java b/src/main/java/org/springframework/samples/petclinic/controller/common/WebSocketSender.java similarity index 95% rename from src/main/java/org/springframework/samples/petclinic/controller/WebSocketSender.java rename to src/main/java/org/springframework/samples/petclinic/controller/common/WebSocketSender.java index 394fea208..57673ecf3 100644 --- a/src/main/java/org/springframework/samples/petclinic/controller/WebSocketSender.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/common/WebSocketSender.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.common; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessagingTemplate; diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/controller/common/WelcomeController.java similarity index 92% rename from src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java rename to src/main/java/org/springframework/samples/petclinic/controller/common/WelcomeController.java index 9224015bc..e9d5a8224 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/src/main/java/org/springframework/samples/petclinic/controller/common/WelcomeController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.controller.common; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/OwnerControllerIntegrationTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/OwnerControllerIntegrationTest.java similarity index 95% rename from src/test/java/org/springframework/samples/petclinic/controller/OwnerControllerIntegrationTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/OwnerControllerIntegrationTest.java index 4db0104a3..af9968dce 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/OwnerControllerIntegrationTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/OwnerControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.*; @@ -9,6 +9,8 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.OwnerController; import org.springframework.samples.petclinic.dto.business.OwnerDTO; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.PetTypeDTO; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/OwnerControllerTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/OwnerControllerTest.java similarity index 98% rename from src/test/java/org/springframework/samples/petclinic/controller/OwnerControllerTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/OwnerControllerTest.java index ce0a19e4e..9a32e6b8c 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/OwnerControllerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/OwnerControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import java.time.LocalDate; import java.util.Collections; @@ -36,6 +36,9 @@ import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonError; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.OwnerController; +import org.springframework.samples.petclinic.controller.common.WebSocketSender; import org.springframework.samples.petclinic.dto.business.OwnerDTO; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.PetTypeDTO; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/PetControllerIntegrationTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/PetControllerIntegrationTest.java similarity index 96% rename from src/test/java/org/springframework/samples/petclinic/controller/PetControllerIntegrationTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/PetControllerIntegrationTest.java index 06eb34506..d653034ea 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/PetControllerIntegrationTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/PetControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.*; @@ -9,6 +9,8 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.PetController; import org.springframework.samples.petclinic.dto.business.OwnerDTO; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.repository.PetRepository; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/PetControllerTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/PetControllerTest.java similarity index 97% rename from src/test/java/org/springframework/samples/petclinic/controller/PetControllerTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/PetControllerTest.java index 978b43da4..e2b68e1cb 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/PetControllerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/PetControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -41,6 +41,8 @@ import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonError; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.PetController; import org.springframework.samples.petclinic.dto.business.OwnerDTO; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.PetTypeDTO; @@ -49,12 +51,9 @@ import org.springframework.samples.petclinic.service.business.OwnerService; import org.springframework.samples.petclinic.service.business.PetService; import org.springframework.samples.petclinic.service.business.PetTypeService; import org.springframework.samples.petclinic.service.common.UserDetailsServiceImpl; -import org.springframework.samples.petclinic.validator.PetDTOValidator; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; /** * Test class for the {@link PetController} diff --git a/src/test/java/org/springframework/samples/petclinic/controller/VetControllerIntegrationTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/VetControllerIntegrationTest.java similarity index 93% rename from src/test/java/org/springframework/samples/petclinic/controller/VetControllerIntegrationTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/VetControllerIntegrationTest.java index 0b8907985..77ffbbaea 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/VetControllerIntegrationTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/VetControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,6 +14,8 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.VetController; import org.springframework.samples.petclinic.dto.business.VetsDTO; import org.springframework.samples.petclinic.repository.VetRepository; import org.springframework.samples.petclinic.service.business.VetService; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/VetControllerTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/VetControllerTest.java similarity index 95% rename from src/test/java/org/springframework/samples/petclinic/controller/VetControllerTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/VetControllerTest.java index 118e3e02b..ed1367b2c 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/VetControllerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/VetControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @@ -37,6 +37,8 @@ import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.VetController; import org.springframework.samples.petclinic.dto.business.SpecialtyDTO; import org.springframework.samples.petclinic.dto.business.VetDTO; import org.springframework.samples.petclinic.dto.business.VetsDTO; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerIntegrationTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/VisitControllerIntegrationTest.java similarity index 96% rename from src/test/java/org/springframework/samples/petclinic/controller/VisitControllerIntegrationTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/VisitControllerIntegrationTest.java index 702210fd9..793d1e209 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerIntegrationTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/VisitControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.*; @@ -9,6 +9,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.VisitDTO; import org.springframework.samples.petclinic.model.business.Visit; diff --git a/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTest.java b/src/test/java/org/springframework/samples/petclinic/controller/business/VisitControllerTest.java similarity index 96% rename from src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/business/VisitControllerTest.java index f28899911..207a8e5a4 100644 --- a/src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/business/VisitControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.controller; +package org.springframework.samples.petclinic.controller.business; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @@ -36,6 +36,8 @@ import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.samples.petclinic.common.CommonAttribute; import org.springframework.samples.petclinic.common.CommonEndPoint; import org.springframework.samples.petclinic.common.CommonView; +import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.business.VisitController; import org.springframework.samples.petclinic.dto.business.PetDTO; import org.springframework.samples.petclinic.dto.business.PetTypeDTO; import org.springframework.samples.petclinic.dto.business.VisitDTO; diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTest.java b/src/test/java/org/springframework/samples/petclinic/controller/common/CrashControllerTest.java similarity index 94% rename from src/test/java/org/springframework/samples/petclinic/system/CrashControllerTest.java rename to src/test/java/org/springframework/samples/petclinic/controller/common/CrashControllerTest.java index 946247a86..88ef8b8c8 100644 --- a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/controller/common/CrashControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.controller.common; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -23,6 +23,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.samples.petclinic.controller.WebSecurityConfig; +import org.springframework.samples.petclinic.controller.common.CrashController; import org.springframework.samples.petclinic.service.common.UserDetailsServiceImpl; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.MockMvc;