diff --git a/pom.xml b/pom.xml index 522bfe4..d3f1b59 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.sonatype.oss @@ -26,7 +28,7 @@ The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -41,8 +43,8 @@ - 1.6 - 2.10.0 + 11 + 2.16.1 @@ -64,13 +66,13 @@ org.mockito mockito-core - 1.10.19 + 5.10.0 test junit junit - 4.12 + 4.13.2 test @@ -120,5 +122,11 @@ + + + https://repo.maven.apache.org/maven2/ + apache + + diff --git a/src/main/java/org/geojson/jackson/LngLatAltDeserializer.java b/src/main/java/org/geojson/jackson/LngLatAltDeserializer.java index ff888c6..27272f6 100644 --- a/src/main/java/org/geojson/jackson/LngLatAltDeserializer.java +++ b/src/main/java/org/geojson/jackson/LngLatAltDeserializer.java @@ -17,7 +17,7 @@ public LngLatAlt deserialize(JsonParser jp, DeserializationContext ctxt) throws if (jp.isExpectedStartArrayToken()) { return deserializeArray(jp, ctxt); } - throw ctxt.mappingException(LngLatAlt.class); + throw ctxt.wrongTokenException(jp,LngLatAlt.class, JsonToken.START_ARRAY, "expected JSON Array"); } protected LngLatAlt deserializeArray(JsonParser jp, DeserializationContext ctxt) throws IOException { @@ -46,14 +46,14 @@ private double extractDouble(JsonParser jp, DeserializationContext ctxt, boolean if (optional) return Double.NaN; else - throw ctxt.mappingException("Unexpected end-of-input when binding data into LngLatAlt"); + throw ctxt.instantiationException(LngLatAltDeserializer.class, "Unexpected end-of-input when binding data into LngLatAlt"); } else { switch (token) { case END_ARRAY: if (optional) return Double.NaN; else - throw ctxt.mappingException("Unexpected end-of-input when binding data into LngLatAlt"); + throw ctxt.instantiationException( this.getClass(), "Unexpected end-of-input when binding data into LngLatAlt"); case VALUE_NUMBER_FLOAT: return jp.getDoubleValue(); case VALUE_NUMBER_INT: @@ -61,8 +61,7 @@ private double extractDouble(JsonParser jp, DeserializationContext ctxt, boolean case VALUE_STRING: return jp.getValueAsDouble(); default: - throw ctxt.mappingException( - "Unexpected token (" + token.name() + ") when binding data into LngLatAlt"); + throw ctxt.instantiationException(this.getClass(), "Unexpected token (" + token.name() + ") when binding data into LngLatAlt"); } } }