Skip to content

Commit 5e60c50

Browse files
pivovaritpivovarit
committed
jackson-annotations -> jackson
1 parent 565b0a9 commit 5e60c50

91 files changed

Lines changed: 103 additions & 351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎jackson-annotations/pom.xml‎

Lines changed: 0 additions & 222 deletions
This file was deleted.

‎jackson/pom.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,27 @@
8888
<scope>test</scope>
8989
</dependency>
9090

91+
<dependency>
92+
<groupId>io.rest-assured</groupId>
93+
<artifactId>json-schema-validator</artifactId>
94+
<version>${rest-assured.version}</version>
95+
<scope>test</scope>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>io.rest-assured</groupId>
100+
<artifactId>json-path</artifactId>
101+
<version>${rest-assured.version}</version>
102+
<scope>test</scope>
103+
</dependency>
104+
105+
<dependency>
106+
<groupId>org.assertj</groupId>
107+
<artifactId>assertj-core</artifactId>
108+
<version>${assertj.version}</version>
109+
<scope>test</scope>
110+
</dependency>
111+
91112
<dependency>
92113
<groupId>org.hamcrest</groupId>
93114
<artifactId>hamcrest-core</artifactId>
@@ -186,7 +207,8 @@
186207
<org.hamcrest.version>1.3</org.hamcrest.version>
187208
<junit.version>4.12</junit.version>
188209
<mockito.version>1.10.19</mockito.version>
189-
<rest-assured.version>2.9.0</rest-assured.version>
210+
<rest-assured.version>3.0.1</rest-assured.version>
211+
<assertj.version>3.6.1</assertj.version>
190212

191213
<!-- maven plugins -->
192214
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Author.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
import java.util.ArrayList;
66
import java.util.List;
77

8-
/**
9-
* Source code github.com/readlearncode
10-
*
11-
* @author Alex Theedom www.readlearncode.com
12-
* @version 1.0
13-
*/
148
public class Author extends Person {
159

1610
List<Item> items = new ArrayList<>();

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/Person.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
import java.util.UUID;
66

7-
/**
8-
* Source code github.com/readlearncode
9-
*
10-
* @author Alex Theedom www.readlearncode.com
11-
* @version 1.0
12-
*/
137
public class Person {
148

159
@JacksonInject

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/Inventory.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,12 @@
22

33
import com.baeldung.jacksonannotation.domain.Author;
44
import com.baeldung.jacksonannotation.domain.Item;
5-
import com.fasterxml.jackson.annotation.JsonAnyGetter;
65
import com.fasterxml.jackson.annotation.JsonAnySetter;
76
import com.fasterxml.jackson.annotation.JsonIgnore;
87

98
import java.util.HashMap;
109
import java.util.Map;
1110

12-
/**
13-
* Source code github.com/readlearncode
14-
*
15-
* @author Alex Theedom www.readlearncode.com
16-
* @version 1.0
17-
* @see JsonAnyGetter
18-
*/
1911
public class Inventory {
2012

2113
private Map<Author, Item> stock = new HashMap<>();

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/Author.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,11 @@
44
import com.baeldung.jacksonannotation.domain.Item;
55
import com.baeldung.jacksonannotation.domain.Person;
66
import com.fasterxml.jackson.annotation.JsonCreator;
7-
import com.fasterxml.jackson.annotation.JsonGetter;
87
import com.fasterxml.jackson.annotation.JsonProperty;
98

109
import java.util.ArrayList;
1110
import java.util.List;
1211

13-
/**
14-
* Source code github.com/readlearncode
15-
*
16-
* @author Alex Theedom www.readlearncode.com
17-
* @version 1.0
18-
* @see JsonGetter
19-
*/
2012
public class Author extends Person {
2113

2214
List<Item> items = new ArrayList<>();

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Author.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
import java.util.ArrayList;
77
import java.util.List;
88

9-
/**
10-
* Source code github.com/readlearncode
11-
*
12-
* @author Alex Theedom www.readlearncode.com
13-
* @version 1.0
14-
*/
159
public class Author extends Person {
1610

1711
List<Item> items = new ArrayList<>();

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Book.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
import java.math.BigDecimal;
66
import java.util.Date;
77

8-
/**
9-
* Source code github.com/readlearncode
10-
*
11-
* @author Alex Theedom www.readlearncode.com
12-
* @version 1.0
13-
*/
148
public class Book extends Item {
159

1610
private String ISBN;

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/CustomDateDeserializer.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.baeldung.jacksonannotation.deserialization.jsondeserialize;
22

33
import com.fasterxml.jackson.core.JsonParser;
4-
import com.fasterxml.jackson.core.JsonProcessingException;
54
import com.fasterxml.jackson.databind.DeserializationContext;
65
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
76

@@ -10,12 +9,6 @@
109
import java.text.SimpleDateFormat;
1110
import java.util.Date;
1211

13-
/**
14-
* Source code github.com/readlearncode
15-
*
16-
* @author Alex Theedom www.readlearncode.com
17-
* @version 1.0
18-
*/
1912
public class CustomDateDeserializer extends StdDeserializer<Date> {
2013

2114
private static SimpleDateFormat formatter =
@@ -31,7 +24,7 @@ public CustomDateDeserializer(Class<?> vc) {
3124

3225
@Override
3326
public Date deserialize(JsonParser jsonparser, DeserializationContext context)
34-
throws IOException, JsonProcessingException {
27+
throws IOException {
3528
String date = jsonparser.getText();
3629
try {
3730
return formatter.parse(date);

jackson-annotations/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java renamed to jackson/src/main/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/Item.java

File renamed without changes.

0 commit comments

Comments
 (0)