From 2884dca9b6b0d6430ad51096d962674d7e59357c Mon Sep 17 00:00:00 2001 From: Vicaria Barker Date: Thu, 25 Nov 2021 12:36:09 +0100 Subject: [PATCH 1/6] Renamed service package to rest --- .../{service => rest}/v1/ProductRestService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/devonfw/quarkus/productmanagement/{service => rest}/v1/ProductRestService.java (98%) diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java similarity index 98% rename from src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java rename to src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java index 4cb9c128..f6e14971 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java @@ -1,4 +1,4 @@ -package com.devonfw.quarkus.productmanagement.service.v1; +package com.devonfw.quarkus.productmanagement.rest.v1; import javax.inject.Inject; import javax.ws.rs.BeanParam; From 71484ef2b414766aa0e2e5824afd6648f952e445 Mon Sep 17 00:00:00 2001 From: Vicaria Barker Date: Mon, 29 Nov 2021 10:39:28 +0100 Subject: [PATCH 2/6] Moved classes from service.v1 package to rest.v1 in -reference --- .../{service => rest}/v1/mapper/ProductMapper.java | 2 +- .../{service => rest}/v1/model/NewProductDto.java | 2 +- .../{service => rest}/v1/model/ProductDto.java | 2 +- .../{service => rest}/v1/model/ProductSearchCriteriaDto.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/com/devonfw/quarkus/productmanagement/{service => rest}/v1/mapper/ProductMapper.java (90%) rename src/main/java/com/devonfw/quarkus/productmanagement/{service => rest}/v1/model/NewProductDto.java (88%) rename src/main/java/com/devonfw/quarkus/productmanagement/{service => rest}/v1/model/ProductDto.java (77%) rename src/main/java/com/devonfw/quarkus/productmanagement/{service => rest}/v1/model/ProductSearchCriteriaDto.java (89%) diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/mapper/ProductMapper.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java similarity index 90% rename from src/main/java/com/devonfw/quarkus/productmanagement/service/v1/mapper/ProductMapper.java rename to src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java index 46c1f856..0c8d90a0 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/mapper/ProductMapper.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java @@ -1,4 +1,4 @@ -package com.devonfw.quarkus.productmanagement.service.v1.mapper; +package com.devonfw.quarkus.productmanagement.rest.v1.mapper; import java.util.List; diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/NewProductDto.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/NewProductDto.java similarity index 88% rename from src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/NewProductDto.java rename to src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/NewProductDto.java index 69cf8119..23326e7a 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/NewProductDto.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/NewProductDto.java @@ -1,4 +1,4 @@ -package com.devonfw.quarkus.productmanagement.service.v1.model; +package com.devonfw.quarkus.productmanagement.rest.v1.model; import java.math.BigDecimal; diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/ProductDto.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/ProductDto.java similarity index 77% rename from src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/ProductDto.java rename to src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/ProductDto.java index c3dd0465..1beadbe1 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/ProductDto.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/ProductDto.java @@ -1,4 +1,4 @@ -package com.devonfw.quarkus.productmanagement.service.v1.model; +package com.devonfw.quarkus.productmanagement.rest.v1.model; import java.math.BigDecimal; diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/ProductSearchCriteriaDto.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/ProductSearchCriteriaDto.java similarity index 89% rename from src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/ProductSearchCriteriaDto.java rename to src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/ProductSearchCriteriaDto.java index 1ad69ed5..d57d17db 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/model/ProductSearchCriteriaDto.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/model/ProductSearchCriteriaDto.java @@ -1,4 +1,4 @@ -package com.devonfw.quarkus.productmanagement.service.v1.model; +package com.devonfw.quarkus.productmanagement.rest.v1.model; import java.math.BigDecimal; From d17d5096a722a85977172de6df606028765e0b88 Mon Sep 17 00:00:00 2001 From: Vicaria Barker Date: Mon, 29 Nov 2021 10:58:11 +0100 Subject: [PATCH 3/6] Moved test classes from service.v1 package to rest.v1 in -reference --- .../{service => rest}/v1/ProductRestServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/test/java/com/devonfw/demoquarkus/{service => rest}/v1/ProductRestServiceTest.java (98%) diff --git a/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java b/src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java similarity index 98% rename from src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java rename to src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java index 20b7e2e2..19661919 100644 --- a/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java +++ b/src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java @@ -1,4 +1,4 @@ -package com.devonfw.demoquarkus.service.v1; +package com.devonfw.demoquarkus.rest.v1; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; From 40971b012101292befbc1c5e765337324fb59f8c Mon Sep 17 00:00:00 2001 From: Vicaria Barker Date: Mon, 29 Nov 2021 11:41:37 +0100 Subject: [PATCH 4/6] Made final changes from service to rest in import statements --- .../productmanagement/domain/repo/ProductFragment.java | 2 +- .../productmanagement/domain/repo/ProductFragmentImpl.java | 2 +- .../quarkus/productmanagement/logic/UcFindProduct.java | 4 ++-- .../quarkus/productmanagement/logic/UcFindProductImpl.java | 6 +++--- .../quarkus/productmanagement/logic/UcManageProduct.java | 4 ++-- .../productmanagement/logic/UcManageProductImpl.java | 6 +++--- .../productmanagement/rest/v1/ProductRestService.java | 6 +++--- .../productmanagement/rest/v1/mapper/ProductMapper.java | 4 ++-- .../devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragment.java b/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragment.java index 576fba29..32fafaaa 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragment.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragment.java @@ -3,7 +3,7 @@ import org.springframework.data.domain.Page; import com.devonfw.quarkus.productmanagement.domain.model.ProductEntity; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductSearchCriteriaDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductSearchCriteriaDto; public interface ProductFragment { public Page findAllCriteriaApi(ProductSearchCriteriaDto dto); diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragmentImpl.java b/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragmentImpl.java index 3c7e0c78..d1a0e06d 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragmentImpl.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/domain/repo/ProductFragmentImpl.java @@ -19,7 +19,7 @@ import com.devonfw.quarkus.productmanagement.domain.model.ProductEntity; import com.devonfw.quarkus.productmanagement.domain.model.ProductEntity_; import com.devonfw.quarkus.productmanagement.domain.model.QProductEntity; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductSearchCriteriaDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductSearchCriteriaDto; import com.querydsl.jpa.impl.JPAQuery; public class ProductFragmentImpl implements ProductFragment { diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProduct.java b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProduct.java index 487232d8..67f33064 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProduct.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProduct.java @@ -2,8 +2,8 @@ import org.springframework.data.domain.Page; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductSearchCriteriaDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductSearchCriteriaDto; public interface UcFindProduct { Page findProducts(ProductSearchCriteriaDto dto); diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProductImpl.java b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProductImpl.java index 759f7dc0..6590ade9 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProductImpl.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcFindProductImpl.java @@ -13,9 +13,9 @@ import com.devonfw.quarkus.productmanagement.domain.model.ProductEntity; import com.devonfw.quarkus.productmanagement.domain.repo.ProductRepository; -import com.devonfw.quarkus.productmanagement.service.v1.mapper.ProductMapper; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductSearchCriteriaDto; +import com.devonfw.quarkus.productmanagement.rest.v1.mapper.ProductMapper; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductSearchCriteriaDto; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProduct.java b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProduct.java index 1b8cf630..cf8d6892 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProduct.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProduct.java @@ -1,7 +1,7 @@ package com.devonfw.quarkus.productmanagement.logic; -import com.devonfw.quarkus.productmanagement.service.v1.model.NewProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.NewProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; public interface UcManageProduct { ProductDto saveProduct(NewProductDto dto); diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProductImpl.java b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProductImpl.java index d79477a3..4d51a02e 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProductImpl.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/logic/UcManageProductImpl.java @@ -6,9 +6,9 @@ import com.devonfw.quarkus.productmanagement.domain.model.ProductEntity; import com.devonfw.quarkus.productmanagement.domain.repo.ProductRepository; -import com.devonfw.quarkus.productmanagement.service.v1.mapper.ProductMapper; -import com.devonfw.quarkus.productmanagement.service.v1.model.NewProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.mapper.ProductMapper; +import com.devonfw.quarkus.productmanagement.rest.v1.model.NewProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; @Named @Transactional diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java index f6e14971..7778e7a5 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/ProductRestService.java @@ -24,9 +24,9 @@ import com.devonfw.quarkus.productmanagement.logic.UcFindProduct; import com.devonfw.quarkus.productmanagement.logic.UcManageProduct; -import com.devonfw.quarkus.productmanagement.service.v1.model.NewProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductSearchCriteriaDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.NewProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductSearchCriteriaDto; //In Quarkus all JAX-RS resources are treated as CDI beans //default is Singleton scope diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java index 0c8d90a0..a4b3f930 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/rest/v1/mapper/ProductMapper.java @@ -6,8 +6,8 @@ import org.tkit.quarkus.rs.mappers.OffsetDateTimeMapper; import com.devonfw.quarkus.productmanagement.domain.model.ProductEntity; -import com.devonfw.quarkus.productmanagement.service.v1.model.NewProductDto; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.NewProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; //mapstruct will generate an impl class(CDI bean, see pom.xml) from this interface at compile time @Mapper(uses = OffsetDateTimeMapper.class) diff --git a/src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java b/src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java index 19661919..6935e7c3 100644 --- a/src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java +++ b/src/test/java/com/devonfw/demoquarkus/rest/v1/ProductRestServiceTest.java @@ -16,7 +16,7 @@ import org.tkit.quarkus.test.WithDBData; import org.tkit.quarkus.test.docker.DockerComposeTestResource; -import com.devonfw.quarkus.productmanagement.service.v1.model.ProductDto; +import com.devonfw.quarkus.productmanagement.rest.v1.model.ProductDto; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; From 7d362349f716d833497776eed74a5e7cd24e618a Mon Sep 17 00:00:00 2001 From: Vicaria Barker Date: Tue, 14 Dec 2021 16:31:39 +0100 Subject: [PATCH 5/6] Removed Tkit section --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 0786e10f..4d1b4e2d 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,6 @@ You can run your application in dev mode that enables live coding using: You can run tests from your IDE or via Maven. Simply run `./mvnw test ` or `./mvnw package` -## Tkit quarkus - -Adding tkit libs to our project gives us several new features. Check the logs for example, all our business methods are now logged and timed. -The REST API now handles exceptions gracefully(as JSON response), and we get server side pagination with very little effort. -Our tests are now real integration tests with real postgres DB, and are stuitable for CI envs. - ## Access your REST endpoint Go to http://localhost:8080/animals From 79364c842e84cd7565072aa7ada82fc4d7049452 Mon Sep 17 00:00:00 2001 From: Vicaria Barker Date: Tue, 14 Dec 2021 16:38:28 +0100 Subject: [PATCH 6/6] Renamed service to rest in PostgresResource --- .../java/com/devonfw/demoquarkus/rest/v1/PostgresResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/devonfw/demoquarkus/rest/v1/PostgresResource.java b/src/test/java/com/devonfw/demoquarkus/rest/v1/PostgresResource.java index 69e669dd..3d985742 100644 --- a/src/test/java/com/devonfw/demoquarkus/rest/v1/PostgresResource.java +++ b/src/test/java/com/devonfw/demoquarkus/rest/v1/PostgresResource.java @@ -1,4 +1,4 @@ -package com.devonfw.demoquarkus.service.v1; +package com.devonfw.demoquarkus.rest.v1; import java.util.Collections; import java.util.Map;