More stylistic tweaks, moving to more compact format (sorry!)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/JsonFactory.java

@@ -588,9 +588,7 @@ public final boolean isEnabled(JsonGenerator.Feature f) {
      * Method for accessing custom escapes factory uses for {@link JsonGenerator}s
      * it creates.
      */
-    public CharacterEscapes getCharacterEscapes() {
-        return _characterEscapes;
-    }
+    public CharacterEscapes getCharacterEscapes() { return _characterEscapes; }
 
     /**
      * Method for defining custom escapes factory uses for {@link JsonGenerator}s
@@ -678,9 +676,7 @@ public JsonFactory setCodec(ObjectCodec oc) {
      * 
      * @since 2.1
      */
-    public JsonParser createParser(File f)
-        throws IOException, JsonParseException
-    {
+    public JsonParser createParser(File f) throws IOException, JsonParseException {
         // true, since we create InputStream from File
         IOContext ctxt = _createContext(f, true);
         InputStream in = new FileInputStream(f);
@@ -706,9 +702,7 @@ public JsonParser createParser(File f)
      * 
      * @since 2.1
      */
-    public JsonParser createParser(URL url)
-        throws IOException, JsonParseException
-    {
+    public JsonParser createParser(URL url) throws IOException, JsonParseException {
         // true, since we create InputStream from URL
         IOContext ctxt = _createContext(url, true);
         InputStream in = _optimizedStreamFromURL(url);
@@ -736,9 +730,7 @@ public JsonParser createParser(URL url)
      * 
      * @since 2.1
      */
-    public JsonParser createParser(InputStream in)
-        throws IOException, JsonParseException
-    {
+    public JsonParser createParser(InputStream in) throws IOException, JsonParseException {
         IOContext ctxt = _createContext(in, false);
         // [JACKSON-512]: allow wrapping with InputDecorator
         if (_inputDecorator != null) {
@@ -761,9 +753,7 @@ public JsonParser createParser(InputStream in)
      * 
      * @since 2.1
      */
-    public JsonParser createParser(Reader r)
-        throws IOException, JsonParseException
-    {
+    public JsonParser createParser(Reader r) throws IOException, JsonParseException {
         // false -> we do NOT own Reader (did not create it)
         IOContext ctxt = _createContext(r, false);
         // [JACKSON-512]: allow wrapping with InputDecorator
@@ -779,9 +769,7 @@ public JsonParser createParser(Reader r)
      * 
      * @since 2.1
      */
-    public JsonParser createParser(byte[] data)
-        throws IOException, JsonParseException
-    {
+    public JsonParser createParser(byte[] data) throws IOException, JsonParseException {
         IOContext ctxt = _createContext(data, true);
         // [JACKSON-512]: allow wrapping with InputDecorator
         if (_inputDecorator != null) {
@@ -803,9 +791,7 @@ public JsonParser createParser(byte[] data)
      * 
      * @since 2.1
      */
-    public JsonParser createParser(byte[] data, int offset, int len)
-        throws IOException, JsonParseException
-    {
+    public JsonParser createParser(byte[] data, int offset, int len) throws IOException, JsonParseException {
         IOContext ctxt = _createContext(data, true);
         // [JACKSON-512]: allow wrapping with InputDecorator
         if (_inputDecorator != null) {
@@ -823,8 +809,7 @@ public JsonParser createParser(byte[] data, int offset, int len)
      * 
      * @since 2.1
      */
-    public JsonParser createParser(String content) throws IOException, JsonParseException
-    {
+    public JsonParser createParser(String content) throws IOException, JsonParseException {
         Reader r = new StringReader(content);
         // true -> we own the Reader (and must close); not a big deal
         IOContext ctxt = _createContext(r, true);

src/main/java/com/fasterxml/jackson/core/JsonParseException.java

@@ -10,18 +10,14 @@
  * (content that does not conform to JSON syntax as per specification)
  * is encountered.
  */
-public class JsonParseException
-    extends JsonProcessingException
-{
+public class JsonParseException extends JsonProcessingException {
     private static final long serialVersionUID = 1L;
 
-    public JsonParseException(String msg, JsonLocation loc)
-    {
+    public JsonParseException(String msg, JsonLocation loc) {
         super(msg, loc);
     }
 
-    public JsonParseException(String msg, JsonLocation loc, Throwable root)
-    {
+    public JsonParseException(String msg, JsonLocation loc, Throwable root) {
         super(msg, loc, root);
     }
 }

src/main/java/com/fasterxml/jackson/core/JsonParser.java

@@ -493,7 +493,7 @@ public JsonParser setFeatureMask(int mask) {
      * @return Next token from the stream, if any found, or null
      *   to indicate end-of-input
      */
-    public abstract JsonToken nextToken() throws IOException;
+    public abstract JsonToken nextToken() throws IOException, JsonParseException;
 
     /**
      * Iteration method that will advance stream enough
@@ -512,7 +512,7 @@ public JsonParser setFeatureMask(int mask) {
      *   parsers, {@link JsonToken#NOT_AVAILABLE} if no tokens were
      *   available yet)
      */
-    public abstract JsonToken nextValue() throws IOException;
+    public abstract JsonToken nextValue() throws IOException, JsonParseException;
 
     /**
      * Method that fetches next token (as if calling {@link #nextToken}) and
@@ -527,7 +527,7 @@ public JsonParser setFeatureMask(int mask) {
      * 
      * @param str Property name to compare next token to (if next token is <code>JsonToken.FIELD_NAME<code>)
      */
-    public boolean nextFieldName(SerializableString str) throws IOException {
+    public boolean nextFieldName(SerializableString str) throws IOException, JsonParseException {
         return (nextToken() == JsonToken.FIELD_NAME) && str.getValue().equals(getCurrentName());
     }
 
@@ -542,7 +542,7 @@ public boolean nextFieldName(SerializableString str) throws IOException {
      * but may be faster for parser to process, and can therefore be used if caller
      * expects to get a String value next from input.
      */
-    public String nextTextValue() throws IOException {
+    public String nextTextValue() throws IOException, JsonParseException {
         return (nextToken() == JsonToken.VALUE_STRING) ? getText() : null;
     }
 
@@ -557,7 +557,7 @@ public String nextTextValue() throws IOException {
      * but may be faster for parser to process, and can therefore be used if caller
      * expects to get a String value next from input.
      */
-    public int nextIntValue(int defaultValue) throws IOException {
+    public int nextIntValue(int defaultValue) throws IOException, JsonParseException {
         return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getIntValue() : defaultValue;
     }
 
@@ -572,7 +572,7 @@ public int nextIntValue(int defaultValue) throws IOException {
      * but may be faster for parser to process, and can therefore be used if caller
      * expects to get a String value next from input.
      */
-    public long nextLongValue(long defaultValue) throws IOException {
+    public long nextLongValue(long defaultValue) throws IOException, JsonParseException {
         return (nextToken() == JsonToken.VALUE_NUMBER_INT) ? getLongValue() : defaultValue;
     }
 
@@ -590,7 +590,7 @@ public long nextLongValue(long defaultValue) throws IOException {
      * but may be faster for parser to process, and can therefore be used if caller
      * expects to get a String value next from input.
      */
-    public Boolean nextBooleanValue() throws IOException {
+    public Boolean nextBooleanValue() throws IOException, JsonParseException {
         JsonToken t = nextToken();
         if (t == JsonToken.VALUE_TRUE) { return Boolean.TRUE; }
         if (t == JsonToken.VALUE_FALSE) { return Boolean.FALSE; }
@@ -611,7 +611,7 @@ public Boolean nextBooleanValue() throws IOException {
      * will call {@link #nextToken} to point to the next
      * available token, if any.
      */
-    public abstract JsonParser skipChildren() throws IOException;
+    public abstract JsonParser skipChildren() throws IOException, JsonParseException;
 
     /**
      * Method that can be called to determine whether this parser

src/main/java/com/fasterxml/jackson/core/JsonPointer.java

@@ -52,8 +52,7 @@ public class JsonPointer
      * Constructor used for creating "empty" instance, used to represent
      * state that matches current node.
      */
-    protected JsonPointer()
-    {
+    protected JsonPointer() {
         _nextSegment = null;
         _matchingPropertyName = "";
         _matchingElementIndex = -1;
@@ -63,8 +62,7 @@ protected JsonPointer()
     /**
      * Constructor used for creating non-empty Segments
      */
-    protected JsonPointer(String fullString, String segment, JsonPointer next)
-    {
+    protected JsonPointer(String fullString, String segment, JsonPointer next) {
         _asString = fullString;
         _nextSegment = next;
         // Ok; may always be a property
@@ -87,17 +85,15 @@ protected JsonPointer(String fullString, String segment, JsonPointer next)
      *   expression: currently the only such expression is one that does NOT start with
      *   a slash ('/').
      */
-    public static JsonPointer compile(String input)
-        throws IllegalArgumentException
+    public static JsonPointer compile(String input) throws IllegalArgumentException
     {
         // First quick checks for well-known 'empty' pointer
         if ((input == null) || input.length() == 0) {
             return EMPTY;
         }
         // And then quick validity check:
         if (input.charAt(0) != '/') {
-            throw new IllegalArgumentException("Invalid input: JSON Pointer expression must start with '/': "
-                    +"\""+input+"\"");
+            throw new IllegalArgumentException("Invalid input: JSON Pointer expression must start with '/': "+"\""+input+"\"");
         }
         return _parseTail(input);
     }
@@ -108,10 +104,7 @@ public static JsonPointer compile(String input)
      */
     public static JsonPointer valueOf(String input) { return compile(input); }
 
-    /*
-    
-    /**
-     * Factory method that composes a pointer instance, given a set
+    /* Factory method that composes a pointer instance, given a set
      * of 'raw' segments: raw meaning that no processing will be done,
      * no escaping may is present.
      * 
@@ -139,25 +132,11 @@ public static JsonPointer fromSegment(String... segments)
     /**********************************************************
      */
 
-    public boolean matches() {
-        return _nextSegment == null;
-    }
-    
-    public String getMatchingProperty() {
-        return _matchingPropertyName;
-    }
-
-    public int getMatchingIndex() {
-        return _matchingElementIndex;
-    }
-
-    public boolean mayMatchProperty() {
-        return _matchingPropertyName != null;
-    }
-
-    public boolean mayMatchElement() {
-        return _matchingElementIndex >= 0;
-    }
+    public boolean matches() { return _nextSegment == null; }
+    public String getMatchingProperty() { return _matchingPropertyName; }
+    public int getMatchingIndex() { return _matchingElementIndex; }
+    public boolean mayMatchProperty() { return _matchingPropertyName != null; }
+    public boolean mayMatchElement() { return _matchingElementIndex >= 0; }
 
     public JsonPointer matchProperty(String name) {
         if (_nextSegment == null || !_matchingPropertyName.equals(name)) {
@@ -187,24 +166,13 @@ public JsonPointer tail() {
     /**********************************************************
      */
 
-    @Override
-    public String toString() {
-        return _asString;
-    }
-
-    @Override
-    public int hashCode() {
-        return _asString.hashCode();
-    }
+    @Override public String toString() { return _asString; }
+    @Override public int hashCode() { return _asString.hashCode(); }
 
-    @Override
-    public boolean equals(Object o)
-    {
+    @Override public boolean equals(Object o) {
         if (o == this) return true;
         if (o == null) return false;
-        if (!(o instanceof JsonPointer)) {
-            return false;
-        }
+        if (!(o instanceof JsonPointer)) return false;
         return _asString.equals(((JsonPointer) o)._asString);
     }
 
@@ -214,8 +182,7 @@ public boolean equals(Object o)
     /**********************************************************
      */
 
-    private final static int _parseInt(String str)
-    {
+    private final static int _parseInt(String str) {
         final int len = str.length();
         if (len == 0) {
             return -1;
@@ -230,8 +197,7 @@ private final static int _parseInt(String str)
         return NumberInput.parseInt(str);
     }
 
-    protected static JsonPointer _parseTail(String input)
-    {
+    protected static JsonPointer _parseTail(String input) {
         final int end = input.length();
 
         // first char is the contextual slash, skip
@@ -259,8 +225,7 @@ protected static JsonPointer _parseTail(String input)
      * @param input Full input for the tail being parsed
      * @param i Offset to character after tilde
      */
-    protected static JsonPointer _parseQuotedTail(String input, int i)
-    {
+    protected static JsonPointer _parseQuotedTail(String input, int i) {
         final int end = input.length();
         StringBuilder sb = new StringBuilder(Math.max(16, end));
         if (i > 2) {
@@ -284,8 +249,7 @@ protected static JsonPointer _parseQuotedTail(String input, int i)
         return new JsonPointer(input, sb.toString(), EMPTY);
     }
 
-    private static void _appendEscape(StringBuilder sb, char c)
-    {
+    private static void _appendEscape(StringBuilder sb, char c) {
         if (c == '0') {
             c = '~';
         } else if (c == '1') {