Warnings removal wrt 2.17 (3.0-proofing)

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroParser.java

@@ -250,19 +250,25 @@ public Object getTypeId() throws IOException {
      */
 
     @Override
-    public JsonLocation getTokenLocation()
-    {
+    public JsonLocation currentLocation() {
         // !!! TODO
         return null;
     }
 
     @Override
-    public JsonLocation getCurrentLocation()
-    {
+    public JsonLocation currentTokenLocation() {
         // !!! TODO
         return null;
     }
 
+    @Deprecated // since 2.17
+    @Override
+    public JsonLocation getCurrentLocation() { return currentLocation(); }
+
+    @Deprecated // since 2.17
+    @Override
+    public JsonLocation getTokenLocation() { return currentTokenLocation(); }
+
     /*
     /**********************************************************
     /* Parsing
@@ -278,17 +284,8 @@ public JsonLocation getCurrentLocation()
     /**********************************************************
      */
 
-    @Override
-    public abstract boolean hasTextCharacters();
-
-    @Override
-    public abstract String getText() throws IOException;
-
-    @Override
-    public abstract int getText(Writer writer) throws IOException;
-
-    @Override
-    public String getCurrentName() throws IOException {
+    @Override // since 2.17
+    public String currentName() throws IOException {
         return _avroContext.getCurrentName();
     }
 
@@ -300,16 +297,28 @@ public void overrideCurrentName(String name)
         if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
             ctxt = ctxt.getParent();
         }
-        /* 24-Sep-2013, tatu: Unfortunate, but since we did not expose exceptions,
-         *   need to wrap this here
-         */
+        // 24-Sep-2013, tatu: Unfortunate, but since we did not expose exceptions,
+        //   need to wrap this here
         try {
             ctxt.setCurrentName(name);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
     }
 
+    @Deprecated // since 2.17
+    @Override
+    public String getCurrentName() throws IOException { return currentName(); }
+
+    @Override
+    public abstract boolean hasTextCharacters();
+
+    @Override
+    public abstract String getText() throws IOException;
+
+    @Override
+    public abstract int getText(Writer writer) throws IOException;
+
     @Override
     public char[] getTextCharacters() throws IOException {
         String text = getText();

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroSerializerModifier.java

@@ -19,6 +19,8 @@
 public class AvroSerializerModifier
     extends BeanSerializerModifier
 {
+    private static final long serialVersionUID = 1L;
+
     @Override
     public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
             BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties)

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java

@@ -5,7 +5,6 @@
 import java.io.Writer;
 
 import org.apache.avro.io.BinaryDecoder;
-import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.DecoderFactory;
 
 import com.fasterxml.jackson.core.*;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/AvroRecyclerPools.java

@@ -105,7 +105,7 @@ public static RecyclerPool<ApacheCodecRecycler> newBoundedPool(int size) {
     /**
      * {@link ThreadLocal}-based {@link RecyclerPool} implementation used for
      * recycling {@link ApacheCodecRecycler} instances:
-     * see {@link RecyclerPool.ThreadLocalPoolBase} for full explanation
+     * see {@code RecyclerPool.ThreadLocalPoolBase} for full explanation
      * of functioning.
      */
     public static class ThreadLocalPool

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroUntypedDeserializer.java

@@ -84,7 +84,7 @@ protected Object mapObject(JsonParser p, DeserializationContext ctxt) throws IOE
 
             key1 = p.nextFieldName();
         } else if (t == JsonToken.FIELD_NAME) {
-            key1 = p.getCurrentName();
+            key1 = p.currentName();
         } else {
             if (t != JsonToken.END_OBJECT) {
                 return ctxt.handleUnexpectedToken(handledType(), p);

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/deser/AvroJavaTimeDeserializerBase.java

@@ -10,7 +10,9 @@
 
 import static com.fasterxml.jackson.core.JsonToken.VALUE_NUMBER_INT;
 
-public abstract class AvroJavaTimeDeserializerBase<T> extends StdScalarDeserializer<T> {
+public abstract class AvroJavaTimeDeserializerBase<T> extends StdScalarDeserializer<T>
+{
+    private static final long serialVersionUID = 1L;
 
     protected AvroJavaTimeDeserializerBase(Class<T> supportedType) {
         super(supportedType);

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/BinaryDataTest.java

@@ -59,14 +59,14 @@ public void _testAvroSchemaGenerationWithJackson(AvroMapper mapper) throws Excep
         p.setSchema(schema);
         assertToken(JsonToken.START_OBJECT, p.nextToken());
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("filename", p.getCurrentName());
+        assertEquals("filename", p.currentName());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("data", p.getCurrentName());
+        assertEquals("data", p.currentName());
         assertToken(JsonToken.VALUE_EMBEDDED_OBJECT, p.nextToken());
         // skip, don't read!
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("size", p.getCurrentName());
+        assertEquals("size", p.currentName());
         assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
         assertEquals(result.size, p.getLongValue());
         assertEquals((int) result.size, p.getIntValue());

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/MapTest.java

@@ -64,7 +64,7 @@ public void testRecordWithMap() throws Exception
         p.setSchema(schema);
         assertToken(JsonToken.START_OBJECT, p.nextToken());
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("stuff", p.getCurrentName());
+        assertEquals("stuff", p.currentName());
         assertToken(JsonToken.START_OBJECT, p.nextToken());
 
         String n = p.nextFieldName();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/POJOSimpleReadTest.java

@@ -58,7 +58,7 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
 
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
         assertFalse(p.hasTextCharacters());
-        assertEquals("name", p.getCurrentName());
+        assertEquals("name", p.currentName());
         assertEquals("name", p.getText());
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
         assertEquals(empl.name, p.getText());
@@ -69,7 +69,7 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
 
         assertTrue(p.hasTextCharacters());
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("age", p.getCurrentName());
+        assertEquals("age", p.currentName());
         assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
         assertEquals(NumberType.INT, p.getNumberType());
         assertEquals(Integer.valueOf(empl.age), p.getNumberValue());
@@ -78,7 +78,7 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
         assertEquals((double) empl.age, p.getDoubleValue());
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
 
-        assertEquals("emails", p.getCurrentName());
+        assertEquals("emails", p.currentName());
         sw  = new StringWriter();
         assertEquals(6, p.getText(sw));
         assertEquals("emails", sw.toString());
@@ -91,11 +91,11 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
         assertToken(JsonToken.END_ARRAY, p.nextToken());
 
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("boss", p.getCurrentName());
+        assertEquals("boss", p.currentName());
 
         assertToken(JsonToken.START_OBJECT, p.nextToken());
         assertToken(JsonToken.FIELD_NAME, p.nextToken());
-        assertEquals("name", p.getCurrentName());
+        assertEquals("name", p.currentName());
         // and then skip various bits and pieces
         assertToken(JsonToken.VALUE_STRING, p.nextToken());
         assertTrue(p.nextFieldName(new SerializedString("age")));
@@ -108,7 +108,7 @@ private void _testSimplePojoViaParser(Employee empl, byte[] avro,
         assertToken(JsonToken.END_ARRAY, p.nextToken());
         assertFalse(p.nextFieldName(new SerializedString("bossy")));
         assertToken(JsonToken.FIELD_NAME, p.currentToken());
-        assertEquals("boss", p.getCurrentName());
+        assertEquals("boss", p.currentName());
         assertToken(JsonToken.VALUE_NULL, p.nextToken());
 
         assertToken(JsonToken.END_OBJECT, p.nextToken());

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/ApacheAvroInteropUtil.java

@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 
 import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroModule;
 import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 import com.fasterxml.jackson.dataformat.avro.testsupport.BiFunction;
 import com.fasterxml.jackson.dataformat.avro.testsupport.Function;