cleaning up schema compatibility handling, to reduce ObjectMapper overrides

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/csv/CsvFactory.java

@@ -85,13 +85,12 @@ public Version version() {
 
     /*
     /**********************************************************
-    /* Format detection functionality (since 1.8)
+    /* Format detection functionality
     /**********************************************************
      */
 
     @Override
-    public String getFormatName()
-    {
+    public String getFormatName() {
         return FORMAT_NAME_CSV;
     }
 
@@ -104,7 +103,12 @@ public MatchStrength hasFormat(InputAccessor acc) throws IOException
         // !!! TBI -- but how?
         return MatchStrength.INCONCLUSIVE;
     }
-    
+
+    @Override
+    public boolean canUseSchema(FormatSchema schema) {
+        return (schema instanceof CsvSchema);
+    }
+
     /*
     /**********************************************************
     /* Configuration, parser settings

src/main/java/com/fasterxml/jackson/dataformat/csv/CsvMapper.java

@@ -1,7 +1,5 @@
 package com.fasterxml.jackson.dataformat.csv;
 
-import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -14,7 +12,7 @@
  */
 public class CsvMapper extends ObjectMapper
 {
-    private static final long serialVersionUID = 898121211926121724L;
+    private static final long serialVersionUID = -4573529235914611523L;
 
     /**
      * Simple caching for schema instances, given that they are relatively expensive
@@ -93,29 +91,6 @@ public final CsvFactory getFactory() {
         return (CsvFactory) _jsonFactory;
     }
 
-    /**
-     * Overridden with more specific type, since factory we have
-     * is always of type {@link CsvFactory}
-     * 
-     * @deprecated Since 2.1 use {@link #getFactory()}
-     */
-    @Deprecated
-    @Override
-    public final CsvFactory getJsonFactory() {
-        return getCsvFactory();
-    }
-
-    /**
-     * Type-safe accessor for accessing underlying CSV-specific
-     * {@link JsonFactory} implementation
-     * 
-     * @deprecated Since 2.1 use {@link #getFactory()}, it is co-variant
-     */
-    @Deprecated
-    public final CsvFactory getCsvFactory() {
-        return (CsvFactory) _jsonFactory;
-    }
-    
     /*
     /**********************************************************************
     /* CsvSchema construction; overrides, new methods
@@ -160,24 +135,6 @@ public final CsvSchema typedSchemaFor(Class<?> pojoType) {
     public final CsvSchema typedSchemaFor(TypeReference<?> pojoTypeRef) {
         return _schemaFor(constructType(pojoTypeRef.getType()), _typedSchemas, true);
     }
-    
-    @Override
-    public ObjectReader reader(FormatSchema schema)
-    {
-        if ((schema != null) && !(schema instanceof CsvSchema)) {
-            throw new IllegalArgumentException("Schema to set must be of type CsvSchema");
-        }
-        return super.reader(schema);
-    }
-
-    @Override
-    public ObjectWriter writer(FormatSchema schema)
-    {
-        if ((schema != null) && !(schema instanceof CsvSchema)) {
-            throw new IllegalArgumentException("Schema to set must be of type CsvSchema");
-        }
-        return super.writer(schema);
-    }
 
     /**
      * Convenience method which is functionally equivalent to:
@@ -276,5 +233,4 @@ protected CsvSchema.ColumnType _determineType(Class<?> propType)
         // but in general we will just do what we can:
         return CsvSchema.ColumnType.NUMBER_OR_STRING;
     }
-
 }