More warnings cleanup

32 files changed, 51 insertions, 52 deletions

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
index 1c4d78452..2f9c41440 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
@@ -26,6 +26,8 @@ public final class IndexedStringListSerializer
     extends StaticListSerializerBase<List<String>>
     implements ContextualSerializer
 {
+    private static final long serialVersionUID = 1L;
+
     public final static IndexedStringListSerializer instance = new IndexedStringListSerializer();
     
     protected final JsonSerializer<String> _serializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java
index 20e86b32f..0a77d721d 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IteratorSerializer.java
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.ContainerSerializer;
 import com.fasterxml.jackson.databind.ser.std.AsArraySerializerBase;
 
+@SuppressWarnings("serial")
 @JacksonStdImpl
 public class IteratorSerializer
     extends AsArraySerializerBase<Iterator<?>>
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java
index 38dbfeda2..165ebbe08 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java
@@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 /**
  * @since 2.5
  */
+@SuppressWarnings("serial")
 @JacksonStdImpl
 public class MapEntrySerializer
     extends ContainerSerializer<Map.Entry<?,?>>
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
index 7dd804f2e..d64c8c8cf 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringArraySerializer.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.type.TypeFactory;
  * Standard serializer used for <code>String[]</code> values.
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class StringArraySerializer
     extends ArraySerializerBase<String[]>
     implements ContextualSerializer
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
index 110c9fa5a..6d2efd294 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
@@ -22,6 +21,7 @@ import com.fasterxml.jackson.databind.ser.std.StaticListSerializerBase;
  * String serializer.
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class StringCollectionSerializer
     extends StaticListSerializerBase<Collection<String>>
     implements ContextualSerializer
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java
index 4b4a163e7..f2e2a2716 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/impl/UnknownSerializer.java
@@ -4,12 +4,12 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
+@SuppressWarnings("serial")
 public class UnknownSerializer
     extends StdSerializer<Object>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
index 85ff64daf..fec231862 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
@@ -33,6 +33,7 @@ import com.fasterxml.jackson.databind.util.NameTransformer;
  * Can be used for custom bean serializers as well, although that
  * is not the primary design goal.
  */
+@SuppressWarnings("serial")
 public abstract class BeanSerializerBase
     extends StdSerializer<Object>
     implements ContextualSerializer, ResolvableSerializer,
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ClassSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ClassSerializer.java
index 2328c7d5d..cf6ff3574 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/ClassSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/ClassSerializer.java
@@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrappe
  * Also: default bean access will not do much good with Class.class. But
  * we can just serialize the class name and that should be enough.
  */
+@SuppressWarnings("serial")
 public class ClassSerializer
     extends StdScalarSerializer<Class<?>>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java
index 926aec45e..337148101 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.net.InetAddress;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
@@ -12,14 +11,14 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
  * Simple serializer for {@link java.net.InetAddress}. Main complexity is
  * with registration, since same serializer is to be used for sub-classes.
  */
+@SuppressWarnings("serial")
 public class InetAddressSerializer
     extends StdScalarSerializer<InetAddress>
 {
     public InetAddressSerializer() { super(InetAddress.class); }
 
     @Override
-    public void serialize(InetAddress value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+    public void serialize(InetAddress value, JsonGenerator jgen, SerializerProvider provider) throws IOException
     {
         // Ok: get textual description; choose "more specific" part
         String str = value.toString().trim();
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java
index 470ede4b4..3879d9b2f 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/IterableSerializer.java
@@ -4,13 +4,13 @@ import java.io.IOException;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.ContainerSerializer;
 
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class IterableSerializer
     extends AsArraySerializerBase<Iterable<?>>
 {
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 0d9389de6..4ec7ff7d3 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
@@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.ser.ContextualSerializer;
  *  This must be done from {@link #createContextual} method, and NOT from constructor;
  * otherwise we could end up with an infinite loop.
  */
+@SuppressWarnings("serial")
 @JacksonStdImpl
 public class JsonValueSerializer
     extends StdSerializer<Object>
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
index e032a8d11..1029f3474 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
@@ -31,6 +31,8 @@ public class MapSerializer
     extends ContainerSerializer<Map<?,?>>
     implements ContextualSerializer
 {
+    private static final long serialVersionUID = -3465193297149553004L;
+
     protected final static JavaType UNSPECIFIED_TYPE = TypeFactory.unknownType();
 
     /**
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java
index 16050e55b..350627979 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/NonTypedScalarSerializerBase.java
@@ -3,7 +3,6 @@ package com.fasterxml.jackson.databind.ser.std;
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
@@ -14,6 +13,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
  * types: {@link java.lang.String}, {@link java.lang.Integer},
  * {@link java.lang.Double} and {@link java.lang.Boolean}.
  */
+@SuppressWarnings("serial")
 public abstract class NonTypedScalarSerializerBase<T>
     extends StdScalarSerializer<T>
 {
@@ -23,8 +23,7 @@ public abstract class NonTypedScalarSerializerBase<T>
 
     @Override
     public final void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
+            TypeSerializer typeSer) throws IOException
     {
         // no type info, just regular serialization
         serialize(value, jgen, provider);            
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/NullSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/NullSerializer.java
index 8dc8081af..9296d75f6 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/NullSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/NullSerializer.java
@@ -4,7 +4,6 @@ import java.lang.reflect.Type;
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
@@ -17,6 +16,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrappe
  * more exotic types (java.lang.Void).
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class NullSerializer
     extends StdSerializer<Object>
 {
@@ -25,23 +25,17 @@ public class NullSerializer
     private NullSerializer() { super(Object.class); }
     
     @Override
-    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
+    public void serialize(Object value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         jgen.writeNull();
     }
     
     @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-        throws JsonMappingException
-    {
+    public JsonNode getSchema(SerializerProvider provider, Type typeHint) throws JsonMappingException {
         return createSchemaNode("null");
     }
     
     @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
-    {
+    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) throws JsonMappingException {
         visitor.expectNullFormat(typeHint);
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/NumberSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/NumberSerializer.java
index c4b44bf43..a599a9df1 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/NumberSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/NumberSerializer.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonNumberFormatVisitor
  * like {@link BigInteger} and {@link BigDecimal}.
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class NumberSerializer
     extends StdScalarSerializer<Number>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java
index 77c4cfdfc..7579345ac 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/ObjectArraySerializer.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.type.TypeFactory;
  * Generic serializer for Object arrays (<code>Object[]</code>).
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class ObjectArraySerializer
     extends ArraySerializerBase<Object[]>
     implements ContextualSerializer
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/RawSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/RawSerializer.java
index 79a2a08bb..c9e3b5461 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/RawSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/RawSerializer.java
@@ -4,7 +4,6 @@ import java.lang.reflect.Type;
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
@@ -13,6 +12,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
  * This is a simple dummy serializer that will just output raw values by calling
  * toString() on value to serialize.
  */
+@SuppressWarnings("serial")
 public class RawSerializer<T>
     extends StdSerializer<T>
 {
@@ -26,16 +26,14 @@ public class RawSerializer<T>
     }
 
     @Override
-    public void serialize(T value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
+    public void serialize(T value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         jgen.writeRawValue(value.toString());
     }
 
     @Override
     public void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
             TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         typeSer.writeTypePrefixForScalar(value, jgen);
         serialize(value, jgen, provider);
@@ -50,8 +48,7 @@ public class RawSerializer<T>
     }
     
     @Override
-    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
-        throws JsonMappingException
+    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) throws JsonMappingException
     {
         visitor.expectStringFormat(typeHint);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java
index 9b669c837..791791e90 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/SerializableSerializer.java
@@ -5,8 +5,6 @@ import java.lang.reflect.Type;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.fasterxml.jackson.core.*;
-
-
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -27,6 +25,7 @@ import com.fasterxml.jackson.databind.type.TypeFactory;
  * interface, can not be checked for direct class equivalence.
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class SerializableSerializer
     extends StdSerializer<JsonSerializable>
 {
@@ -38,17 +37,13 @@ public class SerializableSerializer
     protected SerializableSerializer() { super(JsonSerializable.class); }
 
     @Override
-    public void serialize(JsonSerializable value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
-    {
+    public void serialize(JsonSerializable value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         value.serialize(jgen, provider);
     }
 
     @Override
     public final void serializeWithType(JsonSerializable value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
-    {
+            TypeSerializer typeSer) throws IOException {
         value.serializeWithType(jgen, provider, typeSer);
     }
     
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java
index f1322c88f..2f405bec2 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlDateSerializer.java
@@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrappe
  * that should not be used by plain SQL date.
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class SqlDateSerializer
     extends DateTimeSerializerBase<java.sql.Date>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java
index 9b4043f3f..0444302a0 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/SqlTimeSerializer.java
@@ -3,7 +3,6 @@ package com.fasterxml.jackson.databind.ser.std;
 import java.io.IOException;
 import java.lang.reflect.Type;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -15,21 +14,20 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonStringFormatVisitor
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
 
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class SqlTimeSerializer
     extends StdScalarSerializer<java.sql.Time>
 {
     public SqlTimeSerializer() { super(java.sql.Time.class); }
 
     @Override
-    public void serialize(java.sql.Time value, JsonGenerator jgen, SerializerProvider provider)
-        throws IOException, JsonGenerationException
+    public void serialize(java.sql.Time value, JsonGenerator jgen, SerializerProvider provider) throws IOException
     {
         jgen.writeString(value.toString());
     }
 
     @Override
-    public JsonNode getSchema(SerializerProvider provider, Type typeHint)
-    {
+    public JsonNode getSchema(SerializerProvider provider, Type typeHint) {
         return createSchemaNode("string", true);
     }
     
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java
index de174dc0e..ba10dc788 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StaticListSerializerBase.java
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrappe
  * Intermediate base class for Lists, Collections and Arrays
  * that contain static (non-dynamic) value types.
  */
+@SuppressWarnings("serial")
 public abstract class StaticListSerializerBase<T extends Collection<?>>
     extends StdSerializer<T>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java
index 225240655..089c257f8 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdKeySerializer.java
@@ -5,7 +5,6 @@ import java.lang.reflect.Type;
 import java.util.Date;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -17,6 +16,7 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrappe
  * serializer, when serializing {@link java.util.Map}s to JSON
  * Objects.
  */
+@SuppressWarnings("serial")
 public class StdKeySerializer extends StdSerializer<Object>
 {
     public StdKeySerializer() { super(Object.class); }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java
index 42f38e7e1..9233ef749 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdScalarSerializer.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -12,6 +11,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
+@SuppressWarnings("serial")
 public abstract class StdScalarSerializer<T>
     extends StdSerializer<T>
 {
@@ -37,8 +37,7 @@ public abstract class StdScalarSerializer<T>
      */
     @Override
     public void serializeWithType(T value, JsonGenerator jgen, SerializerProvider provider,
-            TypeSerializer typeSer)
-        throws IOException, JsonGenerationException
+            TypeSerializer typeSer) throws IOException
     {
         typeSer.writeTypePrefixForScalar(value, jgen);
         serialize(value, jgen, provider);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StringSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StringSerializer.java
index 3bf58b5e8..040734b21 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StringSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StringSerializer.java
@@ -22,6 +22,8 @@ import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrappe
 public final class StringSerializer
     extends NonTypedScalarSerializerBase<String>
 {
+    private static final long serialVersionUID = 1L;
+
     public StringSerializer() { super(String.class); }
 
     /**
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java
index 6ca0e2ec7..3ad88de8c 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/TimeZoneSerializer.java
@@ -4,21 +4,21 @@ import java.io.IOException;
 import java.util.TimeZone;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
+@SuppressWarnings("serial")
 public class TimeZoneSerializer extends StdScalarSerializer<TimeZone>
 {
     public TimeZoneSerializer() { super(TimeZone.class); }
 
     @Override
-    public void serialize(TimeZone value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonGenerationException {
+    public void serialize(TimeZone value, JsonGenerator jgen, SerializerProvider provider) throws IOException {
         jgen.writeString(value.getID());
     }
 
     @Override
-    public void serializeWithType(TimeZone value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer) throws IOException, JsonGenerationException {
+    public void serializeWithType(TimeZone value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer) throws IOException {
         // Better ensure we don't use specific sub-classes:
         typeSer.writeTypePrefixForScalar(value, jgen, TimeZone.class);
         serialize(value, jgen, provider);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java
index 1016086b7..6dc7bd605 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/ToStringSerializer.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -19,6 +18,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
  * value.
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class ToStringSerializer
     extends StdSerializer<Object>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java
index 0871b5c3d..d5782ca22 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/TokenBufferSerializer.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -21,6 +20,7 @@ import com.fasterxml.jackson.databind.util.TokenBuffer;
  * (which is only included in the mapper package)
  */
 @JacksonStdImpl
+@SuppressWarnings("serial")
 public class TokenBufferSerializer
     extends StdSerializer<TokenBuffer>
 {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.java
index 0804002b6..1db68d19e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.util.UUID;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 
@@ -15,6 +14,7 @@ import com.fasterxml.jackson.databind.util.TokenBuffer;
  * allow serialization using raw binary output (as 16-byte block)
  * if underlying data format has efficient means to access that.
  */
+@SuppressWarnings("serial")
 public class UUIDSerializer
     extends StdScalarSerializer<UUID>
 {
diff --git a/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithSer.java b/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithSer.java
index 3759c4d58..830621e24 100644
--- a/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithSer.java
+++ b/src/test/java/com/fasterxml/jackson/databind/contextual/TestContextAttributeWithSer.java
@@ -3,7 +3,6 @@ package com.fasterxml.jackson.databind.contextual;
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
@@ -11,7 +10,8 @@ import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 public class TestContextAttributeWithSer extends BaseMapTest
 {
     final static String KEY = "foobar";
-    
+
+    @SuppressWarnings("serial")
     static class PrefixStringSerializer extends StdScalarSerializer<String>
     {
         protected PrefixStringSerializer() {
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java
index b70384585..b58507593 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java
@@ -111,6 +111,7 @@ public class TestCustomSerializers extends BaseMapTest
         }
     }
     
+    @SuppressWarnings("serial")
     static class ParentClassSerializer
         extends StdScalarSerializer<Object>
     {
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestEnumSerialization.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestEnumSerialization.java
index d8e491ea0..bda3f6d64 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ser/TestEnumSerialization.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ser/TestEnumSerialization.java
@@ -140,7 +140,7 @@ public class TestEnumSerialization
         A, B;
     }
 
-    @SuppressWarnings("rawtypes")
+    @SuppressWarnings({ "rawtypes", "serial" })
     static class LowerCasingEnumSerializer extends StdSerializer<Enum>
     {
         public LowerCasingEnumSerializer() { super(Enum.class); }
diff --git a/src/test/java/perf/ManulWritePerfWithUUID.java b/src/test/java/perf/ManulWritePerfWithUUID.java
index 47ef8fd75..a782c3a7e 100644
--- a/src/test/java/perf/ManulWritePerfWithUUID.java
+++ b/src/test/java/perf/ManulWritePerfWithUUID.java
@@ -48,6 +48,7 @@ class UUIDSlow
     public UUIDSlow(UUID[] v) { values = v; }
 }
 
+@SuppressWarnings("serial")
 class SlowSer extends StdScalarSerializer<UUID>
 {
     public SlowSer() { super(UUID.class); }