diff --git a/design-patterns/README.md b/design-patterns/README.md deleted file mode 100644 index 2cca13c9b9..0000000000 --- a/design-patterns/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## Article related - -- [The DTO Pattern (Data Transfer Object)]() - - diff --git a/design-patterns/dto-pattern/pom.xml b/design-patterns/dto-pattern/pom.xml deleted file mode 100644 index 19f66ac596..0000000000 --- a/design-patterns/dto-pattern/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - com.baeldung.designpatterns.dtopattern - 4.0.0 - dto-pattern - dto-pattern - - - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../../parent-boot-2 - - - - - org.springframework.boot - spring-boot-starter-web - - - - - 1.8 - 1.8 - UTF-8 - - - \ No newline at end of file diff --git a/design-patterns/pom.xml b/design-patterns/pom.xml deleted file mode 100644 index 5fc0e95b2b..0000000000 --- a/design-patterns/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - com.baeldung.designpatterns - design-patterns - 1.0.0-SNAPSHOT - design-patterns - pom - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - dto-pattern - - - \ No newline at end of file diff --git a/patterns/design-patterns-architectural/pom.xml b/patterns/design-patterns-architectural/pom.xml index c917744757..02716d7a10 100644 --- a/patterns/design-patterns-architectural/pom.xml +++ b/patterns/design-patterns-architectural/pom.xml @@ -15,6 +15,21 @@ + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + + + io.rest-assured + rest-assured + ${rest-assured.version} + org.assertj assertj-core @@ -38,6 +53,9 @@ 3.9.1 5.2.16.Final 6.0.6 + 2.5.3 + 3.3.0 + \ No newline at end of file diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/Main.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java similarity index 84% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/Main.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java index ae6c03f856..3177c06c46 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/Main.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern; +package com.baeldung.dtopattern; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/Mapper.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java similarity index 78% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/Mapper.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java index 7f9466b6a4..3440dad23c 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/Mapper.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java @@ -1,7 +1,7 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; -import com.baeldung.designpatterns.dtopattern.domain.Role; -import com.baeldung.designpatterns.dtopattern.domain.User; +import com.baeldung.dtopattern.domain.Role; +import com.baeldung.dtopattern.domain.User; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserController.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java similarity index 81% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserController.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java index 8866d1236f..2abd483c81 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserController.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java @@ -1,8 +1,8 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; -import com.baeldung.designpatterns.dtopattern.domain.RoleService; -import com.baeldung.designpatterns.dtopattern.domain.User; -import com.baeldung.designpatterns.dtopattern.domain.UserService; +import com.baeldung.dtopattern.domain.RoleService; +import com.baeldung.dtopattern.domain.User; +import com.baeldung.dtopattern.domain.UserService; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserCreationDTO.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java similarity index 91% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserCreationDTO.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java index 3a38547cbd..47786a9f15 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserCreationDTO.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; import java.util.List; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserDTO.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java similarity index 86% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserDTO.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java index 41d4ac2dc9..c00de0077b 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserDTO.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; import java.util.List; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserIdDTO.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java similarity index 76% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserIdDTO.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java index 0a4a6c8291..33bd336a4f 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/api/UserIdDTO.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; public class UserIdDTO { diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/InMemoryRepository.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java similarity index 95% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/InMemoryRepository.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java index c947519786..e138b51328 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/InMemoryRepository.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import org.springframework.stereotype.Service; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/Role.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java similarity index 89% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/Role.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java index c671741720..fa049421f8 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/Role.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import java.util.Objects; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/RoleRepository.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java similarity index 70% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/RoleRepository.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java index d43ea709f3..1e4383672b 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/RoleRepository.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; public interface RoleRepository { Role getRoleById(String id); diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/RoleService.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java similarity index 91% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/RoleService.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java index 4a5b371fa2..f1d6b639cb 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/RoleService.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import org.springframework.stereotype.Service; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/User.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java similarity index 97% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/User.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java index 086c701620..fcc7629910 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/User.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import javax.crypto.*; import javax.crypto.spec.SecretKeySpec; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/UserRepository.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java similarity index 70% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/UserRepository.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java index 504f328118..fe62c6c70e 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/UserRepository.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import java.util.List; diff --git a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/UserService.java b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java similarity index 89% rename from design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/UserService.java rename to patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java index 3b5ac86974..ec65d61823 100644 --- a/design-patterns/dto-pattern/src/main/java/com/baeldung/designpatterns/dtopattern/domain/UserService.java +++ b/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import org.springframework.stereotype.Service; diff --git a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/api/MapperUnitTest.java b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java similarity index 89% rename from design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/api/MapperUnitTest.java rename to patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java index 8728f6952e..97ccad1feb 100644 --- a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/api/MapperUnitTest.java +++ b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java @@ -1,7 +1,7 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; -import com.baeldung.designpatterns.dtopattern.domain.Role; -import com.baeldung.designpatterns.dtopattern.domain.User; +import com.baeldung.dtopattern.domain.Role; +import com.baeldung.dtopattern.domain.User; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/api/UserControllerIntegrationTest.java b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java similarity index 87% rename from design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/api/UserControllerIntegrationTest.java rename to patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java index 2cb351ffd1..13739f4c83 100644 --- a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/api/UserControllerIntegrationTest.java +++ b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java @@ -1,9 +1,9 @@ -package com.baeldung.designpatterns.dtopattern.api; +package com.baeldung.dtopattern.api; -import com.baeldung.designpatterns.dtopattern.domain.Role; -import com.baeldung.designpatterns.dtopattern.domain.RoleRepository; -import com.baeldung.designpatterns.dtopattern.domain.User; -import com.baeldung.designpatterns.dtopattern.domain.UserRepository; +import com.baeldung.dtopattern.domain.Role; +import com.baeldung.dtopattern.domain.RoleRepository; +import com.baeldung.dtopattern.domain.User; +import com.baeldung.dtopattern.domain.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; import io.restassured.http.ContentType; import org.junit.jupiter.api.Test; diff --git a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/domain/InMemoryRepositoryUnitTest.java b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java similarity index 97% rename from design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/domain/InMemoryRepositoryUnitTest.java rename to patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java index cc16005f01..8b05e962fa 100644 --- a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/domain/InMemoryRepositoryUnitTest.java +++ b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import org.junit.jupiter.api.Test; diff --git a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/domain/UserUnitTest.java b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java similarity index 94% rename from design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/domain/UserUnitTest.java rename to patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java index 0af2c37cb5..9ee0568a0d 100644 --- a/design-patterns/dto-pattern/src/test/java/com/baeldung/designpatterns/dtopattern/domain/UserUnitTest.java +++ b/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.designpatterns.dtopattern.domain; +package com.baeldung.dtopattern.domain; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index b82a044893..059c6dae25 100644 --- a/pom.xml +++ b/pom.xml @@ -387,7 +387,6 @@ core-groovy-strings core-java-modules - design-patterns couchbase custom-pmd