Trying to resolve all compilation, javadoc warnings for 1.6.0 release
diff --git a/build-test.xml b/build-test.xml
index 599a21c..8fde4e9 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -106,7 +106,7 @@
<!-- and also interop tests, run later on -->
<exclude name="org/codehaus/jackson/jaxrs/*.class"/>
<exclude name="org/codehaus/jackson/map/interop/Test*.class"/>
- <exclude name="org/codehaus/jackson/map/version/*.class"/>
+ <exclude name="org/codehaus/jackson/version/*.class"/>
<include name="**/Test*.class"/>
</fileset>
</batchtest>
diff --git a/release-notes/VERSION b/release-notes/VERSION
index ddd9a39..fa2cde2 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -1,10 +1,12 @@
Version: 1.6.0
Release date:
- xx-Aug-2010
+ 06-Sep-2010
Description:
- Version 1.6
+ The official 1.6 release. Technically a minor release after 1.5 as API is
+ designed to be backwards compatible with earlier 1.x version (and 1.5
+ specifically).
Fixes:
diff --git a/src/java/org/codehaus/jackson/Base64Variant.java b/src/java/org/codehaus/jackson/Base64Variant.java
index e97187c..308c4ab 100644
--- a/src/java/org/codehaus/jackson/Base64Variant.java
+++ b/src/java/org/codehaus/jackson/Base64Variant.java
@@ -407,7 +407,7 @@
/**********************************************************
*/
- // @Override
+ @Override
public String toString() { return _name; }
}
diff --git a/src/java/org/codehaus/jackson/JsonFactory.java b/src/java/org/codehaus/jackson/JsonFactory.java
index 5279387..52cfdb7 100644
--- a/src/java/org/codehaus/jackson/JsonFactory.java
+++ b/src/java/org/codehaus/jackson/JsonFactory.java
@@ -196,6 +196,7 @@
/**
* @deprecated Use {@link #enable(JsonParser.Feature)} instead
*/
+ @SuppressWarnings("dep-ann")
public final void enableParserFeature(JsonParser.Feature f) {
enable(f);
}
@@ -203,6 +204,7 @@
/**
* @deprecated Use {@link #disable(JsonParser.Feature)} instead
*/
+ @SuppressWarnings("dep-ann")
public final void disableParserFeature(JsonParser.Feature f) {
disable(f);
}
@@ -210,6 +212,7 @@
/**
* @deprecated Use {@link #configure(JsonParser.Feature, boolean)} instead
*/
+ @SuppressWarnings("dep-ann")
public final void setParserFeature(JsonParser.Feature f, boolean state) {
configure(f, state);
}
@@ -217,6 +220,7 @@
/**
* @deprecated Use {@link #isEnabled(JsonParser.Feature)} instead
*/
+ @SuppressWarnings("dep-ann")
public final boolean isParserFeatureEnabled(JsonParser.Feature f) {
return (_parserFeatures & f.getMask()) != 0;
}
@@ -279,6 +283,7 @@
/**
* @deprecated Use {@link #enable(JsonGenerator.Feature)} instead
*/
+ @Deprecated
public final void enableGeneratorFeature(JsonGenerator.Feature f) {
enable(f);
}
@@ -286,6 +291,7 @@
/**
* @deprecated Use {@link #disable(JsonGenerator.Feature)} instead
*/
+ @Deprecated
public final void disableGeneratorFeature(JsonGenerator.Feature f) {
disable(f);
}
@@ -293,6 +299,7 @@
/**
* @deprecated Use {@link #configure(JsonGenerator.Feature, boolean)} instead
*/
+ @Deprecated
public final void setGeneratorFeature(JsonGenerator.Feature f, boolean state) {
configure(f, state);
}
@@ -300,6 +307,7 @@
/**
* @deprecated Use {@link #isEnabled(JsonGenerator.Feature)} instead
*/
+ @Deprecated
public final boolean isGeneratorFeatureEnabled(JsonGenerator.Feature f) {
return isEnabled(f);
}
diff --git a/src/java/org/codehaus/jackson/JsonGenerator.java b/src/java/org/codehaus/jackson/JsonGenerator.java
index b2cfc35..3a9293d 100644
--- a/src/java/org/codehaus/jackson/JsonGenerator.java
+++ b/src/java/org/codehaus/jackson/JsonGenerator.java
@@ -223,21 +223,24 @@
/** @deprecated Use {@link #enable} instead
*/
+ @SuppressWarnings("dep-ann")
public void enableFeature(Feature f) { enable(f); }
/** @deprecated Use {@link #disable} instead
*/
+ @SuppressWarnings("dep-ann")
public void disableFeature(Feature f) { disable(f); }
/** @deprecated Use {@link #configure} instead
*/
+ @SuppressWarnings("dep-ann")
public void setFeature(Feature f, boolean state) { configure(f, state); }
/** @deprecated Use {@link #isEnabled} instead
*/
+ @SuppressWarnings("dep-ann")
public boolean isFeatureEnabled(Feature f) { return isEnabled(f); }
-
/*
/**********************************************************
/* Configuring generator
diff --git a/src/java/org/codehaus/jackson/JsonNode.java b/src/java/org/codehaus/jackson/JsonNode.java
index 1d8d290..d5aa44b 100644
--- a/src/java/org/codehaus/jackson/JsonNode.java
+++ b/src/java/org/codehaus/jackson/JsonNode.java
@@ -655,6 +655,7 @@
* or {@link org.codehaus.jackson.map.ObjectMapper}
* instead.
*/
+ @Deprecated
public abstract void writeTo(JsonGenerator jg)
throws IOException, JsonGenerationException;
diff --git a/src/java/org/codehaus/jackson/JsonParser.java b/src/java/org/codehaus/jackson/JsonParser.java
index 8c2c519..ab0c856 100644
--- a/src/java/org/codehaus/jackson/JsonParser.java
+++ b/src/java/org/codehaus/jackson/JsonParser.java
@@ -420,18 +420,22 @@
/** @deprecated Use {@link #configure} instead
*/
+ @SuppressWarnings("dep-ann")
public void setFeature(Feature f, boolean state) { configure(f, state); }
/** @deprecated Use {@link #enable(Feature)} instead
*/
+ @SuppressWarnings("dep-ann")
public void enableFeature(Feature f) { enable(f); }
/** @deprecated Use {@link #disable(Feature)} instead
*/
+ @SuppressWarnings("dep-ann")
public void disableFeature(Feature f) { disable(f); }
/** @deprecated Use {@link #isEnabled(Feature)} instead
*/
+ @SuppressWarnings("dep-ann")
public final boolean isFeatureEnabled(Feature f) { return isEnabled(f); }
diff --git a/src/java/org/codehaus/jackson/annotate/JsonClass.java b/src/java/org/codehaus/jackson/annotate/JsonClass.java
index c0725e2..5016395 100644
--- a/src/java/org/codehaus/jackson/annotate/JsonClass.java
+++ b/src/java/org/codehaus/jackson/annotate/JsonClass.java
@@ -30,6 +30,7 @@
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@JacksonAnnotation
+@Deprecated
public @interface JsonClass
{
/**
diff --git a/src/java/org/codehaus/jackson/annotate/JsonContentClass.java b/src/java/org/codehaus/jackson/annotate/JsonContentClass.java
index ada5481..5d72b81 100644
--- a/src/java/org/codehaus/jackson/annotate/JsonContentClass.java
+++ b/src/java/org/codehaus/jackson/annotate/JsonContentClass.java
@@ -27,6 +27,7 @@
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@JacksonAnnotation
+@Deprecated
public @interface JsonContentClass
{
/**
diff --git a/src/java/org/codehaus/jackson/annotate/JsonGetter.java b/src/java/org/codehaus/jackson/annotate/JsonGetter.java
index 19a6fe6..312ac98 100644
--- a/src/java/org/codehaus/jackson/annotate/JsonGetter.java
+++ b/src/java/org/codehaus/jackson/annotate/JsonGetter.java
@@ -22,6 +22,7 @@
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@JacksonAnnotation
+@Deprecated
public @interface JsonGetter
{
/**
diff --git a/src/java/org/codehaus/jackson/annotate/JsonKeyClass.java b/src/java/org/codehaus/jackson/annotate/JsonKeyClass.java
index 456eb13..e17dbc8 100644
--- a/src/java/org/codehaus/jackson/annotate/JsonKeyClass.java
+++ b/src/java/org/codehaus/jackson/annotate/JsonKeyClass.java
@@ -29,6 +29,7 @@
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@JacksonAnnotation
+@Deprecated
public @interface JsonKeyClass
{
/**
diff --git a/src/java/org/codehaus/jackson/annotate/JsonWriteNullProperties.java b/src/java/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
index c0d99c4..40e1bd7 100644
--- a/src/java/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
+++ b/src/java/org/codehaus/jackson/annotate/JsonWriteNullProperties.java
@@ -23,6 +23,7 @@
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@JacksonAnnotation
+@Deprecated
public @interface JsonWriteNullProperties
{
/**
diff --git a/src/java/org/codehaus/jackson/impl/JsonGeneratorBase.java b/src/java/org/codehaus/jackson/impl/JsonGeneratorBase.java
index 5c1e51f..9ec2781 100644
--- a/src/java/org/codehaus/jackson/impl/JsonGeneratorBase.java
+++ b/src/java/org/codehaus/jackson/impl/JsonGeneratorBase.java
@@ -112,16 +112,19 @@
return (_features & f.getMask()) != 0;
}
+ @Override
public final JsonGenerator useDefaultPrettyPrinter()
{
return setPrettyPrinter(new DefaultPrettyPrinter());
}
+ @Override
public final JsonGenerator setCodec(ObjectCodec oc) {
_objectCodec = oc;
return this;
}
+ @Override
public final ObjectCodec getCodec() { return _objectCodec; }
/*
@@ -133,6 +136,7 @@
/**
* Note: co-variant return type.
*/
+ @Override
public final JsonWriteContext getOutputContext() { return _writeContext; }
/*
@@ -141,8 +145,8 @@
/**********************************************************
*/
- public final void writeStartArray()
- throws IOException, JsonGenerationException
+ @Override
+ public final void writeStartArray() throws IOException, JsonGenerationException
{
// Array is a value, need to verify it's allowed
_verifyValueWrite("start an array");
@@ -154,11 +158,10 @@
}
}
- protected abstract void _writeStartArray()
- throws IOException, JsonGenerationException;
+ protected abstract void _writeStartArray() throws IOException, JsonGenerationException;
- public final void writeEndArray()
- throws IOException, JsonGenerationException
+ @Override
+ public final void writeEndArray() throws IOException, JsonGenerationException
{
if (!_writeContext.inArray()) {
_reportError("Current context not an ARRAY but "+_writeContext.getTypeDesc());
@@ -174,8 +177,8 @@
protected abstract void _writeEndArray()
throws IOException, JsonGenerationException;
- public final void writeStartObject()
- throws IOException, JsonGenerationException
+ @Override
+ public final void writeStartObject() throws IOException, JsonGenerationException
{
_verifyValueWrite("start an object");
_writeContext = _writeContext.createChildObjectContext();
@@ -189,8 +192,8 @@
protected abstract void _writeStartObject()
throws IOException, JsonGenerationException;
- public final void writeEndObject()
- throws IOException, JsonGenerationException
+ @Override
+ public final void writeEndObject() throws IOException, JsonGenerationException
{
if (!_writeContext.inObject()) {
_reportError("Current context not an object but "+_writeContext.getTypeDesc());
@@ -206,8 +209,8 @@
protected abstract void _writeEndObject()
throws IOException, JsonGenerationException;
- public final void writeFieldName(String name)
- throws IOException, JsonGenerationException
+ @Override
+ public final void writeFieldName(String name) throws IOException, JsonGenerationException
{
// Object is a value, need to verify it's allowed
int status = _writeContext.writeFieldName(name);
@@ -294,26 +297,17 @@
/**********************************************************
*/
+ // Not implemented at this well, added as placeholders
+
+ /*
public abstract void writeNumber(int i)
- throws IOException, JsonGenerationException;
-
public abstract void writeNumber(long l)
- throws IOException, JsonGenerationException;
-
public abstract void writeNumber(double d)
- throws IOException, JsonGenerationException;
-
public abstract void writeNumber(float f)
- throws IOException, JsonGenerationException;
-
public abstract void writeNumber(BigDecimal dec)
- throws IOException, JsonGenerationException;
-
public abstract void writeBoolean(boolean state)
- throws IOException, JsonGenerationException;
-
public abstract void writeNull()
- throws IOException, JsonGenerationException;
+ */
/*
/**********************************************************
@@ -321,6 +315,7 @@
/**********************************************************
*/
+ @Override
public void writeObject(Object value)
throws IOException, JsonProcessingException
{
@@ -341,6 +336,7 @@
}
}
+ @Override
public void writeTree(JsonNode rootNode)
throws IOException, JsonProcessingException
{
@@ -361,13 +357,16 @@
/**********************************************************
*/
+ @Override
public abstract void flush() throws IOException;
+ @Override
public void close() throws IOException
{
_closed = true;
}
+ @Override
public boolean isClosed() { return _closed; }
/*
@@ -376,6 +375,7 @@
/**********************************************************
*/
+ @Override
public final void copyCurrentEvent(JsonParser jp)
throws IOException, JsonProcessingException
{
@@ -443,6 +443,7 @@
}
}
+ @Override
public final void copyCurrentStructure(JsonParser jp)
throws IOException, JsonProcessingException
{
diff --git a/src/java/org/codehaus/jackson/impl/JsonNumericParserBase.java b/src/java/org/codehaus/jackson/impl/JsonNumericParserBase.java
index 5b756f5..11b2326 100644
--- a/src/java/org/codehaus/jackson/impl/JsonNumericParserBase.java
+++ b/src/java/org/codehaus/jackson/impl/JsonNumericParserBase.java
@@ -164,8 +164,8 @@
/**********************************************************
*/
- public Number getNumberValue()
- throws IOException, JsonParseException
+ @Override
+ public Number getNumberValue() throws IOException, JsonParseException
{
if (_numTypesValid == NR_UNKNOWN) {
_parseNumericValue(NR_UNKNOWN); // will also check event type
@@ -197,8 +197,8 @@
return Double.valueOf(_numberDouble);
}
- public NumberType getNumberType()
- throws IOException, JsonParseException
+ @Override
+ public NumberType getNumberType() throws IOException, JsonParseException
{
if (_numTypesValid == NR_UNKNOWN) {
_parseNumericValue(NR_UNKNOWN); // will also check event type
@@ -225,8 +225,8 @@
return NumberType.DOUBLE;
}
- public int getIntValue()
- throws IOException, JsonParseException
+ @Override
+ public int getIntValue() throws IOException, JsonParseException
{
if ((_numTypesValid & NR_INT) == 0) {
if (_numTypesValid == NR_UNKNOWN) { // not parsed at all
@@ -239,8 +239,8 @@
return _numberInt;
}
- public long getLongValue()
- throws IOException, JsonParseException
+ @Override
+ public long getLongValue() throws IOException, JsonParseException
{
if ((_numTypesValid & NR_LONG) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
@@ -253,8 +253,8 @@
return _numberLong;
}
- public BigInteger getBigIntegerValue()
- throws IOException, JsonParseException
+ @Override
+ public BigInteger getBigIntegerValue() throws IOException, JsonParseException
{
if ((_numTypesValid & NR_BIGINT) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
@@ -267,8 +267,8 @@
return _numberBigInt;
}
- public float getFloatValue()
- throws IOException, JsonParseException
+ @Override
+ public float getFloatValue() throws IOException, JsonParseException
{
double value = getDoubleValue();
/* 22-Jan-2009, tatu: Bounds/range checks would be tricky
@@ -282,8 +282,8 @@
return (float) value;
}
- public double getDoubleValue()
- throws IOException, JsonParseException
+ @Override
+ public double getDoubleValue() throws IOException, JsonParseException
{
if ((_numTypesValid & NR_DOUBLE) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
@@ -296,8 +296,8 @@
return _numberDouble;
}
- public BigDecimal getDecimalValue()
- throws IOException, JsonParseException
+ @Override
+ public BigDecimal getDecimalValue() throws IOException, JsonParseException
{
if ((_numTypesValid & NR_BIGDECIMAL) == 0) {
if (_numTypesValid == NR_UNKNOWN) {
diff --git a/src/java/org/codehaus/jackson/impl/JsonParserBase.java b/src/java/org/codehaus/jackson/impl/JsonParserBase.java
index 64e85b0..ace6719 100644
--- a/src/java/org/codehaus/jackson/impl/JsonParserBase.java
+++ b/src/java/org/codehaus/jackson/impl/JsonParserBase.java
@@ -204,12 +204,14 @@
* Method that can be called to get the name associated with
* the current event.
*/
+ @Override
public String getCurrentName()
throws IOException, JsonParseException
{
return _parsingContext.getCurrentName();
}
+ @Override
public void close() throws IOException
{
if (!_closed) {
@@ -224,8 +226,10 @@
}
}
+ @Override
public boolean isClosed() { return _closed; }
+ @Override
public JsonReadContext getParsingContext()
{
return _parsingContext;
@@ -236,6 +240,7 @@
* token; that is, position of the first character from input
* that starts the current token.
*/
+ @Override
public JsonLocation getTokenLocation()
{
return new JsonLocation(_ioContext.getSourceReference(),
@@ -248,6 +253,7 @@
* Method that returns location of the last processed character;
* usually for error reporting purposes
*/
+ @Override
public JsonLocation getCurrentLocation()
{
int col = _inputPtr - _currInputRowStart + 1; // 1-based
@@ -268,6 +274,7 @@
* after encountering end-of-input), returns null.
* Method can be called for any event.
*/
+ @Override
public String getText()
throws IOException, JsonParseException
{
@@ -293,6 +300,7 @@
return null;
}
+ @Override
public char[] getTextCharacters()
throws IOException, JsonParseException
{
@@ -344,6 +352,7 @@
return false;
}
+ @Override
public int getTextLength()
throws IOException, JsonParseException
{
@@ -369,6 +378,7 @@
return 0;
}
+ @Override
public int getTextOffset() throws IOException, JsonParseException
{
// Most have offset of 0, only some may have other values:
@@ -390,6 +400,7 @@
return 0;
}
+ @Override
public byte[] getBinaryValue(Base64Variant b64variant)
throws IOException, JsonParseException
{
@@ -479,6 +490,7 @@
* If so, it may be a legitimate EOF, but only iff there
* is no open non-root context.
*/
+ @Override
protected void _handleEOF() throws JsonParseException
{
if (!_parsingContext.inRoot()) {
diff --git a/src/java/org/codehaus/jackson/impl/JsonParserMinimalBase.java b/src/java/org/codehaus/jackson/impl/JsonParserMinimalBase.java
index c0f15b5..680d5a0 100644
--- a/src/java/org/codehaus/jackson/impl/JsonParserMinimalBase.java
+++ b/src/java/org/codehaus/jackson/impl/JsonParserMinimalBase.java
@@ -74,13 +74,13 @@
/**********************************************************
*/
- public abstract JsonToken nextToken()
- throws IOException, JsonParseException;
+ @Override
+ public abstract JsonToken nextToken() throws IOException, JsonParseException;
//public final JsonToken nextValue()
- public JsonParser skipChildren()
- throws IOException, JsonParseException
+ @Override
+ public JsonParser skipChildren() throws IOException, JsonParseException
{
if (_currToken != JsonToken.START_OBJECT
&& _currToken != JsonToken.START_ARRAY) {
@@ -125,13 +125,16 @@
//public boolean hasCurrentToken()
- public abstract String getCurrentName()
- throws IOException, JsonParseException;
+ @Override
+ public abstract String getCurrentName() throws IOException, JsonParseException;
+ @Override
public abstract void close() throws IOException;
+ @Override
public abstract boolean isClosed();
+ @Override
public abstract JsonStreamContext getParsingContext();
// public abstract JsonLocation getTokenLocation();
@@ -144,15 +147,19 @@
/**********************************************************
*/
+ @Override
public abstract String getText() throws IOException, JsonParseException;
+ @Override
public abstract char[] getTextCharacters() throws IOException, JsonParseException;
@Override
public abstract boolean hasTextCharacters();
+ @Override
public abstract int getTextLength() throws IOException, JsonParseException;
+ @Override
public abstract int getTextOffset() throws IOException, JsonParseException;
/*
@@ -161,6 +168,7 @@
/**********************************************************
*/
+ @Override
public abstract byte[] getBinaryValue(Base64Variant b64variant)
throws IOException, JsonParseException;
@@ -170,8 +178,8 @@
/**********************************************************
*/
- public int getValueAsInt(int defaultValue)
- throws IOException, JsonParseException
+ @Override
+ public int getValueAsInt(int defaultValue) throws IOException, JsonParseException
{
if (_currToken != null) {
switch (_currToken) {
@@ -190,8 +198,8 @@
return defaultValue;
}
- public long getValueAsLong(long defaultValue)
- throws IOException, JsonParseException
+ @Override
+ public long getValueAsLong(long defaultValue) throws IOException, JsonParseException
{
if (_currToken != null) {
switch (_currToken) {
@@ -210,8 +218,8 @@
return defaultValue;
}
- public double getValueAsDouble(double defaultValue)
- throws IOException, JsonParseException
+ @Override
+ public double getValueAsDouble(double defaultValue) throws IOException, JsonParseException
{
if (_currToken != null) {
switch (_currToken) {
diff --git a/src/java/org/codehaus/jackson/impl/JsonReadContext.java b/src/java/org/codehaus/jackson/impl/JsonReadContext.java
index 9a5bf3d..2ca52f2 100644
--- a/src/java/org/codehaus/jackson/impl/JsonReadContext.java
+++ b/src/java/org/codehaus/jackson/impl/JsonReadContext.java
@@ -92,8 +92,10 @@
/**********************************************************
*/
+ @Override
public final String getCurrentName() { return _currentName; }
+ @Override
public final JsonReadContext getParent() { return _parent; }
/*
@@ -147,6 +149,7 @@
* Overridden to provide developer readable "JsonPath" representation
* of the context.
*/
+ @Override
public final String toString()
{
StringBuilder sb = new StringBuilder(64);
diff --git a/src/java/org/codehaus/jackson/impl/JsonWriteContext.java b/src/java/org/codehaus/jackson/impl/JsonWriteContext.java
index 61e42c5..db774cb 100644
--- a/src/java/org/codehaus/jackson/impl/JsonWriteContext.java
+++ b/src/java/org/codehaus/jackson/impl/JsonWriteContext.java
@@ -76,6 +76,7 @@
// // // Shared API
+ @Override
public final JsonWriteContext getParent() { return _parent; }
// // // API sub-classes are to implement
@@ -99,6 +100,7 @@
* Overridden to provide developer writeable "JsonPath" representation
* of the context.
*/
+ @Override
public final String toString()
{
StringBuilder sb = new StringBuilder(64);
@@ -119,13 +121,16 @@
super(TYPE_ROOT, null);
}
+ @Override
public String getCurrentName() { return null; }
+ @Override
public int writeFieldName(String name)
{
return STATUS_EXPECT_VALUE;
}
+ @Override
public int writeValue()
{
// No commas within root context, but need space
@@ -133,6 +138,7 @@
return (_index == 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_SPACE;
}
+ @Override
protected void appendDesc(StringBuilder sb)
{
sb.append("/");
@@ -147,13 +153,16 @@
super(TYPE_ARRAY, parent);
}
+ @Override
public String getCurrentName() { return null; }
+ @Override
public int writeFieldName(String name)
{
return STATUS_EXPECT_VALUE;
}
+ @Override
public int writeValue()
{
int ix = _index;
@@ -161,6 +170,7 @@
return (ix < 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_COMMA;
}
+ @Override
protected void appendDesc(StringBuilder sb)
{
sb.append('[');
@@ -190,8 +200,10 @@
_expectValue = false;
}
+ @Override
public String getCurrentName() { return _currentName; }
+ @Override
public int writeFieldName(String name)
{
if (_currentName != null) { // just wrote a name...
@@ -201,6 +213,7 @@
return (_index < 0) ? STATUS_OK_AS_IS : STATUS_OK_AFTER_COMMA;
}
+ @Override
public int writeValue()
{
if (_currentName == null) {
@@ -211,6 +224,7 @@
return STATUS_OK_AFTER_COLON;
}
+ @Override
protected void appendDesc(StringBuilder sb)
{
sb.append('{');
diff --git a/src/java/org/codehaus/jackson/impl/ReaderBasedParser.java b/src/java/org/codehaus/jackson/impl/ReaderBasedParser.java
index b2012f8..36d9d78 100644
--- a/src/java/org/codehaus/jackson/impl/ReaderBasedParser.java
+++ b/src/java/org/codehaus/jackson/impl/ReaderBasedParser.java
@@ -39,10 +39,12 @@
_symbols = st;
}
+ @Override
public ObjectCodec getCodec() {
return _objectCodec;
}
+ @Override
public void setCodec(ObjectCodec c) {
_objectCodec = c;
}
diff --git a/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java b/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java
index c7dde4e..3e09b83 100644
--- a/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java
+++ b/src/java/org/codehaus/jackson/impl/Utf8StreamParser.java
@@ -59,10 +59,12 @@
}
}
+ @Override
public ObjectCodec getCodec() {
return _objectCodec;
}
+ @Override
public void setCodec(ObjectCodec c) {
_objectCodec = c;
}
diff --git a/src/java/org/codehaus/jackson/io/BaseReader.java b/src/java/org/codehaus/jackson/io/BaseReader.java
index f0b132d..0d87c03 100644
--- a/src/java/org/codehaus/jackson/io/BaseReader.java
+++ b/src/java/org/codehaus/jackson/io/BaseReader.java
@@ -52,8 +52,8 @@
/**********************************************************
*/
- public void close()
- throws IOException
+ @Override
+ public void close() throws IOException
{
InputStream in = _in;
@@ -64,23 +64,23 @@
}
}
- char[] mTmpBuf = null;
+ protected char[] _tmpBuf = null;
/**
* Although this method is implemented by the base class, AND it should
* never be called by main code, let's still implement it bit more
* efficiently just in case
*/
- public int read()
- throws IOException
+ @Override
+ public int read() throws IOException
{
- if (mTmpBuf == null) {
- mTmpBuf = new char[1];
+ if (_tmpBuf == null) {
+ _tmpBuf = new char[1];
}
- if (read(mTmpBuf, 0, 1) < 1) {
+ if (read(_tmpBuf, 0, 1) < 1) {
return -1;
}
- return mTmpBuf[0];
+ return _tmpBuf[0];
}
/*
diff --git a/src/java/org/codehaus/jackson/io/MergedStream.java b/src/java/org/codehaus/jackson/io/MergedStream.java
index 7ec3694..471e791 100644
--- a/src/java/org/codehaus/jackson/io/MergedStream.java
+++ b/src/java/org/codehaus/jackson/io/MergedStream.java
@@ -33,8 +33,8 @@
_end = end;
}
- public int available()
- throws IOException
+ @Override
+ public int available() throws IOException
{
if (_buffer != null) {
return _end - _ptr;
@@ -42,13 +42,14 @@
return _in.available();
}
- public void close()
- throws IOException
+ @Override
+ public void close() throws IOException
{
freeMergedBuffer();
_in.close();
}
+ @Override
public void mark(int readlimit)
{
if (_buffer == null) {
@@ -56,14 +57,15 @@
}
}
+ @Override
public boolean markSupported()
{
// Only supports marks past the initial rewindable section...
return (_buffer == null) && _in.markSupported();
}
- public int read()
- throws IOException
+ @Override
+ public int read() throws IOException
{
if (_buffer != null) {
int c = _buffer[_ptr++] & 0xFF;
@@ -75,14 +77,14 @@
return _in.read();
}
- public int read(byte[] b)
- throws IOException
+ @Override
+ public int read(byte[] b) throws IOException
{
return read(b, 0, b.length);
}
- public int read(byte[] b, int off, int len)
- throws IOException
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException
{
if (_buffer != null) {
int avail = _end - _ptr;
@@ -99,16 +101,16 @@
return _in.read(b, off, len);
}
- public void reset()
- throws IOException
+ @Override
+ public void reset() throws IOException
{
if (_buffer == null) {
_in.reset();
}
}
- public long skip(long n)
- throws IOException
+ @Override
+ public long skip(long n) throws IOException
{
long count = 0L;
diff --git a/src/java/org/codehaus/jackson/sym/Name1.java b/src/java/org/codehaus/jackson/sym/Name1.java
index 6be327a..1ee5976 100644
--- a/src/java/org/codehaus/jackson/sym/Name1.java
+++ b/src/java/org/codehaus/jackson/sym/Name1.java
@@ -24,16 +24,19 @@
final static Name1 getEmptyName() { return sEmptyName; }
+ @Override
public boolean equals(int quad)
{
return (quad == mQuad);
}
+ @Override
public boolean equals(int quad1, int quad2)
{
return (quad1 == mQuad) && (quad2 == 0);
}
+ @Override
public boolean equals(int[] quads, int qlen)
{
return (qlen == 1 && quads[0] == mQuad);
diff --git a/src/java/org/codehaus/jackson/sym/Name2.java b/src/java/org/codehaus/jackson/sym/Name2.java
index ba6d97e..933db2a 100644
--- a/src/java/org/codehaus/jackson/sym/Name2.java
+++ b/src/java/org/codehaus/jackson/sym/Name2.java
@@ -23,13 +23,16 @@
mQuad2 = quad2;
}
+ @Override
public boolean equals(int quad) { return false; }
+ @Override
public boolean equals(int quad1, int quad2)
{
return (quad1 == mQuad1) && (quad2 == mQuad2);
}
+ @Override
public boolean equals(int[] quads, int qlen)
{
return (qlen == 2 && quads[0] == mQuad1 && quads[1] == mQuad2);
diff --git a/src/java/org/codehaus/jackson/sym/Name3.java b/src/java/org/codehaus/jackson/sym/Name3.java
index d35db6c..0b10404 100644
--- a/src/java/org/codehaus/jackson/sym/Name3.java
+++ b/src/java/org/codehaus/jackson/sym/Name3.java
@@ -21,11 +21,14 @@
}
// Implies quad length == 1, never matches
+ @Override
public boolean equals(int quad) { return false; }
// Implies quad length == 2, never matches
+ @Override
public boolean equals(int quad1, int quad2) { return false; }
+ @Override
public boolean equals(int[] quads, int qlen)
{
return (qlen == 3)
diff --git a/src/java/org/codehaus/jackson/type/JavaType.java b/src/java/org/codehaus/jackson/type/JavaType.java
index afaa4e7..6e64630 100644
--- a/src/java/org/codehaus/jackson/type/JavaType.java
+++ b/src/java/org/codehaus/jackson/type/JavaType.java
@@ -413,8 +413,10 @@
/**********************************************************
*/
+ @Override
public abstract String toString();
+ @Override
public abstract boolean equals(Object o);
@Override
diff --git a/src/java/org/codehaus/jackson/util/InternCache.java b/src/java/org/codehaus/jackson/util/InternCache.java
index 0246409..7fdae9f 100644
--- a/src/java/org/codehaus/jackson/util/InternCache.java
+++ b/src/java/org/codehaus/jackson/util/InternCache.java
@@ -28,6 +28,7 @@
super(MAX_ENTRIES, 0.8f, true);
}
+ @Override
protected boolean removeEldestEntry(Map.Entry<String,String> eldest)
{
return size() > MAX_ENTRIES;
diff --git a/src/java/org/codehaus/jackson/util/JsonParserDelegate.java b/src/java/org/codehaus/jackson/util/JsonParserDelegate.java
index 10c5fbf..07ad08f 100644
--- a/src/java/org/codehaus/jackson/util/JsonParserDelegate.java
+++ b/src/java/org/codehaus/jackson/util/JsonParserDelegate.java
@@ -42,16 +42,19 @@
return delegate.getCodec();
}
+ @Override
public JsonParser enable(Feature f) {
delegate.enable(f);
return this;
}
+ @Override
public JsonParser disable(Feature f) {
delegate.disable(f);
return this;
}
+ @Override
public boolean isEnabled(Feature f) {
return delegate.isEnabled(f);
}
@@ -78,14 +81,17 @@
/**********************************************************
*/
+ @Override
public JsonToken getCurrentToken() {
return delegate.getCurrentToken();
}
+ @Override
public boolean hasCurrentToken() {
return delegate.hasCurrentToken();
}
+ @Override
public void clearCurrentToken() {
delegate.clearCurrentToken();
}
diff --git a/src/java/org/codehaus/jackson/util/TokenBuffer.java b/src/java/org/codehaus/jackson/util/TokenBuffer.java
index 77fa680..f58cbda 100644
--- a/src/java/org/codehaus/jackson/util/TokenBuffer.java
+++ b/src/java/org/codehaus/jackson/util/TokenBuffer.java
@@ -300,18 +300,22 @@
return (_generatorFeatures & f.getMask()) != 0;
}
+ @Override
public JsonGenerator useDefaultPrettyPrinter() {
// No-op: we don't indent
return this;
}
+ @Override
public JsonGenerator setCodec(ObjectCodec oc) {
_objectCodec = oc;
return this;
}
+ @Override
public ObjectCodec getCodec() { return _objectCodec; }
+ @Override
public final JsonWriteContext getOutputContext() { return _writeContext; }
/*
@@ -320,12 +324,15 @@
/**********************************************************
*/
+ @Override
public void flush() throws IOException { /* NOP */ }
+ @Override
public void close() throws IOException {
_closed = true;
}
+ @Override
public boolean isClosed() { return _closed; }
/*
@@ -362,6 +369,7 @@
_writeContext = _writeContext.createChildObjectContext();
}
+ @Override
public final void writeEndObject()
throws IOException, JsonGenerationException
{
@@ -512,6 +520,7 @@
/***********************************************************
*/
+ @Override
public void writeObject(Object value)
throws IOException, JsonProcessingException
{
@@ -519,6 +528,7 @@
_append(JsonToken.VALUE_EMBEDDED_OBJECT, value);
}
+ @Override
public void writeTree(JsonNode rootNode)
throws IOException, JsonProcessingException
{
@@ -974,8 +984,7 @@
/**********************************************************
*/
- private final static int INT_SPACE = 0x0020;
-
+ @Override
public Object getEmbeddedObject()
{
if (_currToken == JsonToken.VALUE_EMBEDDED_OBJECT) {
diff --git a/src/java/org/codehaus/jackson/util/VersionUtil.java b/src/java/org/codehaus/jackson/util/VersionUtil.java
index 4181d27..ec663eb 100644
--- a/src/java/org/codehaus/jackson/util/VersionUtil.java
+++ b/src/java/org/codehaus/jackson/util/VersionUtil.java
@@ -14,7 +14,7 @@
{
public final static String VERSION_FILE = "VERSION.txt";
- private final static Pattern VERSION_SEPARATOR = Pattern.compile("[-_.]");
+ private final static Pattern VERSION_SEPARATOR = Pattern.compile("[-_./;:]");
/**
* Helper method that will try to load version information for specified
diff --git a/src/mapper/java/org/codehaus/jackson/map/AnnotationIntrospector.java b/src/mapper/java/org/codehaus/jackson/map/AnnotationIntrospector.java
index ca9d05b..79bbea9 100644
--- a/src/mapper/java/org/codehaus/jackson/map/AnnotationIntrospector.java
+++ b/src/mapper/java/org/codehaus/jackson/map/AnnotationIntrospector.java
@@ -971,7 +971,7 @@
// // // Serialization: class annotations
-
+ @Override
public String[] findSerializationPropertyOrder(AnnotatedClass ac) {
String[] result = _primary.findSerializationPropertyOrder(ac);
if (result == null) {
@@ -985,6 +985,7 @@
* for which no explicit is defined should be alphabetically (lexicograpically)
* ordered
*/
+ @Override
public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
Boolean result = _primary.findSerializationSortAlphabetically(ac);
if (result == null) {
diff --git a/src/mapper/java/org/codehaus/jackson/map/DeserializationConfig.java b/src/mapper/java/org/codehaus/jackson/map/DeserializationConfig.java
index 48e8c98..613c0c5 100644
--- a/src/mapper/java/org/codehaus/jackson/map/DeserializationConfig.java
+++ b/src/mapper/java/org/codehaus/jackson/map/DeserializationConfig.java
@@ -173,7 +173,7 @@
* Since pre-1.6 method was to use Enum name, this is the default.
*<p>
* Note: this feature should usually have same value
- * as {@link SerializationConfig#WRITE_ENUMS_USING_TO_STRING}.
+ * as {@link SerializationConfig.Feature#WRITE_ENUMS_USING_TO_STRING}.
*<p>
* For further details, check out [JACKSON-212]
*
diff --git a/src/mapper/java/org/codehaus/jackson/map/JsonMappingException.java b/src/mapper/java/org/codehaus/jackson/map/JsonMappingException.java
index 81ac3b7..c6a1882 100644
--- a/src/mapper/java/org/codehaus/jackson/map/JsonMappingException.java
+++ b/src/mapper/java/org/codehaus/jackson/map/JsonMappingException.java
@@ -275,6 +275,7 @@
* Method is overridden so that we can properly inject description
* of problem path, if such is defined.
*/
+ @Override
public String getMessage()
{
/* First: if we have no path info, let's just use parent's
diff --git a/src/mapper/java/org/codehaus/jackson/map/JsonSerializable.java b/src/mapper/java/org/codehaus/jackson/map/JsonSerializable.java
index afa9fdb..907f707 100644
--- a/src/mapper/java/org/codehaus/jackson/map/JsonSerializable.java
+++ b/src/mapper/java/org/codehaus/jackson/map/JsonSerializable.java
@@ -6,7 +6,7 @@
/**
* Interface that can be implemented by objects that know how to
- * serialize themselves to Json, using {@link JsonGenerator}
+ * serialize themselves to JSON, using {@link JsonGenerator}
* (and {@link SerializerProvider} if necessary).
*<p>
* Note that implementing this interface binds implementing object
@@ -17,13 +17,16 @@
* NOTE: as of version 1.5, this interface is missing one crucial
* aspect, that of dealing with type information embedding.
* Because of this, this interface is deprecated, although will be
- * fully supported for all 1.x releases.
+ * fully supported for all 1.x releases, and will work except for
+ * cases where polymorphic type information handling is needed for
+ * type (in which case implementing if {@link JsonSerializableWithType} is crucial).
*
* @see org.codehaus.jackson.map.JsonSerializableWithType
*
* @since 1.5
* @deprecated Use {@link JsonSerializableWithType} instead
*/
+@Deprecated
public interface JsonSerializable
{
public void serialize(JsonGenerator jgen, SerializerProvider provider)
diff --git a/src/mapper/java/org/codehaus/jackson/map/ObjectMapper.java b/src/mapper/java/org/codehaus/jackson/map/ObjectMapper.java
index 712393c..439f71a 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ObjectMapper.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ObjectMapper.java
@@ -359,6 +359,7 @@
* @deprecated Use other constructors instead; note that
* you can just set serializer factory with {@link #setSerializerFactory}
*/
+ @Deprecated
public ObjectMapper(SerializerFactory sf)
{
this(null, null, null);
@@ -761,6 +762,7 @@
/**
* @deprecated Typo in name -- use {@link #setDefaultTyping} instead.
*/
+ @Deprecated
public ObjectMapper setDefaltTyping(TypeResolverBuilder<?> typer) {
_defaultTyper = typer;
return this;
@@ -1053,6 +1055,7 @@
* Method to serialize given JSON Tree, using generator
* provided.
*/
+ @Override
public void writeTree(JsonGenerator jgen, JsonNode rootNode)
throws IOException, JsonProcessingException
{
@@ -1089,6 +1092,7 @@
*
* @since 1.2
*/
+ @Override
public ObjectNode createObjectNode() {
return _deserializationConfig.getNodeFactory().objectNode();
}
@@ -1102,6 +1106,7 @@
*
* @since 1.2
*/
+ @Override
public ArrayNode createArrayNode() {
return _deserializationConfig.getNodeFactory().arrayNode();
}
@@ -1114,6 +1119,7 @@
*
* @since 1.3
*/
+ @Override
public JsonParser treeAsTokens(JsonNode n)
{
return new TreeTraversingParser(n, this);
@@ -1128,6 +1134,7 @@
* objectMapper.convertValue(n, valueClass);
*</pre>
*/
+ @Override
public <T> T treeToValue(JsonNode n, Class<T> valueType)
throws IOException, JsonParseException, JsonMappingException
{
@@ -1514,6 +1521,7 @@
*
* @deprecated Use {@link #viewWriter} instead
*/
+ @Deprecated
public void writeValueUsingView(JsonGenerator jgen, Object value, Class<?> viewClass)
throws IOException, JsonGenerationException, JsonMappingException
{
@@ -1533,6 +1541,7 @@
*
* @deprecated Use {@link #viewWriter} instead
*/
+ @Deprecated
public void writeValueUsingView(Writer w, Object value, Class<?> viewClass)
throws IOException, JsonGenerationException, JsonMappingException
{
@@ -1552,6 +1561,7 @@
*
* @deprecated Use {@link #viewWriter} instead
*/
+ @Deprecated
public void writeValueUsingView(OutputStream out, Object value, Class<?> viewClass)
throws IOException, JsonGenerationException, JsonMappingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/SerializationConfig.java b/src/mapper/java/org/codehaus/jackson/map/SerializationConfig.java
index a0fd8a9..ba4c638 100644
--- a/src/mapper/java/org/codehaus/jackson/map/SerializationConfig.java
+++ b/src/mapper/java/org/codehaus/jackson/map/SerializationConfig.java
@@ -127,6 +127,7 @@
* @deprecated As of 1.1, use {@link SerializationConfig#setSerializationInclusion}
* instead
*/
+ @Deprecated
WRITE_NULL_PROPERTIES(true),
/**
@@ -244,7 +245,7 @@
* Since pre-1.6 method was to use Enum name, this is the default.
*<p>
* Note: this feature should usually have same value
- * as {@link SerializationConfig#READ_ENUMS_USING_TO_STRING}.
+ * as {@link DeserializationConfig.Feature#READ_ENUMS_USING_TO_STRING}.
*<p>
* For further details, check out [JACKSON-212]
*
diff --git a/src/mapper/java/org/codehaus/jackson/map/SerializerFactory.java b/src/mapper/java/org/codehaus/jackson/map/SerializerFactory.java
index 6e88bfc..89795eb 100644
--- a/src/mapper/java/org/codehaus/jackson/map/SerializerFactory.java
+++ b/src/mapper/java/org/codehaus/jackson/map/SerializerFactory.java
@@ -26,6 +26,7 @@
* @deprecated Use {@link #createSerializer(JavaType,SerializationConfig)} instead
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public <T> JsonSerializer<T> createSerializer(Class<T> type, SerializationConfig config) {
return (JsonSerializer<T>) createSerializer(TypeFactory.type(type), config);
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/TreeMapper.java b/src/mapper/java/org/codehaus/jackson/map/TreeMapper.java
index 1d3bbaf..5ea55f9 100644
--- a/src/mapper/java/org/codehaus/jackson/map/TreeMapper.java
+++ b/src/mapper/java/org/codehaus/jackson/map/TreeMapper.java
@@ -23,6 +23,7 @@
*
* @deprecated Use {@link org.codehaus.jackson.map.ObjectMapper} instead
*/
+@Deprecated
public class TreeMapper
extends JsonNodeFactory
{
@@ -32,9 +33,9 @@
protected ObjectMapper _objectMapper;
/*
- ////////////////////////////////////////////////////
- // Life-cycle (construction, configuration)
- ////////////////////////////////////////////////////
+ /**********************************************************
+ /* Life-cycle (construction, configuration)
+ /**********************************************************
*/
public TreeMapper()
@@ -57,16 +58,16 @@
public JsonFactory getJsonFactory() { return objectMapper().getJsonFactory(); }
/*
- ////////////////////////////////////////////////////
- // Public API, constructing in-memory trees
- ////////////////////////////////////////////////////
+ /**********************************************************
+ /* Public API, constructing in-memory trees
+ /**********************************************************
*/
/*
- ////////////////////////////////////////////////////
- // Public API, root-level mapping methods,
- // mapping from JSON content to nodes
- ////////////////////////////////////////////////////
+ /**********************************************************
+ /* Public API, root-level mapping methods,
+ /* mapping from JSON content to nodes
+ /**********************************************************
*/
/**
@@ -139,10 +140,10 @@
}
/*
- ////////////////////////////////////////////////////
- // Public API, root-level mapping methods,
- // writing nodes as JSON content
- ////////////////////////////////////////////////////
+ /**********************************************************
+ /* Public API, root-level mapping methods,
+ /* writing nodes as JSON content
+ /**********************************************************
*/
public void writeTree(JsonNode rootNode, File dst)
@@ -164,9 +165,9 @@
}
/*
- ////////////////////////////////////////////////////
- // Internal methods
- ////////////////////////////////////////////////////
+ /**********************************************************
+ /* Internal methods
+ /**********************************************************
*/
protected synchronized ObjectMapper objectMapper()
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializer.java
index 01e0ab9..67ed674 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializer.java
@@ -68,10 +68,12 @@
/**********************************************************
*/
+ @Override
public JavaType getContentType() {
return _arrayType.getContentType();
}
+ @Override
public JsonDeserializer<Object> getContentDeserializer() {
return _elementDeserializer;
}
@@ -82,6 +84,7 @@
/**********************************************************
*/
+ @Override
public Object[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -132,6 +135,7 @@
return result;
}
+ @Override
public Object[] deserializeWithType(JsonParser jp, DeserializationContext ctxt,
TypeDeserializer typeDeserializer)
throws IOException, JsonProcessingException
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializers.java b/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializers.java
index b6b629f..8793de3 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializers.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/ArrayDeserializers.java
@@ -102,6 +102,7 @@
{
public StringDeser() { super(String[].class); }
+ @Override
public String[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -135,6 +136,7 @@
{
public CharDeser() { super(char[].class); }
+ @Override
public char[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -196,6 +198,7 @@
{
public BooleanDeser() { super(boolean[].class); }
+ @Override
public boolean[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -229,6 +232,7 @@
{
public ByteDeser() { super(byte[].class); }
+ @Override
public byte[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -282,6 +286,7 @@
{
public ShortDeser() { super(short[].class); }
+ @Override
public short[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -310,6 +315,7 @@
{
public IntDeser() { super(int[].class); }
+ @Override
public int[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -339,6 +345,7 @@
{
public LongDeser() { super(long[].class); }
+ @Override
public long[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -367,6 +374,7 @@
{
public FloatDeser() { super(float[].class); }
+ @Override
public float[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -396,6 +404,7 @@
{
public DoubleDeser() { super(double[].class); }
+ @Override
public double[] deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/BeanDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/BeanDeserializer.java
index 84ea22e..8a8dc1d 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/BeanDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/BeanDeserializer.java
@@ -337,6 +337,7 @@
/**
* Main deserialization method for bean-based objects (POJOs).
*/
+ @Override
public final Object deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -372,6 +373,7 @@
* instance is created as part of deserialization, potentially
* after collecting some or all of the properties to set.
*/
+ @Override
public Object deserialize(JsonParser jp, DeserializationContext ctxt, Object bean)
throws IOException, JsonProcessingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/CollectionDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/CollectionDeserializer.java
index 0f5a921..4f255f5 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/CollectionDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/CollectionDeserializer.java
@@ -64,10 +64,12 @@
/**********************************************************
*/
+ @Override
public JavaType getContentType() {
return _collectionType.getContentType();
}
+ @Override
public JsonDeserializer<Object> getContentDeserializer() {
return _valueDeserializer;
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/EnumDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/EnumDeserializer.java
index dc73640..bcbcf32 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/EnumDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/EnumDeserializer.java
@@ -61,6 +61,7 @@
/**********************************************************
*/
+ @Override
public Enum<?> deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -110,6 +111,7 @@
_factory = f.getAnnotated();
}
+ @Override
public Object deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/EnumMapDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/EnumMapDeserializer.java
index 0191f6a..84ff452 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/EnumMapDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/EnumMapDeserializer.java
@@ -33,7 +33,8 @@
}
@SuppressWarnings("unchecked")
- public EnumMap<?,?> deserialize(JsonParser jp, DeserializationContext ctxt)
+ @Override
+ public EnumMap<?,?> deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
// Ok: must point to START_OBJECT
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/EnumSetDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/EnumSetDeserializer.java
index 9ead04d..08b9c9f 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/EnumSetDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/EnumSetDeserializer.java
@@ -35,6 +35,7 @@
}
@SuppressWarnings("unchecked")
+ @Override
public EnumSet<?> deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/FromStringDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/FromStringDeserializer.java
index 0720583..b22f6f0 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/FromStringDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/FromStringDeserializer.java
@@ -23,6 +23,7 @@
super(vc);
}
+ @Override
public final T deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -55,8 +56,8 @@
{
public UUIDDeserializer() { super(UUID.class); }
- protected UUID _deserialize(String value, DeserializationContext ctxt)
- {
+ @Override
+ protected UUID _deserialize(String value, DeserializationContext ctxt) {
return UUID.fromString(value);
}
}
@@ -66,6 +67,7 @@
{
public URLDeserializer() { super(URL.class); }
+ @Override
protected URL _deserialize(String value, DeserializationContext ctxt)
throws IOException
{
@@ -77,7 +79,8 @@
extends FromStringDeserializer<URI>
{
public URIDeserializer() { super(URI.class); }
-
+
+ @Override
protected URI _deserialize(String value, DeserializationContext ctxt)
throws IllegalArgumentException
{
@@ -90,6 +93,7 @@
{
public CurrencyDeserializer() { super(Currency.class); }
+ @Override
protected Currency _deserialize(String value, DeserializationContext ctxt)
throws IllegalArgumentException
{
@@ -103,6 +107,7 @@
{
public PatternDeserializer() { super(Pattern.class); }
+ @Override
protected Pattern _deserialize(String value, DeserializationContext ctxt)
throws IllegalArgumentException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java
index a4e1258..f324832 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/JsonNodeDeserializer.java
@@ -49,6 +49,7 @@
* deserializer is registered to handle (in case of more specialized handler).
* Overridden by typed sub-classes for more thorough checking
*/
+ @Override
public JsonNode deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
@@ -64,6 +65,7 @@
final static class ObjectDeserializer
extends BaseNodeDeserializer<ObjectNode>
{
+ @SuppressWarnings("hiding")
protected final static ObjectDeserializer instance = new ObjectDeserializer();
protected ObjectDeserializer() {
@@ -88,6 +90,7 @@
final static class ArrayDeserializer
extends BaseNodeDeserializer<ArrayNode>
{
+ @SuppressWarnings("hiding")
protected final static ArrayDeserializer instance = new ArrayDeserializer();
protected ArrayDeserializer() {
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/MapDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/MapDeserializer.java
index 0db8c10..71d759a 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/MapDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/MapDeserializer.java
@@ -102,10 +102,12 @@
/**********************************************************
*/
+ @Override
public JavaType getContentType() {
return _mapType.getContentType();
}
+ @Override
public JsonDeserializer<Object> getContentDeserializer() {
return _valueDeserializer;
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/PropertyValue.java b/src/mapper/java/org/codehaus/jackson/map/deser/PropertyValue.java
index a0f2fbf..6f6bc07 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/PropertyValue.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/PropertyValue.java
@@ -24,16 +24,16 @@
/**
* Method called to assign stored value of this property to specified
- * bean isntance
+ * bean instance
*/
public abstract void assign(Object bean)
throws IOException, JsonProcessingException;
/*
- /////////////////////////////////////////////////////
- // Concrete property value classes
- /////////////////////////////////////////////////////
- */
+ /**********************************************************
+ /* Concrete property value classes
+ /**********************************************************
+ */
/**
* Property value that used when assigning value to property using
@@ -51,6 +51,7 @@
_property = prop;
}
+ @Override
public void assign(Object bean)
throws IOException, JsonProcessingException
{
@@ -79,6 +80,7 @@
_propertyName = propName;
}
+ @Override
public void assign(Object bean)
throws IOException, JsonProcessingException
{
@@ -102,6 +104,7 @@
}
@SuppressWarnings("unchecked")
+ @Override
public void assign(Object bean)
throws IOException, JsonProcessingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/SettableBeanProperty.java b/src/mapper/java/org/codehaus/jackson/map/deser/SettableBeanProperty.java
index feb2f2d..ededdc2 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/SettableBeanProperty.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/SettableBeanProperty.java
@@ -223,18 +223,21 @@
_setter = setter;
}
+ @Override
protected Class<?> getDeclaringClass()
{
return _setter.getDeclaringClass();
}
+ @Override
public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
- Object instance)
+ Object instance)
throws IOException, JsonProcessingException
{
set(instance, deserialize(jp, ctxt));
}
+ @Override
public final void set(Object instance, Object value)
throws IOException
{
@@ -266,13 +269,15 @@
_getter = getter;
}
+ @Override
protected Class<?> getDeclaringClass()
{
return _getter.getDeclaringClass();
}
+ @Override
public final void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
- Object instance)
+ Object instance)
throws IOException, JsonProcessingException
{
JsonToken t = jp.getCurrentToken();
@@ -302,6 +307,7 @@
_valueDeserializer.deserialize(jp, ctxt, toModify);
}
+ @Override
public final void set(Object instance, Object value)
throws IOException
{
@@ -328,11 +334,13 @@
_field = f;
}
+ @Override
protected Class<?> getDeclaringClass()
{
return _field.getDeclaringClass();
}
+ @Override
public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
Object instance)
throws IOException, JsonProcessingException
@@ -340,6 +348,7 @@
set(instance, deserialize(jp, ctxt));
}
+ @Override
public final void set(Object instance, Object value)
throws IOException
{
@@ -382,13 +391,16 @@
* Base implementation returns -1 to indicate that no index exists
* for the property.
*/
+ @Override
public int getCreatorIndex() { return _index; }
+ @Override
protected Class<?> getDeclaringClass()
{
return _declaringClass;
}
+ @Override
public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
Object instance)
throws IOException, JsonProcessingException
@@ -396,6 +408,7 @@
set(instance, deserialize(jp, ctxt));
}
+ @Override
public void set(Object instance, Object value)
throws IOException
{
@@ -439,11 +452,13 @@
_isContainer = isContainer;
}
+ @Override
protected Class<?> getDeclaringClass()
{
return _managedProperty.getDeclaringClass();
}
+ @Override
public void deserializeAndSet(JsonParser jp, DeserializationContext ctxt,
Object instance)
throws IOException, JsonProcessingException
@@ -451,6 +466,7 @@
set(instance, _managedProperty.deserialize(jp, ctxt));
}
+ @Override
public final void set(Object instance, Object value)
throws IOException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializer.java
index 5a71453..884d255 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializer.java
@@ -63,6 +63,7 @@
* inclusion mechanism. Sub-classes are expected to override
* this method if they are to handle type information.
*/
+ @Override
public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
TypeDeserializer typeDeserializer)
throws IOException, JsonProcessingException
@@ -561,6 +562,7 @@
_nullValue = nvl;
}
+ @Override
public final T getNullValue() { return _nullValue; }
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializerProvider.java b/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializerProvider.java
index fb2d921..0ec5d15 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializerProvider.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/StdDeserializerProvider.java
@@ -166,8 +166,8 @@
* Method that can be called to find out whether a deserializer can
* be found for given type
*/
- public boolean hasValueDeserializerFor(DeserializationConfig config,
- JavaType type)
+ @Override
+ public boolean hasValueDeserializerFor(DeserializationConfig config, JavaType type)
{
/* Note: mostly copied from findValueDeserializer, except for
* handling of unknown types
@@ -183,6 +183,7 @@
return (deser != null);
}
+ @Override
public int cachedDeserializersCount() {
return _cachedDeserializers.size();
}
@@ -196,6 +197,7 @@
*
* @since 1.4
*/
+ @Override
public void flushCachedDeserializers() {
_cachedDeserializers.clear();
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/ext/CoreXMLDeserializers.java b/src/mapper/java/org/codehaus/jackson/map/ext/CoreXMLDeserializers.java
index 03b0036..528042e 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ext/CoreXMLDeserializers.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ext/CoreXMLDeserializers.java
@@ -45,10 +45,10 @@
}
/*
- ////////////////////////////////////////////////////////////////////////
- // Provider implementation
- ////////////////////////////////////////////////////////////////////////
- */
+ /**********************************************************
+ /* Provider implementation
+ /**********************************************************
+ */
/**
* Method called by {@link org.codehaus.jackson.map.deser.BasicDeserializerFactory}
@@ -66,16 +66,17 @@
}
/*
- ////////////////////////////////////////////////////////////////////////
- // Concrete deserializers
- ////////////////////////////////////////////////////////////////////////
- */
+ /**********************************************************
+ /* Concrete deserializers
+ /**********************************************************
+ */
public static class DurationDeserializer
extends FromStringDeserializer<Duration>
{
public DurationDeserializer() { super(Duration.class); }
+ @Override
protected Duration _deserialize(String value, DeserializationContext ctxt)
throws IllegalArgumentException
{
@@ -88,6 +89,7 @@
{
public GregorianCalendarDeserializer() { super(XMLGregorianCalendar.class); }
+ @Override
protected XMLGregorianCalendar _deserialize(String value, DeserializationContext ctxt)
throws IllegalArgumentException, IOException {
Date date = _parseDate(ctxt.getParser(), ctxt);
@@ -102,6 +104,7 @@
{
public QNameDeserializer() { super(QName.class); }
+ @Override
protected QName _deserialize(String value, DeserializationContext ctxt)
throws IllegalArgumentException
{
@@ -125,6 +128,7 @@
protected DOMDeserializer(Class<T> cls) { super(cls); }
+ @Override
public abstract T _deserialize(String value, DeserializationContext ctxt);
protected final Document parse(String value) throws IllegalArgumentException
@@ -140,6 +144,7 @@
public static class DOMNodeDeserializer extends DOMDeserializer<Node>
{
public DOMNodeDeserializer() { super(Node.class); }
+ @Override
public Node _deserialize(String value, DeserializationContext ctxt) throws IllegalArgumentException {
return parse(value);
}
@@ -148,6 +153,7 @@
public static class DOMDocumentDeserializer extends DOMDeserializer<Document>
{
public DOMDocumentDeserializer() { super(Document.class); }
+ @Override
public Document _deserialize(String value, DeserializationContext ctxt) throws IllegalArgumentException {
return parse(value);
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedClass.java b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedClass.java
index f5a72fa..d052af0 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedClass.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedClass.java
@@ -162,12 +162,16 @@
/**********************************************************
*/
+ @Override
public Class<?> getAnnotated() { return _class; }
+ @Override
public int getModifiers() { return _class.getModifiers(); }
+ @Override
public String getName() { return _class.getName(); }
+ @Override
public <A extends Annotation> A getAnnotation(Class<A> acls)
{
if (_classAnnotations == null) {
@@ -176,10 +180,12 @@
return _classAnnotations.get(acls);
}
+ @Override
public Type getGenericType() {
return _class;
}
+ @Override
public Class<?> getRawType() {
return _class;
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java
index 4da17f0..8d16788 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedConstructor.java
@@ -7,12 +7,12 @@
public final class AnnotatedConstructor
extends AnnotatedWithParams
{
- final Constructor<?> _constructor;
+ protected final Constructor<?> _constructor;
/*
- //////////////////////////////////////////////////////
- // Life-cycle
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Life-cycle
+ /**********************************************************
*/
public AnnotatedConstructor(Constructor<?> constructor,
@@ -26,45 +26,54 @@
}
/*
- //////////////////////////////////////////////////////
- // Annotated impl
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Annotated impl
+ /**********************************************************
*/
+ @Override
public Constructor<?> getAnnotated() { return _constructor; }
+ @Override
public int getModifiers() { return _constructor.getModifiers(); }
+ @Override
public String getName() { return _constructor.getName(); }
+ @Override
public Type getGenericType() {
return getRawType();
}
+ @Override
public Class<?> getRawType() {
return _constructor.getDeclaringClass();
}
/*
- //////////////////////////////////////////////////////
- // Extended API
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Extended API
+ /**********************************************************
*/
+ @Override
public AnnotatedParameter getParameter(int index) {
return new AnnotatedParameter(getParameterType(index), _paramAnnotations[index]);
}
+ @Override
public int getParameterCount() {
return _constructor.getParameterTypes().length;
}
+ @Override
public Class<?> getParameterClass(int index)
{
Class<?>[] types = _constructor.getParameterTypes();
return (index >= types.length) ? null : types[index];
}
+ @Override
public Type getParameterType(int index)
{
Type[] types = _constructor.getGenericParameterTypes();
@@ -72,23 +81,25 @@
}
/*
- //////////////////////////////////////////////////////
- // AnnotatedMember impl
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* AnnotatedMember impl
+ /**********************************************************
*/
+ @Override
public Class<?> getDeclaringClass() { return _constructor.getDeclaringClass(); }
+ @Override
public Member getMember() { return _constructor; }
/*
- //////////////////////////////////////////////////////
- // Extended API, specific annotations
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Extended API, specific annotations
+ /**********************************************************
*/
- public String toString()
- {
+ @Override
+ public String toString() {
return "[constructor for "+getName()+", annotations: "+_annotations+"]";
}
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedField.java b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedField.java
index 7bb7909..75c6351 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedField.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedField.java
@@ -19,9 +19,9 @@
protected final AnnotationMap _annotations;
/*
- //////////////////////////////////////////////////////
- // Life-cycle
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Life-cycle
+ /**********************************************************
*/
public AnnotatedField(Field field, AnnotationMap annMap)
@@ -41,44 +41,52 @@
}
/*
- //////////////////////////////////////////////////////
- // Annotated impl
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Annotated impl
+ /**********************************************************
*/
+ @Override
public Field getAnnotated() { return _field; }
+ @Override
public int getModifiers() { return _field.getModifiers(); }
+ @Override
public String getName() { return _field.getName(); }
+ @Override
public <A extends Annotation> A getAnnotation(Class<A> acls)
{
return _annotations.get(acls);
}
+ @Override
public Type getGenericType() {
return _field.getGenericType();
}
+ @Override
public Class<?> getRawType() {
return _field.getType();
}
/*
- //////////////////////////////////////////////////////
- // AnnotatedMember impl
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* AnnotatedMember impl
+ /**********************************************************
*/
+ @Override
public Class<?> getDeclaringClass() { return _field.getDeclaringClass(); }
+ @Override
public Member getMember() { return _field; }
/*
- //////////////////////////////////////////////////////
- // Extended API, generic
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Extended API, generic
+ /**********************************************************
*/
public String getFullName() {
@@ -87,6 +95,7 @@
public int getAnnotationCount() { return _annotations.size(); }
+ @Override
public String toString()
{
return "[field "+getName()+", annotations: "+_annotations+"]";
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedMethod.java b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedMethod.java
index 78ffa9a..eb6df5f 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedMethod.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedMethod.java
@@ -32,18 +32,21 @@
/*****************************************************
*/
+ @Override
public Method getAnnotated() { return _method; }
+ @Override
public int getModifiers() { return _method.getModifiers(); }
+ @Override
public String getName() { return _method.getName(); }
-
/**
* For methods, this returns declared return type, which is only
* useful with getters (setters do not return anything; hence "void"
* type is returned here)
*/
+ @Override
public Type getGenericType() {
return _method.getGenericReturnType();
}
@@ -53,6 +56,7 @@
* useful with getters (setters do not return anything; hence "void"
* type is returned here)
*/
+ @Override
public Class<?> getRawType() {
return _method.getReturnType();
}
@@ -63,10 +67,11 @@
/********************************************************
*/
+ @Override
public Class<?> getDeclaringClass() { return _method.getDeclaringClass(); }
+ @Override
public Member getMember() { return _method; }
-
/*
/*****************************************************
@@ -74,10 +79,12 @@
/*****************************************************
*/
+ @Override
public AnnotatedParameter getParameter(int index) {
return new AnnotatedParameter(getParameterType(index), _paramAnnotations[index]);
}
+ @Override
public int getParameterCount() {
return getParameterTypes().length;
}
@@ -86,12 +93,14 @@
return _method.getGenericParameterTypes();
}
+ @Override
public Class<?> getParameterClass(int index)
{
Class<?>[] types = _method.getParameterTypes();
return (index >= types.length) ? null : types[index];
}
+ @Override
public Type getParameterType(int index)
{
Type[] types = _method.getGenericParameterTypes();
@@ -121,6 +130,7 @@
/********************************************************
*/
+ @Override
public String toString()
{
return "[method "+getName()+", annotations: "+_annotations+"]";
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedParameter.java b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedParameter.java
index e1653c6..8aee842 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedParameter.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedParameter.java
@@ -16,9 +16,9 @@
final AnnotationMap _annotations;
/*
- //////////////////////////////////////////////////////
- // Life-cycle
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Life-cycle
+ /**********************************************************
*/
public AnnotatedParameter(Type type, AnnotationMap ann)
@@ -33,24 +33,29 @@
}
/*
- //////////////////////////////////////////////////////
- // Annotated impl
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Annotated impl
+ /**********************************************************
*/
/// Unfortunately, there is no matching JDK type...
+ @Override
public AnnotatedElement getAnnotated() { return null; }
/// Unfortunately, there is no matching JDK type...
+ @Override
public int getModifiers() { return 0; }
+ @Override
public String getName() { return ""; }
+ @Override
public <A extends Annotation> A getAnnotation(Class<A> acls)
{
return _annotations.get(acls);
}
+ @Override
public Type getGenericType() {
/* Hmmh. Could figure out real type (require it to be passed).
* But for now, let's assume we don't really need this method.
@@ -58,15 +63,16 @@
return getRawType();
}
+ @Override
public Class<?> getRawType() {
// should never be called
throw new IllegalStateException();
}
/*
- //////////////////////////////////////////////////////
- // Extended API
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Extended API
+ /**********************************************************
*/
public Type getParameterType() { return _type; }
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java
index 1b47db3..f649d29 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/AnnotatedWithParams.java
@@ -23,9 +23,9 @@
protected final AnnotationMap[] _paramAnnotations;
/*
- //////////////////////////////////////////////////////
- // Life-cycle
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Life-cycle
+ /**********************************************************
*/
protected AnnotatedWithParams(AnnotationMap classAnn, AnnotationMap[] paramAnn)
@@ -70,20 +70,21 @@
}
/*
- //////////////////////////////////////////////////////
- // Partial Annotated impl
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Partial Annotated impl
+ /**********************************************************
*/
+ @Override
public final <A extends Annotation> A getAnnotation(Class<A> acls)
{
return _annotations.get(acls);
}
/*
- //////////////////////////////////////////////////////
- // Extended API
- //////////////////////////////////////////////////////
+ /**********************************************************
+ /* Extended API
+ /**********************************************************
*/
public final AnnotationMap getParameterAnnotations(int index)
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/BasicBeanDescription.java b/src/mapper/java/org/codehaus/jackson/map/introspect/BasicBeanDescription.java
index 3fb97f2..115445a 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/BasicBeanDescription.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/BasicBeanDescription.java
@@ -125,6 +125,7 @@
/**********************************************************
*/
+ @Override
public LinkedHashMap<String,AnnotatedMethod> findGetters(VisibilityChecker<?> visibilityChecker,
Collection<String> ignoredProperties)
{
@@ -409,6 +410,7 @@
/**********************************************************
*/
+ @Override
public LinkedHashMap<String,AnnotatedMethod> findSetters(VisibilityChecker<?> vchecker)
{
LinkedHashMap<String,AnnotatedMethod> results = new LinkedHashMap<String,AnnotatedMethod>();
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java b/src/mapper/java/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java
index 845bdd3..a8f849f 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/BasicClassIntrospector.java
@@ -24,6 +24,7 @@
public static class GetterMethodFilter
implements MethodFilter
{
+ @SuppressWarnings("hiding")
public final static GetterMethodFilter instance = new GetterMethodFilter();
private GetterMethodFilter() { }
@@ -46,6 +47,7 @@
public static class SetterMethodFilter
implements MethodFilter
{
+ @SuppressWarnings("hiding")
public final static SetterMethodFilter instance = new SetterMethodFilter();
public boolean includeMethod(Method m)
@@ -82,8 +84,10 @@
public final static class SetterAndGetterMethodFilter
extends SetterMethodFilter
{
+ @SuppressWarnings("hiding")
public final static SetterAndGetterMethodFilter instance = new SetterAndGetterMethodFilter();
+ @Override
public boolean includeMethod(Method m)
{
if (super.includeMethod(m)) {
@@ -118,6 +122,7 @@
/**********************************************************
*/
+ @Override
public BasicBeanDescription forSerialization(SerializationConfig cfg,
JavaType type, MixInResolver r)
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java b/src/mapper/java/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java
index ff38e98..672a4d2 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/JacksonAnnotationIntrospector.java
@@ -314,12 +314,13 @@
/**********************************************************
*/
-
+ @Override
public String[] findSerializationPropertyOrder(AnnotatedClass ac) {
JsonPropertyOrder order = ac.getAnnotation(JsonPropertyOrder.class);
return (order == null) ? null : order.value();
}
+ @Override
public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
JsonPropertyOrder order = ac.getAnnotation(JsonPropertyOrder.class);
return (order == null) ? null : order.alphabetic();
diff --git a/src/mapper/java/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java b/src/mapper/java/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java
index 7cc3ad7..41329db 100644
--- a/src/mapper/java/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java
+++ b/src/mapper/java/org/codehaus/jackson/map/introspect/NopAnnotationIntrospector.java
@@ -152,10 +152,12 @@
/**********************************************************
*/
+ @Override
public String[] findSerializationPropertyOrder(AnnotatedClass ac) {
return null;
}
+ @Override
public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
return null;
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java
index 5b6ea18..06ca237 100644
--- a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsArrayTypeDeserializer.java
@@ -9,7 +9,7 @@
import org.codehaus.jackson.type.JavaType;
/**
- * Type deserializer used with {@link JsonTypeInfo.As.WRAPPER_ARRAY}
+ * Type deserializer used with {@link JsonTypeInfo.As#WRAPPER_ARRAY}
* inclusion mechanism. Simple since JSON structure used is always
* the same, regardless of structure used for actual value: wrapping
* is done using a 2-element JSON Array where type id is the first
diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java
index 0960c8f..bc11c1f 100644
--- a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/AsPropertyTypeDeserializer.java
@@ -89,6 +89,7 @@
* this through bit more in future, but for now this does address issue and has
* no negative side effects (at least within existing unit test suite).
*/
+ @Override
public Object deserializeTypedFromAny(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java
index 580f5dd..cd27d40 100644
--- a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java
+++ b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/MinimalClassNameIdResolver.java
@@ -32,6 +32,7 @@
}
}
+ @Override
public JsonTypeInfo.Id getMechanism() { return JsonTypeInfo.Id.MINIMAL_CLASS; }
@Override
diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/StdSubtypeResolver.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/StdSubtypeResolver.java
index 3706346..d2ce568 100644
--- a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/StdSubtypeResolver.java
+++ b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/StdSubtypeResolver.java
@@ -20,6 +20,7 @@
/**********************************************************
*/
+ @Override
public void registerSubtypes(NamedType... types)
{
if (_registeredSubtypes == null) {
@@ -30,6 +31,7 @@
}
}
+ @Override
public void registerSubtypes(Class<?>... classes)
{
NamedType[] types = new NamedType[classes.length];
@@ -44,6 +46,7 @@
* @param property Base member to use for type resolution: either annotated type (class),
* or property (field, getter/setter)
*/
+ @Override
public Collection<NamedType> collectAndResolveSubtypes(AnnotatedMember property,
MapperConfig<?> config, AnnotationIntrospector ai)
{
@@ -56,6 +59,7 @@
return _collectAndResolve(property, config, ai, st);
}
+ @Override
public Collection<NamedType> collectAndResolveSubtypes(AnnotatedClass type,
MapperConfig<?> config, AnnotationIntrospector ai)
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java
index 76268da..0cc0aaf 100644
--- a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java
+++ b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/TypeSerializerBase.java
@@ -23,5 +23,6 @@
@Override
public String getPropertyName() { return null; }
+ @Override
public TypeIdResolver getTypeIdResolver() { return _idResolver; }
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/ArraySerializers.java b/src/mapper/java/org/codehaus/jackson/map/ser/ArraySerializers.java
index 85274a2..f5a9357 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/ArraySerializers.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/ArraySerializers.java
@@ -260,7 +260,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
throws JsonMappingException
{
@@ -334,7 +334,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -368,7 +368,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -399,6 +399,7 @@
jgen.writeBinary(value);
}
+ @Override
public void serializeWithType(byte[] value, JsonGenerator jgen, SerializerProvider provider,
TypeSerializer typeSer)
throws IOException, JsonGenerationException
@@ -408,7 +409,7 @@
typeSer.writeTypeSuffixForScalar(value, jgen);
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -440,7 +441,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
//no "short" type defined by json
@@ -501,8 +502,8 @@
jgen.writeString(value, i, 1);
}
}
-
- //@Override
+
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -538,7 +539,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -568,7 +569,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -598,7 +599,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
@@ -632,7 +633,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializer.java b/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializer.java
index 8ec3bd9..eaaab3e 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializer.java
@@ -123,6 +123,7 @@
* configured
* {@link BeanPropertyWriter} instances.
*/
+ @Override
public final void serialize(Object bean, JsonGenerator jgen, SerializerProvider provider)
throws IOException, JsonGenerationException
{
@@ -131,6 +132,7 @@
jgen.writeEndObject();
}
+ @Override
public final void serializeWithType(Object bean, JsonGenerator jgen, SerializerProvider provider,
TypeSerializer typeSer)
throws IOException, JsonGenerationException
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java b/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
index a00c1bd..b700ea6 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/BeanSerializerFactory.java
@@ -53,6 +53,7 @@
* thus a single shared global (== singleton) instance can be used
* without thread-safety issues.
*/
+ @SuppressWarnings("hiding")
public final static BeanSerializerFactory instance = new BeanSerializerFactory();
/*
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/FailingSerializer.java b/src/mapper/java/org/codehaus/jackson/map/ser/FailingSerializer.java
index a9ddb87..a407d6e 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/FailingSerializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/FailingSerializer.java
@@ -26,12 +26,14 @@
_msg = msg;
}
+ @Override
public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
throws IOException, JsonGenerationException
{
throw new JsonGenerationException(_msg);
}
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
throws JsonMappingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/JsonValueSerializer.java b/src/mapper/java/org/codehaus/jackson/map/ser/JsonValueSerializer.java
index 1af7e45..a7fcf16 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/JsonValueSerializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/JsonValueSerializer.java
@@ -50,6 +50,7 @@
_valueSerializer = ser;
}
+ @Override
public void serialize(Object bean, JsonGenerator jgen, SerializerProvider prov)
throws IOException, JsonGenerationException
{
@@ -89,7 +90,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
throws JsonMappingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/SerializerBase.java b/src/mapper/java/org/codehaus/jackson/map/ser/SerializerBase.java
index e714809..efd49a7 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/SerializerBase.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/SerializerBase.java
@@ -37,8 +37,10 @@
_handledType = (Class<T>) t;
}
+ @Override
public final Class<T> handledType() { return _handledType; }
+ @Override
public abstract void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
throws IOException, JsonGenerationException;
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/StdKeySerializer.java b/src/mapper/java/org/codehaus/jackson/map/ser/StdKeySerializer.java
index 595128f..e999e1d 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/StdKeySerializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/StdKeySerializer.java
@@ -30,7 +30,7 @@
jgen.writeFieldName(keyStr);
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
throws JsonMappingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/StdSerializerProvider.java b/src/mapper/java/org/codehaus/jackson/map/ser/StdSerializerProvider.java
index 8528844..8d0c66a 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/StdSerializerProvider.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/StdSerializerProvider.java
@@ -271,6 +271,7 @@
return new JsonSchema((ObjectNode) schemaNode);
}
+ @Override
public boolean hasSerializerFor(SerializationConfig config,
Class<?> cls, SerializerFactory jsf)
{
@@ -371,10 +372,12 @@
_nullKeySerializer = nks;
}
+ @Override
public int cachedSerializersCount() {
return _serializerCache.size();
}
+ @Override
public void flushCachedSerializers() {
_serializerCache.flush();
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/ser/ToStringSerializer.java b/src/mapper/java/org/codehaus/jackson/map/ser/ToStringSerializer.java
index 0b7ad35..11e4a9d 100644
--- a/src/mapper/java/org/codehaus/jackson/map/ser/ToStringSerializer.java
+++ b/src/mapper/java/org/codehaus/jackson/map/ser/ToStringSerializer.java
@@ -41,7 +41,7 @@
jgen.writeString(value.toString());
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
throws JsonMappingException
{
diff --git a/src/mapper/java/org/codehaus/jackson/map/type/ArrayType.java b/src/mapper/java/org/codehaus/jackson/map/type/ArrayType.java
index 304655b..cbab4cd 100644
--- a/src/mapper/java/org/codehaus/jackson/map/type/ArrayType.java
+++ b/src/mapper/java/org/codehaus/jackson/map/type/ArrayType.java
@@ -45,6 +45,7 @@
return new ArrayType(componentType, emptyInstance);
}
+ @Override
protected String buildCanonicalName() {
return _class.getName();
}
@@ -59,6 +60,7 @@
* Handling of narrowing conversions for arrays is trickier: for now,
* it is not even allowed.
*/
+ @Override
protected JavaType _narrow(Class<?> subclass)
{
/* Ok: need a bit of indirection here. First, must replace component
@@ -79,6 +81,7 @@
* For array types, both main type and content type can be modified;
* but ultimately they are interchangeable.
*/
+ @Override
public JavaType narrowContentsBy(Class<?> contentClass)
{
// Can do a quick check first:
@@ -120,6 +123,7 @@
return _componentType.hasGenericTypes();
}
+ @Override
public List<JavaType> findGenericTypesFor(Class<?> genericClass) {
// any parameterization would be found from element type...
return _componentType.findGenericTypesFor(genericClass);
@@ -131,6 +135,7 @@
* Should not really matter since array types have no
* super types.
*/
+ @Override
public String containedTypeName(int index) {
if (index == 0) return "E";
return null;
@@ -142,21 +147,26 @@
/**********************************************************
*/
+ @Override
public boolean isContainerType() { return true; }
@Override
public JavaType getContentType() { return _componentType; }
+ @Override
public int containedTypeCount() { return 1; }
+ @Override
public JavaType containedType(int index) {
return (index == 0) ? _componentType : null;
}
+ @Override
public StringBuilder getGenericSignature(StringBuilder sb) {
sb.append('[');
return _componentType.getGenericSignature(sb);
}
+ @Override
public StringBuilder getErasedSignature(StringBuilder sb) {
sb.append('[');
return _componentType.getErasedSignature(sb);
@@ -174,6 +184,7 @@
return "[array type, component type: "+_componentType+"]";
}
+ @Override
public boolean equals(Object o)
{
if (o == this) return true;
diff --git a/src/mapper/java/org/codehaus/jackson/map/type/CollectionType.java b/src/mapper/java/org/codehaus/jackson/map/type/CollectionType.java
index b588c5b..e0c0ee4 100644
--- a/src/mapper/java/org/codehaus/jackson/map/type/CollectionType.java
+++ b/src/mapper/java/org/codehaus/jackson/map/type/CollectionType.java
@@ -26,11 +26,12 @@
_hashCode += elemT.hashCode();
}
- protected JavaType _narrow(Class<?> subclass)
- {
+ @Override
+ protected JavaType _narrow(Class<?> subclass) {
return new CollectionType(subclass, _elementType);
}
+ @Override
public JavaType narrowContentsBy(Class<?> contentClass)
{
// Can do a quick check first:
@@ -47,6 +48,7 @@
return new CollectionType(rawType, elemT);
}
+ @Override
protected String buildCanonicalName() {
StringBuilder sb = new StringBuilder();
sb.append(_class.getName());
@@ -64,8 +66,11 @@
/**********************************************************
*/
+ @Override
public JavaType getContentType() { return _elementType; }
+ @Override
public int containedTypeCount() { return 1; }
+ @Override
public JavaType containedType(int index) {
return (index == 0) ? _elementType : null;
}
@@ -74,15 +79,18 @@
* Not sure if we should count on this, but type names
* for core interfaces use "E" for element type
*/
+ @Override
public String containedTypeName(int index) {
if (index == 0) return "E";
return null;
}
+ @Override
public StringBuilder getErasedSignature(StringBuilder sb) {
return _classSignature(_class, sb, true);
}
+ @Override
public StringBuilder getGenericSignature(StringBuilder sb) {
_classSignature(_class, sb, false);
sb.append('<');
@@ -97,6 +105,7 @@
/**********************************************************
*/
+ @Override
public boolean isContainerType() { return true; }
/*
@@ -111,6 +120,7 @@
return "[collection type; class "+_class.getName()+", contains "+_elementType+"]";
}
+ @Override
public boolean equals(Object o)
{
if (o == this) return true;
diff --git a/src/mapper/java/org/codehaus/jackson/map/type/MapType.java b/src/mapper/java/org/codehaus/jackson/map/type/MapType.java
index 521e94c..4f2b329 100644
--- a/src/mapper/java/org/codehaus/jackson/map/type/MapType.java
+++ b/src/mapper/java/org/codehaus/jackson/map/type/MapType.java
@@ -39,11 +39,13 @@
return new MapType(rawType, keyT, valueT);
}
+ @Override
protected JavaType _narrow(Class<?> subclass)
{
return new MapType(subclass, _keyType, _valueType);
}
+ @Override
public JavaType narrowContentsBy(Class<?> contentClass)
{
// Can do a quick check first:
@@ -64,6 +66,7 @@
return new MapType(_class, newKeyType, _valueType).copyHandlers(this);
}
+ @Override
protected String buildCanonicalName() {
StringBuilder sb = new StringBuilder();
sb.append(_class.getName());
@@ -83,6 +86,7 @@
/**********************************************************
*/
+ @Override
public boolean isContainerType() { return true; }
@Override
@@ -106,16 +110,19 @@
* for core interfaces are "K" and "V" respectively.
* For now let's assume this should work.
*/
+ @Override
public String containedTypeName(int index) {
if (index == 0) return "K";
if (index == 1) return "V";
return null;
}
+ @Override
public StringBuilder getErasedSignature(StringBuilder sb) {
return _classSignature(_class, sb, true);
}
+ @Override
public StringBuilder getGenericSignature(StringBuilder sb)
{
_classSignature(_class, sb, false);
@@ -133,11 +140,12 @@
*/
@Override
- public String toString()
+ public String toString()
{
return "[map type; class "+_class.getName()+", "+_keyType+" -> "+_valueType+"]";
}
+ @Override
public boolean equals(Object o)
{
if (o == this) return true;
diff --git a/src/mapper/java/org/codehaus/jackson/map/type/SimpleType.java b/src/mapper/java/org/codehaus/jackson/map/type/SimpleType.java
index 0da6182..84dac0f 100644
--- a/src/mapper/java/org/codehaus/jackson/map/type/SimpleType.java
+++ b/src/mapper/java/org/codehaus/jackson/map/type/SimpleType.java
@@ -52,12 +52,14 @@
}
}
+ @Override
protected JavaType _narrow(Class<?> subclass)
{
// Should we check that there is a sub-class relationship?
return new SimpleType(subclass, _typeNames, _typeParameters);
}
+ @Override
public JavaType narrowContentsBy(Class<?> subclass)
{
// should never get called
@@ -82,6 +84,7 @@
return new SimpleType(cls);
}
+ @Override
protected String buildCanonicalName()
{
StringBuilder sb = new StringBuilder();
@@ -125,6 +128,7 @@
return _typeParameters[index];
}
+ @Override
public String containedTypeName(int index)
{
if (index < 0 || _typeNames == null || index >= _typeNames.length) {
@@ -133,10 +137,12 @@
return _typeNames[index];
}
+ @Override
public StringBuilder getErasedSignature(StringBuilder sb) {
return _classSignature(_class, sb, true);
}
+ @Override
public StringBuilder getGenericSignature(StringBuilder sb)
{
_classSignature(_class, sb, false);
diff --git a/src/mapper/java/org/codehaus/jackson/map/type/TypeBase.java b/src/mapper/java/org/codehaus/jackson/map/type/TypeBase.java
index c49e929..1e981fc 100644
--- a/src/mapper/java/org/codehaus/jackson/map/type/TypeBase.java
+++ b/src/mapper/java/org/codehaus/jackson/map/type/TypeBase.java
@@ -34,10 +34,13 @@
return this;
}
+ @Override
public abstract StringBuilder getGenericSignature(StringBuilder sb);
+ @Override
public abstract StringBuilder getErasedSignature(StringBuilder sb);
+ @Override
public List<JavaType> findGenericTypesFor(Class<?> genericClass)
{
// first, sanity check:
diff --git a/src/mapper/java/org/codehaus/jackson/map/type/TypeFactory.java b/src/mapper/java/org/codehaus/jackson/map/type/TypeFactory.java
index 2e38a98..d10c999 100644
--- a/src/mapper/java/org/codehaus/jackson/map/type/TypeFactory.java
+++ b/src/mapper/java/org/codehaus/jackson/map/type/TypeFactory.java
@@ -404,6 +404,7 @@
*
* @deprecated Use {@link #type(Type)} instead
*/
+ @Deprecated
public static JavaType fromClass(Class<?> clz)
{
return instance._fromClass(clz, null);
@@ -417,6 +418,7 @@
*
* @deprecated Use {@link #type(Type)} instead
*/
+ @Deprecated
public static JavaType fromTypeReference(TypeReference<?> ref)
{
return type(ref.getType());
@@ -429,6 +431,7 @@
*
* @deprecated Use {@link #type(Type)} instead
*/
+ @Deprecated
public static JavaType fromType(Type type)
{
return instance._fromType(type, null);
diff --git a/src/mapper/java/org/codehaus/jackson/map/util/ArrayBuilders.java b/src/mapper/java/org/codehaus/jackson/map/util/ArrayBuilders.java
index b219d71..a99f537 100644
--- a/src/mapper/java/org/codehaus/jackson/map/util/ArrayBuilders.java
+++ b/src/mapper/java/org/codehaus/jackson/map/util/ArrayBuilders.java
@@ -78,15 +78,16 @@
}
/*
- /////////////////////////////////////////////////////
- // Impl classes
- /////////////////////////////////////////////////////
+ /**********************************************************
+ /* Impl classes
+ /**********************************************************
*/
public final static class BooleanBuilder
extends PrimitiveArrayBuilder<boolean[]>
{
public BooleanBuilder() { }
+ @Override
public final boolean[] _constructArray(int len) { return new boolean[len]; }
}
@@ -94,24 +95,28 @@
extends PrimitiveArrayBuilder<byte[]>
{
public ByteBuilder() { }
+ @Override
public final byte[] _constructArray(int len) { return new byte[len]; }
}
public final static class ShortBuilder
extends PrimitiveArrayBuilder<short[]>
{
public ShortBuilder() { }
+ @Override
public final short[] _constructArray(int len) { return new short[len]; }
}
public final static class IntBuilder
extends PrimitiveArrayBuilder<int[]>
{
public IntBuilder() { }
+ @Override
public final int[] _constructArray(int len) { return new int[len]; }
}
public final static class LongBuilder
extends PrimitiveArrayBuilder<long[]>
{
public LongBuilder() { }
+ @Override
public final long[] _constructArray(int len) { return new long[len]; }
}
@@ -119,19 +124,21 @@
extends PrimitiveArrayBuilder<float[]>
{
public FloatBuilder() { }
+ @Override
public final float[] _constructArray(int len) { return new float[len]; }
}
public final static class DoubleBuilder
extends PrimitiveArrayBuilder<double[]>
{
public DoubleBuilder() { }
+ @Override
public final double[] _constructArray(int len) { return new double[len]; }
}
/*
- ***************************************************************
- * Static helper methods
- ***************************************************************
+ /**********************************************************
+ /* Static helper methods
+ /**********************************************************
*/
public static <T> HashSet<T> arrayToSet(T[] elements)
diff --git a/src/mapper/java/org/codehaus/jackson/map/util/ClassUtil.java b/src/mapper/java/org/codehaus/jackson/map/util/ClassUtil.java
index 10b10bd..abf99bd 100644
--- a/src/mapper/java/org/codehaus/jackson/map/util/ClassUtil.java
+++ b/src/mapper/java/org/codehaus/jackson/map/util/ClassUtil.java
@@ -439,8 +439,8 @@
}
@SuppressWarnings("unchecked")
- public Class<? extends Enum<?>> enumTypeFor(EnumSet<?> set)
- {
+ public Class<? extends Enum<?>> enumTypeFor(EnumSet<?> set)
+ {
if (enumSetTypeField != null) {
return (Class<? extends Enum<?>>) get(set, enumSetTypeField);
}
@@ -448,18 +448,19 @@
}
@SuppressWarnings("unchecked")
- public Class<? extends Enum<?>> enumTypeFor(EnumMap<?,?> set)
- {
+ public Class<? extends Enum<?>> enumTypeFor(EnumMap<?,?> set)
+ {
if (enumMapTypeField != null) {
return (Class<? extends Enum<?>>) get(set, enumMapTypeField);
}
throw new IllegalStateException("Can not figure out type for EnumMap (odd JDK platform?)");
- }
+
+ }
- private Object get(Object instance, Field field)
+ private Object get(Object bean, Field field)
{
try {
- return field.get(instance);
+ return field.get(bean);
} catch (Exception e) {
throw new IllegalArgumentException(e);
}
diff --git a/src/mapper/java/org/codehaus/jackson/map/util/StdDateFormat.java b/src/mapper/java/org/codehaus/jackson/map/util/StdDateFormat.java
index dddcfbe..8c2edf1 100644
--- a/src/mapper/java/org/codehaus/jackson/map/util/StdDateFormat.java
+++ b/src/mapper/java/org/codehaus/jackson/map/util/StdDateFormat.java
@@ -104,6 +104,7 @@
public StdDateFormat() { }
+ @Override
public StdDateFormat clone() {
/* Since we always delegate all work to child DateFormat instances,
* let's NOT call super.clone(); this is bit unusual, but makes
@@ -160,8 +161,8 @@
/**********************************************************
*/
- public Date parse(String dateStr)
- throws ParseException
+ @Override
+ public Date parse(String dateStr) throws ParseException
{
dateStr = dateStr.trim();
ParsePosition pos = new ParsePosition(0);
@@ -185,6 +186,7 @@
dateStr, sb.toString()), pos.getErrorIndex());
}
+ @Override
public Date parse(String dateStr, ParsePosition pos)
{
if (looksLikeISO8601(dateStr)) { // also includes "plain"
@@ -207,6 +209,7 @@
return parseAsRFC1123(dateStr, pos);
}
+ @Override
public StringBuffer format(Date date, StringBuffer toAppendTo,
FieldPosition fieldPosition)
{
diff --git a/src/mapper/java/org/codehaus/jackson/node/ArrayNode.java b/src/mapper/java/org/codehaus/jackson/node/ArrayNode.java
index e8168d2..013e048 100644
--- a/src/mapper/java/org/codehaus/jackson/node/ArrayNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/ArrayNode.java
@@ -260,6 +260,7 @@
return null;
}
+ @Override
public ArrayNode removeAll()
{
_children = null;
diff --git a/src/mapper/java/org/codehaus/jackson/node/BaseJsonNode.java b/src/mapper/java/org/codehaus/jackson/node/BaseJsonNode.java
index 1a9d85c..145deec 100644
--- a/src/mapper/java/org/codehaus/jackson/node/BaseJsonNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/BaseJsonNode.java
@@ -84,11 +84,13 @@
*
* @since 1.3
*/
+ @Override
public abstract JsonToken asToken();
/**
* @since 1.3
*/
+ @Override
public JsonParser.NumberType getNumberType() {
// most types non-numeric, so:
return null;
diff --git a/src/mapper/java/org/codehaus/jackson/node/BigIntegerNode.java b/src/mapper/java/org/codehaus/jackson/node/BigIntegerNode.java
index d019deb..709ef9f 100644
--- a/src/mapper/java/org/codehaus/jackson/node/BigIntegerNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/BigIntegerNode.java
@@ -69,6 +69,7 @@
/**********************************************************
*/
+ @Override
public String getValueAsText() {
return _value.toString();
}
diff --git a/src/mapper/java/org/codehaus/jackson/node/BinaryNode.java b/src/mapper/java/org/codehaus/jackson/node/BinaryNode.java
index 375bee3..d828c5d 100644
--- a/src/mapper/java/org/codehaus/jackson/node/BinaryNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/BinaryNode.java
@@ -78,6 +78,7 @@
* Hmmh. This is not quite as efficient as using {@link #serialize},
* but will work correctly.
*/
+ @Override
public String getValueAsText() {
return Base64Variants.getDefaultVariant().encode(_data, false);
}
diff --git a/src/mapper/java/org/codehaus/jackson/node/BooleanNode.java b/src/mapper/java/org/codehaus/jackson/node/BooleanNode.java
index de7d07d..e89f571 100644
--- a/src/mapper/java/org/codehaus/jackson/node/BooleanNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/BooleanNode.java
@@ -38,6 +38,7 @@
return (this == TRUE);
}
+ @Override
public String getValueAsText() {
return (this == TRUE) ? "true" : "false";
}
@@ -62,6 +63,7 @@
jg.writeBoolean(this == TRUE);
}
+ @Override
public boolean equals(Object o)
{
/* Since there are only ever two instances in existence
diff --git a/src/mapper/java/org/codehaus/jackson/node/ContainerNode.java b/src/mapper/java/org/codehaus/jackson/node/ContainerNode.java
index 78a1bdc..3f5787d 100644
--- a/src/mapper/java/org/codehaus/jackson/node/ContainerNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/ContainerNode.java
@@ -63,10 +63,13 @@
/**********************************************************
*/
+ @Override
public abstract int size();
+ @Override
public abstract JsonNode get(int index);
+ @Override
public abstract JsonNode get(String fieldName);
/*
diff --git a/src/mapper/java/org/codehaus/jackson/node/DecimalNode.java b/src/mapper/java/org/codehaus/jackson/node/DecimalNode.java
index 0636d30..c703cc5 100644
--- a/src/mapper/java/org/codehaus/jackson/node/DecimalNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/DecimalNode.java
@@ -34,6 +34,7 @@
@Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_FLOAT; }
+ @Override
public JsonParser.NumberType getNumberType() { return JsonParser.NumberType.BIG_DECIMAL; }
/*
@@ -43,30 +44,31 @@
*/
@Override
- public boolean isFloatingPointNumber() { return true; }
+ public boolean isFloatingPointNumber() { return true; }
@Override
- public boolean isBigDecimal() { return true; }
+ public boolean isBigDecimal() { return true; }
@Override
- public Number getNumberValue() { return _value; }
+ public Number getNumberValue() { return _value; }
@Override
- public int getIntValue() { return _value.intValue(); }
+ public int getIntValue() { return _value.intValue(); }
@Override
- public long getLongValue() { return _value.longValue(); }
+ public long getLongValue() { return _value.longValue(); }
@Override
- public BigInteger getBigIntegerValue() { return _value.toBigInteger(); }
+ public BigInteger getBigIntegerValue() { return _value.toBigInteger(); }
@Override
- public double getDoubleValue() { return _value.doubleValue(); }
+ public double getDoubleValue() { return _value.doubleValue(); }
@Override
- public BigDecimal getDecimalValue() { return _value; }
+ public BigDecimal getDecimalValue() { return _value; }
+ @Override
public String getValueAsText() {
return _value.toString();
}
diff --git a/src/mapper/java/org/codehaus/jackson/node/DoubleNode.java b/src/mapper/java/org/codehaus/jackson/node/DoubleNode.java
index 15d6b36..ac35f3a 100644
--- a/src/mapper/java/org/codehaus/jackson/node/DoubleNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/DoubleNode.java
@@ -15,12 +15,12 @@
public final class DoubleNode
extends NumericNode
{
- final double _value;
+ protected final double _value;
/*
- ************************************************
- * Construction
- ************************************************
+ /**********************************************************
+ /* Construction
+ /**********************************************************
*/
public DoubleNode(double v) { _value = v; }
@@ -28,19 +28,20 @@
public static DoubleNode valueOf(double v) { return new DoubleNode(v); }
/*
- ************************************************
- * BaseJsonNode extended API
- ************************************************
+ /**********************************************************
+ /* BaseJsonNode extended API
+ /**********************************************************
*/
@Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_FLOAT; }
+ @Override
public JsonParser.NumberType getNumberType() { return JsonParser.NumberType.DOUBLE; }
/*
- ************************************************
- * Overrridden JsonNode methods
- ************************************************
+ /**********************************************************
+ /* Overrridden JsonNode methods
+ /**********************************************************
*/
@Override
@@ -71,6 +72,7 @@
return getDecimalValue().toBigInteger();
}
+ @Override
public String getValueAsText() {
return NumberOutput.toString(_value);
}
diff --git a/src/mapper/java/org/codehaus/jackson/node/IntNode.java b/src/mapper/java/org/codehaus/jackson/node/IntNode.java
index c864040..fcc5b49 100644
--- a/src/mapper/java/org/codehaus/jackson/node/IntNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/IntNode.java
@@ -47,20 +47,21 @@
}
/*
- ************************************************
- * BaseJsonNode extended API
- ************************************************
- */
+ /**********************************************************
+ /* BaseJsonNode extended API
+ /**********************************************************
+ */
@Override public JsonToken asToken() { return JsonToken.VALUE_NUMBER_INT; }
+ @Override
public JsonParser.NumberType getNumberType() { return JsonParser.NumberType.INT; }
/*
- ************************************************
- * Overrridden JsonNode methods
- ************************************************
- */
+ /**********************************************************
+ /* Overrridden JsonNode methods
+ /**********************************************************
+ */
@Override
public boolean isIntegralNumber() { return true; }
@@ -74,20 +75,21 @@
}
@Override
- public int getIntValue() { return _value; }
+ public int getIntValue() { return _value; }
@Override
- public long getLongValue() { return (long) _value; }
+ public long getLongValue() { return (long) _value; }
@Override
- public double getDoubleValue() { return (double) _value; }
+ public double getDoubleValue() { return (double) _value; }
@Override
- public BigDecimal getDecimalValue() { return BigDecimal.valueOf(_value); }
+ public BigDecimal getDecimalValue() { return BigDecimal.valueOf(_value); }
@Override
- public BigInteger getBigIntegerValue() { return BigInteger.valueOf(_value); }
+ public BigInteger getBigIntegerValue() { return BigInteger.valueOf(_value); }
+ @Override
public String getValueAsText() {
return NumberOutput.toString(_value);
}
diff --git a/src/mapper/java/org/codehaus/jackson/node/LongNode.java b/src/mapper/java/org/codehaus/jackson/node/LongNode.java
index 1c13d16..303ec04 100644
--- a/src/mapper/java/org/codehaus/jackson/node/LongNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/LongNode.java
@@ -50,20 +50,21 @@
}
@Override
- public int getIntValue() { return (int) _value; }
+ public int getIntValue() { return (int) _value; }
@Override
- public long getLongValue() { return _value; }
+ public long getLongValue() { return _value; }
@Override
- public double getDoubleValue() { return (double) _value; }
+ public double getDoubleValue() { return (double) _value; }
@Override
- public BigDecimal getDecimalValue() { return BigDecimal.valueOf(_value); }
+ public BigDecimal getDecimalValue() { return BigDecimal.valueOf(_value); }
@Override
- public BigInteger getBigIntegerValue() { return BigInteger.valueOf(_value); }
+ public BigInteger getBigIntegerValue() { return BigInteger.valueOf(_value); }
+ @Override
public String getValueAsText() {
return NumberOutput.toString(_value);
}
diff --git a/src/mapper/java/org/codehaus/jackson/node/MissingNode.java b/src/mapper/java/org/codehaus/jackson/node/MissingNode.java
index 64967c6..5f6ed4a 100644
--- a/src/mapper/java/org/codehaus/jackson/node/MissingNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/MissingNode.java
@@ -63,6 +63,7 @@
*/
}
+ @Override
public boolean equals(Object o)
{
/* Hmmh. Since there's just a singleton instance, this
diff --git a/src/mapper/java/org/codehaus/jackson/node/NodeCursor.java b/src/mapper/java/org/codehaus/jackson/node/NodeCursor.java
index 6a15662..8f68d32 100644
--- a/src/mapper/java/org/codehaus/jackson/node/NodeCursor.java
+++ b/src/mapper/java/org/codehaus/jackson/node/NodeCursor.java
@@ -30,8 +30,10 @@
*/
// note: co-variant return type
+ @Override
public final NodeCursor getParent() { return _parent; }
+ @Override
public abstract String getCurrentName();
/*
@@ -86,8 +88,10 @@
_node = n;
}
+ @Override
public String getCurrentName() { return null; }
+ @Override
public JsonToken nextToken() {
if (!_done) {
_done = true;
@@ -97,9 +101,13 @@
return null;
}
+ @Override
public JsonToken nextValue() { return nextToken(); }
+ @Override
public JsonToken endToken() { return null; }
+ @Override
public JsonNode currentNode() { return _node; }
+ @Override
public boolean currentHasChildren() { return false; }
}
@@ -118,8 +126,10 @@
_contents = n.getElements();
}
+ @Override
public String getCurrentName() { return null; }
+ @Override
public JsonToken nextToken()
{
if (!_contents.hasNext()) {
@@ -130,10 +140,14 @@
return _currentNode.asToken();
}
+ @Override
public JsonToken nextValue() { return nextToken(); }
+ @Override
public JsonToken endToken() { return JsonToken.END_ARRAY; }
+ @Override
public JsonNode currentNode() { return _currentNode; }
+ @Override
public boolean currentHasChildren() {
// note: ONLY to be called for container nodes
return ((ContainerNode) currentNode()).size() > 0;
@@ -158,10 +172,12 @@
_needEntry = true;
}
+ @Override
public String getCurrentName() {
return (_current == null) ? null : _current.getKey();
}
+ @Override
public JsonToken nextToken()
{
// Need a new entry?
@@ -178,6 +194,7 @@
return _current.getValue().asToken();
}
+ @Override
public JsonToken nextValue()
{
JsonToken t = nextToken();
@@ -187,11 +204,14 @@
return t;
}
+ @Override
public JsonToken endToken() { return JsonToken.END_OBJECT; }
+ @Override
public JsonNode currentNode() {
return (_current == null) ? null : _current.getValue();
}
+ @Override
public boolean currentHasChildren() {
// note: ONLY to be called for container nodes
return ((ContainerNode) currentNode()).size() > 0;
diff --git a/src/mapper/java/org/codehaus/jackson/node/NullNode.java b/src/mapper/java/org/codehaus/jackson/node/NullNode.java
index 98e0202..6821673 100644
--- a/src/mapper/java/org/codehaus/jackson/node/NullNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/NullNode.java
@@ -50,6 +50,7 @@
jg.writeNull();
}
+ @Override
public boolean equals(Object o)
{
return (o == this);
diff --git a/src/mapper/java/org/codehaus/jackson/node/NumericNode.java b/src/mapper/java/org/codehaus/jackson/node/NumericNode.java
index 6b1cc0b..1ce4f17 100644
--- a/src/mapper/java/org/codehaus/jackson/node/NumericNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/NumericNode.java
@@ -18,13 +18,20 @@
// // // Let's re-abstract so sub-classes handle them
+ @Override
public abstract JsonParser.NumberType getNumberType();
+ @Override
public abstract Number getNumberValue();
+ @Override
public abstract int getIntValue();
+ @Override
public abstract long getLongValue();
+ @Override
public abstract double getDoubleValue();
+ @Override
public abstract BigDecimal getDecimalValue();
+ @Override
public abstract BigInteger getBigIntegerValue();
/*
@@ -33,6 +40,7 @@
/**********************************************************
*/
+ @Override
public abstract String getValueAsText();
@Override
diff --git a/src/mapper/java/org/codehaus/jackson/node/ObjectNode.java b/src/mapper/java/org/codehaus/jackson/node/ObjectNode.java
index b4890c1..89e9d8d 100644
--- a/src/mapper/java/org/codehaus/jackson/node/ObjectNode.java
+++ b/src/mapper/java/org/codehaus/jackson/node/ObjectNode.java
@@ -278,6 +278,7 @@
* Method for removing all field properties, such that this
* ObjectNode will contain no properties after call.
*/
+ @Override
public ObjectNode removeAll()
{
_children = null;
diff --git a/src/mapper/java/org/codehaus/jackson/node/TreeTraversingParser.java b/src/mapper/java/org/codehaus/jackson/node/TreeTraversingParser.java
index 3b48aff..30c2d04 100644
--- a/src/mapper/java/org/codehaus/jackson/node/TreeTraversingParser.java
+++ b/src/mapper/java/org/codehaus/jackson/node/TreeTraversingParser.java
@@ -80,10 +80,12 @@
}
}
+ @Override
public void setCodec(ObjectCodec c) {
_objectCodec = c;
}
+ @Override
public ObjectCodec getCodec() {
return _objectCodec;
}
@@ -301,6 +303,7 @@
return currentNumericNode().getNumberValue();
}
+ @Override
public Object getEmbeddedObject() {
if (!_closed) {
JsonNode n = currentNode();
diff --git a/src/mrbean/java/org/codehaus/jackson/mrbean/BeanBuilder.java b/src/mrbean/java/org/codehaus/jackson/mrbean/BeanBuilder.java
index c2c25ac..980bab8 100644
--- a/src/mrbean/java/org/codehaus/jackson/mrbean/BeanBuilder.java
+++ b/src/mrbean/java/org/codehaus/jackson/mrbean/BeanBuilder.java
@@ -37,8 +37,6 @@
*/
/**
- * @param parent Interface or abstract class that resulting class should
- * complete (implement all abstract/interface methods)
* @param failOnUnrecognized If true, and an unrecognized (non-getter, non-setter)
* method is encountered, will throw {@link IllegalArgumentException}; if false,
* will implement bogus method that will throw {@link UnsupportedOperationException}
diff --git a/src/perf/BaseReader.java b/src/perf/BaseReader.java
index 7831789..e3418f1 100644
--- a/src/perf/BaseReader.java
+++ b/src/perf/BaseReader.java
@@ -52,8 +52,8 @@
////////////////////////////////////////
*/
- public void close()
- throws IOException
+ @Override
+ public void close() throws IOException
{
InputStream in = mIn;
@@ -71,6 +71,7 @@
* never be called by main code, let's still implement it bit more
* efficiently just in case
*/
+ @Override
public int read()
throws IOException
{
diff --git a/src/perf/UTF8Reader.java b/src/perf/UTF8Reader.java
index c69f937..0fef906 100644
--- a/src/perf/UTF8Reader.java
+++ b/src/perf/UTF8Reader.java
@@ -43,6 +43,7 @@
////////////////////////////////////////
*/
+ @Override
public int read(char[] cbuf, int start, int len)
throws IOException
{
diff --git a/src/sample/BeanWithCursor.java b/src/sample/BeanWithCursor.java
index 896ec86..351f588 100644
--- a/src/sample/BeanWithCursor.java
+++ b/src/sample/BeanWithCursor.java
@@ -29,6 +29,7 @@
public int getToUserId() { return _toUserId; }
public String getLanguageCode() { return _languageCode; }
+ @Override
public String toString() {
return "[Tweet, id: "+_id+", text='"+_text+"', from: "+_fromUserId+", to: "+_toUserId+", lang: "+_languageCode+"]";
}
diff --git a/src/sample/CustomSerializationView.java b/src/sample/CustomSerializationView.java
index c54fe21..aa580a0 100644
--- a/src/sample/CustomSerializationView.java
+++ b/src/sample/CustomSerializationView.java
@@ -70,6 +70,7 @@
_writer = w;
}
+ @Override
public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov)
throws Exception
{
diff --git a/src/smile/java/org/codehaus/jackson/smile/SmileFactory.java b/src/smile/java/org/codehaus/jackson/smile/SmileFactory.java
index 67dc576..f759b9c 100644
--- a/src/smile/java/org/codehaus/jackson/smile/SmileFactory.java
+++ b/src/smile/java/org/codehaus/jackson/smile/SmileFactory.java
@@ -178,18 +178,21 @@
/**********************************************************
*/
+ @Override
public SmileParser createJsonParser(File f)
throws IOException, JsonParseException
{
return _createJsonParser(new FileInputStream(f), _createContext(f, true));
}
+ @Override
public SmileParser createJsonParser(URL url)
throws IOException, JsonParseException
{
return _createJsonParser(_optimizedStreamFromURL(url), _createContext(url, true));
}
+ @Override
public SmileParser createJsonParser(InputStream in)
throws IOException, JsonParseException
{
@@ -198,12 +201,14 @@
//public JsonParser createJsonParser(Reader r)
+ @Override
public SmileParser createJsonParser(byte[] data)
throws IOException, JsonParseException
{
return _createJsonParser(data, 0, data.length, _createContext(data, true));
}
+ @Override
public SmileParser createJsonParser(byte[] data, int offset, int len)
throws IOException, JsonParseException
{
@@ -220,6 +225,7 @@
*<p>
* note: co-variant return type
*/
+ @Override
public SmileGenerator createJsonGenerator(OutputStream out, JsonEncoding enc)
throws IOException
{
@@ -256,6 +262,7 @@
* Overridable factory method that actually instantiates desired
* parser.
*/
+ @Override
protected SmileParser _createJsonParser(InputStream in, IOContext ctxt)
throws IOException, JsonParseException
{
@@ -267,6 +274,7 @@
* Overridable factory method that actually instantiates desired
* parser.
*/
+ @Override
protected JsonParser _createJsonParser(Reader r, IOContext ctxt)
throws IOException, JsonParseException
{
@@ -280,6 +288,7 @@
* Overridable factory method that actually instantiates desired
* parser.
*/
+ @Override
protected SmileParser _createJsonParser(byte[] data, int offset, int len, IOContext ctxt)
throws IOException, JsonParseException
{
@@ -291,6 +300,7 @@
* Overridable factory method that actually instantiates desired
* generator.
*/
+ @Override
protected JsonGenerator _createJsonGenerator(Writer out, IOContext ctxt)
throws IOException
{
@@ -302,6 +312,7 @@
//public BufferRecycler _getBufferRecycler()
+ @Override
protected Writer _createWriter(OutputStream out, JsonEncoding enc, IOContext ctxt) throws IOException
{
if (_cfgDelegateToTextual) {
diff --git a/src/smile/java/org/codehaus/jackson/smile/SmileParser.java b/src/smile/java/org/codehaus/jackson/smile/SmileParser.java
index d43c56b..4a685ab 100644
--- a/src/smile/java/org/codehaus/jackson/smile/SmileParser.java
+++ b/src/smile/java/org/codehaus/jackson/smile/SmileParser.java
@@ -167,10 +167,12 @@
_tokenInputCol = -1;
}
+ @Override
public ObjectCodec getCodec() {
return _objectCodec;
}
+ @Override
public void setCodec(ObjectCodec c) {
_objectCodec = c;
}
@@ -468,6 +470,7 @@
return _parsingContext.getCurrentName();
}
+ @Override
public NumberType getNumberType()
throws IOException, JsonParseException
{
diff --git a/src/test/org/codehaus/jackson/main/TestGeneratorClosing.java b/src/test/org/codehaus/jackson/main/TestGeneratorClosing.java
index 625f51c..e5a6733 100644
--- a/src/test/org/codehaus/jackson/main/TestGeneratorClosing.java
+++ b/src/test/org/codehaus/jackson/main/TestGeneratorClosing.java
@@ -131,6 +131,7 @@
public MyWriter() { }
+ @Override
public void close() throws IOException {
mIsClosed = true;
super.close();
@@ -144,6 +145,7 @@
public MyStream() { }
+ @Override
public void close() throws IOException {
mIsClosed = true;
super.close();
diff --git a/src/test/org/codehaus/jackson/main/TestParserClosing.java b/src/test/org/codehaus/jackson/main/TestParserClosing.java
index 7956a90..4830c9f 100644
--- a/src/test/org/codehaus/jackson/main/TestParserClosing.java
+++ b/src/test/org/codehaus/jackson/main/TestParserClosing.java
@@ -138,6 +138,7 @@
super(contents);
}
+ @Override
public void close() {
mIsClosed = true;
super.close();
@@ -154,6 +155,7 @@
super(data);
}
+ @Override
public void close() throws IOException {
mIsClosed = true;
super.close();
diff --git a/src/test/org/codehaus/jackson/map/BrokenStringWriter.java b/src/test/org/codehaus/jackson/map/BrokenStringWriter.java
index a92dada..354c92b 100644
--- a/src/test/org/codehaus/jackson/map/BrokenStringWriter.java
+++ b/src/test/org/codehaus/jackson/map/BrokenStringWriter.java
@@ -12,16 +12,19 @@
_message = msg;
}
+ @Override
public void write(char[] cbuf, int off, int len) throws IOException
{
throw new IOException(_message);
}
+ @Override
public void write(int c) throws IOException
{
throw new IOException(_message);
}
+ @Override
public void write(String str, int off, int len) throws IOException
{
throw new IOException(_message);
diff --git a/src/test/org/codehaus/jackson/map/jsontype/TestGenericListSerialization.java b/src/test/org/codehaus/jackson/map/jsontype/TestGenericListSerialization.java
index a78d415..f36a317 100644
--- a/src/test/org/codehaus/jackson/map/jsontype/TestGenericListSerialization.java
+++ b/src/test/org/codehaus/jackson/map/jsontype/TestGenericListSerialization.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.codehaus.jackson.Version;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.codehaus.jackson.map.BaseMapTest;
import org.codehaus.jackson.map.ObjectMapper;
@@ -49,13 +50,22 @@
public void testSubTypesFor356() throws Exception
{
+ ObjectMapper mapper = new ObjectMapper();
+ /* 06-Sep-2010, tatus: This was not fixed for 1.6; and to keep junit test
+ * suite green, let's not run it for versions prior to 1.7...
+ */
+ Version v = mapper.version();
+ if (v.getMajorVersion() == 1 && v.getMinorVersion() == 6) {
+ System.err.println("Note: skipping test for Jackson 1.6");
+ return;
+ }
+
JSONResponse<List<Parent>> input = new JSONResponse<List<Parent>>();
List<Parent> embedded = new ArrayList<Parent>();
embedded.add(new Child1());
embedded.add(new Child2());
input.setResult(embedded);
- ObjectMapper mapper = new ObjectMapper();
mapper.configure(SerializationConfig.Feature.USE_STATIC_TYPING, true);
JavaType rootType = TypeFactory.type(new TypeReference<JSONResponse<List<Parent>>>() { });
diff --git a/src/tools/CheckNumberSpeed.java b/src/tools/CheckNumberSpeed.java
index d0e5604..7b4a435 100644
--- a/src/tools/CheckNumberSpeed.java
+++ b/src/tools/CheckNumberSpeed.java
@@ -4,6 +4,7 @@
* Simple test to see what is the performance difference between converting
* simple int values into different wrapper types.
*/
+@SuppressWarnings("hiding")
public final class CheckNumberSpeed
{
final int[] data;
diff --git a/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonDeserializer.java b/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonDeserializer.java
index c46fc48..8de74b2 100644
--- a/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonDeserializer.java
+++ b/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonDeserializer.java
@@ -21,6 +21,7 @@
{
public DataHandlerJsonDeserializer() { super(DataHandler.class); }
+ @Override
public DataHandler deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
diff --git a/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonSerializer.java b/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonSerializer.java
index 1a456f3..1a60431 100644
--- a/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonSerializer.java
+++ b/src/xc/java/org/codehaus/jackson/xc/DataHandlerJsonSerializer.java
@@ -21,6 +21,7 @@
{
public DataHandlerJsonSerializer() { super(DataHandler.class); }
+ @Override
public void serialize(DataHandler value, JsonGenerator jgen, SerializerProvider provider)
throws IOException, JsonProcessingException
{
@@ -43,6 +44,7 @@
jgen.writeBinary(out.toByteArray());
}
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
{
ObjectNode o = createSchemaNode("array", true);
diff --git a/src/xc/java/org/codehaus/jackson/xc/DomElementJsonDeserializer.java b/src/xc/java/org/codehaus/jackson/xc/DomElementJsonDeserializer.java
index f26d0fa..5bdd9fa 100644
--- a/src/xc/java/org/codehaus/jackson/xc/DomElementJsonDeserializer.java
+++ b/src/xc/java/org/codehaus/jackson/xc/DomElementJsonDeserializer.java
@@ -42,6 +42,7 @@
this.builder = builder;
}
+ @Override
public Element deserialize(JsonParser jp, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
diff --git a/src/xc/java/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java b/src/xc/java/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java
index baef0fc..ae66843 100644
--- a/src/xc/java/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java
+++ b/src/xc/java/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java
@@ -186,6 +186,7 @@
* called potentially for every single enum value being
* serialized. Need to improve somehow
*/
+ @Override
public String findEnumValue(Enum<?> e)
{
Class<?> enumClass = e.getDeclaringClass();
@@ -444,12 +445,13 @@
/**********************************************************
*/
+ @Override
public boolean isIgnorableMethod(AnnotatedMethod m)
{
return m.getAnnotation(XmlTransient.class) != null;
-
}
+ @Override
public boolean isIgnorableConstructor(AnnotatedConstructor c)
{
/* @XmlTransient can not be attached to constructors...
@@ -465,6 +467,7 @@
/**********************************************************
*/
+ @Override
public boolean isIgnorableField(AnnotatedField f)
{
return f.getAnnotation(XmlTransient.class) != null;
@@ -476,6 +479,7 @@
/**********************************************************
*/
+ @Override
public JsonSerializer<?> findSerializer(Annotated am)
{
XmlAdapter<Object,Object> adapter = findAdapter(am);
@@ -511,6 +515,7 @@
&& (("javax.activation.DataHandler".equals(type.getName()) || isDataHandler(type.getSuperclass())));
}
+ @Override
public Class<?> findSerializationType(Annotated a)
{
/* 15-Feb-2010, tatu: May need to support in future; if so, would make use of
@@ -525,6 +530,7 @@
* from Jackson defaults. As of version 1.5 and above, this is resolved by honoring
* Jackson defaults (which are configurable), and only using JAXB explicit annotations.
*/
+ @Override
public JsonSerialize.Inclusion findSerializationInclusion(Annotated a, JsonSerialize.Inclusion defValue)
{
XmlElementWrapper w = a.getAnnotation(XmlElementWrapper.class);
@@ -560,6 +566,7 @@
/**********************************************************
*/
+ @Override
public String[] findSerializationPropertyOrder(AnnotatedClass ac)
{
// @XmlType.propOrder fits the bill here:
@@ -599,6 +606,7 @@
return order;
}
+ @Override
public Boolean findSerializationSortAlphabetically(AnnotatedClass ac) {
// Yup, XmlAccessorOrder can provide this...
XmlAccessorOrder order = findAnnotation(XmlAccessorOrder.class, ac, true, true, true);
@@ -611,6 +619,7 @@
/**********************************************************
*/
+ @Override
public String findGettablePropertyName(AnnotatedMethod am)
{
PropertyDescriptor desc = findPropertyDescriptor(am);
@@ -620,6 +629,7 @@
return null;
}
+ @Override
public boolean hasAsValueAnnotation(AnnotatedMethod am)
{
//since jaxb says @XmlValue can exist with attributes, this won't map as a JSON value.
@@ -683,6 +693,7 @@
/**********************************************************
*/
+ @Override
public JsonDeserializer<?> findDeserializer(Annotated am)
{
XmlAdapter<Object,Object> adapter = findAdapter(am);
@@ -775,6 +786,7 @@
return null;
}
+ @Override
public String findSettablePropertyName(AnnotatedMethod am)
{
PropertyDescriptor desc = findPropertyDescriptor(am);
@@ -784,6 +796,7 @@
return null;
}
+ @Override
public boolean hasAnySetterAnnotation(AnnotatedMethod am)
{
//(ryan) JAXB has @XmlAnyAttribute and @XmlAnyElement annotations, but they're not applicable in this case
@@ -793,6 +806,7 @@
return false;
}
+ @Override
public boolean hasCreatorAnnotation(Annotated am)
{
return false;
@@ -819,6 +833,7 @@
/**********************************************************
*/
+ @Override
public String findPropertyNameForParam(AnnotatedParameter param)
{
// JAXB has nothing like this...
diff --git a/src/xc/java/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java b/src/xc/java/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java
index 1e044f5..3551e27 100644
--- a/src/xc/java/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java
+++ b/src/xc/java/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java
@@ -48,7 +48,7 @@
}
}
- //@Override
+ @Override
public JsonNode getSchema(SerializerProvider provider, Type typeHint)
throws JsonMappingException
{
diff --git a/src/xc/java/org/codehaus/jackson/xml/FromXmlParser.java b/src/xc/java/org/codehaus/jackson/xml/FromXmlParser.java
index d80e70d..a391bbc 100644
--- a/src/xc/java/org/codehaus/jackson/xml/FromXmlParser.java
+++ b/src/xc/java/org/codehaus/jackson/xml/FromXmlParser.java
@@ -101,10 +101,12 @@
_xmlReader = Stax2ReaderAdapter.wrapIfNecessary(xmlReader);
}
+ @Override
public ObjectCodec getCodec() {
return _objectCodec;
}
+ @Override
public void setCodec(ObjectCodec c) {
_objectCodec = c;
}
@@ -157,6 +159,7 @@
/**********************************************************
*/
+ @Override
protected byte[] _decodeBase64(Base64Variant b64variant)
throws IOException, JsonParseException
{
diff --git a/src/xc/java/org/codehaus/jackson/xml/XmlFactory.java b/src/xc/java/org/codehaus/jackson/xml/XmlFactory.java
index 7d15f89..14a829a 100644
--- a/src/xc/java/org/codehaus/jackson/xml/XmlFactory.java
+++ b/src/xc/java/org/codehaus/jackson/xml/XmlFactory.java
@@ -98,7 +98,7 @@
/**
* Method for enabling or disabling specified parser feature
- * (check {@link XmlParser.Feature} for list of features)
+ * (check {@link FromXmlParser.Feature} for list of features)
*/
public final XmlFactory configure(FromXmlParser.Feature f, boolean state)
{
@@ -206,6 +206,7 @@
*<p>
* note: co-variant return type
*/
+ @Override
public ToXmlGenerator createJsonGenerator(OutputStream out, JsonEncoding enc)
throws IOException
{
@@ -215,6 +216,7 @@
_objectCodec, _createXmlWriter(out));
}
+ @Override
public ToXmlGenerator createJsonGenerator(Writer out)
throws IOException
{
@@ -223,6 +225,7 @@
_objectCodec, _createXmlWriter(out));
}
+ @Override
public ToXmlGenerator createJsonGenerator(File f, JsonEncoding enc)
throws IOException
{
@@ -246,6 +249,7 @@
* Overridable factory method that actually instantiates desired
* parser.
*/
+ @Override
protected FromXmlParser _createJsonParser(InputStream in, IOContext ctxt)
throws IOException, JsonParseException
{
@@ -258,6 +262,7 @@
* Overridable factory method that actually instantiates desired
* parser.
*/
+ @Override
protected FromXmlParser _createJsonParser(Reader r, IOContext ctxt)
throws IOException, JsonParseException
{
@@ -269,6 +274,7 @@
* Overridable factory method that actually instantiates desired
* parser.
*/
+ @Override
protected FromXmlParser _createJsonParser(byte[] data, int offset, int len, IOContext ctxt)
throws IOException, JsonParseException
{
