Merge pull request #132 from raphael5178/jackson-2.18-update

#131 Jackson update from 2.15.2 to 2.18.3

Author: michel-kraemer

build.gradle

@@ -42,6 +42,7 @@ configurations {
     integrationTest213 { extendsFrom integrationTestBase }
     integrationTest214 { extendsFrom integrationTestBase }
     integrationTest215 { extendsFrom integrationTestBase }
+    integrationTest218 { extendsFrom integrationTestBase }
 }
 
 String jacksonCore = 'com.fasterxml.jackson.core:jackson-core:'
@@ -51,36 +52,36 @@ String junit = 'junit:junit:4.13.2'
 String mongoDbJavaDriver = 'org.mongodb:mongo-java-driver:3.12.14'
 
 dependencies {
-    implementation jacksonCore + '2.15.2'
-    implementation jacksonAnnotations + '2.15.2'
-    implementation jacksonDatabind + '2.15.2'
+    implementation jacksonCore + '2.18.3'
+    implementation jacksonAnnotations + '2.18.3'
+    implementation jacksonDatabind + '2.18.3'
 
     testImplementation junit
     testImplementation mongoDbJavaDriver
-    
+
     integrationTestBase junit
     integrationTestBase mongoDbJavaDriver
-        
+
     integrationTest21 jacksonCore + '2.1.0'
     integrationTest21 jacksonAnnotations + '2.1.0'
     integrationTest21 jacksonDatabind + '2.1.0'
-    
+
     integrationTest22 jacksonCore + '2.2.0'
     integrationTest22 jacksonAnnotations + '2.2.0'
     integrationTest22 jacksonDatabind + '2.2.0'
-    
+
     integrationTest23 jacksonCore + '2.3.0'
     integrationTest23 jacksonAnnotations + '2.3.0'
     integrationTest23 jacksonDatabind + '2.3.0'
-    
+
     integrationTest24 jacksonCore + '2.4.0'
     integrationTest24 jacksonAnnotations + '2.4.0'
     integrationTest24 jacksonDatabind + '2.4.0'
-    
+
     integrationTest25 jacksonCore + '2.5.0'
     integrationTest25 jacksonAnnotations + '2.5.0'
     integrationTest25 jacksonDatabind + '2.5.0'
-    
+
     integrationTest26 jacksonCore + '2.6.4'
     integrationTest26 jacksonAnnotations + '2.6.4'
     integrationTest26 jacksonDatabind + '2.6.4'
@@ -120,6 +121,10 @@ dependencies {
     integrationTest215 jacksonCore + '2.15.2'
     integrationTest215 jacksonAnnotations + '2.15.2'
     integrationTest215 jacksonDatabind + '2.15.2'
+
+    integrationTest218 jacksonCore + '2.18.3'
+    integrationTest218 jacksonAnnotations + '2.18.3'
+    integrationTest218 jacksonDatabind + '2.18.3'
 }
 
 tasks.named("jar") {
@@ -239,13 +244,18 @@ tasks.register('doIntegrationTest215', Test) {
     classpath = sourceSets.test.output + sourceSets.main.output + configurations.integrationTest215
 }
 
+tasks.register('doIntegrationTest218', Test) {
+    testClassesDirs = testing.suites.test.sources.output.classesDirs
+    classpath = sourceSets.test.output + sourceSets.main.output + configurations.integrationTest218
+}
+
 tasks.register('integrationTest') {
     dependsOn([doIntegrationTest21, doIntegrationTest22,
             doIntegrationTest23, doIntegrationTest24, doIntegrationTest25,
             doIntegrationTest26, doIntegrationTest27, doIntegrationTest28,
             doIntegrationTest29, doIntegrationTest210, doIntegrationTest211,
             doIntegrationTest212, doIntegrationTest213, doIntegrationTest214,
-            doIntegrationTest215])
+            doIntegrationTest215, doIntegrationTest218])
 }
 
 check.dependsOn integrationTest
@@ -265,21 +275,21 @@ publishing {
                packaging = 'jar'
                description = 'A pluggable BSON generator and parser for Jackson JSON processor.'
                url = 'https://michelkraemer.com'
- 
+
                scm {
                    url = 'scm:git:git://github.com/michel-kraemer/bson4jackson.git'
                    connection = 'scm:git:git://github.com/michel-kraemer/bson4jackson.git'
                    developerConnection = 'scm:git:git://github.com/michel-kraemer/bson4jackson.git'
                }
- 
+
                licenses {
                    license {
                        name = 'The Apache Software License, Version 2.0'
                        url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
                        distribution = 'repo'
                    }
                }
- 
+
                developers {
                    developer {
                        id = 'michel-kraemer'

src/main/java/de/undercouch/bson4jackson/deserializers/BsonCalendarDeserializer.java

@@ -18,14 +18,13 @@
  */
 public class BsonCalendarDeserializer extends JsonDeserializer<Calendar> {
     @Override
-    @SuppressWarnings("deprecation")
     public Calendar deserialize(JsonParser jp, DeserializationContext ctxt)
             throws IOException {
         if (jp instanceof BsonParser) {
             BsonParser bsonParser = (BsonParser)jp;
             if (bsonParser.getCurrentToken() != JsonToken.VALUE_EMBEDDED_OBJECT ||
                     bsonParser.getCurrentBsonType() != BsonConstants.TYPE_DATETIME) {
-                throw ctxt.mappingException(Date.class);
+                ctxt.reportBadDefinition(Date.class, "Current token isn't embedded object or date time");
             }
 
             Object obj = bsonParser.getEmbeddedObject();

src/main/java/de/undercouch/bson4jackson/deserializers/BsonDateDeserializer.java

@@ -17,14 +17,13 @@
  */
 public class BsonDateDeserializer extends JsonDeserializer<Date> {
     @Override
-    @SuppressWarnings("deprecation")
     public Date deserialize(JsonParser jp, DeserializationContext ctxt)
             throws IOException {
         if (jp instanceof BsonParser) {
             BsonParser bsonParser = (BsonParser)jp;
             if (bsonParser.getCurrentToken() != JsonToken.VALUE_EMBEDDED_OBJECT ||
                     bsonParser.getCurrentBsonType() != BsonConstants.TYPE_DATETIME) {
-                throw ctxt.mappingException(Date.class);
+                ctxt.reportBadDefinition(Date.class, "Current token isn't embedded object or date time");
             }
             return (Date)bsonParser.getEmbeddedObject();
         } else if (jp.getCurrentToken() == JsonToken.VALUE_EMBEDDED_OBJECT &&

src/main/java/de/undercouch/bson4jackson/deserializers/BsonJavaScriptDeserializer.java

@@ -21,15 +21,14 @@
  */
 public class BsonJavaScriptDeserializer extends JsonDeserializer<JavaScript> {
     @Override
-    @SuppressWarnings("deprecation")
     public JavaScript deserialize(JsonParser jp, DeserializationContext ctxt)
             throws IOException {
         if (jp instanceof BsonParser) {
             BsonParser bsonParser = (BsonParser)jp;
             if (bsonParser.getCurrentToken() != JsonToken.VALUE_EMBEDDED_OBJECT ||
                     (bsonParser.getCurrentBsonType() != BsonConstants.TYPE_JAVASCRIPT &&
                             bsonParser.getCurrentBsonType() != BsonConstants.TYPE_JAVASCRIPT_WITH_SCOPE)) {
-                throw ctxt.mappingException(JavaScript.class);
+                ctxt.reportBadDefinition(JavaScript.class, "Current token isn't a JavaScript object");
             }
             return (JavaScript)bsonParser.getEmbeddedObject();
         } else if (jp.getCurrentToken() == JsonToken.VALUE_EMBEDDED_OBJECT &&

src/main/java/de/undercouch/bson4jackson/deserializers/BsonObjectIdDeserializer.java

@@ -46,7 +46,7 @@ public ObjectId deserialize(JsonParser jp, DeserializationContext ctxt)
             BsonParser bsonParser = (BsonParser)jp;
             if (bsonParser.getCurrentToken() != JsonToken.VALUE_EMBEDDED_OBJECT ||
                     bsonParser.getCurrentBsonType() != BsonConstants.TYPE_OBJECTID) {
-                throw ctxt.mappingException(ObjectId.class);
+                ctxt.reportBadDefinition(ObjectId.class, "Current token isn't a embedded object or isn't objectId");
             }
             return (ObjectId)bsonParser.getEmbeddedObject();
         } else if (jp.getCurrentToken() == JsonToken.VALUE_EMBEDDED_OBJECT &&

src/main/java/de/undercouch/bson4jackson/deserializers/BsonRegexDeserializer.java

@@ -19,14 +19,13 @@
  */
 public class BsonRegexDeserializer extends JsonDeserializer<Pattern> {
     @Override
-    @SuppressWarnings("deprecation")
     public Pattern deserialize(JsonParser jp, DeserializationContext ctxt)
             throws IOException {
         if (jp instanceof BsonParser) {
             BsonParser bsonParser = (BsonParser)jp;
             if (bsonParser.getCurrentToken() != JsonToken.VALUE_EMBEDDED_OBJECT ||
                     bsonParser.getCurrentBsonType() != BsonConstants.TYPE_REGEX) {
-                throw ctxt.mappingException(Pattern.class);
+                ctxt.reportBadDefinition(Pattern.class, "Current token isn't embedded object or regular expression");
             }
             return (Pattern)bsonParser.getEmbeddedObject();
         } else if (jp.getCurrentToken() == JsonToken.VALUE_EMBEDDED_OBJECT &&

src/main/java/de/undercouch/bson4jackson/deserializers/BsonTimestampDeserializer.java

@@ -19,14 +19,13 @@
  */
 public class BsonTimestampDeserializer extends JsonDeserializer<Timestamp> {
     @Override
-    @SuppressWarnings("deprecation")
     public Timestamp deserialize(JsonParser jp, DeserializationContext ctxt)
             throws IOException {
         if (jp instanceof BsonParser) {
             BsonParser bsonParser = (BsonParser)jp;
             if (bsonParser.getCurrentToken() != JsonToken.VALUE_EMBEDDED_OBJECT ||
                     bsonParser.getCurrentBsonType() != BsonConstants.TYPE_TIMESTAMP) {
-                throw ctxt.mappingException(Timestamp.class);
+                ctxt.reportBadDefinition(Timestamp.class, "Current token isn't a embedded object or a timestamp");
             }
             return (Timestamp)bsonParser.getEmbeddedObject();
         } else if (jp.getCurrentToken() == JsonToken.VALUE_EMBEDDED_OBJECT &&