fix test issues

Author: the-other-tim-brown

hudi-common/src/main/java/org/apache/hudi/common/table/read/FileGroupReaderSchemaHandler.java

@@ -170,8 +170,7 @@ HoodieSchema generateRequiredSchema(DeleteContext deleteContext) {
     //might need to change this if other queries than mor have mandatory fields
     if (!readerContext.getHasLogFiles()) {
       if (hasInstantRange && !findNestedField(requestedSchema, HoodieRecord.COMMIT_TIME_METADATA_FIELD).isPresent()) {
-        List<HoodieSchemaField> addedFields = new ArrayList<>();
-        addedFields.add(getField(this.tableSchema, HoodieRecord.COMMIT_TIME_METADATA_FIELD));
+        List<HoodieSchemaField> addedFields = Collections.singletonList(getField(this.tableSchema, HoodieRecord.COMMIT_TIME_METADATA_FIELD));
         return appendFieldsToSchemaDedupNested(requestedSchema, addedFields);
       }
       return requestedSchema;
@@ -288,21 +287,16 @@ static Pair<List<HoodieSchemaField>, List<HoodieSchemaField>> getDataAndMetaCols
 
   public HoodieSchema createSchemaFromFields(List<HoodieSchemaField> fields) {
     //fields have positions set, so we need to remove them due to avro setFields implementation
-    for (int i = 0; i < fields.size(); i++) {
-      HoodieSchemaField curr = fields.get(i);
-      fields.set(i, createNewSchemaField(curr));
-    }
-    return createNewSchemaFromFieldsWithReference(tableSchema, fields);
+    List<HoodieSchemaField> newFields = new ArrayList<>(fields.size());
+    fields.forEach(f -> newFields.add(createNewSchemaField(f)));
+    return createNewSchemaFromFieldsWithReference(tableSchema, newFields);
   }
 
   /**
    * Get {@link Schema.Field} from {@link Schema} by field name.
    */
   private static HoodieSchemaField getField(HoodieSchema schema, String fieldName) {
     Option<HoodieSchemaField> foundFieldOpt = findNestedField(schema, fieldName);
-    if (!foundFieldOpt.isPresent()) {
-      throw new IllegalArgumentException("Field: " + fieldName + " does not exist in the table schema");
-    }
-    return foundFieldOpt.get();
+    return foundFieldOpt.orElseThrow(() -> new IllegalArgumentException("Field: " + fieldName + " does not exist in the table schema"));
   }
 }

hudi-common/src/test/java/org/apache/hudi/common/table/read/buffer/BaseTestFileGroupRecordBuffer.java

@@ -118,6 +118,7 @@ protected static KeyBasedFileGroupRecordBuffer<IndexedRecord> buildKeyBasedFileG
     });
     FileGroupReaderSchemaHandler<IndexedRecord> fileGroupReaderSchemaHandler = mock(FileGroupReaderSchemaHandler.class);
     when(fileGroupReaderSchemaHandler.getRequiredSchema()).thenReturn(SCHEMA);
+    when(fileGroupReaderSchemaHandler.getSchemaForUpdates()).thenReturn(SCHEMA);
     when(fileGroupReaderSchemaHandler.getInternalSchema()).thenReturn(InternalSchema.getEmptyInternalSchema());
     when(fileGroupReaderSchemaHandler.getDeleteContext()).thenReturn(new DeleteContext(props, SCHEMA));
     readerContext.setSchemaHandler(fileGroupReaderSchemaHandler);

hudi-common/src/test/java/org/apache/hudi/common/table/read/buffer/TestFileGroupRecordBufferLoader.java

@@ -72,6 +72,7 @@ public void testDefaultFileGroupBufferRecordLoader(String fileGroupRecordBufferT
     FileGroupReaderSchemaHandler<IndexedRecord> fileGroupReaderSchemaHandler = mock(FileGroupReaderSchemaHandler.class);
     when(fileGroupReaderSchemaHandler.getRequiredSchema()).thenReturn(SCHEMA);
     when(fileGroupReaderSchemaHandler.getRequestedSchema()).thenReturn(SCHEMA);
+    when(fileGroupReaderSchemaHandler.getSchemaForUpdates()).thenReturn(SCHEMA);
     when(fileGroupReaderSchemaHandler.getInternalSchema()).thenReturn(InternalSchema.getEmptyInternalSchema());
     DeleteContext deleteContext = mock(DeleteContext.class);
     when(deleteContext.getCustomDeleteMarkerKeyValue()).thenReturn(Option.empty());