address the comments.

apache · Nov 13, 2023 · 685d9e7 · 685d9e7
1 parent 1e767a3
commit 685d9e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java b/lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java
@@ -862,9 +862,9 @@ public static Schema makeNullable(Schema schema) {
   private static final ConcurrentMap<Class<?>, Field[]> NATIVE_FIELDS_CACHE = new ConcurrentHashMap<>();
 
   // Return of this class and its superclasses to serialize.
-  private static Field[] getCachedFields(Class<?> recordClass, boolean orderBy) {
-    return MapUtil.computeIfAbsent(orderBy ? FIELDS_CACHE : NATIVE_FIELDS_CACHE, recordClass,
-        rc -> getFields(rc, true, orderBy));
+  private static Field[] getCachedFields(Class<?> recordClass, boolean useDeterministicFieldOrder) {
+    return MapUtil.computeIfAbsent(useDeterministicFieldOrder ? FIELDS_CACHE : NATIVE_FIELDS_CACHE, recordClass,
+        rc -> getFields(rc, true, useDeterministicFieldOrder));
   }
 
   private static Field[] getFields(Class<?> recordClass, boolean excludeJava, boolean orderBy) {

diff --git a/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java b/lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java
@@ -91,10 +91,11 @@ void fieldsOrder() {
     schema = new ReflectData(false).getSchema(Meta.class);
     fields = schema.getFields();
     assertEquals(fields.size(), 4);
-    assertEquals(fields.get(0).name(), "f1");
-    assertEquals(fields.get(1).name(), "f4");
-    assertEquals(fields.get(2).name(), "f2");
-    assertEquals(fields.get(3).name(), "f3");
+
+    Field[] declaredFields = Meta.class.getDeclaredFields();
+    for (int i = 0; i < declaredFields.length; i++) {
+      assertEquals(fields.get(i).name(), declaredFields[i].getName());
+    }
   }
 
   private interface CrudProtocol<R, I> extends OtherProtocol<I> {