Yet more pruning
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedInputStream.java b/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedInputStream.java
index b36e6cb..2e89342 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedInputStream.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedInputStream.java
@@ -8,32 +8,21 @@
* Simple {@link InputStream} implementation that exposes currently
* available content of a {@link ByteBuffer}.
*/
-public class ByteBufferBackedInputStream extends InputStream
-{
- protected final ByteBuffer _buffer;
+public class ByteBufferBackedInputStream extends InputStream {
+ protected final ByteBuffer _b;
- public ByteBufferBackedInputStream(ByteBuffer buf) {
- _buffer = buf;
- }
+ public ByteBufferBackedInputStream(ByteBuffer buf) { _b = buf; }
- @Override
- public int available() {
- return _buffer.remaining();
- }
+ @Override public int available() { return _b.remaining(); }
@Override
- public int read() throws IOException {
- return _buffer.hasRemaining() ? (_buffer.get() & 0xFF) : -1;
- }
+ public int read() throws IOException { return _b.hasRemaining() ? (_b.get() & 0xFF) : -1; }
@Override
- public int read(byte[] bytes, int off, int len) throws IOException
- {
- if (!_buffer.hasRemaining()) {
- return -1;
- }
- len = Math.min(len, _buffer.remaining());
- _buffer.get(bytes, off, len);
+ public int read(byte[] bytes, int off, int len) throws IOException {
+ if (!_b.hasRemaining()) return -1;
+ len = Math.min(len, _b.remaining());
+ _b.get(bytes, off, len);
return len;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedOutputStream.java b/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedOutputStream.java
index 3f8e51e..e59a801 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedOutputStream.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ByteBufferBackedOutputStream.java
@@ -7,21 +7,11 @@
* Simple {@link OutputStream} implementation that appends content
* written in given {@link ByteBuffer} instance.
*/
-public class ByteBufferBackedOutputStream extends OutputStream
-{
- protected final ByteBuffer _buffer;
+public class ByteBufferBackedOutputStream extends OutputStream {
+ protected final ByteBuffer _b;
- public ByteBufferBackedOutputStream(ByteBuffer buf) {
- this._buffer = buf;
- }
+ public ByteBufferBackedOutputStream(ByteBuffer buf) { _b = buf; }
- @Override
- public void write(int b) throws IOException {
- _buffer.put((byte) b);
- }
-
- @Override
- public void write(byte[] bytes, int off, int len) throws IOException {
- _buffer.put(bytes, off, len);
- }
+ @Override public void write(int b) throws IOException { _b.put((byte) b); }
+ @Override public void write(byte[] bytes, int off, int len) throws IOException { _b.put(bytes, off, len); }
}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java b/src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java
index c7bf18f..c3f4efc 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java
@@ -25,22 +25,17 @@
* @param endBefore Super-type to NOT include in results, if any; when
* encountered, will be ignored (and no super types are checked).
*/
- public static List<Class<?>> findSuperTypes(Class<?> cls, Class<?> endBefore)
- {
+ public static List<Class<?>> findSuperTypes(Class<?> cls, Class<?> endBefore) {
return findSuperTypes(cls, endBefore, new ArrayList<Class<?>>(8));
}
- public static List<Class<?>> findSuperTypes(Class<?> cls, Class<?> endBefore, List<Class<?>> result)
- {
+ public static List<Class<?>> findSuperTypes(Class<?> cls, Class<?> endBefore, List<Class<?>> result) {
_addSuperTypes(cls, endBefore, result, false);
return result;
}
- private static void _addSuperTypes(Class<?> cls, Class<?> endBefore, Collection<Class<?>> result, boolean addClassItself)
- {
- if (cls == endBefore || cls == null || cls == Object.class) {
- return;
- }
+ private static void _addSuperTypes(Class<?> cls, Class<?> endBefore, Collection<Class<?>> result, boolean addClassItself) {
+ if (cls == endBefore || cls == null || cls == Object.class) { return; }
if (addClassItself) {
if (result.contains(cls)) { // already added, no need to check supers
return;
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/EmptyIterator.java b/src/main/java/com/fasterxml/jackson/databind/util/EmptyIterator.java
index c341d8a..fb11e30 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/EmptyIterator.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/EmptyIterator.java
@@ -10,24 +10,13 @@
*
* @since 2.2 (before, we had embedded instances)
*/
-public class EmptyIterator<T> implements Iterator<T>
-{
+public class EmptyIterator<T> implements Iterator<T> {
private final static EmptyIterator<?> instance = new EmptyIterator<Object>();
- private EmptyIterator() { }
-
@SuppressWarnings("unchecked")
- public static <T> Iterator<T> instance() {
- return (Iterator<T>) instance;
- }
+ public static <T> Iterator<T> instance() { return (Iterator<T>) instance; }
- @Override
- public boolean hasNext() { return false; }
- @Override
- public T next() { throw new NoSuchElementException(); }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
+ @Override public boolean hasNext() { return false; }
+ @Override public T next() { throw new NoSuchElementException(); }
+ @Override public void remove() { throw new UnsupportedOperationException(); }
}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java b/src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java
index 0abd0d9..4f4f666 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/EnumResolver.java
@@ -9,8 +9,7 @@
* Helper class used to resolve String values (either JSON Object field
* names or regular String values) into Java Enum instances.
*/
-public class EnumResolver<T extends Enum<T>>
- implements java.io.Serializable
+public class EnumResolver<T extends Enum<T>> implements java.io.Serializable
{
private static final long serialVersionUID = 1L;
@@ -118,21 +117,16 @@
return constructUsingMethod(enumCls, accessor);
}
- public T findEnum(String key)
- {
- return _enumsById.get(key);
- }
+ public T findEnum(String key) { return _enumsById.get(key); }
- public T getEnum(int index)
- {
+ public T getEnum(int index) {
if (index < 0 || index >= _enums.length) {
return null;
}
return _enums[index];
}
- public List<T> getEnums()
- {
+ public List<T> getEnums() {
ArrayList<T> enums = new ArrayList<T>(_enums.length);
for (T e : _enums) {
enums.add(e);
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/EnumValues.java b/src/main/java/com/fasterxml/jackson/databind/util/EnumValues.java
index 40752a5..bbbad1e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/EnumValues.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/EnumValues.java
@@ -11,9 +11,6 @@
*/
public final class EnumValues
{
- /**
- * @since 2.2
- */
private final Class<Enum<?>> _enumClass;
/**
@@ -28,8 +25,7 @@
_values = new EnumMap(v);
}
- public static EnumValues construct(Class<Enum<?>> enumClass, AnnotationIntrospector intr)
- {
+ public static EnumValues construct(Class<Enum<?>> enumClass, AnnotationIntrospector intr) {
return constructFromName(enumClass, intr);
}
@@ -67,30 +63,16 @@
throw new IllegalArgumentException("Can not determine enum constants for Class "+enumClass.getName());
}
- public SerializedString serializedValueFor(Enum<?> key)
- {
- return _values.get(key);
- }
-
- public Collection<SerializedString> values() {
- return _values.values();
- }
+ public SerializedString serializedValueFor(Enum<?> key) { return _values.get(key); }
+ public Collection<SerializedString> values() { return _values.values(); }
/**
- * Method used for serialization and introspection by core Jackson
- * code.
- *
- * @since 2.1
+ * Method used for serialization and introspection by core Jackson code.
*/
- public EnumMap<?,SerializedString> internalMap() {
- return _values;
- }
+ public EnumMap<?,SerializedString> internalMap() { return _values; }
/**
* @since 2.2
*/
- public Class<Enum<?>> getEnumClass() {
- return _enumClass;
- }
-
+ public Class<Enum<?>> getEnumClass() { return _enumClass; }
}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java b/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
index fc19024..50ee767 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
@@ -29,16 +29,14 @@
}
@Override
- public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition)
- {
+ public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
String value = ISO8601Utils.format(date);
toAppendTo.append(value);
return toAppendTo;
}
@Override
- public Date parse(String source, ParsePosition pos)
- {
+ public Date parse(String source, ParsePosition pos) {
// index must be set to other than 0, I would swear this requirement is not there in
// some version of jdk 6.
/* 03-Nov-2013, tatu: I can't see this having any direct effect
@@ -58,7 +56,5 @@
}
@Override
- public String toString() {
- return getClass().getName();
- }
+ public String toString() { return getClass().getName(); }
}
\ No newline at end of file
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ISO8601Utils.java b/src/main/java/com/fasterxml/jackson/databind/util/ISO8601Utils.java
index 43398ac..84a3452 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ISO8601Utils.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ISO8601Utils.java
@@ -27,9 +27,7 @@
/**
* Accessor for static GMT timezone instance.
*/
- public static TimeZone timeZoneGMT() {
- return TIMEZONE_GMT;
- }
+ public static TimeZone timeZoneGMT() { return TIMEZONE_GMT; }
/*
/**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java b/src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java
index 90bbdf8..f411a92 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/JSONWrappedObject.java
@@ -14,11 +14,8 @@
* function name and parenthesis are used with JSONP).
*
* @see com.fasterxml.jackson.databind.util.JSONPObject
- *
- * @author tatu
*/
-public class JSONWrappedObject
- implements JsonSerializable
+public class JSONWrappedObject implements JsonSerializable
{
/**
* Literal String to output before serialized value.
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/Provider.java b/src/main/java/com/fasterxml/jackson/databind/util/Provider.java
deleted file mode 100644
index 075748c..0000000
--- a/src/main/java/com/fasterxml/jackson/databind/util/Provider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.fasterxml.jackson.databind.util;
-
-import java.util.*;
-
-/**
-* Simple helper class used for decoupling instantiation of
-* optionally loaded handlers, like deserializers and deserializers
-* for libraries that are only present on some platforms.
- *
- * @author tatu
- *
- * @param <T> Type of objects provided
- *
- * @since 2.2 Not really needed that much, will be eventually removed
- */
-@Deprecated
-public interface Provider<T>
-{
- /**
- * Method used to request provider to provide entries it has
- */
- public Collection<T> provide();
-}
-
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/RootNameLookup.java b/src/main/java/com/fasterxml/jackson/databind/util/RootNameLookup.java
index c262444..531aec7 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/RootNameLookup.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/RootNameLookup.java
@@ -10,8 +10,7 @@
/**
* Helper class for caching resolved root names.
*/
-public class RootNameLookup
- implements java.io.Serializable
+public class RootNameLookup implements java.io.Serializable
{
private static final long serialVersionUID = 1L;
@@ -23,8 +22,7 @@
public RootNameLookup() { }
- public SerializedString findRootName(JavaType rootType, MapperConfig<?> config)
- {
+ public SerializedString findRootName(JavaType rootType, MapperConfig<?> config) {
return findRootName(rootType.getRawClass(), config);
}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java b/src/main/java/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java
index 93605b1..5adbf5f 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java
@@ -138,24 +138,16 @@
*/
@Override
- public boolean hasGetter() {
- return (getGetter() != null);
- }
+ public boolean hasGetter() { return (getGetter() != null); }
@Override
- public boolean hasSetter() {
- return (getSetter() != null);
- }
+ public boolean hasSetter() { return (getSetter() != null); }
@Override
- public boolean hasField() {
- return (_member instanceof AnnotatedField);
- }
+ public boolean hasField() { return (_member instanceof AnnotatedField); }
@Override
- public boolean hasConstructorParameter() {
- return (_member instanceof AnnotatedParameter);
- }
+ public boolean hasConstructorParameter() { return (_member instanceof AnnotatedParameter); }
@Override
public AnnotatedMethod getGetter() {
@@ -177,14 +169,12 @@
@Override
public AnnotatedField getField() {
- return (_member instanceof AnnotatedField) ?
- (AnnotatedField) _member : null;
+ return (_member instanceof AnnotatedField) ? (AnnotatedField) _member : null;
}
@Override
public AnnotatedParameter getConstructorParameter() {
- return (_member instanceof AnnotatedParameter) ?
- (AnnotatedParameter) _member : null;
+ return (_member instanceof AnnotatedParameter) ? (AnnotatedParameter) _member : null;
}
/**
@@ -228,7 +218,5 @@
}
@Override
- public AnnotatedMember getPrimaryMember() {
- return _member;
- }
+ public AnnotatedMember getPrimaryMember() { return _member; }
}
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/StdConverter.java b/src/main/java/com/fasterxml/jackson/databind/util/StdConverter.java
index 1e280c3..e36682a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/StdConverter.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/StdConverter.java
@@ -18,7 +18,7 @@
/* Partial Converter API implementation
/**********************************************************
*/
-
+
@Override
public abstract OUT convert(IN value);
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
index d49f5a3..9ad136c 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
@@ -91,7 +91,7 @@
/**
* Offset within last segment,
*/
- protected int _appendOffset;
+ protected int _appendAt;
/**
* If native type ids supported, this is the id for following
@@ -150,7 +150,7 @@
_writeContext = JsonWriteContext.createRootContext(null);
// at first we have just one segment
_first = _last = new Segment();
- _appendOffset = 0;
+ _appendAt = 0;
_hasNativeTypeIds = hasNativeIds;
_hasNativeObjectIds = hasNativeIds;
@@ -167,7 +167,7 @@
_writeContext = JsonWriteContext.createRootContext(null);
// at first we have just one segment
_first = _last = new Segment();
- _appendOffset = 0;
+ _appendAt = 0;
_hasNativeTypeIds = jp.canReadTypeId();
_hasNativeObjectIds = jp.canReadObjectId();
_mayHaveNativeIds = _hasNativeTypeIds | _hasNativeObjectIds;
@@ -462,11 +462,11 @@
private final void _appendNativeIds(StringBuilder sb)
{
- Object objectId = _last.findObjectId(_appendOffset-1);
+ Object objectId = _last.findObjectId(_appendAt-1);
if (objectId != null) {
sb.append("[objectId=").append(String.valueOf(objectId)).append(']');
}
- Object typeId = _last.findTypeId(_appendOffset-1);
+ Object typeId = _last.findTypeId(_appendAt-1);
if (typeId != null) {
sb.append("[typeId=").append(String.valueOf(typeId)).append(']');
}
@@ -990,39 +990,39 @@
protected final void _append(JsonToken type)
{
Segment next = _hasNativeId
- ? _last.append(_appendOffset, type, _objectId, _typeId)
- : _last.append(_appendOffset, type);
+ ? _last.append(_appendAt, type, _objectId, _typeId)
+ : _last.append(_appendAt, type);
if (next == null) {
- ++_appendOffset;
+ ++_appendAt;
} else {
_last = next;
- _appendOffset = 1; // since we added first at 0
+ _appendAt = 1; // since we added first at 0
}
}
protected final void _append(JsonToken type, Object value)
{
Segment next = _hasNativeId
- ? _last.append(_appendOffset, type, value, _objectId, _typeId)
- : _last.append(_appendOffset, type, value);
+ ? _last.append(_appendAt, type, value, _objectId, _typeId)
+ : _last.append(_appendAt, type, value);
if (next == null) {
- ++_appendOffset;
+ ++_appendAt;
} else {
_last = next;
- _appendOffset = 1;
+ _appendAt = 1;
}
}
protected final void _appendRaw(int rawType, Object value)
{
Segment next = _hasNativeId
- ? _last.appendRaw(_appendOffset, rawType, value, _objectId, _typeId)
- : _last.appendRaw(_appendOffset, rawType, value);
+ ? _last.appendRaw(_appendAt, rawType, value, _objectId, _typeId)
+ : _last.appendRaw(_appendAt, rawType, value);
if (next == null) {
- ++_appendOffset;
+ ++_appendAt;
} else {
_last = next;
- _appendOffset = 1;
+ _appendAt = 1;
}
}
@@ -1714,8 +1714,7 @@
_tokenTypes |= typeCode;
}
- private void set(int index, int rawTokenType, Object value,
- Object objectId, Object typeId)
+ private void set(int index, int rawTokenType, Object value, Object objectId, Object typeId)
{
_tokens[index] = value;
long typeCode = (long) rawTokenType;
@@ -1726,8 +1725,7 @@
assignNativeIds(index, objectId, typeId);
}
- private final void assignNativeIds(int index,
- Object objectId, Object typeId)
+ private final void assignNativeIds(int index, Object objectId, Object typeId)
{
if (_nativeIds == null) {
_nativeIds = new TreeMap<Integer,Object>();
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ViewMatcher.java b/src/main/java/com/fasterxml/jackson/databind/util/ViewMatcher.java
index 89c81b5..4eff505 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ViewMatcher.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ViewMatcher.java
@@ -4,18 +4,22 @@
* Helper class used for checking whether a property is visible
* in the active view
*/
-public abstract class ViewMatcher
+public class ViewMatcher implements java.io.Serializable
{
- public abstract boolean isVisibleForView(Class<?> activeView);
+ private static final long serialVersionUID = 1L;
+
+ protected final static ViewMatcher EMPTY = new ViewMatcher();
+
+ public boolean isVisibleForView(Class<?> activeView) { return false; }
public static ViewMatcher construct(Class<?>[] views)
{
if (views == null) {
- return Empty.instance;
+ return EMPTY;
}
switch (views.length) {
case 0:
- return Empty.instance;
+ return EMPTY;
case 1:
return new Single(views[0]);
}
@@ -28,20 +32,7 @@
/**********************************************************
*/
- private final static class Empty extends ViewMatcher
- implements java.io.Serializable
- {
- private static final long serialVersionUID = 1L;
-
- final static Empty instance = new Empty();
- @Override
- public boolean isVisibleForView(Class<?> activeView) {
- return false;
- }
- }
-
private final static class Single extends ViewMatcher
- implements java.io.Serializable
{
private static final long serialVersionUID = 1L;
