From 16f43c6172e50647a7507f553abe38a8b8af4cb1 Mon Sep 17 00:00:00 2001 From: Denis Savosin Date: Wed, 2 Oct 2024 12:05:21 +0700 Subject: [PATCH] create http package, move http classes to that package --- .../demo/{ => http}/controllers/GreetingController.kt | 2 +- .../demo/{ => http}/controllers/ProductController.kt | 10 +++++----- .../demo/{ => http}/controllers/ShopController.kt | 4 ++-- .../demo/{ => http}/exceptions/ExceptionHandler.kt | 10 +++++----- .../demo/{ => http}/exceptions/NotFoundException.kt | 2 +- .../{ => http}/exceptions/UnprocessableException.kt | 2 +- .../demo/{ => http}/requests/CreateProductRequest.kt | 2 +- .../demo/{ => http}/responses/BadRequestResponse.kt | 2 +- .../example/demo/{ => http}/responses/BaseResponse.kt | 2 +- .../demo/{ => http}/responses/ResponseStatus.kt | 2 +- .../demo/{ => http}/responses/UnprocessableResponse.kt | 2 +- .../kotlin/com/example/demo/services/CityService.kt | 4 ++-- .../com/example/demo/services/CityServiceImpl.kt | 4 ++-- .../kotlin/com/example/demo/services/ProductService.kt | 4 ++-- .../com/example/demo/services/ProductServiceImpl.kt | 4 ++-- .../{ => http}/controllers/GreetingControllerTest.kt | 3 ++- .../{ => http}/controllers/ProductControllerTest.kt | 5 +++-- .../demo/{ => http}/controllers/ShopControllerTest.kt | 3 ++- .../demo/services/ProductServiceImplFeatureTest.kt | 4 ++-- .../example/demo/services/ProductServiceImplTest.kt | 2 +- 20 files changed, 38 insertions(+), 35 deletions(-) rename src/main/kotlin/com/example/demo/{ => http}/controllers/GreetingController.kt (92%) rename src/main/kotlin/com/example/demo/{ => http}/controllers/ProductController.kt (88%) rename src/main/kotlin/com/example/demo/{ => http}/controllers/ShopController.kt (92%) rename src/main/kotlin/com/example/demo/{ => http}/exceptions/ExceptionHandler.kt (83%) rename src/main/kotlin/com/example/demo/{ => http}/exceptions/NotFoundException.kt (52%) rename src/main/kotlin/com/example/demo/{ => http}/exceptions/UnprocessableException.kt (67%) rename src/main/kotlin/com/example/demo/{ => http}/requests/CreateProductRequest.kt (89%) rename src/main/kotlin/com/example/demo/{ => http}/responses/BadRequestResponse.kt (83%) rename src/main/kotlin/com/example/demo/{ => http}/responses/BaseResponse.kt (84%) rename src/main/kotlin/com/example/demo/{ => http}/responses/ResponseStatus.kt (84%) rename src/main/kotlin/com/example/demo/{ => http}/responses/UnprocessableResponse.kt (91%) rename src/test/kotlin/com/example/demo/{ => http}/controllers/GreetingControllerTest.kt (91%) rename src/test/kotlin/com/example/demo/{ => http}/controllers/ProductControllerTest.kt (97%) rename src/test/kotlin/com/example/demo/{ => http}/controllers/ShopControllerTest.kt (97%) diff --git a/src/main/kotlin/com/example/demo/controllers/GreetingController.kt b/src/main/kotlin/com/example/demo/http/controllers/GreetingController.kt similarity index 92% rename from src/main/kotlin/com/example/demo/controllers/GreetingController.kt rename to src/main/kotlin/com/example/demo/http/controllers/GreetingController.kt index c1ccdf6..77eb131 100644 --- a/src/main/kotlin/com/example/demo/controllers/GreetingController.kt +++ b/src/main/kotlin/com/example/demo/http/controllers/GreetingController.kt @@ -1,4 +1,4 @@ -package com.example.demo.controllers +package com.example.demo.http.controllers import com.example.demo.provider.html.renderProductTable import org.springframework.web.bind.annotation.GetMapping diff --git a/src/main/kotlin/com/example/demo/controllers/ProductController.kt b/src/main/kotlin/com/example/demo/http/controllers/ProductController.kt similarity index 88% rename from src/main/kotlin/com/example/demo/controllers/ProductController.kt rename to src/main/kotlin/com/example/demo/http/controllers/ProductController.kt index 6ece5fc..c50fa58 100644 --- a/src/main/kotlin/com/example/demo/controllers/ProductController.kt +++ b/src/main/kotlin/com/example/demo/http/controllers/ProductController.kt @@ -1,9 +1,9 @@ -package com.example.demo.controllers +package com.example.demo.http.controllers -import com.example.demo.exceptions.NotFoundException -import com.example.demo.exceptions.UnprocessableException -import com.example.demo.requests.CreateProductRequest -import com.example.demo.responses.makeOkResponse +import com.example.demo.http.exceptions.NotFoundException +import com.example.demo.http.exceptions.UnprocessableException +import com.example.demo.http.requests.CreateProductRequest +import com.example.demo.http.responses.makeOkResponse import com.example.demo.services.ProductService import com.example.demo.services.kafka.exceptions.InvalidArgumentException import jakarta.validation.Valid diff --git a/src/main/kotlin/com/example/demo/controllers/ShopController.kt b/src/main/kotlin/com/example/demo/http/controllers/ShopController.kt similarity index 92% rename from src/main/kotlin/com/example/demo/controllers/ShopController.kt rename to src/main/kotlin/com/example/demo/http/controllers/ShopController.kt index f77741a..a15d7c2 100644 --- a/src/main/kotlin/com/example/demo/controllers/ShopController.kt +++ b/src/main/kotlin/com/example/demo/http/controllers/ShopController.kt @@ -1,6 +1,6 @@ -package com.example.demo.controllers +package com.example.demo.http.controllers -import com.example.demo.exceptions.NotFoundException +import com.example.demo.http.exceptions.NotFoundException import com.example.demo.provider.ShopProvider import jakarta.servlet.http.HttpServletResponse import kotlinx.serialization.json.Json diff --git a/src/main/kotlin/com/example/demo/exceptions/ExceptionHandler.kt b/src/main/kotlin/com/example/demo/http/exceptions/ExceptionHandler.kt similarity index 83% rename from src/main/kotlin/com/example/demo/exceptions/ExceptionHandler.kt rename to src/main/kotlin/com/example/demo/http/exceptions/ExceptionHandler.kt index af146e5..8514ce5 100644 --- a/src/main/kotlin/com/example/demo/exceptions/ExceptionHandler.kt +++ b/src/main/kotlin/com/example/demo/http/exceptions/ExceptionHandler.kt @@ -1,9 +1,9 @@ -package com.example.demo.exceptions +package com.example.demo.http.exceptions -import com.example.demo.responses.makeBadRequestResponse -import com.example.demo.responses.makeNotFoundResponse -import com.example.demo.responses.makeUnprocessableResponse -import com.example.demo.responses.makeUnprocessableResponseWithErrors +import com.example.demo.http.responses.makeBadRequestResponse +import com.example.demo.http.responses.makeNotFoundResponse +import com.example.demo.http.responses.makeUnprocessableResponse +import com.example.demo.http.responses.makeUnprocessableResponseWithErrors import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.http.converter.HttpMessageNotReadableException diff --git a/src/main/kotlin/com/example/demo/exceptions/NotFoundException.kt b/src/main/kotlin/com/example/demo/http/exceptions/NotFoundException.kt similarity index 52% rename from src/main/kotlin/com/example/demo/exceptions/NotFoundException.kt rename to src/main/kotlin/com/example/demo/http/exceptions/NotFoundException.kt index 4cc0fd6..9622937 100644 --- a/src/main/kotlin/com/example/demo/exceptions/NotFoundException.kt +++ b/src/main/kotlin/com/example/demo/http/exceptions/NotFoundException.kt @@ -1,3 +1,3 @@ -package com.example.demo.exceptions +package com.example.demo.http.exceptions class NotFoundException: RuntimeException() diff --git a/src/main/kotlin/com/example/demo/exceptions/UnprocessableException.kt b/src/main/kotlin/com/example/demo/http/exceptions/UnprocessableException.kt similarity index 67% rename from src/main/kotlin/com/example/demo/exceptions/UnprocessableException.kt rename to src/main/kotlin/com/example/demo/http/exceptions/UnprocessableException.kt index 76d6a4d..9b75038 100644 --- a/src/main/kotlin/com/example/demo/exceptions/UnprocessableException.kt +++ b/src/main/kotlin/com/example/demo/http/exceptions/UnprocessableException.kt @@ -1,3 +1,3 @@ -package com.example.demo.exceptions +package com.example.demo.http.exceptions class UnprocessableException(override val message: String): RuntimeException(message) \ No newline at end of file diff --git a/src/main/kotlin/com/example/demo/requests/CreateProductRequest.kt b/src/main/kotlin/com/example/demo/http/requests/CreateProductRequest.kt similarity index 89% rename from src/main/kotlin/com/example/demo/requests/CreateProductRequest.kt rename to src/main/kotlin/com/example/demo/http/requests/CreateProductRequest.kt index 447ec3f..c88e101 100644 --- a/src/main/kotlin/com/example/demo/requests/CreateProductRequest.kt +++ b/src/main/kotlin/com/example/demo/http/requests/CreateProductRequest.kt @@ -1,4 +1,4 @@ -package com.example.demo.requests +package com.example.demo.http.requests import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/com/example/demo/responses/BadRequestResponse.kt b/src/main/kotlin/com/example/demo/http/responses/BadRequestResponse.kt similarity index 83% rename from src/main/kotlin/com/example/demo/responses/BadRequestResponse.kt rename to src/main/kotlin/com/example/demo/http/responses/BadRequestResponse.kt index a227ac4..ce29dd9 100644 --- a/src/main/kotlin/com/example/demo/responses/BadRequestResponse.kt +++ b/src/main/kotlin/com/example/demo/http/responses/BadRequestResponse.kt @@ -1,4 +1,4 @@ -package com.example.demo.responses +package com.example.demo.http.responses data class BadRequestResponse( val cause: String, diff --git a/src/main/kotlin/com/example/demo/responses/BaseResponse.kt b/src/main/kotlin/com/example/demo/http/responses/BaseResponse.kt similarity index 84% rename from src/main/kotlin/com/example/demo/responses/BaseResponse.kt rename to src/main/kotlin/com/example/demo/http/responses/BaseResponse.kt index d03e341..da03cb6 100644 --- a/src/main/kotlin/com/example/demo/responses/BaseResponse.kt +++ b/src/main/kotlin/com/example/demo/http/responses/BaseResponse.kt @@ -1,4 +1,4 @@ -package com.example.demo.responses +package com.example.demo.http.responses open class BaseResponse(val status: ResponseStatus) diff --git a/src/main/kotlin/com/example/demo/responses/ResponseStatus.kt b/src/main/kotlin/com/example/demo/http/responses/ResponseStatus.kt similarity index 84% rename from src/main/kotlin/com/example/demo/responses/ResponseStatus.kt rename to src/main/kotlin/com/example/demo/http/responses/ResponseStatus.kt index cca92fd..8b3572a 100644 --- a/src/main/kotlin/com/example/demo/responses/ResponseStatus.kt +++ b/src/main/kotlin/com/example/demo/http/responses/ResponseStatus.kt @@ -1,4 +1,4 @@ -package com.example.demo.responses +package com.example.demo.http.responses import com.fasterxml.jackson.annotation.JsonValue diff --git a/src/main/kotlin/com/example/demo/responses/UnprocessableResponse.kt b/src/main/kotlin/com/example/demo/http/responses/UnprocessableResponse.kt similarity index 91% rename from src/main/kotlin/com/example/demo/responses/UnprocessableResponse.kt rename to src/main/kotlin/com/example/demo/http/responses/UnprocessableResponse.kt index 2b66600..070f3d4 100644 --- a/src/main/kotlin/com/example/demo/responses/UnprocessableResponse.kt +++ b/src/main/kotlin/com/example/demo/http/responses/UnprocessableResponse.kt @@ -1,4 +1,4 @@ -package com.example.demo.responses +package com.example.demo.http.responses import org.springframework.validation.ObjectError diff --git a/src/main/kotlin/com/example/demo/services/CityService.kt b/src/main/kotlin/com/example/demo/services/CityService.kt index c81b643..bd01ea1 100644 --- a/src/main/kotlin/com/example/demo/services/CityService.kt +++ b/src/main/kotlin/com/example/demo/services/CityService.kt @@ -1,7 +1,7 @@ package com.example.demo.services -import com.example.demo.exceptions.NotFoundException -import com.example.demo.exceptions.UnprocessableException +import com.example.demo.http.exceptions.NotFoundException +import com.example.demo.http.exceptions.UnprocessableException import com.example.demo.models.City import org.springframework.stereotype.Service import java.util.* diff --git a/src/main/kotlin/com/example/demo/services/CityServiceImpl.kt b/src/main/kotlin/com/example/demo/services/CityServiceImpl.kt index 376f92c..be1dd9d 100644 --- a/src/main/kotlin/com/example/demo/services/CityServiceImpl.kt +++ b/src/main/kotlin/com/example/demo/services/CityServiceImpl.kt @@ -1,7 +1,7 @@ package com.example.demo.services -import com.example.demo.exceptions.NotFoundException -import com.example.demo.exceptions.UnprocessableException +import com.example.demo.http.exceptions.NotFoundException +import com.example.demo.http.exceptions.UnprocessableException import com.example.demo.models.City import com.example.demo.provider.CityRepository import java.time.OffsetDateTime diff --git a/src/main/kotlin/com/example/demo/services/ProductService.kt b/src/main/kotlin/com/example/demo/services/ProductService.kt index 69f491c..ade3447 100644 --- a/src/main/kotlin/com/example/demo/services/ProductService.kt +++ b/src/main/kotlin/com/example/demo/services/ProductService.kt @@ -1,7 +1,7 @@ package com.example.demo.services -import com.example.demo.exceptions.NotFoundException -import com.example.demo.exceptions.UnprocessableException +import com.example.demo.http.exceptions.NotFoundException +import com.example.demo.http.exceptions.UnprocessableException import com.example.demo.models.Product import com.example.demo.services.kafka.exceptions.InvalidArgumentException import org.springframework.stereotype.Service diff --git a/src/main/kotlin/com/example/demo/services/ProductServiceImpl.kt b/src/main/kotlin/com/example/demo/services/ProductServiceImpl.kt index 92c9a11..56e8ec0 100644 --- a/src/main/kotlin/com/example/demo/services/ProductServiceImpl.kt +++ b/src/main/kotlin/com/example/demo/services/ProductServiceImpl.kt @@ -1,7 +1,7 @@ package com.example.demo.services -import com.example.demo.exceptions.NotFoundException -import com.example.demo.exceptions.UnprocessableException +import com.example.demo.http.exceptions.NotFoundException +import com.example.demo.http.exceptions.UnprocessableException import com.example.demo.models.Product import com.example.demo.provider.ProductRepository import com.example.demo.services.kafka.Producer diff --git a/src/test/kotlin/com/example/demo/controllers/GreetingControllerTest.kt b/src/test/kotlin/com/example/demo/http/controllers/GreetingControllerTest.kt similarity index 91% rename from src/test/kotlin/com/example/demo/controllers/GreetingControllerTest.kt rename to src/test/kotlin/com/example/demo/http/controllers/GreetingControllerTest.kt index a9aacc7..244595a 100644 --- a/src/test/kotlin/com/example/demo/controllers/GreetingControllerTest.kt +++ b/src/test/kotlin/com/example/demo/http/controllers/GreetingControllerTest.kt @@ -1,5 +1,6 @@ -package com.example.demo.controllers +package com.example.demo.http.controllers +import com.example.demo.http.controllers.GreetingController import org.hamcrest.core.StringContains import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest diff --git a/src/test/kotlin/com/example/demo/controllers/ProductControllerTest.kt b/src/test/kotlin/com/example/demo/http/controllers/ProductControllerTest.kt similarity index 97% rename from src/test/kotlin/com/example/demo/controllers/ProductControllerTest.kt rename to src/test/kotlin/com/example/demo/http/controllers/ProductControllerTest.kt index 65952cf..663eb9f 100644 --- a/src/test/kotlin/com/example/demo/controllers/ProductControllerTest.kt +++ b/src/test/kotlin/com/example/demo/http/controllers/ProductControllerTest.kt @@ -1,7 +1,8 @@ -package com.example.demo.controllers +package com.example.demo.http.controllers +import com.example.demo.http.controllers.ProductController import com.example.demo.models.Product -import com.example.demo.responses.ResponseStatus +import com.example.demo.http.responses.ResponseStatus import com.example.demo.services.ProductService import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import org.hamcrest.Matchers.contains diff --git a/src/test/kotlin/com/example/demo/controllers/ShopControllerTest.kt b/src/test/kotlin/com/example/demo/http/controllers/ShopControllerTest.kt similarity index 97% rename from src/test/kotlin/com/example/demo/controllers/ShopControllerTest.kt rename to src/test/kotlin/com/example/demo/http/controllers/ShopControllerTest.kt index ce64432..463c4ef 100644 --- a/src/test/kotlin/com/example/demo/controllers/ShopControllerTest.kt +++ b/src/test/kotlin/com/example/demo/http/controllers/ShopControllerTest.kt @@ -1,5 +1,6 @@ -package com.example.demo.controllers +package com.example.demo.http.controllers +import com.example.demo.http.controllers.ShopController import com.example.demo.models.* import com.example.demo.provider.ShopProvider import org.mockito.kotlin.doReturn diff --git a/src/test/kotlin/com/example/demo/services/ProductServiceImplFeatureTest.kt b/src/test/kotlin/com/example/demo/services/ProductServiceImplFeatureTest.kt index f83b534..6696618 100644 --- a/src/test/kotlin/com/example/demo/services/ProductServiceImplFeatureTest.kt +++ b/src/test/kotlin/com/example/demo/services/ProductServiceImplFeatureTest.kt @@ -1,8 +1,8 @@ package com.example.demo.services import com.example.demo.BaseFeatureTest -import com.example.demo.exceptions.NotFoundException -import com.example.demo.exceptions.UnprocessableException +import com.example.demo.http.exceptions.NotFoundException +import com.example.demo.http.exceptions.UnprocessableException import com.example.demo.models.Product import com.example.demo.provider.ProductRepository import org.junit.jupiter.api.assertThrows diff --git a/src/test/kotlin/com/example/demo/services/ProductServiceImplTest.kt b/src/test/kotlin/com/example/demo/services/ProductServiceImplTest.kt index e61d07f..a538925 100644 --- a/src/test/kotlin/com/example/demo/services/ProductServiceImplTest.kt +++ b/src/test/kotlin/com/example/demo/services/ProductServiceImplTest.kt @@ -1,6 +1,6 @@ package com.example.demo.services -import com.example.demo.exceptions.NotFoundException +import com.example.demo.http.exceptions.NotFoundException import com.example.demo.models.Product import com.example.demo.provider.ProductRepository import com.example.demo.services.kafka.Producer