Merge branch '2.6'
Conflicts:
pom.xml
release-notes/VERSION
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 88ba6a9..04d1ef2 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -26,6 +26,10 @@
- Implemented `ReaderBasedJsonParser.nextFieldName(SerializableString)`
(to improved Afterburner performance over String/char[] sources)
+2.6.4 (07-Dec-2015)
+
+No changes since 2.6.3.
+
2.6.3 (12-Oct-2015)
#220: Problem with `JsonParser.nextFieldName(SerializableString)` for byte-backed parser
diff --git a/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java b/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
index 2cba09e..9be3f84 100644
--- a/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
@@ -277,7 +277,7 @@
/**
* Method for accessing the object used for writing Java
- * object as Json content
+ * object as JSON content
* (using method {@link #writeObject}).
*/
public abstract ObjectCodec getCodec();
@@ -980,7 +980,7 @@
* encoded, as a complete String value (surrounded by double quotes).
* This method defaults
*<p>
- * Note: because Json Strings can not contain unescaped linefeeds,
+ * Note: because JSON Strings can not contain unescaped linefeeds,
* if linefeeds are included (as per last argument), they must be
* escaped. This adds overhead for decoding without improving
* readability.
@@ -1169,7 +1169,7 @@
public abstract void writeNumber(String encodedValue) throws IOException;
/**
- * Method for outputting literal Json boolean value (one of
+ * Method for outputting literal JSON boolean value (one of
* Strings 'true' and 'false').
* Can be called in any context where a value is expected
* (Array value, Object field value, root-level value).
@@ -1179,7 +1179,7 @@
public abstract void writeBoolean(boolean state) throws IOException;
/**
- * Method for outputting literal Json null value.
+ * Method for outputting literal JSON null value.
* Can be called in any context where a value is expected
* (Array value, Object field value, root-level value).
* Additional white space may be added around the value
@@ -1235,7 +1235,7 @@
public void writeTypeId(Object id) throws IOException {
throw new JsonGenerationException("No native support for writing Type Ids", this);
}
-
+
/*
/**********************************************************
/* Public API, write methods, serializing Java objects
@@ -1246,8 +1246,8 @@
* Method for writing given Java object (POJO) as Json.
* Exactly how the object gets written depends on object
* in question (ad on codec, its configuration); for most
- * beans it will result in Json object, but for others Json
- * array, or String or numeric value (and for nulls, Json
+ * beans it will result in JSON Object, but for others JSON
+ * Array, or String or numeric value (and for nulls, JSON
* null literal.
* <b>NOTE</b>: generator must have its <b>object codec</b>
* set to non-null value; for generators created by a mapping
@@ -1463,7 +1463,7 @@
* Method for copying contents of the current event that
* the given parser instance points to.
* Note that the method <b>will not</b> copy any other events,
- * such as events contained within Json Array or Object structures.
+ * such as events contained within JSON Array or Object structures.
*<p>
* Calling this method will not advance the given
* parser, although it may cause parser to internally process
@@ -1561,7 +1561,7 @@
* </li>
* <li>{@link JsonToken#FIELD_NAME} the logical value (which
* can consist of a single scalar value; or a sequence of related
- * events for structured types (Json Arrays, Objects)) will
+ * events for structured types (JSON Arrays, Objects)) will
* be copied along with the name itself. So essentially the
* whole <b>field entry</b> (name and value) will be copied.
* </li>
diff --git a/src/main/java/com/fasterxml/jackson/core/TreeCodec.java b/src/main/java/com/fasterxml/jackson/core/TreeCodec.java
index b1037b6..9aa1232 100644
--- a/src/main/java/com/fasterxml/jackson/core/TreeCodec.java
+++ b/src/main/java/com/fasterxml/jackson/core/TreeCodec.java
@@ -10,8 +10,8 @@
*/
public abstract class TreeCodec
{
- public abstract <T extends TreeNode> T readTree(JsonParser jp) throws IOException, JsonProcessingException;
- public abstract void writeTree(JsonGenerator jg, TreeNode tree) throws IOException, JsonProcessingException;
+ public abstract <T extends TreeNode> T readTree(JsonParser p) throws IOException, JsonProcessingException;
+ public abstract void writeTree(JsonGenerator g, TreeNode tree) throws IOException, JsonProcessingException;
public abstract TreeNode createArrayNode();
public abstract TreeNode createObjectNode();
public abstract JsonParser treeAsTokens(TreeNode node);