From e12808bc5ab4a7758f11f44be661da411461159d Mon Sep 17 00:00:00 2001 From: mikr Date: Mon, 20 Jan 2020 09:05:47 +0100 Subject: [PATCH 1/8] BAEL-20595 Fix unit test in akka-http module --- .../test/java/com/baeldung/akkahttp/UserServerUnitTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java b/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java index 1170a2d761..b177439b0a 100644 --- a/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java +++ b/akka-http/src/test/java/com/baeldung/akkahttp/UserServerUnitTest.java @@ -28,10 +28,10 @@ public class UserServerUnitTest extends JUnitRouteTest { .assertStatusCode(404); appRoute.run(HttpRequest.DELETE("/users/1")) - .assertStatusCode(200); + .assertStatusCode(405); appRoute.run(HttpRequest.DELETE("/users/42")) - .assertStatusCode(200); + .assertStatusCode(405); appRoute.run(HttpRequest.POST("/users") .withEntity(HttpEntities.create(ContentTypes.APPLICATION_JSON, zaphod()))) From b0c3152a9c2e14d5c98ac7785eba0407a52877e7 Mon Sep 17 00:00:00 2001 From: mikr Date: Wed, 22 Jan 2020 08:48:27 +0100 Subject: [PATCH 2/8] BAEL-20598 Fix unit test in core-java-jndi module --- core-java-modules/core-java-jndi/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml index 5f1d01a9f5..e60ee35410 100644 --- a/core-java-modules/core-java-jndi/pom.xml +++ b/core-java-modules/core-java-jndi/pom.xml @@ -22,6 +22,17 @@ ${jupiter.version} test + + org.junit.jupiter + junit-jupiter-api + ${jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${jupiter.version} + org.springframework spring-core From 876cc21191cc7856e5e9a661e179b788ea62bd1e Mon Sep 17 00:00:00 2001 From: mikr Date: Wed, 22 Jan 2020 08:55:30 +0100 Subject: [PATCH 3/8] BAEL-20598 Merge master --- core-java-modules/core-java-jndi/pom.xml | 6 ------ .../baeldung/jndi/exceptions/JndiExceptionsUnitTest.java | 1 - 2 files changed, 7 deletions(-) diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml index 4b108292e1..482d07a999 100644 --- a/core-java-modules/core-java-jndi/pom.xml +++ b/core-java-modules/core-java-jndi/pom.xml @@ -21,12 +21,6 @@ ${jupiter.version} test - - org.junit.jupiter - junit-jupiter-api - 5.5.1 - test - org.junit.jupiter junit-jupiter-api diff --git a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java index 434fa41252..218807568c 100644 --- a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java +++ b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java @@ -17,7 +17,6 @@ import org.springframework.mock.jndi.SimpleNamingContextBuilder; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class JndiExceptionsUnitTest { - @Disabled @Test @Order(1) void givenNoContext_whenLookupObject_thenThrowNoInitialContext() { From 4f5d7a6631825f4aa6b37d41d373b74c9c591983 Mon Sep 17 00:00:00 2001 From: mikr Date: Sun, 26 Jan 2020 16:14:45 +0100 Subject: [PATCH 4/8] BAEL-21496 Move Jackson Simple Module --- jackson-modules/pom.xml | 1 - .../jackson-simple => jackson-simple}/README.md | 0 .../jackson-simple => jackson-simple}/pom.xml | 9 ++++++++- .../java/com/baeldung/jackson/annotation/AliasBean.java | 0 .../com/baeldung/jackson/annotation/BeanWithCreator.java | 0 .../jackson/annotation/BeanWithCustomAnnotation.java | 0 .../com/baeldung/jackson/annotation/BeanWithFilter.java | 0 .../com/baeldung/jackson/annotation/BeanWithGetter.java | 0 .../com/baeldung/jackson/annotation/BeanWithIgnore.java | 0 .../com/baeldung/jackson/annotation/BeanWithInject.java | 0 .../com/baeldung/jackson/annotation/ExtendableBean.java | 0 .../java/com/baeldung/jackson/annotation/MyBean.java | 0 .../com/baeldung/jackson/annotation/PrivateBean.java | 0 .../java/com/baeldung/jackson/annotation/RawBean.java | 0 .../com/baeldung/jackson/annotation/UnwrappedUser.java | 0 .../baeldung/jackson/annotation/UserWithIgnoreType.java | 0 .../main/java/com/baeldung/jackson/annotation/Zoo.java | 0 .../jackson/annotation/bidirection/ItemWithIdentity.java | 0 .../jackson/annotation/bidirection/ItemWithIgnore.java | 0 .../jackson/annotation/bidirection/ItemWithRef.java | 0 .../jackson/annotation/bidirection/UserWithIdentity.java | 0 .../jackson/annotation/bidirection/UserWithIgnore.java | 0 .../jackson/annotation/bidirection/UserWithRef.java | 0 .../jackson/annotation/date/CustomDateDeserializer.java | 0 .../jackson/annotation/date/CustomDateSerializer.java | 0 .../jackson/annotation/date/EventWithFormat.java | 0 .../jackson/annotation/date/EventWithSerializer.java | 0 .../deserialization/ItemDeserializerOnClass.java | 0 .../java/com/baeldung/jackson/annotation/dtos/Item.java | 0 .../jackson/annotation/dtos/ItemWithSerializer.java | 0 .../java/com/baeldung/jackson/annotation/dtos/User.java | 0 .../annotation/dtos/withEnum/DistanceEnumWithValue.java | 0 .../jackson/annotation/exception/UserWithRoot.java | 0 .../annotation/exception/UserWithRootNamespace.java | 0 .../jackson/annotation/ignore/MyMixInForIgnoreType.java | 0 .../com/baeldung/jackson/annotation/jsonview/Item.java | 0 .../com/baeldung/jackson/annotation/jsonview/Views.java | 0 .../jackson/annotation/serialization/ItemSerializer.java | 0 .../annotation/serialization/ItemSerializerOnClass.java | 0 .../src/main/java/com/baeldung/jackson/ignore/MyDto.java | 0 .../com/baeldung/jackson/ignore/MyDtoIgnoreField.java | 0 .../baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java | 0 .../com/baeldung/jackson/ignore/MyDtoIgnoreNull.java | 0 .../baeldung/jackson/ignore/MyDtoIncludeNonDefault.java | 0 .../com/baeldung/jackson/ignore/MyDtoWithFilter.java | 0 .../baeldung/jackson/ignore/MyDtoWithSpecialField.java | 0 .../baeldung/jackson/ignore/MyMixInForIgnoreType.java | 0 .../com/baeldung/jackson/ignorenullfields/MyDto.java | 0 .../jackson/ignorenullfields/MyDtoIgnoreNull.java | 0 .../java/com/baeldung/jackson/jsonproperty/MyDto.java | 0 .../jackson/jsonproperty/MyDtoFieldNameChanged.java | 0 .../jackson/objectmapper/CustomCarDeserializer.java | 0 .../jackson/objectmapper/CustomCarSerializer.java | 0 .../java/com/baeldung/jackson/objectmapper/dto/Car.java | 0 .../com/baeldung/jackson/objectmapper/dto/Request.java | 0 .../com/baeldung/jackson/unknownproperties/MyDto.java | 0 .../jackson/unknownproperties/MyDtoIgnoreType.java | 0 .../jackson/unknownproperties/MyDtoIgnoreUnknown.java | 0 .../src/main/resources/logback.xml | 0 .../jackson/annotation/JacksonAnnotationUnitTest.java | 0 .../jackson/ignore/IgnoreFieldsWithFilterUnitTest.java | 0 .../ignore/JacksonSerializationIgnoreUnitTest.java | 0 .../ignorenullfields/IgnoreNullFieldsUnitTest.java | 0 .../jackson/jsonproperty/JsonPropertyUnitTest.java | 0 .../objectmapper/JavaReadWriteJsonExampleUnitTest.java | 0 .../SerializationDeserializationFeatureUnitTest.java | 0 .../unknownproperties/UnknownPropertiesUnitTest.java | 0 .../src/test/resources/json_car.json | 0 pom.xml | 2 ++ 69 files changed, 10 insertions(+), 2 deletions(-) rename {jackson-modules/jackson-simple => jackson-simple}/README.md (100%) rename {jackson-modules/jackson-simple => jackson-simple}/pom.xml (77%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/AliasBean.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/MyBean.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/RawBean.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/Zoo.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/User.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDto.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/main/resources/logback.xml (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java (100%) rename {jackson-modules/jackson-simple => jackson-simple}/src/test/resources/json_car.json (100%) diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml index a8568c1950..4281710ac9 100644 --- a/jackson-modules/pom.xml +++ b/jackson-modules/pom.xml @@ -21,7 +21,6 @@ jackson-conversions-2 jackson-custom-conversions jackson-exceptions - jackson-simple diff --git a/jackson-modules/jackson-simple/README.md b/jackson-simple/README.md similarity index 100% rename from jackson-modules/jackson-simple/README.md rename to jackson-simple/README.md diff --git a/jackson-modules/jackson-simple/pom.xml b/jackson-simple/pom.xml similarity index 77% rename from jackson-modules/jackson-simple/pom.xml rename to jackson-simple/pom.xml index fef28e4359..f41df7085c 100644 --- a/jackson-modules/jackson-simple/pom.xml +++ b/jackson-simple/pom.xml @@ -8,11 +8,18 @@ com.baeldung - jackson-modules + parent-java 0.0.1-SNAPSHOT + ../parent-java + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + org.assertj diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/AliasBean.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCreator.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithCustomAnnotation.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithFilter.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithGetter.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithIgnore.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/BeanWithInject.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/ExtendableBean.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/MyBean.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/PrivateBean.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/RawBean.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/UnwrappedUser.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/UserWithIgnoreType.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/Zoo.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIdentity.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithIgnore.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/ItemWithRef.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIdentity.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithIgnore.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/bidirection/UserWithRef.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateDeserializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/CustomDateSerializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithFormat.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/date/EventWithSerializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/deserialization/ItemDeserializerOnClass.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/Item.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/ItemWithSerializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/User.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/dtos/withEnum/DistanceEnumWithValue.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRoot.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/exception/UserWithRootNamespace.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/ignore/MyMixInForIgnoreType.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Item.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/jsonview/Views.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java b/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java rename to jackson-simple/src/main/java/com/baeldung/jackson/annotation/serialization/ItemSerializerOnClass.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDto.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreField.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreFieldByName.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIgnoreNull.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoIncludeNonDefault.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithFilter.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyDtoWithSpecialField.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignore/MyMixInForIgnoreType.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDto.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java b/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java rename to jackson-simple/src/main/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java b/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java rename to jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDto.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java b/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java rename to jackson-simple/src/main/java/com/baeldung/jackson/jsonproperty/MyDtoFieldNameChanged.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java b/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java rename to jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java b/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java rename to jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java b/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java rename to jackson-simple/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java b/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java rename to jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java b/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java rename to jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java diff --git a/jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java b/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java similarity index 100% rename from jackson-modules/jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java rename to jackson-simple/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java diff --git a/jackson-modules/jackson-simple/src/main/resources/logback.xml b/jackson-simple/src/main/resources/logback.xml similarity index 100% rename from jackson-modules/jackson-simple/src/main/resources/logback.xml rename to jackson-simple/src/main/resources/logback.xml diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/annotation/JacksonAnnotationUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/ignore/IgnoreFieldsWithFilterUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/jsonproperty/JsonPropertyUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java b/jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java similarity index 100% rename from jackson-modules/jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java rename to jackson-simple/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java diff --git a/jackson-modules/jackson-simple/src/test/resources/json_car.json b/jackson-simple/src/test/resources/json_car.json similarity index 100% rename from jackson-modules/jackson-simple/src/test/resources/json_car.json rename to jackson-simple/src/test/resources/json_car.json diff --git a/pom.xml b/pom.xml index e641aebe7d..2abea183a1 100644 --- a/pom.xml +++ b/pom.xml @@ -447,6 +447,7 @@ immutables jackson-modules + jackson-simple java-blockchain java-collections-conversions @@ -997,6 +998,7 @@ immutables jackson-modules + jackson-simple java-blockchain java-collections-conversions From 23473c29706f45dbdb12207cb1b9df17285b24ed Mon Sep 17 00:00:00 2001 From: mikr Date: Sun, 26 Jan 2020 17:06:40 +0100 Subject: [PATCH 5/8] BAEL-20877 Move Spring Boot MVC Birt --- pom.xml | 2 -- spring-boot-modules/pom.xml | 4 ++++ .../spring-boot-mvc-birt}/README.md | 0 .../spring-boot-mvc-birt}/pom.xml | 2 +- .../spring-boot-mvc-birt}/reports/csv_data_report.rptdesign | 0 .../spring-boot-mvc-birt}/reports/data.csv | 0 .../spring-boot-mvc-birt}/reports/static_report.rptdesign | 0 .../com/baeldung/birt/designer/ReportDesignApplication.java | 0 .../com/baeldung/birt/engine/ReportEngineApplication.java | 0 .../baeldung/birt/engine/controller/BirtReportController.java | 0 .../main/java/com/baeldung/birt/engine/dto/OutputType.java | 0 .../src/main/java/com/baeldung/birt/engine/dto/Report.java | 0 .../com/baeldung/birt/engine/service/BirtReportService.java | 0 .../src/main/resources/application.properties | 0 14 files changed, 5 insertions(+), 3 deletions(-) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/README.md (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/pom.xml (98%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/reports/csv_data_report.rptdesign (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/reports/data.csv (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/reports/static_report.rptdesign (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/dto/OutputType.java (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/dto/Report.java (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java (100%) rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/resources/application.properties (100%) diff --git a/pom.xml b/pom.xml index 4d04617dcc..0ac4ab3d51 100644 --- a/pom.xml +++ b/pom.xml @@ -663,7 +663,6 @@ spring-boot-libraries spring-boot-logging-log4j2 spring-boot-mvc-2 - spring-boot-mvc-birt spring-boot-nashorn spring-boot-parent spring-boot-performance @@ -1203,7 +1202,6 @@ spring-boot-logging-log4j2 spring-boot-mvc spring-boot-mvc-2 - spring-boot-mvc-birt spring-boot-nashorn spring-boot-parent spring-boot-performance diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index b4f8328386..7920154d62 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -13,4 +13,8 @@ 1.0.0-SNAPSHOT + + spring-boot-mvc-birt + + diff --git a/spring-boot-mvc-birt/README.md b/spring-boot-modules/spring-boot-mvc-birt/README.md similarity index 100% rename from spring-boot-mvc-birt/README.md rename to spring-boot-modules/spring-boot-mvc-birt/README.md diff --git a/spring-boot-mvc-birt/pom.xml b/spring-boot-modules/spring-boot-mvc-birt/pom.xml similarity index 98% rename from spring-boot-mvc-birt/pom.xml rename to spring-boot-modules/spring-boot-mvc-birt/pom.xml index 76760e661b..f65b851f30 100644 --- a/spring-boot-mvc-birt/pom.xml +++ b/spring-boot-modules/spring-boot-mvc-birt/pom.xml @@ -13,7 +13,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 diff --git a/spring-boot-mvc-birt/reports/csv_data_report.rptdesign b/spring-boot-modules/spring-boot-mvc-birt/reports/csv_data_report.rptdesign similarity index 100% rename from spring-boot-mvc-birt/reports/csv_data_report.rptdesign rename to spring-boot-modules/spring-boot-mvc-birt/reports/csv_data_report.rptdesign diff --git a/spring-boot-mvc-birt/reports/data.csv b/spring-boot-modules/spring-boot-mvc-birt/reports/data.csv similarity index 100% rename from spring-boot-mvc-birt/reports/data.csv rename to spring-boot-modules/spring-boot-mvc-birt/reports/data.csv diff --git a/spring-boot-mvc-birt/reports/static_report.rptdesign b/spring-boot-modules/spring-boot-mvc-birt/reports/static_report.rptdesign similarity index 100% rename from spring-boot-mvc-birt/reports/static_report.rptdesign rename to spring-boot-modules/spring-boot-mvc-birt/reports/static_report.rptdesign diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java similarity index 100% rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java similarity index 100% rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java similarity index 100% rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java similarity index 100% rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java similarity index 100% rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java similarity index 100% rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java diff --git a/spring-boot-mvc-birt/src/main/resources/application.properties b/spring-boot-modules/spring-boot-mvc-birt/src/main/resources/application.properties similarity index 100% rename from spring-boot-mvc-birt/src/main/resources/application.properties rename to spring-boot-modules/spring-boot-mvc-birt/src/main/resources/application.properties From fbebd2c97835978b224c26bfe68d029c65c43f68 Mon Sep 17 00:00:00 2001 From: mikr Date: Sun, 26 Jan 2020 17:18:35 +0100 Subject: [PATCH 6/8] BAEL-20889 move spring-boot-vue --- pom.xml | 2 -- spring-boot-modules/pom.xml | 4 ++++ .../spring-boot-vue}/.gitignore | 0 .../spring-boot-vue}/README.md | 0 .../spring-boot-vue}/pom.xml | 2 +- .../springbootmvc/SpringBootMvcApplication.java | 0 .../springbootmvc/controllers/MainController.java | 0 .../src/main/resources/application.properties | 0 .../spring-boot-vue}/src/main/resources/logback.xml | 0 .../src/main/resources/static/favicon.ico | Bin .../src/main/resources/templates/index.html | 0 .../SpringBootMvcApplicationIntegrationTest.java | 0 .../test/java/org/baeldung/SpringContextTest.java | 0 13 files changed, 5 insertions(+), 3 deletions(-) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/.gitignore (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/README.md (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/pom.xml (96%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/main/java/com/baeldung/springbootmvc/SpringBootMvcApplication.java (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/main/java/com/baeldung/springbootmvc/controllers/MainController.java (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/main/resources/application.properties (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/main/resources/logback.xml (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/main/resources/static/favicon.ico (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/main/resources/templates/index.html (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationIntegrationTest.java (100%) rename {spring-boot-vue => spring-boot-modules/spring-boot-vue}/src/test/java/org/baeldung/SpringContextTest.java (100%) diff --git a/pom.xml b/pom.xml index 4d04617dcc..d73d80b614 100644 --- a/pom.xml +++ b/pom.xml @@ -678,7 +678,6 @@ spring-boot-security spring-boot-springdoc spring-boot-testing - spring-boot-vue spring-caching @@ -1218,7 +1217,6 @@ spring-boot-security spring-boot-springdoc spring-boot-testing - spring-boot-vue spring-caching diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index b4f8328386..11c46a79f9 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -13,4 +13,8 @@ 1.0.0-SNAPSHOT + + spring-boot-vue + + diff --git a/spring-boot-vue/.gitignore b/spring-boot-modules/spring-boot-vue/.gitignore similarity index 100% rename from spring-boot-vue/.gitignore rename to spring-boot-modules/spring-boot-vue/.gitignore diff --git a/spring-boot-vue/README.md b/spring-boot-modules/spring-boot-vue/README.md similarity index 100% rename from spring-boot-vue/README.md rename to spring-boot-modules/spring-boot-vue/README.md diff --git a/spring-boot-vue/pom.xml b/spring-boot-modules/spring-boot-vue/pom.xml similarity index 96% rename from spring-boot-vue/pom.xml rename to spring-boot-modules/spring-boot-vue/pom.xml index 98bba784d2..0a6307e46b 100644 --- a/spring-boot-vue/pom.xml +++ b/spring-boot-modules/spring-boot-vue/pom.xml @@ -12,7 +12,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 diff --git a/spring-boot-vue/src/main/java/com/baeldung/springbootmvc/SpringBootMvcApplication.java b/spring-boot-modules/spring-boot-vue/src/main/java/com/baeldung/springbootmvc/SpringBootMvcApplication.java similarity index 100% rename from spring-boot-vue/src/main/java/com/baeldung/springbootmvc/SpringBootMvcApplication.java rename to spring-boot-modules/spring-boot-vue/src/main/java/com/baeldung/springbootmvc/SpringBootMvcApplication.java diff --git a/spring-boot-vue/src/main/java/com/baeldung/springbootmvc/controllers/MainController.java b/spring-boot-modules/spring-boot-vue/src/main/java/com/baeldung/springbootmvc/controllers/MainController.java similarity index 100% rename from spring-boot-vue/src/main/java/com/baeldung/springbootmvc/controllers/MainController.java rename to spring-boot-modules/spring-boot-vue/src/main/java/com/baeldung/springbootmvc/controllers/MainController.java diff --git a/spring-boot-vue/src/main/resources/application.properties b/spring-boot-modules/spring-boot-vue/src/main/resources/application.properties similarity index 100% rename from spring-boot-vue/src/main/resources/application.properties rename to spring-boot-modules/spring-boot-vue/src/main/resources/application.properties diff --git a/spring-boot-vue/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-vue/src/main/resources/logback.xml similarity index 100% rename from spring-boot-vue/src/main/resources/logback.xml rename to spring-boot-modules/spring-boot-vue/src/main/resources/logback.xml diff --git a/spring-boot-vue/src/main/resources/static/favicon.ico b/spring-boot-modules/spring-boot-vue/src/main/resources/static/favicon.ico similarity index 100% rename from spring-boot-vue/src/main/resources/static/favicon.ico rename to spring-boot-modules/spring-boot-vue/src/main/resources/static/favicon.ico diff --git a/spring-boot-vue/src/main/resources/templates/index.html b/spring-boot-modules/spring-boot-vue/src/main/resources/templates/index.html similarity index 100% rename from spring-boot-vue/src/main/resources/templates/index.html rename to spring-boot-modules/spring-boot-vue/src/main/resources/templates/index.html diff --git a/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationIntegrationTest.java similarity index 100% rename from spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationIntegrationTest.java rename to spring-boot-modules/spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationIntegrationTest.java diff --git a/spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java b/spring-boot-modules/spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java rename to spring-boot-modules/spring-boot-vue/src/test/java/org/baeldung/SpringContextTest.java From df56c4d2d102ea561fc9e96eda8dc42a06d31944 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Sun, 26 Jan 2020 18:50:09 +0200 Subject: [PATCH 7/8] Update README.md --- jackson-simple/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jackson-simple/README.md b/jackson-simple/README.md index ffc76ead22..41aee8cac9 100644 --- a/jackson-simple/README.md +++ b/jackson-simple/README.md @@ -16,4 +16,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring ### NOTE: -Since this is a module tied to an e-book, it should **not** be used to store the code for any further article. +Since this is a module tied to an e-book, it should **not** be moved or used to store the code for any further article. From fe41d7d785abfa058aea7f2d0b6b3e0a2d69d050 Mon Sep 17 00:00:00 2001 From: Amy DeGregorio Date: Sun, 26 Jan 2020 12:05:21 -0500 Subject: [PATCH 8/8] BAEL-3770 JPA Entity Lifecycle Events (#8590) --- .../SpringBootLifecycleEventApplication.java | 11 ++ .../model/AuditTrailListener.java | 39 +++++++ .../baeldung/lifecycleevents/model/User.java | 104 ++++++++++++++++++ .../repository/UserRepository.java | 9 ++ .../UserRepositoryIntegrationTest.java | 80 ++++++++++++++ 5 files changed, 243 insertions(+) create mode 100644 persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/SpringBootLifecycleEventApplication.java create mode 100644 persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/AuditTrailListener.java create mode 100644 persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/User.java create mode 100644 persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/repository/UserRepository.java create mode 100644 persistence-modules/spring-data-jpa-4/src/test/java/lifecycleevents/UserRepositoryIntegrationTest.java diff --git a/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/SpringBootLifecycleEventApplication.java b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/SpringBootLifecycleEventApplication.java new file mode 100644 index 0000000000..fbc861c5fe --- /dev/null +++ b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/SpringBootLifecycleEventApplication.java @@ -0,0 +1,11 @@ +package com.baeldung.lifecycleevents; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBootLifecycleEventApplication { + public static void main(String[] args) { + SpringApplication.run(SpringBootLifecycleEventApplication.class, args); + } +} diff --git a/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/AuditTrailListener.java b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/AuditTrailListener.java new file mode 100644 index 0000000000..26ebff42e4 --- /dev/null +++ b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/AuditTrailListener.java @@ -0,0 +1,39 @@ +package com.baeldung.lifecycleevents.model; + +import javax.persistence.PostLoad; +import javax.persistence.PostPersist; +import javax.persistence.PostRemove; +import javax.persistence.PostUpdate; +import javax.persistence.PrePersist; +import javax.persistence.PreRemove; +import javax.persistence.PreUpdate; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class AuditTrailListener { + private static Log log = LogFactory.getLog(AuditTrailListener.class); + + @PrePersist + @PreUpdate + @PreRemove + private void beforeAnyUpdate(User user) { + if (user.getId() == 0) { + log.info("[USER AUDIT] About to add a user"); + } else { + log.info("[USER AUDIT] About to update/delete user: " + user.getId()); + } + } + + @PostPersist + @PostUpdate + @PostRemove + private void afterAnyUpdate(User user) { + log.info("[USER AUDIT] add/update/delete complete for user: " + user.getId()); + } + + @PostLoad + private void afterLoad(User user) { + log.info("[USER AUDIT] user loaded from database: " + user.getId()); + } +} diff --git a/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/User.java b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/User.java new file mode 100644 index 0000000000..a080cb3bf2 --- /dev/null +++ b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/model/User.java @@ -0,0 +1,104 @@ +package com.baeldung.lifecycleevents.model; + +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.PostLoad; +import javax.persistence.PostPersist; +import javax.persistence.PostRemove; +import javax.persistence.PostUpdate; +import javax.persistence.PrePersist; +import javax.persistence.PreRemove; +import javax.persistence.PreUpdate; +import javax.persistence.Transient; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +@Entity +@EntityListeners(AuditTrailListener.class) +public class User { + private static Log log = LogFactory.getLog(User.class); + + @Id + @GeneratedValue + private int id; + + private String userName; + private String firstName; + private String lastName; + @Transient + private String fullName; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getFullName() { + return fullName; + } + + @PrePersist + public void logNewUserAttempt() { + log.info("Attempting to add new user with username: " + userName); + } + + @PostPersist + public void logNewUserAdded() { + log.info("Added user '" + userName + "' with ID: " + id); + } + + @PreRemove + public void logUserRemovalAttempt() { + log.info("Attempting to delete user: " + userName); + } + + @PostRemove + public void logUserRemoval() { + log.info("Deleted user: " + userName); + } + + @PreUpdate + public void logUserUpdateAttempt() { + log.info("Attempting to update user: " + userName); + } + + @PostUpdate + public void logUserUpdate() { + log.info("Updated user: " + userName); + } + + @PostLoad + public void logUserLoad() { + fullName = firstName + " " + lastName; + } +} diff --git a/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/repository/UserRepository.java b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/repository/UserRepository.java new file mode 100644 index 0000000000..af14117ebb --- /dev/null +++ b/persistence-modules/spring-data-jpa-4/src/main/java/com/baeldung/lifecycleevents/repository/UserRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.lifecycleevents.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.baeldung.lifecycleevents.model.User; + +public interface UserRepository extends JpaRepository { + public User findByUserName(String userName); +} diff --git a/persistence-modules/spring-data-jpa-4/src/test/java/lifecycleevents/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-4/src/test/java/lifecycleevents/UserRepositoryIntegrationTest.java new file mode 100644 index 0000000000..078f437474 --- /dev/null +++ b/persistence-modules/spring-data-jpa-4/src/test/java/lifecycleevents/UserRepositoryIntegrationTest.java @@ -0,0 +1,80 @@ +package lifecycleevents; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import com.baeldung.lifecycleevents.SpringBootLifecycleEventApplication; +import com.baeldung.lifecycleevents.model.User; +import com.baeldung.lifecycleevents.repository.UserRepository; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = SpringBootLifecycleEventApplication.class) +public class UserRepositoryIntegrationTest { + + @Autowired + private UserRepository userRepository; + + @Before + public void setup() { + User user = new User(); + user.setFirstName("Jane"); + user.setLastName("Smith"); + user.setUserName("jsmith123"); + userRepository.save(user); + } + + @After + public void cleanup() { + userRepository.deleteAll(); + } + + @Test + public void whenNewUserProvided_userIsAdded() { + User user = new User(); + user.setFirstName("John"); + user.setLastName("Doe"); + user.setUserName("jdoe123"); + user = userRepository.save(user); + assertTrue(user.getId() > 0); + } + + @Test + public void whenUserNameProvided_userIsLoaded() { + User user = userRepository.findByUserName("jsmith123"); + assertNotNull(user); + assertEquals("jsmith123", user.getUserName()); + } + + @Test + public void whenExistingUserProvided_userIsUpdated() { + User user = userRepository.findByUserName("jsmith123"); + user.setFirstName("Joe"); + user = userRepository.save(user); + assertEquals("Joe", user.getFirstName()); + } + + @Test + public void whenExistingUserDeleted_userIsDeleted() { + User user = userRepository.findByUserName("jsmith123"); + userRepository.delete(user); + user = userRepository.findByUserName("jsmith123"); + assertNull(user); + } + + @Test + public void whenExistingUserLoaded_fullNameIsAvailable() { + String expectedFullName = "Jane Smith"; + User user = userRepository.findByUserName("jsmith123"); + assertEquals(expectedFullName, user.getFullName()); + } +}