Update against the test files with variant logical type

Author: aihuaxu

parquet-avro/pom.xml

@@ -145,6 +145,18 @@
       <version>5.12.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson-databind.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson-databind.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

parquet-avro/src/main/java/org/apache/parquet/avro/AvroRecordConverter.java

@@ -395,9 +395,7 @@ private static Converter newConverter(
         }
         return newStringConverter(schema, model, parent, validator);
       case RECORD:
-        if (type.getName().equals("var")
-            || type.getLogicalTypeAnnotation()
-                instanceof LogicalTypeAnnotation.VariantLogicalTypeAnnotation) {
+        if (type.getLogicalTypeAnnotation() instanceof LogicalTypeAnnotation.VariantLogicalTypeAnnotation) {
           return new AvroVariantConverter(parent, type.asGroupType(), schema, model);
         } else {
           return new AvroRecordConverter(parent, type.asGroupType(), schema, model, validator);

parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java

@@ -470,11 +470,8 @@ public Optional<Schema> visit(
               @Override
               public Optional<Schema> visit(
                   LogicalTypeAnnotation.VariantLogicalTypeAnnotation variantLogicalType) {
-                String name = parquetGroupType.getName();
-                List<Schema.Field> fields = new ArrayList<>();
-                fields.add(new Schema.Field("metadata", Schema.create(Schema.Type.BYTES)));
-                fields.add(new Schema.Field("value", Schema.create(Schema.Type.BYTES)));
-                return of(Schema.createRecord(name, null, namespace(name, names), false, fields));
+                return of(
+                    convertFields(parquetGroupType.getName(), parquetGroupType.getFields(), names));
               }
             })
             .orElseThrow(