javadoc cleanup, as per javadoclint. Also disabling said option (Wtf Oracle?)

19 files changed, 44 insertions, 44 deletions

diff --git a/pom.xml b/pom.xml
index 84af9530b..c62a90526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.fasterxml.jackson.core</groupId>
   <artifactId>jackson-databind</artifactId>
-  <version>2.6.0-rc3-SNAPSHOT</version>
+  <version>2.6.0-rc3</version>
   <name>jackson-databind</name>
   <packaging>bundle</packaging>
   <description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -20,7 +20,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-databind.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-databind.git</developerConnection>
     <url>http://github.com/FasterXML/jackson-databind</url>
-    <tag>HEAD</tag>
+    <tag>jackson-databind-2.6.0-rc3</tag>
   </scm>
 
   <properties>
@@ -111,10 +111,11 @@ javax.xml.datatype, javax.xml.namespace, javax.xml.parsers
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${version.plugin.javadoc}</version>
         <configuration>
+          <additionalparam>-Xdoclint:none</additionalparam>
           <links>
-            <link>http://docs.oracle.com/javase/6/docs/api/</link>
-            <link>http://fasterxml.github.com/jackson-annotations/javadoc/2.5/</link>
-            <link>http://fasterxml.github.com/jackson-core/javadoc/2.5/</link>
+            <link>http://docs.oracle.com/javase/7/docs/api/</link>
+            <link>http://fasterxml.github.com/jackson-annotations/javadoc/2.5</link>
+            <link>http://fasterxml.github.com/jackson-core/javadoc/2.5</link>
           </links>
         </configuration>
       </plugin>
diff --git a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
index 5e1721cb3..abdd07683 100644
--- a/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
+++ b/src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java
@@ -562,7 +562,7 @@ public abstract class AnnotationIntrospector
      * Method for getting a serializer definition on specified method
      * or field. Type of definition is either instance (of type
      * {@link JsonSerializer}) or Class (of type
-     * <code>Class<JsonSerializer></code>); if value of different
+     * <code>Class&lt;JsonSerializer></code>); if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */
     public Object findSerializer(Annotated am) {
@@ -573,7 +573,7 @@ public abstract class AnnotationIntrospector
      * Method for getting a serializer definition for keys of associated <code>Map</code> property.
      * Type of definition is either instance (of type
      * {@link JsonSerializer}) or Class (of type
-     * <code>Class<JsonSerializer></code>); if value of different
+     * <code>Class&lt;JsonSerializer></code>); if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */
     public Object findKeySerializer(Annotated am) {
@@ -585,7 +585,7 @@ public abstract class AnnotationIntrospector
      * associated <code>Collection</code>, <code>array</code> or <code>Map</code> property.
      * Type of definition is either instance (of type
      * {@link JsonSerializer}) or Class (of type
-     * <code>Class<JsonSerializer></code>); if value of different
+     * <code>Class&lt;JsonSerializer></code>); if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */
     public Object findContentSerializer(Annotated am) {
@@ -841,7 +841,7 @@ public abstract class AnnotationIntrospector
      * or field.
      * Type of definition is either instance (of type
      * {@link JsonDeserializer}) or Class (of type
-     * <code>Class<JsonDeserializer></code>); if value of different
+     * <code>Class&lt;JsonDeserializer></code>); if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */
     public Object findDeserializer(Annotated am) {
@@ -853,7 +853,7 @@ public abstract class AnnotationIntrospector
      * associated <code>Map</code> property.
      * Type of definition is either instance (of type
      * {@link JsonDeserializer}) or Class (of type
-     * <code>Class<JsonDeserializer></code>); if value of different
+     * <code>Class&lt;JsonDeserializer></code>); if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */
     public Object findKeyDeserializer(Annotated am) {
@@ -866,7 +866,7 @@ public abstract class AnnotationIntrospector
      * <code>Map</code> property.
      * Type of definition is either instance (of type
      * {@link JsonDeserializer}) or Class (of type
-     * <code>Class<JsonDeserializer></code>); if value of different
+     * <code>Class&lt;JsonDeserializer></code>); if value of different
      * type is returned, a runtime exception may be thrown by caller.
      */
     public Object findContentDeserializer(Annotated am) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
index 6c1bdb2fb..dcc4cbc0f 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -936,7 +936,7 @@ public class ObjectMapper
      * Convenience method that is functionally equivalent to:
      *<code>
      *   mapper.registerModules(mapper.findModules());
-     *<code>
+     *</code>
      *<p>
      * As with {@link #findModules()}, no caching is done for modules, so care
      * needs to be taken to either create and share a single mapper instance;
diff --git a/src/main/java/com/fasterxml/jackson/databind/annotation/JsonSerialize.java b/src/main/java/com/fasterxml/jackson/databind/annotation/JsonSerialize.java
index 0eb656364..dda47f4e0 100644
--- a/src/main/java/com/fasterxml/jackson/databind/annotation/JsonSerialize.java
+++ b/src/main/java/com/fasterxml/jackson/databind/annotation/JsonSerialize.java
@@ -222,7 +222,7 @@ public @interface JsonSerialize
          *   and return value of 0 indicates empty String (note that <code>String.isEmpty()</code>
          *   was added in Java 1.6 and as such can not be used by Jackson
          *   </li>
-         * <ul>
+         * </ul>
          *  For other types, non-null values are to be included.
          */
         NON_EMPTY,
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java
index ee0d01f23..c7b8237f9 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerModifier.java
@@ -24,9 +24,11 @@ import com.fasterxml.jackson.databind.type.MapType;
  * of deserializers can be changed.
  *<p>
  * Sequence in which callback methods are called for {@link BeanDeserializer} is:
+ * <ol>
  *  <li>{@link #updateProperties} is called once all property definitions are
  *    collected, and initial filtering (by ignorable type and explicit ignoral-by-bean)
  *    has been performed.
+ *   </li>
  *  <li>{@link #updateBuilder} is called once all initial pieces for building deserializer
  *    have been collected
  *   </li>
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/ValueInstantiator.java b/src/main/java/com/fasterxml/jackson/databind/deser/ValueInstantiator.java
index c9c71b523..67f506dd7 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/ValueInstantiator.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/ValueInstantiator.java
@@ -250,7 +250,7 @@ public abstract class ValueInstantiator
      */
 
     /**
-     * @since 2.4 (demoted from <code>StdValueInstantiator)
+     * @since 2.4 (demoted from <code>StdValueInstantiator</code>)
      */
     protected Object _createFromStringFallbacks(DeserializationContext ctxt, String value)
             throws IOException, JsonProcessingException
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
index 3d146e271..c0c4637e8 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java
@@ -103,10 +103,6 @@ public class PropertyValueBuffer
      * after either {@link #assignParameter(SettableBeanProperty, Object)}
      * returns <code>true</code> (to indicate all creator properties are found), or when
      * then whole JSON Object has been processed,
-     *
-     * @param defaults If any of parameters requires nulls to be replaced with a non-null
-     *    object (usually primitive types), this is a non-null array that has such replacement
-     *    values (and nulls for cases where nulls are ok)
      */
     protected Object[] getParameters(SettableBeanProperty[] props)
         throws JsonMappingException
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
index d4c5353a4..6fd73c1df 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
@@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
  * Deserializer for {@link EnumMap} values.
  * <p>
  * Note: casting within this class is all messed up -- just could not figure out a way
- * to properly deal with recursive definition of "EnumMap<K extends Enum<K>, V>
+ * to properly deal with recursive definition of "EnumMap&lt;K extends Enum&lt;K>, V>
  */
 @SuppressWarnings({ "unchecked", "rawtypes" }) 
 public class EnumMapDeserializer
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
index 69c0d3feb..54d5ff005 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
@@ -651,9 +651,9 @@ public class MapDeserializer
     }
 
     /**
-     * Helper class to maintain processing order of value. The resolved
-     * object associated with {@link #_id} comes before the values in
-     * {@link _next}.
+     * Helper class to maintain processing order of value.
+     * The resolved object associated with {@link #key} comes before the values in
+     * {@link #next}.
      */
     final static class MapReferring extends Referring {
         private final MapReferringAccumulator _parent;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java
index 1f7a28aec..ee4c4b81b 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDelegatingDeserializer.java
@@ -45,7 +45,7 @@ public class StdDelegatingDeserializer<T>
     protected final JavaType _delegateType;
 
     /**
-     * Underlying serializer for type <code>T<.code>.
+     * Underlying serializer for type <code>T</code>.
      */
     protected final JsonDeserializer<Object> _delegateDeserializer;
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
index 866454b05..eca460cc6 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
@@ -908,7 +908,8 @@ public abstract class StdDeserializer<T>
      * {@link java.lang.Number} into "bigger" type like {@link java.lang.Long} or
      * {@link java.math.BigInteger}
      * 
-     * @see {@link DeserializationFeature#USE_BIG_INTEGER_FOR_INTS}, {@link DeserializationFeature#USE_LONG_FOR_INTS}
+     * @see DeserializationFeature#USE_BIG_INTEGER_FOR_INTS
+     * @see DeserializationFeature#USE_LONG_FOR_INTS
      *
      * @since 2.6
      */
diff --git a/src/main/java/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java b/src/main/java/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java
index 5edd39cf9..f442be42a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java
+++ b/src/main/java/com/fasterxml/jackson/databind/jsonschema/JsonSchema.java
@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
  * @see <a href="http://json-schema.org/">JSON Schema</a>
  * 
  * @deprecated Since 2.2, we recommend use of external
- *   <a href="https://github.com/FasterXML/jackson-module-jsonSchema">JSON Schema generator module</module>
+ *   <a href="https://github.com/FasterXML/jackson-module-jsonSchema">JSON Schema generator module</a>
  */
 @Deprecated
 public class JsonSchema
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java
index 831a21037..5444cc1f8 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java
@@ -786,7 +786,7 @@ public abstract class BasicSerializerFactory
     /**
      *<p>
      * NOTE: although return type is left opaque, it really needs to be
-     * {@link JsonInclude#Include} for things to work as expected.
+     * <code>JsonInclude.Include</code> for things to work as expected.
      *
      * @since 2.5
      */
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java b/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
index ef82ade3b..1e805f42d 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java
@@ -28,9 +28,9 @@ public class PropertyBuilder
 
     /**
      * If a property has serialization inclusion value of
-     * {@link Inclusion#ALWAYS}, we need to know the default
-     * value of the bean, to know if property value equals default
-     * one.
+     * {@link com.fasterxml.jackson.annotation.JsonInclude.Include#NON_DEFAULT},
+     * we need to know the default value of the bean, to know if property value
+     * equals default one.
      */
     protected Object _defaultBean;
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/SerializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/ser/SerializerFactory.java
index 432656b06..712beb388 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/SerializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/SerializerFactory.java
@@ -21,7 +21,7 @@ public abstract class SerializerFactory
      * provider; equivalent to calling
      *<pre>
      *   withConfig(getConfig().withAdditionalSerializers(additional));
-     *<pre>
+     *</pre>
      */
     public abstract SerializerFactory withAdditionalSerializers(Serializers additional);
 
@@ -32,7 +32,7 @@ public abstract class SerializerFactory
      * serializer modifier; equivalent to calling
      *<pre>
      *   withConfig(getConfig().withSerializerModifier(modifier));
-     *<pre>
+     *</pre>
      */
     public abstract SerializerFactory withSerializerModifier(BeanSerializerModifier modifier);
     
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
index ee986015b..817d289d0 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ser.ContextualSerializer;
  * {@link com.fasterxml.jackson.annotation.JsonValue} annotation to
  * indicate that serialization should be done by calling the method
  * annotated, and serializing result it returns.
- * <p/>
+ *<p>
  * Implementation note: we will post-process resulting serializer
  * (much like what is done with {@link BeanSerializer})
  * to figure out actual serializers for final types.
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
index f5415a1d8..4612bf9a7 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java
@@ -37,7 +37,7 @@ public class StdDelegatingSerializer
     protected final JavaType _delegateType;
     
     /**
-     * Underlying serializer for type <code>T<.code>.
+     * Underlying serializer for type <code>T</code>.
      */
     protected final JsonSerializer<Object> _delegateSerializer;
     
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
index 4fa88cd22..83a242d13 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -184,8 +184,8 @@ public final class TypeFactory
     /**
      * Factory method for creating a subtype of given base type, as defined
      * by specified subclass; but retaining generic type information if any.
-     * Can be used, for example, to get equivalent of "HashMap&lt;String,Integer>"
-     * from "Map&ltString,Integer>" by giving <code>HashMap.class</code>
+     * Can be used, for example, to get equivalent of "HashMap&lt;String,Integer&gt;"
+     * from "Map&lt;String,Integer&gt;" by giving <code>HashMap.class</code>
      * as subclass.
      */
     public JavaType constructSpecializedType(JavaType baseType, Class<?> subclass)
@@ -575,7 +575,7 @@ public final class TypeFactory
     /**
      * Factory method for constructing {@link JavaType} that
      * represents a parameterized type. For example, to represent
-     * type <code>List&ltInteger></code>, you could
+     * type <code>List&lt;Integer></code>, you could
      * call
      *<pre>
      *  TypeFactory.constructParametrizedType(List.class, List.class, Integer.class);
@@ -583,7 +583,7 @@ public final class TypeFactory
      *<p>
      * The reason for first two arguments to be separate is that parameterization may
      * apply to a super-type. For example, if generic type was instead to be
-     * constructed for <code>ArrayList<Integer></code>, the usual call would be:
+     * constructed for <code>ArrayList&lt;Integer></code>, the usual call would be:
      *<pre>
      *  TypeFactory.constructParametrizedType(ArrayList.class, List.class, Integer.class);
      *</pre>
@@ -632,7 +632,7 @@ public final class TypeFactory
      *<p>
      * The reason for first two arguments to be separate is that parameterization may
      * apply to a super-type. For example, if generic type was instead to be
-     * constructed for <code>ArrayList<Integer></code>, the usual call would be:
+     * constructed for <code>ArrayList&lt;Integer></code>, the usual call would be:
      *<pre>
      *  TypeFactory.constructParametrizedType(ArrayList.class, List.class, Integer.class);
      *</pre>
@@ -701,7 +701,7 @@ public final class TypeFactory
      * and is equivalent to calling:
      *<pre>
      *  typeFactory.constructCollectionType(collectionClass, typeFactory.unknownType());
-     *<pre>
+     *</pre>
      *<p>
      * This method should only be used if parameterization is completely unavailable.
      */
@@ -716,7 +716,7 @@ public final class TypeFactory
      * and is equivalent to calling:
      *<pre>
      *  typeFactory.constructCollectionLikeType(collectionClass, typeFactory.unknownType());
-     *<pre>
+     *</pre>
      *<p>
      * This method should only be used if parameterization is completely unavailable.
      */
@@ -731,7 +731,7 @@ public final class TypeFactory
      * and is equivalent to calling:
      *<pre>
      *  typeFactory.constructMapType(collectionClass, typeFactory.unknownType(), typeFactory.unknownType());
-     *<pre>
+     *</pre>
      *<p>
      * This method should only be used if parameterization is completely unavailable.
      */
@@ -746,7 +746,7 @@ public final class TypeFactory
      * and is equivalent to calling:
      *<pre>
      *  typeFactory.constructMapLikeType(collectionClass, typeFactory.unknownType(), typeFactory.unknownType());
-     *<pre>
+     *</pre>
      *<p>
      * This method should only be used if parameterization is completely unavailable.
      */
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java b/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
index ffe2d9aa9..833ef6e7a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/ISO8601DateFormat.java
@@ -8,9 +8,9 @@ import java.util.GregorianCalendar;
 /**
  * Provide a fast thread-safe formatter/parser DateFormat for ISO8601 dates ONLY.
  * It was mainly done to be used with Jackson JSON Processor.
- * <p/>
+ *<p>
  * Watch out for clone implementation that returns itself.
- * <p/>
+ *<p>
  * All other methods but parse and format and clone are undefined behavior.
  *
  * @see ISO8601Utils