From 5e60c508513ef6826b25374892111aeebd7084eb Mon Sep 17 00:00:00 2001 From: pivovarit Date: Sun, 1 Jan 2017 13:05:31 +0100 Subject: [PATCH] jackson-annotations -> jackson --- jackson-annotations/pom.xml | 222 ------------------ jackson/pom.xml | 24 +- .../deserialization/jacksoninject/Author.java | 6 - .../deserialization/jacksoninject/Person.java | 6 - .../jsonanysetter/Inventory.java | 8 - .../deserialization/jsoncreator/Author.java | 8 - .../jsondeserialize/Author.java | 6 - .../deserialization/jsondeserialize/Book.java | 6 - .../CustomDateDeserializer.java | 9 +- .../deserialization/jsondeserialize/Item.java | 0 .../deserialization/jsonsetter/Author.java | 0 .../jacksonannotation/domain/Author.java | 0 .../jacksonannotation/domain/Book.java | 0 .../jacksonannotation/domain/Course.java | 0 .../jacksonannotation/domain/Customer.java | 0 .../jacksonannotation/domain/Inventory.java | 0 .../jacksonannotation/domain/Item.java | 0 .../jacksonannotation/domain/Order.java | 0 .../jacksonannotation/domain/Person.java | 0 .../jacksonannotation/format/User.java | 80 +++---- .../general/jsonfilter/Author.java | 0 .../general/jsonformat/Book.java | 0 .../general/jsonidentityinfo/Author.java | 0 .../general/jsonidentityinfo/Course.java | 0 .../general/jsonidentityinfo/Item.java | 0 .../general/jsonidentityinfo/Person.java | 0 .../general/jsonproperty/Author.java | 0 .../general/jsonproperty/Book.java | 0 .../general/jsonproperty/Item.java | 0 .../general/jsonunwrapped/Order.java | 0 .../general/jsonview/Order.java | 0 .../general/jsonview/Views.java | 0 .../general/reference/Author.java | 0 .../general/reference/Course.java | 0 .../general/reference/Item.java | 0 .../general/reference/Person.java | 0 .../inclusion/jsonautodetect/Order.java | 0 .../inclusion/jsonignore/Author.java | 0 .../inclusion/jsonignore/Person.java | 0 .../jsonignoreproperties/Course.java | 0 .../inclusion/jsonignoretype/Order.java | 0 .../inclusion/jsoninclude/Author.java | 0 .../miscellaneous/custom/Course.java | 0 .../custom/CustomCourseAnnotation.java | 0 .../miscellaneous/custom/Item.java | 0 .../miscellaneous/disable/Author.java | 0 .../miscellaneous/mixin/Author.java | 0 .../miscellaneous/mixin/IgnoreListMixIn.java | 0 .../jacksonannotation/polymorphism/Order.java | 0 .../jsonanygetter/Inventory.java | 0 .../serialization/jsongetter/Author.java | 0 .../jsonpropertyorder/Author.java | 0 .../jsonpropertyorder/Person.java | 0 .../serialization/jsonrawvalue/Customer.java | 0 .../serialization/jsonrootname/Author.java | 0 .../serialization/jsonserialize/Author.java | 0 .../serialization/jsonserialize/Book.java | 0 .../jsonserialize/CustomDateSerializer.java | 0 .../serialization/jsonserialize/Item.java | 0 .../serialization/jsonvalue/Course.java | 0 .../jacksoninject/JacksonInjectTest.java | 0 .../jsonanysetter/JsonAnySetterTest.java | 0 .../jsoncreator/JsonCreatorTest.java | 0 .../jsondeserialize/JsonDeserializeTest.java | 0 .../jsonsetter/JsonSetterTest.java | 0 .../format/JsonFormatTest.java | 78 +++--- .../general/jsonfilter/JsonFilterTest.java | 0 .../general/jsonformat/JsonFormatTest.java | 0 .../JsonIdentityInfoTest.java | 0 .../jsonproperty/JsonPropertyTest.java | 0 .../jsonunwrapped/JsonUnwrappedTest.java | 0 .../general/jsonview/JsonViewTest.java | 0 .../general/reference/ReferenceTest.java | 0 .../jsonautodetect/JsonAutoDetectTest.java | 0 .../inclusion/jsonignore/JsonIgnoreTest.java | 0 .../JsonIgnorePropertiesTest.java | 0 .../jsonignoretype/JsonIgnoreTypeTest.java | 0 .../jsoninclude/JsonIncludeTest.java | 0 .../miscellaneous/custom/CustomTest.java | 0 .../miscellaneous/disable/DisableTest.java | 0 .../miscellaneous/mixin/MixInTest.java | 0 .../polymorphism/PolymorphismTest.java | 0 .../jsonanygetter/JsonAnyGetterTest.java | 0 .../jsongetter/JsonGetterTest.java | 0 .../JsonPropertyOrderTest.java | 0 .../jsonrawvalue/JsonRawValueTest.java | 0 .../jsonrootname/JsonRootNameTest.java | 0 .../jsonserialize/JsonSerializeTest.java | 0 .../jsonvalue/JsonValueTest.java | 0 .../author-jsonpropertyorder-schema.json | 0 pom.xml | 1 - 91 files changed, 103 insertions(+), 351 deletions(-) delete mode 100644 jackson-annotations/pom.xml rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java (82%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java (88%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java (81%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java (80%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java (83%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java (88%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java (80%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Book.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Course.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Customer.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Inventory.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Order.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/domain/Person.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/format/User.java (95%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonfilter/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonformat/Book.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Course.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Person.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Book.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonunwrapped/Order.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Order.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Views.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/reference/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/reference/Course.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/reference/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/general/reference/Person.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/Order.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Person.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/Course.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/Order.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Course.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomCourseAnnotation.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/miscellaneous/disable/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/IgnoreListMixIn.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/polymorphism/Order.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/Inventory.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsongetter/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Person.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/Customer.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrootname/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Author.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Book.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/CustomDateSerializer.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Item.java (100%) rename {jackson-annotations => jackson}/src/main/java/com/baeldung/jacksonannotation/serialization/jsonvalue/Course.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java (96%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java (100%) rename {jackson-annotations => jackson}/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java (100%) rename {jackson-annotations => jackson}/src/test/resources/author-jsonpropertyorder-schema.json (100%) diff --git a/jackson-annotations/pom.xml b/jackson-annotations/pom.xml deleted file mode 100644 index 559ef5709b..0000000000 --- a/jackson-annotations/pom.xml +++ /dev/null @@ -1,222 +0,0 @@ - - 4.0.0 - - com.baeldung - jackson-annotations - 1.0-SNAPSHOT - jar - - jackson-annotations - - - - - - - com.google.guava - guava - ${guava.version} - - - - commons-io - commons-io - ${commons-io.version} - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - - - - joda-time - joda-time - ${joda-time.version} - - - - com.google.code.gson - gson - ${gson.version} - - - - - - io.rest-assured - rest-assured - ${rest-assured.version} - test - - - - io.rest-assured - json-schema-validator - ${rest-assured.version} - test - - - - io.rest-assured - json-path - ${rest-assured.version} - test - - - - com.github.fge - json-schema-validator - ${json-schema-validator.version} - test - - - - junit - junit - ${junit.version} - test - - - - org.assertj - assertj-core - ${assertj.version} - test - - - - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - - - - jackson - - - src/main/resources - true - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven-compiler-plugin.source} - ${maven-compiler-plugin.source} - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - - - - - 2.8.5 - - - 1.7.21 - 1.1.7 - - - 2.9.6 - 2.8.0 - 4.1 - - - 20.0 - 3.5 - 2.5 - - - 4.12 - 3.0.1 - 2.2.6 - 3.6.1 - - - 3.6.0 - 2.19.1 - - UTF-8 - 1.8 - - - - diff --git a/jackson/pom.xml b/jackson/pom.xml index 9996af10f2..53fb82c61e 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -88,6 +88,27 @@ test + + io.rest-assured + json-schema-validator + ${rest-assured.version} + test + + + + io.rest-assured + json-path + ${rest-assured.version} + test + + + + org.assertj + assertj-core + ${assertj.version} + test + + org.hamcrest hamcrest-core @@ -186,7 +207,8 @@ 1.3 4.12 1.10.19 - 2.9.0 + 3.0.1 + 3.6.1 3.6.0 diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java similarity index 82% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java index 2fcb1bbf32..922cc1d69b 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java @@ -5,12 +5,6 @@ import com.baeldung.jacksonannotation.domain.Item; import java.util.ArrayList; import java.util.List; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ public class Author extends Person { List items = new ArrayList<>(); diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java similarity index 88% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java index f7e44b3dd4..c10ad1351d 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java @@ -4,12 +4,6 @@ import com.fasterxml.jackson.annotation.JacksonInject; import java.util.UUID; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ public class Person { @JacksonInject diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java similarity index 81% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java index 22b1540896..365e4c88f4 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java @@ -2,20 +2,12 @@ package com.baeldung.jacksonannotation.deserialization.jsonanysetter; import com.baeldung.jacksonannotation.domain.Author; import com.baeldung.jacksonannotation.domain.Item; -import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.HashMap; import java.util.Map; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - * @see JsonAnyGetter - */ public class Inventory { private Map stock = new HashMap<>(); diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java similarity index 80% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java index c9ed3eaf47..6986bae6a3 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java @@ -4,19 +4,11 @@ package com.baeldung.jacksonannotation.deserialization.jsoncreator; import com.baeldung.jacksonannotation.domain.Item; import com.baeldung.jacksonannotation.domain.Person; import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - * @see JsonGetter - */ public class Author extends Person { List items = new ArrayList<>(); diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java similarity index 83% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java index 5830d099e1..0e203d45eb 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java @@ -6,12 +6,6 @@ import com.baeldung.jacksonannotation.domain.Person; import java.util.ArrayList; import java.util.List; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ public class Author extends Person { List items = new ArrayList<>(); diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java similarity index 88% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java index b4cf1227cc..36c879cd53 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java @@ -5,12 +5,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.math.BigDecimal; import java.util.Date; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ public class Book extends Item { private String ISBN; diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java similarity index 80% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java index c8ad9979ab..d924221ed6 100644 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java @@ -1,7 +1,6 @@ package com.baeldung.jacksonannotation.deserialization.jsondeserialize; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; @@ -10,12 +9,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -/** - * Source code github.com/readlearncode - * - * @author Alex Theedom www.readlearncode.com - * @version 1.0 - */ public class CustomDateDeserializer extends StdDeserializer { private static SimpleDateFormat formatter = @@ -31,7 +24,7 @@ public class CustomDateDeserializer extends StdDeserializer { @Override public Date deserialize(JsonParser jsonparser, DeserializationContext context) - throws IOException, JsonProcessingException { + throws IOException { String date = jsonparser.getText(); try { return formatter.parse(date); diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Book.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Book.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Book.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Book.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Course.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Course.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Course.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Course.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Customer.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Customer.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Customer.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Customer.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Inventory.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Inventory.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Inventory.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Inventory.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Order.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Order.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Order.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Order.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Person.java b/jackson/src/main/java/com/baeldung/jacksonannotation/domain/Person.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/domain/Person.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/domain/Person.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/format/User.java b/jackson/src/main/java/com/baeldung/jacksonannotation/format/User.java similarity index 95% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/format/User.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/format/User.java index 8e23a2c755..2ca4a4213b 100755 --- a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/format/User.java +++ b/jackson/src/main/java/com/baeldung/jacksonannotation/format/User.java @@ -1,40 +1,40 @@ -package com.baeldung.jacksonannotation.format; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; - -import com.baeldung.jacksonannotation.domain.Person; - -/** - * @author Jay Sridhar - * @version 1.0 - */ -public class User extends Person { - private String firstName; - private String lastName; - - @JsonFormat(shape = JsonFormat.Shape.STRING, - pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ") - private Date createdDate; - - public User(String firstName,String lastName) { - super(firstName, lastName); - this.createdDate = new Date(); - } - - public Date getCreatedDate() { - return createdDate; - } - - @JsonFormat(shape = JsonFormat.Shape.STRING, - pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ", - locale = "en_GB") - public Date getCurrentDate() { - return new Date(); - } - - @JsonFormat(shape = JsonFormat.Shape.NUMBER) - public Date getDateNum() { - return new Date(); - } -} +package com.baeldung.jacksonannotation.format; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import com.baeldung.jacksonannotation.domain.Person; + +/** + * @author Jay Sridhar + * @version 1.0 + */ +public class User extends Person { + private String firstName; + private String lastName; + + @JsonFormat(shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ") + private Date createdDate; + + public User(String firstName,String lastName) { + super(firstName, lastName); + this.createdDate = new Date(); + } + + public Date getCreatedDate() { + return createdDate; + } + + @JsonFormat(shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ", + locale = "en_GB") + public Date getCurrentDate() { + return new Date(); + } + + @JsonFormat(shape = JsonFormat.Shape.NUMBER) + public Date getDateNum() { + return new Date(); + } +} diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonfilter/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonfilter/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonfilter/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonfilter/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonformat/Book.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonformat/Book.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonformat/Book.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonformat/Book.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Course.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Course.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Course.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Course.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Person.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Person.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Person.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/Person.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Book.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Book.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Book.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Book.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonproperty/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonunwrapped/Order.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonunwrapped/Order.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonunwrapped/Order.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonunwrapped/Order.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Order.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Order.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Order.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Order.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Views.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Views.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Views.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/jsonview/Views.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Course.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Course.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Course.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Course.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Person.java b/jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Person.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/general/reference/Person.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/general/reference/Person.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/Order.java b/jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/Order.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/Order.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/Order.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Person.java b/jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Person.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Person.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignore/Person.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/Course.java b/jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/Course.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/Course.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/Course.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/Order.java b/jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/Order.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/Order.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/Order.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Course.java b/jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Course.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Course.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Course.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomCourseAnnotation.java b/jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomCourseAnnotation.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomCourseAnnotation.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomCourseAnnotation.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/custom/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/disable/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/disable/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/disable/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/disable/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/IgnoreListMixIn.java b/jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/IgnoreListMixIn.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/IgnoreListMixIn.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/miscellaneous/mixin/IgnoreListMixIn.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/polymorphism/Order.java b/jackson/src/main/java/com/baeldung/jacksonannotation/polymorphism/Order.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/polymorphism/Order.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/polymorphism/Order.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/Inventory.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/Inventory.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/Inventory.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/Inventory.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsongetter/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsongetter/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsongetter/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsongetter/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Person.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Person.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Person.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/Person.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/Customer.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/Customer.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/Customer.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/Customer.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrootname/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrootname/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrootname/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonrootname/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Author.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Author.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Author.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Author.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Book.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Book.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Book.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Book.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/CustomDateSerializer.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/CustomDateSerializer.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/CustomDateSerializer.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/CustomDateSerializer.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Item.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Item.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Item.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonserialize/Item.java diff --git a/jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonvalue/Course.java b/jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonvalue/Course.java similarity index 100% rename from jackson-annotations/src/main/java/com/baeldung/jacksonannotation/serialization/jsonvalue/Course.java rename to jackson/src/main/java/com/baeldung/jacksonannotation/serialization/jsonvalue/Course.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java similarity index 96% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java index e5547d2aa6..7c342d51e4 100755 --- a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java +++ b/jackson/src/test/java/com/baeldung/jacksonannotation/format/JsonFormatTest.java @@ -1,39 +1,39 @@ -package com.baeldung.jacksonannotation.format; - -import java.util.Date; - -import com.fasterxml.jackson.core.JsonProcessingException; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.junit.Test; - -import static io.restassured.path.json.JsonPath.from; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.data.Percentage.withPercentage; - -/** - * @author Jay Sridhar - * @version 1.0 - */ -public class JsonFormatTest { - - @Test - public void whenSerializedDateFormat_thenCorrect() throws JsonProcessingException { - - User user = new User("Jay", "Sridhar"); - - String result = new ObjectMapper().writeValueAsString(user); - - // Expected to match: "2016-12-19@09:34:42.628+0000" - assertThat(from(result).getString("createdDate")) - .matches("\\d{4}\\-\\d{2}\\-\\d{2}@\\d{2}:\\d{2}:\\d{2}\\.\\d{3}\\+\\d{4}"); - - // Expected to be close to current time - long now = new Date().getTime(); - assertThat(from(result).getLong("dateNum")) - .isCloseTo(now, withPercentage(10.0)); - - } -} +package com.baeldung.jacksonannotation.format; + +import java.util.Date; + +import com.fasterxml.jackson.core.JsonProcessingException; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.junit.Test; + +import static io.restassured.path.json.JsonPath.from; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.data.Percentage.withPercentage; + +/** + * @author Jay Sridhar + * @version 1.0 + */ +public class JsonFormatTest { + + @Test + public void whenSerializedDateFormat_thenCorrect() throws JsonProcessingException { + + User user = new User("Jay", "Sridhar"); + + String result = new ObjectMapper().writeValueAsString(user); + + // Expected to match: "2016-12-19@09:34:42.628+0000" + assertThat(from(result).getString("createdDate")) + .matches("\\d{4}\\-\\d{2}\\-\\d{2}@\\d{2}:\\d{2}:\\d{2}\\.\\d{3}\\+\\d{4}"); + + // Expected to be close to current time + long now = new Date().getTime(); + assertThat(from(result).getLong("dateNum")) + .isCloseTo(now, withPercentage(10.0)); + + } +} diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java diff --git a/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java b/jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java similarity index 100% rename from jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java rename to jackson/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java diff --git a/jackson-annotations/src/test/resources/author-jsonpropertyorder-schema.json b/jackson/src/test/resources/author-jsonpropertyorder-schema.json similarity index 100% rename from jackson-annotations/src/test/resources/author-jsonpropertyorder-schema.json rename to jackson/src/test/resources/author-jsonpropertyorder-schema.json diff --git a/pom.xml b/pom.xml index d8398ab2e6..19bec5bf81 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ immutables jackson - jackson-annotations java-cassandra javaslang javax-servlets