Fixed default read strategy performances.

Author: lorenzo

releases.json

@@ -1,4 +1,9 @@
 [
+  {
+    "version": "1.0.1",
+    "date": "//TODO: Add date",
+    "release-notes": "<ul><li>Bugfix: Fixed default read strategy.</li><li>Bugfix: Changed default read buffer size for stream base strategies to 1048576 bytes.</li><ul>"
+  },
   {
     "version": "1.0.0",
     "date": "22/6/2020",

src/main/java/com/reedelk/file/component/FileReadConfiguration.java

@@ -6,7 +6,6 @@
 
 import static org.osgi.service.component.annotations.ServiceScope.PROTOTYPE;
 
-@Collapsible
 @Component(service = FileReadConfiguration.class, scope = PROTOTYPE)
 public class FileReadConfiguration implements Implementor {
 
@@ -33,13 +32,14 @@ public class FileReadConfiguration implements Implementor {
     private Long lockRetryWaitTime;
 
     @Property("Read buffer size")
-    @Hint("65536")
-    @Example("262144")
-    @DefaultValue("65536")
+    @Hint("524288")
+    @Example("524288")
+    @DefaultValue("1048576")
     @Description("The buffer size used to read the files from filesystem. " +
             "This parameter can be used to improve read performances. " +
             "If the files are big the buffer size should be bigger, " +
-            "otherwise for very small files it should be kept smaller.")
+            "otherwise for very small files it should be kept smaller. " +
+            "The read buffer size is expressed in bytes and it can only be applied when the read mode strategy is 'Stream'.")
     private Integer readBufferSize;
 
     public Boolean getLockFile() {

src/main/java/com/reedelk/file/internal/commons/Defaults.java

@@ -7,7 +7,7 @@ public static class FileRead {
         private FileRead() {
         }
 
-        public static final int READ_FILE_BUFFER_SIZE = 65536;
+        public static final int READ_FILE_BUFFER_SIZE = 1048576;
         public static final int RETRY_MAX_ATTEMPTS = 3;
         public static final long RETRY_WAIT_TIME = 500;
     }

src/main/java/com/reedelk/file/internal/read/ReadStrategyDefault.java

@@ -1,21 +1,25 @@
 package com.reedelk.file.internal.read;
 
-import com.reedelk.runtime.api.commons.StreamUtils;
+import com.reedelk.file.internal.exception.FileReadException;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
-public class ReadStrategyDefault extends ReadStrategyStream {
+import static com.reedelk.file.internal.commons.Messages.FileRead.FILE_READ_ERROR;
+
+public class ReadStrategyDefault implements ReadStrategy {
 
     @Override
     public Publisher<byte[]> read(Path path, ReadConfigurationDecorator config) {
-
-        Publisher<byte[]> read = super.read(path, config);
-
-        // We immediately consume the content.
-        byte[] consume = StreamUtils.FromByteArray.consume(read);
-
-        return Mono.just(consume);
+        try {
+            byte[] bytes = Files.readAllBytes(path);
+            return Mono.just(bytes);
+        } catch (IOException e) {
+            String message = FILE_READ_ERROR.format(path, e.getMessage());
+            throw new FileReadException(message, e);
+        }
     }
 }

src/main/java/com/reedelk/file/internal/read/ReadStrategyStream.java

@@ -62,11 +62,15 @@ public Publisher<byte[]> read(Path path, ReadConfigurationDecorator config) {
 
                     byteBuffer.get(chunk);
 
-                    byteBuffer.clear();
-
                     sink.next(chunk);
+
+                    byteBuffer.clear();
                 }
 
+                byteBuffer.clear();
+
+                byteBuffer = null;
+
                 sink.complete();
 
             } catch (NoSuchFileException exception) {