fix tests

core/src/main/java/org/apache/druid/data/input/impl/LocalInputSource.java

@@ -34,7 +34,6 @@ import org.apache.druid.data.input.SplitHintSpec;
 
 import javax.annotation.Nullable;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.Spliterator;
@@ -117,14 +116,7 @@ public class LocalInputSource extends AbstractInputSource implements SplittableI
         // reader() is supposed to be called in each task that creates segments.
         // The task should already have only one split in parallel indexing,
         // while there's no need to make splits using splitHintSpec in sequential indexing.
-        createSplits(inputFormat, null).map(split -> {
+        createSplits(inputFormat, null).map(split -> new FileSource(split.get())),
-          try {
-            return new FileSource(split.get());
-          }
-          catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-          }
-        }),
         temporaryDirectory
     );
   }

core/src/main/java/org/apache/druid/java/util/common/FileUtils.java

@@ -287,16 +287,23 @@ public class FileUtils
       String messageOnRetry
   ) throws IOException
   {
-    try (InputStream inputStream = objectOpenFunction.open(object)) {
+    try {
-      return copyLarge(
+      return RetryUtils.retry(
-          inputStream,
+          () -> {
-          outFile,
+            try (InputStream inputStream = objectOpenFunction.open(object);
-          fetchBuffer,
+                 OutputStream out = new FileOutputStream(outFile)) {
+              return IOUtils.copyLarge(inputStream, out, fetchBuffer);
+            }
+          },
           retryCondition,
+          outFile::delete,
           numRetries,
           messageOnRetry
       );
     }
+    catch (Exception e) {
+      throw new IOException(e);
+    }
   }
 
   public static long copyLarge(

core/src/test/java/org/apache/druid/data/input/impl/ObjectIteratingReaderTest.java

@@ -72,14 +72,7 @@ public class ObjectIteratingReaderTest
             false,
             0
         ),
-        files.stream().flatMap(file -> {
+        files.stream().flatMap(file -> ImmutableList.of(new FileSource(file)).stream()),
-          try {
-            return ImmutableList.of(new FileSource(file)).stream();
-          }
-          catch (IOException e) {
-            throw new RuntimeException(e);
-          }
-        }),
         temporaryFolder.newFolder()
     );
 

server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java

@@ -198,7 +198,7 @@ public class DataSchema
   }
 
   @Nullable
-  @JsonProperty
+  @JsonProperty("timestampSpec")
   private TimestampSpec getGivenTimestampSpec()
   {
     return timestampSpec;
@@ -213,7 +213,7 @@ public class DataSchema
   }
 
   @Nullable
-  @JsonProperty
+  @JsonProperty("dimensionsSpec")
   private DimensionsSpec getGivenDimensionsSpec()
   {
     return dimensionsSpec;