[jackson-databind] 01/04: Merge tag 'upstream/2.8.5'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 15 16:03:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jackson-databind.
commit 80ead30f6c323c40c5713f6e2b3fd167dfabef7f
Merge: 069221a bb24ae8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Dec 15 15:41:24 2016 +0100
Merge tag 'upstream/2.8.5'
Upstream version 2.8.5
.gitattributes | 4 +
.github/ISSUE_TEMPLATE.md | 6 +
.travis.yml | 3 +-
README.md | 5 +-
attic/MappingIteratorReadTest.java | 25 -
pom.xml | 36 +-
release-notes/CREDITS | 127 +++
release-notes/VERSION | 177 ++++
.../jackson/databind/AbstractTypeResolver.java | 13 +-
.../jackson/databind/AnnotationIntrospector.java | 98 ++-
.../jackson/databind/BeanDescription.java | 27 +-
.../fasterxml/jackson/databind/BeanProperty.java | 21 +-
.../jackson/databind/DatabindContext.java | 7 +-
.../jackson/databind/DeserializationConfig.java | 70 +-
.../jackson/databind/DeserializationContext.java | 676 ++++++++++++---
.../jackson/databind/DeserializationFeature.java | 48 +-
.../com/fasterxml/jackson/databind/JavaType.java | 43 +
.../jackson/databind/JsonMappingException.java | 104 ++-
.../fasterxml/jackson/databind/JsonSerializer.java | 12 +-
.../fasterxml/jackson/databind/MapperFeature.java | 10 +-
.../com/fasterxml/jackson/databind/Module.java | 26 +
.../fasterxml/jackson/databind/ObjectMapper.java | 335 ++++----
.../fasterxml/jackson/databind/ObjectReader.java | 169 ++--
.../fasterxml/jackson/databind/ObjectWriter.java | 98 +--
.../jackson/databind/PropertyNamingStrategy.java | 2 +-
.../jackson/databind/SerializationConfig.java | 76 +-
.../jackson/databind/SerializationFeature.java | 8 +
.../jackson/databind/SerializerProvider.java | 133 ++-
.../jackson/databind/annotation/JsonAppend.java | 7 +-
.../databind/annotation/JsonDeserialize.java | 11 +
.../databind/annotation/JsonPOJOBuilder.java | 10 +-
.../jackson/databind/cfg/BaseSettings.java | 3 +-
.../jackson/databind/cfg/ConfigOverride.java | 57 ++
.../jackson/databind/cfg/ConfigOverrides.java | 59 ++
.../jackson/databind/cfg/MapperConfig.java | 51 +-
.../jackson/databind/cfg/MapperConfigBase.java | 146 +++-
.../databind/cfg/MutableConfigOverride.java | 51 ++
.../databind/deser/AbstractDeserializer.java | 5 +-
.../databind/deser/BasicDeserializerFactory.java | 303 ++++---
.../jackson/databind/deser/BeanDeserializer.java | 136 ++-
.../databind/deser/BeanDeserializerBase.java | 230 +++--
.../databind/deser/BeanDeserializerBuilder.java | 116 ++-
.../databind/deser/BeanDeserializerFactory.java | 213 ++---
.../databind/deser/BuilderBasedDeserializer.java | 279 +++---
.../jackson/databind/deser/CreatorProperty.java | 25 +-
.../deser/DefaultDeserializationContext.java | 9 +-
.../deser/DeserializationProblemHandler.java | 267 +++++-
.../jackson/databind/deser/DeserializerCache.java | 25 +-
.../jackson/databind/deser/Deserializers.java | 2 +
.../databind/deser/SettableAnyProperty.java | 50 +-
.../databind/deser/SettableBeanProperty.java | 21 +-
.../jackson/databind/deser/ValueInstantiator.java | 138 ++-
.../deser/impl/BeanAsArrayBuilderDeserializer.java | 65 +-
.../deser/impl/BeanAsArrayDeserializer.java | 69 +-
.../databind/deser/impl/BeanPropertyMap.java | 65 +-
.../databind/deser/impl/CreatorCollector.java | 405 ++++++---
.../deser/impl/ErrorThrowingDeserializer.java | 29 +
.../databind/deser/impl/ExternalTypeHandler.java | 115 ++-
.../databind/deser/impl/FailingDeserializer.java | 3 +-
.../jackson/databind/deser/impl/FieldProperty.java | 13 +-
.../databind/deser/impl/InnerClassProperty.java | 5 +
.../deser/impl/ManagedReferenceProperty.java | 23 +-
.../databind/deser/impl/MethodProperty.java | 10 +-
.../deser/impl/NoClassDefFoundDeserializer.java | 30 -
.../jackson/databind/deser/impl/NullProvider.java | 39 -
.../deser/impl/ObjectIdReferenceProperty.java | 7 +
.../databind/deser/impl/PropertyBasedCreator.java | 80 +-
.../databind/deser/impl/PropertyValueBuffer.java | 83 +-
.../databind/deser/impl/ReadableObjectId.java | 27 +-
.../databind/deser/impl/SetterlessProperty.java | 18 +-
.../deser/impl/TypeWrappedDeserializer.java | 21 +
.../deser/std/AtomicReferenceDeserializer.java | 74 +-
.../databind/deser/std/CollectionDeserializer.java | 39 +-
.../databind/deser/std/DateDeserializers.java | 21 +-
.../databind/deser/std/EnumDeserializer.java | 197 ++---
.../databind/deser/std/EnumMapDeserializer.java | 25 +-
.../databind/deser/std/EnumSetDeserializer.java | 6 +-
.../deser/std/FactoryBasedEnumDeserializer.java | 213 +++++
.../databind/deser/std/FromStringDeserializer.java | 67 +-
.../deser/std/JsonLocationInstantiator.java | 10 +-
.../databind/deser/std/JsonNodeDeserializer.java | 39 +-
.../databind/deser/std/MapDeserializer.java | 86 +-
.../databind/deser/std/MapEntryDeserializer.java | 42 +-
.../databind/deser/std/NumberDeserializers.java | 44 +-
.../deser/std/ObjectArrayDeserializer.java | 7 +-
.../deser/std/PrimitiveArrayDeserializers.java | 42 +-
.../deser/std/ReferenceTypeDeserializer.java | 138 +++
.../deser/std/StackTraceElementDeserializer.java | 61 +-
.../databind/deser/std/StdDeserializer.java | 393 +++++----
.../databind/deser/std/StdKeyDeserializer.java | 81 +-
.../databind/deser/std/StdValueInstantiator.java | 119 ++-
.../deser/std/StringArrayDeserializer.java | 2 +-
.../deser/std/StringCollectionDeserializer.java | 3 +-
.../databind/deser/std/StringDeserializer.java | 5 +-
.../databind/deser/std/ThrowableDeserializer.java | 17 +-
.../databind/deser/std/UUIDDeserializer.java | 32 +-
.../deser/std/UntypedObjectDeserializer.java | 74 +-
.../databind/exc/InvalidTypeIdException.java | 53 ++
.../jackson/databind/ext/CoreXMLDeserializers.java | 52 +-
.../jackson/databind/ext/DOMDeserializer.java | 33 +-
.../jackson/databind/ext/Java7Support.java | 48 ++
.../jackson/databind/ext/Java7SupportImpl.java | 86 ++
.../jackson/databind/ext/NioPathDeserializer.java | 41 +
.../jackson/databind/ext/NioPathSerializer.java | 25 +
.../databind/ext/OptionalHandlerFactory.java | 32 +-
.../jackson/databind/ext/PathDeserializer.java | 29 -
.../jackson/databind/introspect/Annotated.java | 11 +-
.../databind/introspect/AnnotatedClass.java | 56 +-
.../databind/introspect/AnnotatedConstructor.java | 14 +-
.../databind/introspect/AnnotatedField.java | 6 +
.../databind/introspect/AnnotatedMember.java | 7 +-
.../databind/introspect/AnnotatedMethod.java | 90 +-
.../databind/introspect/AnnotatedParameter.java | 12 +-
.../databind/introspect/AnnotatedWithParams.java | 41 +-
.../introspect/AnnotationIntrospectorPair.java | 26 +-
.../databind/introspect/BasicBeanDescription.java | 123 ++-
.../introspect/BeanPropertyDefinition.java | 2 +
.../introspect/ConcreteBeanPropertyBase.java | 53 +-
.../introspect/JacksonAnnotationIntrospector.java | 147 ++--
.../introspect/POJOPropertiesCollector.java | 73 +-
.../databind/introspect/POJOPropertyBuilder.java | 29 +-
.../introspect/VirtualAnnotatedMember.java | 22 +-
.../databind/introspect/VisibilityChecker.java | 10 +-
.../jackson/databind/jsontype/SubtypeResolver.java | 14 +-
.../jackson/databind/jsontype/TypeIdResolver.java | 17 +-
.../jackson/databind/jsontype/TypeSerializer.java | 50 +-
.../jsontype/impl/AsArrayTypeDeserializer.java | 33 +-
.../jsontype/impl/AsArrayTypeSerializer.java | 144 ++--
.../impl/AsExistingPropertyTypeSerializer.java | 32 +-
.../jsontype/impl/AsExternalTypeDeserializer.java | 8 +-
.../jsontype/impl/AsPropertyTypeDeserializer.java | 21 +-
.../jsontype/impl/AsWrapperTypeDeserializer.java | 16 +-
.../jsontype/impl/AsWrapperTypeSerializer.java | 2 +-
.../jsontype/impl/ClassNameIdResolver.java | 45 +-
.../jsontype/impl/MinimalClassNameIdResolver.java | 7 +-
.../databind/jsontype/impl/StdSubtypeResolver.java | 24 +-
.../jsontype/impl/StdTypeResolverBuilder.java | 48 +-
.../jsontype/impl/TypeDeserializerBase.java | 57 +-
.../databind/jsontype/impl/TypeIdResolverBase.java | 23 +-
.../databind/jsontype/impl/TypeNameIdResolver.java | 21 +-
.../module/SimpleAbstractTypeResolver.java | 1 +
.../fasterxml/jackson/databind/node/ArrayNode.java | 124 +--
.../jackson/databind/node/ContainerNode.java | 12 +-
.../fasterxml/jackson/databind/node/FloatNode.java | 2 +-
.../jackson/databind/node/JsonNodeCreator.java | 16 +-
.../jackson/databind/node/JsonNodeFactory.java | 30 +-
.../jackson/databind/node/ObjectNode.java | 57 +-
.../fasterxml/jackson/databind/node/TextNode.java | 2 +-
.../jackson/databind/ser/AnyGetterWriter.java | 18 +-
.../databind/ser/BasicSerializerFactory.java | 58 +-
.../jackson/databind/ser/BeanPropertyWriter.java | 496 ++++++-----
.../jackson/databind/ser/BeanSerializer.java | 10 +-
.../databind/ser/BeanSerializerBuilder.java | 15 +-
.../databind/ser/BeanSerializerFactory.java | 90 +-
.../databind/ser/DefaultSerializerProvider.java | 402 +++++----
.../jackson/databind/ser/PropertyBuilder.java | 121 ++-
.../databind/ser/impl/BeanAsArraySerializer.java | 7 +-
.../databind/ser/impl/FailingSerializer.java | 4 +-
.../databind/ser/impl/MapEntrySerializer.java | 4 +-
.../databind/ser/impl/StringArraySerializer.java | 1 +
.../databind/ser/impl/UnknownSerializer.java | 11 +-
.../ser/impl/UnwrappingBeanSerializer.java | 10 +-
.../databind/ser/impl/WritableObjectId.java | 14 +-
.../databind/ser/std/ArraySerializerBase.java | 7 +-
.../databind/ser/std/AsArraySerializerBase.java | 24 +-
.../ser/std/AtomicReferenceSerializer.java | 311 +------
.../databind/ser/std/BeanSerializerBase.java | 80 +-
.../databind/ser/std/DateTimeSerializerBase.java | 7 +-
.../jackson/databind/ser/std/EnumSerializer.java | 24 +-
.../databind/ser/std/JsonValueSerializer.java | 223 +++--
.../jackson/databind/ser/std/MapSerializer.java | 167 ++--
.../databind/ser/std/NumberSerializers.java | 61 +-
.../databind/ser/std/ObjectArraySerializer.java | 22 +-
...erializer.java => ReferenceTypeSerializer.java} | 89 +-
.../databind/ser/std/SerializableSerializer.java | 6 +-
.../databind/ser/std/StaticListSerializerBase.java | 23 +-
.../databind/ser/std/StdArraySerializers.java | 136 +--
.../jackson/databind/ser/std/StdKeySerializer.java | 3 +
.../databind/ser/std/StdKeySerializers.java | 59 +-
.../jackson/databind/ser/std/StdSerializer.java | 17 +-
.../databind/ser/std/ToStringSerializer.java | 6 -
.../fasterxml/jackson/databind/type/ArrayType.java | 5 +
.../jackson/databind/type/CollectionLikeType.java | 18 +
.../jackson/databind/type/CollectionType.java | 2 +-
.../jackson/databind/type/MapLikeType.java | 62 +-
.../fasterxml/jackson/databind/type/MapType.java | 2 +-
.../jackson/databind/type/ReferenceType.java | 81 +-
.../databind/type/ResolvedRecursiveType.java | 24 +-
.../jackson/databind/type/SimpleType.java | 5 +-
.../fasterxml/jackson/databind/type/TypeBase.java | 8 -
.../jackson/databind/type/TypeBindings.java | 66 +-
.../jackson/databind/type/TypeFactory.java | 160 ++--
.../jackson/databind/util/ArrayBuilders.java | 2 +-
.../fasterxml/jackson/databind/util/ClassUtil.java | 579 ++++++-------
.../jackson/databind/util/EnumResolver.java | 85 +-
.../jackson/databind/util/ISO8601Utils.java | 40 -
.../jackson/databind/util/JSONWrappedObject.java | 2 +-
.../jackson/databind/util/LinkedNode.java | 2 -
.../jackson/databind/util/ObjectIdMap.java | 38 -
.../jackson/databind/util/TokenBuffer.java | 56 +-
.../fasterxml/jackson/databind/BaseMapTest.java | 53 +-
.../com/fasterxml/jackson/databind/BaseTest.java | 9 +-
.../jackson/databind/ObjectMapperTest.java | 41 +-
.../jackson/databind/TestFormatSchema.java | 5 -
.../databind/TestObjectMapperBeanDeserializer.java | 9 +-
.../TestContextualWithAnnDeserializer.java | 35 +-
.../databind/convert/TestArrayConversions.java | 11 +-
.../databind/convert/TestBeanConversions.java | 18 +-
.../jackson/databind/convert/TestUpdateValue.java | 4 +-
.../ArrayDelegatorCreatorForCollectionTest.java | 32 +
.../databind/creators/BuilderSimpleTest.java | 40 +-
.../databind/creators/CreatorPropertiesTest.java | 2 +-
.../DelegatingCreatorImplicitNames1001Test.java | 4 +-
.../jackson/databind/creators/EnumCreatorTest.java | 310 +++++++
.../databind/creators/FailOnNullCreatorTest.java | 60 ++
.../databind/creators/SingleArgCreatorTest.java | 38 +-
.../databind/creators/TestConstructFromMap.java | 1 -
.../jackson/databind/creators/TestCreators2.java | 2 +-
.../creators/TestCreatorsWithIdentity.java | 2 +-
.../creators/TestCustomValueInstDefaults.java | 555 ++++++++++++
.../databind/creators/TestValueInstantiator.java | 46 +-
.../jackson/databind/creators/TestValueUpdate.java | 13 +-
...alization.java => EnumDeserializationTest.java} | 303 +++----
...ExceptionFromCustomEnumKeyDeserializerTest.java | 99 ---
...JDKAtomicTypes.java => JDKAtomicTypesTest.java} | 31 +-
...umberDeserTest.java => JDKNumberDeserTest.java} | 129 ++-
.../{TestSimpleTypes.java => JDKScalarsTest.java} | 953 +++++++++++++--------
.../databind/deser/JDKStringLikeTypesTest.java | 477 +++++++++++
.../jackson/databind/deser/KeyDeser1429Test.java | 48 ++
.../jackson/databind/deser/NullHandlingTest.java | 224 +++++
.../databind/deser/TestAnnotationIgnore.java | 3 +-
.../jackson/databind/deser/TestAnyProperties.java | 42 +
.../databind/deser/TestDateDeserialization.java | 2 +-
.../jackson/databind/deser/TestIgnoredTypes.java | 46 +-
.../jackson/databind/deser/TestJdkTypes.java | 743 ----------------
.../databind/deser/TestMapDeserialization.java | 2 +-
.../jackson/databind/deser/TestNullHandling.java | 99 ---
.../databind/deser/TestUntypedDeserialization.java | 12 +
.../databind/deser/TestValueAnnotations.java | 10 +-
.../jackson/databind/deser/UntypedNumbersTest.java | 137 ---
.../databind/deser/exc/ExceptionPathTest.java | 46 +
.../{ => exc}/TestExceptionDeserialization.java | 40 +-
.../deser/{ => exc}/TestExceptionHandling.java | 7 +-
...xceptionHandlingWithDefaultDeserialization.java | 21 +-
...tionHandlingWithJsonCreatorDeserialization.java | 5 +-
.../deser/exc/TestExceptionSerialization.java | 124 +++
.../exc/TestExceptionsDuringWriting.java} | 4 +-
.../fasterxml/jackson/databind/ext/TestDOM.java | 21 +-
.../{TestJdk16Types.java => TestJava6Types.java} | 2 +-
.../{TestJdk7Types.java => TestJava7Types.java} | 15 +-
.../fasterxml/jackson/databind/ext/TestSOAP.java | 20 -
.../filter/IgnorePropertyOnDeser1217Test.java | 61 ++
...rePropsTest.java => IgnorePropsForSerTest.java} | 13 +-
.../databind/filter/JsonInclude1327Test.java | 56 ++
.../jackson/databind/filter/JsonIncludeTest.java | 91 +-
.../databind/filter/ProblemHandlerTest.java | 306 +++++++
.../databind/filter/TestAnyGetterFiltering.java | 34 +-
.../jackson/databind/filter/TestJsonFilter.java | 44 +
.../filter/TestSimpleSerializationIgnore.java | 20 +-
.../filter/TestUnknownPropertyDeserialization.java | 5 +-
.../jackson/databind/format/DateFormatTest.java | 37 +
.../databind/introspect/TestAutoDetect.java | 3 +-
.../TestJacksonAnnotationIntrospector.java | 5 -
.../databind/introspect/TestNamingStrategyStd.java | 2 +-
.../jackson/databind/introspect/TransientTest.java | 24 +
.../jackson/databind/jsonschema/NewSchemaTest.java | 3 +-
.../jsonschema/TestGenerateJsonSchema.java | 2 +-
.../jsontype/DefaultTypingWithPrimitivesTest.java | 42 +
.../jsontype/TestCustomTypeIdResolver.java | 92 +-
.../databind/jsontype/TestDefaultForArrays.java | 23 +
.../databind/jsontype/TestDefaultForObject.java | 8 -
.../databind/jsontype/TestDefaultWithCreators.java | 51 +-
.../jsontype/TestGenericListSerialization.java | 2 +-
...mes312.java => TestOverlappingTypeIdNames.java} | 2 +-
.../jsontype/TestPolymorphicWithDefaultImpl.java | 25 +-
.../jackson/databind/jsontype/TestSubtypes.java | 15 +-
.../jsontype/TypeRefinementForMapTest.java | 132 +++
.../databind/jsontype/UnknownSubClassTest.java | 27 +
.../jsontype/{ => ext}/ExternalTypeId198Test.java | 38 +-
.../jsontype/ext}/ExternalTypeId999Test.java | 27 +-
.../ExternalTypeIdTest.java} | 14 +-
.../jsontype/ext/ExternalTypeIdTest1288.java | 513 +++++++++++
.../jsontype/ext/JsonValueExtTypeIdTest.java} | 4 +-
...estSubtypesExternalPropertyMissingProperty.java | 259 ++++++
.../jackson/databind/misc/AccessFixTest.java | 42 +
...iveDeser.java => CaseInsensitiveDeserTest.java} | 61 +-
.../fasterxml/jackson/databind/misc/TestJSONP.java | 30 +-
.../jackson/databind/module/TestAbstractTypes.java | 10 +-
.../module/TestCustomEnumKeyDeserializer.java | 90 +-
.../databind/node/NotANumberConversionTest.java | 41 +
.../databind/node/TestEndOfInputHandling.java | 31 +
.../objectid/AlwaysAsReferenceFirstTest.java | 35 +
.../jackson/databind/objectid/Objecid1083Test.java | 43 -
.../objectid/ObjectWithCreator1261Test.java | 107 +++
.../jackson/databind/objectid/TestObjectId.java | 29 +-
.../objectid}/TestObjectIdWithInjectables538.java | 5 +-
.../jackson/databind/seq/ObjectReaderTest.java | 106 ++-
.../jackson/databind/seq/ObjectWriterTest.java | 103 ++-
.../jackson/databind/seq/ReadValuesTest.java | 57 +-
.../jackson/databind/seq/SequenceWriterTest.java | 40 +-
.../jackson/databind/ser/NumberSerTest.java | 15 +
...eatures.java => SerializationFeaturesTest.java} | 85 +-
.../databind/ser/TestEnumSerialization.java | 31 +-
.../databind/ser/TestExceptionSerialization.java | 42 -
.../jackson/databind/ser/TestJdkTypes.java | 2 +
.../jackson/databind/ser/TestJsonSerialize.java | 2 +-
.../jackson/databind/ser/TestJsonSerializeAs.java | 13 +-
.../jackson/databind/ser/TestJsonValue.java | 33 +-
.../jackson/databind/ser/TestMapSerialization.java | 22 +-
.../jackson/databind/ser/TestRootType.java | 11 +-
.../databind/struct/FormatFeaturesTest.java | 68 +-
.../databind/struct/SingleValueAsArrayTest.java | 86 ++
.../struct/TestBackRefsWithPolymorphic.java | 59 +-
.../databind/struct/TestFormatForCollections.java | 2 +-
.../jackson/databind/struct/TestPOJOAsArray.java | 49 +-
.../jackson/databind/type/JavaType76Test.java | 22 -
.../{TestLocalType609.java => LocalTypeTest.java} | 7 +-
...siveType938Test.java => RecursiveTypeTest.java} | 42 +-
.../jackson/databind/type/TestJavaType.java | 50 ++
.../jackson/databind/type/TestTypeBindings.java | 15 +-
.../jackson/databind/type/TestTypeFactory.java | 17 +-
.../jackson/databind/util/TestTokenBuffer.java | 228 +++--
.../jackson/failing/AnySetter1035Test.java | 8 +-
.../failing/BuilderWithIgnored1214Test.java | 49 ++
.../jackson/failing/CreatorProperties1401Test.java | 43 +
.../jackson/failing/EnumCreatorTest929.java | 29 -
...rnalId96Test.java => ExternalTypeId96Test.java} | 2 +-
.../failing/ObjectIdWithCreator1367Test.java | 49 ++
.../failing/ObjectIdWithInjectable639Test.java | 45 +
.../SkipInjectableIntrospection962Test.java | 55 ++
.../failing/TestObjectIdWithInjectables639.java | 85 ++
.../failing/TestObjectIdWithUnwrapping1298.java | 83 ++
.../jackson/failing/TestSubtypes1311.java | 38 +
.../java/perf/ManualReadWithTypeResolution.java | 156 ++++
334 files changed, 15365 insertions(+), 7150 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-databind.git
More information about the pkg-java-commits
mailing list