sync with databind/5599

Author: cowtowncoder

avro/src/main/java/tools/jackson/dataformat/avro/schema/ArrayVisitor.java

@@ -23,7 +23,8 @@ public class ArrayVisitor
 
     protected Schema _elementSchema;
 
-    public ArrayVisitor(SerializationContext p, JavaType type, VisitorFormatWrapperImpl visitorWrapper)
+    public ArrayVisitor(SerializationContext p, JavaType type,
+            VisitorFormatWrapperImpl visitorWrapper)
     {
         super(p);
         _type = type;

avro/src/main/java/tools/jackson/dataformat/avro/schema/MapVisitor.java

@@ -19,7 +19,8 @@ public class MapVisitor extends JsonMapFormatVisitor.Base
 
     protected JavaType _keyType;
 
-    public MapVisitor(SerializationContext p, JavaType type, VisitorFormatWrapperImpl visitorWrapper)
+    public MapVisitor(SerializationContext p, JavaType type,
+            VisitorFormatWrapperImpl visitorWrapper)
     {
         super(p);
         _type = type;
@@ -32,7 +33,7 @@ public Schema builtAvroSchema() {
         if (_valueSchema == null) {
             throw new IllegalStateException("Missing value type for "+_type);
         }
-        AnnotatedClass ac = _provider.introspectClassAnnotations(_keyType);
+        AnnotatedClass ac = getContext().introspectClassAnnotations(_keyType);
         if (AvroSchemaHelper.isStringable(ac)) {
             return AvroSchemaHelper.stringableKeyMapSchema(_type, _keyType, _valueSchema);
         }

avro/src/main/java/tools/jackson/dataformat/avro/schema/VisitorBase.java

@@ -106,7 +106,7 @@ protected DataType getDataType(JavaType type)
             if (isNested(type)) {
                 if (!_nestedTypes.contains(type)) { // create nested type
                     _nestedTypes.add(type);
-                    ProtoBufSchemaVisitor builder = acceptTypeElement(_provider, type,
+                    ProtoBufSchemaVisitor builder = acceptTypeElement(getContext(), type,
                             _definedTypeElementBuilders, true);
                     DataType scalarType = builder.getSimpleType();
                     if (scalarType != null){
@@ -115,7 +115,7 @@ protected DataType getDataType(JavaType type)
                     _builder.addType(builder.build());
                 }
             } else { // track non-nested types to generate them later
-                ProtoBufSchemaVisitor builder = acceptTypeElement(_provider, type,
+                ProtoBufSchemaVisitor builder = acceptTypeElement(getContext(), type,
                         _definedTypeElementBuilders, false);
                 DataType scalarType = builder.getSimpleType();
                 if (scalarType != null){