Add JsonPropertyNamingStrategy.LOWER_CASE_WITH_DOTS for dot-delimited names

.gitattributes

@@ -5,3 +5,9 @@
 # (and if ever need to disable change `true` to `false`
 
 pom.xml merge=ours
+.travis.yml merge=ours
+
+# 28-Sep-2017, tatu: For 2.x -> 3.0 also block these
+
+release-notes/VERSION merge=ours
+release-notes/CREDITS merge=ours

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,17 @@
-We appreciate issues as very valuable contributions, but just to make sure here are things that are important to do before filing an issue:
+We appreciate issues as very valuable contributions, but just to make sure here are things that are important to do before filing an issue.
 
-* Only report issues (and perhaps request new features, FEATURE):,Usage Questions should be asked on [Jackson-users](https://groups.google.com/forum/#!search/jackson-users) list -- you are more likely to get help that way (and we will promptly close questions-as-issues)
-* Check to see if this issue has already been reported (quick glance at existing issues): no deep search necessary, just quick sanity check
+First, and foremost: THIS IS NOT A GENERAL-PURPOSES SUPPORT FORUM FOR ASKING QUESTIONS.
+Such a place exixsts at:
+
+    https://groups.google.com/forum/#!forum/jackson-user
+
+so please go there for anything other than bug reports and feature/improvement suggestions.
+You are more likely to get help that way (and we will promptly close questions-as-issues)
+
+Also, we would appreciate if you:
+
+* Check to see if this issue has already been reported (quick glance at existing issues)
+    * no deep search necessary, just quick sanity check
 * Include version information for Jackson version you use
 * (optional but highly recommended) Verify that the problem occurs with the latest patch of same minor version; and even better, if possible, try using the latest stable patch version
     * For example: if you observe an issue with version `2.4.1`, first upgrade to `2.4.6` to ensure problem has not already been fixed.

.travis.yml

@@ -1,9 +1,9 @@
 language: java
 
-# Since Jackson 2.7, build requires jdk7, although module itself works on jdk6 still (for now)
+# Jackson 3.x only compiles on Java 8 and above so...
 jdk:
-  - openjdk7
   - openjdk8
+  - oraclejdk9
 
 # Below this line is configuration for deploying to the Sonatype OSS repo
 # http://blog.xeiam.com/2013/05/configure-travis-ci-to-deploy-snapshots.html
@@ -16,7 +16,7 @@ after_success:
 branches:
   only:
     - master
-    - "2.10"
+    - "3.0"
 
 env:
   global:

README.md

@@ -1,16 +1,16 @@
 # Overview
 
 This project contains the general-purpose data-binding functionality
-and tree-model for [Jackson Data Processor](http://wiki.fasterxml.com/JacksonHome).
-It builds on [core streaming parser/generator](../../../jackson-core) package,
+and tree-model for [Jackson Data Processor](../../../jackson).
+It builds on [Streaming API](../../../jackson-core) (stream parser/generator) package,
 and uses [Jackson Annotations](../../../jackson-annotations) for configuration.
 Project is licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
 While the original use case for Jackson was JSON data-binding, it can now be used for other data formats as well, as long as parser and generator implementations exist.
 Naming of classes uses word 'JSON' in many places even though there is no actual hard dependency to JSON format.
 
 [![Build Status](https://travis-ci.org/FasterXML/jackson-databind.svg?branch=master)](https://travis-ci.org/FasterXML/jackson-databind) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.fasterxml.jackson.core/jackson-databind/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.fasterxml.jackson.core/jackson-databind)
-[![Javadoc](https://javadoc-emblem.rhcloud.com/doc/com.fasterxml.jackson.core/jackson-databind/badge.svg)](http://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind)
+[![Javadoc](https://javadoc.io/badge/com.fasterxml.jackson.core/jackson-databind.svg)](http://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind)
 [![Coverage Status](https://coveralls.io/repos/github/FasterXML/jackson-databind/badge.svg?branch=master)](https://coveralls.io/github/FasterXML/jackson-databind?branch=master)
 
 -----
@@ -25,7 +25,7 @@ Functionality of this package is contained in Java package `com.fasterxml.jackso
 <properties>
   ...
   <!-- Use the latest version whenever possible. -->
-  <jackson.version>2.9.0</jackson.version>
+  <jackson.version>2.9.7</jackson.version>
   ...
 </properties>
 
@@ -180,7 +180,7 @@ But let's look at a simple teaser to whet your appetite.
 JsonFactory f = mapper.getFactory(); // may alternatively construct directly too
 
 // First: write simple JSON output
-File jsonFile = new JsonFile("test.json");
+File jsonFile = new File("test.json");
 JsonGenerator g = f.createGenerator(jsonFile);
 // write JSON: { "message" : "Hello world!" }
 g.writeStartObject();
@@ -412,19 +412,19 @@ usually a Jackson module.
 
 -----
 
-# Differences from Jackson 1.x
+## Differences from Jackson 1.x
 
-Project contains versions 2.0 and above: source code for earlier (1.x) versions was available from [Codehaus](http://jackson.codehaus.org) SVN repository, but due to Codehaus closure is currently (July 2015) not officially available.
-We may try to create Jackson1x repository at Github in future (if you care about this, ping Jackson team via mailing lists, or file an issue for this project).
+Project contains versions 2.0 and above: source code for last (1.x) release, 1.9, is available at
+[Jackson-1](../../../jackson-1) repo.
 
-Main differences compared to 1.0 "mapper" jar are:
+Main differences compared to 1.x "mapper" jar are:
 
 * Maven build instead of Ant
 * Java package is now `com.fasterxml.jackson.databind` (instead of `org.codehaus.jackson.map`)
 
 -----
 
-# Further reading
+## Further reading
 
 * [Overall Jackson Docs](../../../jackson-docs)
 * [Project wiki page](https://github.com/FasterXML/jackson-databind/wiki)
@@ -433,4 +433,5 @@ Related:
 
 * [Core annotations](https://github.com/FasterXML/jackson-annotations) package defines annotations commonly used for configuring databinding details
 * [Core parser/generator](https://github.com/FasterXML/jackson-core) package defines low-level incremental/streaming parsers, generators
-* [Jackson Project Home](http://wiki.fasterxml.com/JacksonHome) has additional documentation (although much of it for Jackson 1.x)
+* [Jackson Project Home](../../../jackson) has links to all modules
+* [Jackson Docs](../../../jackson-docs) is project's documentation hub

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.10.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-databind</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <name>jackson-databind</name>
   <packaging>bundle</packaging>
   <description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -25,24 +25,17 @@
   </scm>
 
   <properties>
-    <!-- With Jackson 2.10 baseline is JDK 7 (except for annotations/streaming),
-         and new language features (diamond pattern) may be used.
-         JDK classes are still loaded dynamically since there isn't much downside
-         (small number of types); this allows use on JDK 6 platforms still (including
-         Android)
-      -->
-    <javac.src.version>1.7</javac.src.version>
-    <javac.target.version>1.7</javac.target.version>
-
     <!-- Can not use default, since group id != Java package name here -->
     <osgi.export>com.fasterxml.jackson.databind.*;version=${project.version}</osgi.export>
     <!-- but imports should work fine with defaults -->
 
+    <version.powermock>2.0.0-beta.5</version.powermock>
+
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/databind/cfg</packageVersion.dir>
     <packageVersion.package>com.fasterxml.jackson.databind.cfg</packageVersion.package>
 
-    <!-- NOTE! can not use packageVersion.package as is -->
+    <!-- Automatic Module Name default needs changing -->
     <jdk.module.name>com.fasterxml.jackson.databind</jdk.module.name>
   </properties>
 
@@ -66,26 +59,39 @@
     <!-- and for testing we need a few libraries
          libs for which we use reflection for code, but direct dep for testing
       -->
-
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>${version.powermock}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>1.7.4</version>
+      <version>${version.powermock}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.7.4</version>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>${version.powermock}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.9.1</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- For testing TestNoClassDefFoundDeserializer -->
     <dependency>
       <groupId>javax.measure</groupId>
       <artifactId>jsr-275</artifactId>
       <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <!-- Alas, need to include snapshot reference since otherwise can not find
@@ -101,20 +107,31 @@
   </repositories>
 
   <build>
-     <plugins>
-      <!-- Important: enable enforcer plug-in: -->
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions> <!-- or?  combine.children="merge"> -->
-          <execution>
-            <id>enforce-properties</id>
-	    <phase>validate</phase>
-            <goals><goal>enforce</goal></goals>
-          </execution>
-        </executions>
-      </plugin>
+    <plugins>
 
       <plugin>
+	<groupId>org.jacoco</groupId>
+	<artifactId>jacoco-maven-plugin</artifactId>
+
+<!-- from parent (base)
+    <executions>
+        <execution>
+            <goals>
+                <goal>prepare-agent</goal>
+            </goals>
+        </execution>
+        <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+                <goal>report</goal>
+            </goals>
+        </execution>
+    </executions>
+-->
+</plugin>
+
+       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <version>${version.plugin.surefire}</version>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -128,24 +145,37 @@
         </configuration>
       </plugin>
 
-      <!-- parent definitions should be ok, but need to add more links -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links combine.children="append">
-            <link>http://fasterxml.github.com/jackson-annotations/javadoc/2.9</link>
-            <link>http://fasterxml.github.com/jackson-core/javadoc/2.9</link>
+            <link>http://fasterxml.github.com/jackson-annotations/javadoc/3.0</link>
+            <link>http://fasterxml.github.com/jackson-core/javadoc/3.0</link>
           </links>
         </configuration>
       </plugin>
 
-      <!-- settings are fine, but needed to trigger execution! -->
-      <plugin>
+      <plugin> <!-- default settings are fine, just need to enable here -->
+        <!-- Inherited from oss-base. Generate PackageVersion.java.-->
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
 
+      <!-- 17-Sep-2017, tatu: With 3.0 need to ensure parameter names compiled in
+        -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <optimize>true</optimize>
+          <compilerArgs>
+            <arg>-parameters</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+
       <!-- 18-Oct-2016, tatu: Try to make coveralls work -->
       <plugin>
         <groupId>org.eluder.coveralls</groupId>
@@ -155,15 +185,6 @@
     </plugins>
   </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
     <profile>
       <id>release</id>

release-notes/CREDITS

@@ -0,0 +1,11 @@
+Here are people who have contributed to the development of Jackson JSON processor
+databind core component, version 3.x
+Version numbers in brackets indicate release in which the problem was fixed
+
+(note: for older credits, see `CREDITS-2.x` instead)
+
+Tatu Saloranta, [email protected]: author
+
+Alexander Koshman (akoshman@github)
+ * Requested #1600: Serializing locale with underscore, not standard hyphen	
+  [3.0.0]

release-notes/VERSION

@@ -0,0 +1,40 @@
+Project: jackson-databind 
+Versions: 3.x (for earlier see VERSION-2.x)
+
+------------------------------------------------------------------------
+=== Releases === 
+------------------------------------------------------------------------
+
+3.0.0 (not yet released)
+
+#1058: Add a way to pass std and format-specific parser/generator flags during
+  parser/generation construction
+#1600: Serializing locale with underscore, not standard hyphen
+ (requested by Alexander K)
+#1762: `StdDateFormat`: serialize time offset using colon
+#1772: Remove `MapperFeature. USE_STD_BEAN_NAMING`
+#1773: Remove `MapperFeature.AUTO_DETECT_xxx` features
+#1774: Merge Java8 datatype (`Optional`, `Stream`) support (`jackson-datatype-jdk8`
+#1775: Merge Java8 parameter name support (`jackson-module-parameter-names`)
+#1781: Return `ObjectNode` from `ObjectNode` set-methods in order to allow better chaining
+ (reported by timo-schmid@github)
+#1789: Add `createGenerator` methods in `ObjectMapper`, `ObjectWriter`
+#1790: Add `createParser` methods in `ObjectMapper`, `ObjectReader`
+#1883: Add "abstract type mapping" for deserialization from `Map<ENUMTYPE,V>`
+  into `EnumMap` (and `Set<ENUMTYPE>` to `EnumSet<EnumType>`) 
+#1888: Merge `ResolvableSerializer` into `JsonSerializer`, `ResolvableDeserializer`
+ into `JsonDeserializer`
+#1889: Merge `ContextualSerializer` into `JsonSerializer`, `ContextualDeserializer`
+ into `JsonDeserializer`
+#1916: Change `MapperFeature.USE_GETTERS_AS_SETTERS)` default to `false`
+#1917: Remove `canSerialize` and `canDeserialize` methods from `ObjectMapper`
+#1954: Add Builder pattern for creating configured `ObjectMapper` instances
+#1955: Change the way `Module`s configure, interact with `ObjectMapper`
+#1973: Remove support for "default [Map] key serializer" configuration from
+  `SerializerProvider`
+#1994: Limit size of `SerializerCache`, auto-flush on exceeding
+#1995: Limit size of `DeserializerCache`, auto-flush on exceeding
+#2040: Remove `JsonSerializer.isEmpty()` from 3.0
+#2176: Add `JsonMapper.shared()` static method
+- Remove `MappingJsonFactory`
+- Add context parameter for `TypeSerializer` contextualization (`forProperty()`)

src/main/java/com/fasterxml/jackson/databind/AbstractTypeResolver.java

@@ -30,18 +30,6 @@ public JavaType findTypeMapping(DeserializationConfig config, JavaType type) {
         return null;
     }
 
-    /**
-     * Older variant of {@link #resolveAbstractType(DeserializationConfig, BeanDescription)};
-     * obsoleted in 2.7
-     *
-     * @deprecated since 2.8 (may be removed from 2.9 or later)
-     */
-    @Deprecated
-    public JavaType resolveAbstractType(DeserializationConfig config,
-            JavaType type) {
-        return null;
-    }
-
     /**
      * Method called to try to resolve an abstract type into
      * concrete type (usually for purposes of deserializing),
@@ -56,8 +44,6 @@ public JavaType resolveAbstractType(DeserializationConfig config,
      * @return Resolved concrete type (which should retain generic
      *    type parameters of input type, if any), if resolution succeeds;
      *    null if resolver does not know how to resolve given type
-     *
-     * @since 2.7
      */
     public JavaType resolveAbstractType(DeserializationConfig config,
             BeanDescription typeDesc) {