Merge branch 'master' into release-6.4.0

Author: tsolakoua

src/main/java/com/amadeus/travel/TripParser.java

@@ -6,11 +6,10 @@
 import com.amadeus.resources.Resource;
 import com.amadeus.resources.TripDetail;
 import com.google.gson.JsonObject;
-import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
-
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.util.Base64;
 
 /**
  * <p>
@@ -89,12 +88,21 @@ public TripDetail post(String body) throws ResponseException {
    */
   public TripDetail post(File file) throws ResponseException, IOException {
     // Base64 encode file and create request body
-    String b64Encoded = Base64.encode(Files.readAllBytes(file.toPath()));
-    JsonObject body = new JsonObject();
-    body.addProperty("payload", b64Encoded);
+    try (FileInputStream fileInputStreamReader = new FileInputStream(file)) {
+      byte[] bytes = new byte[(int)file.length()];
+      int count = 0;
+      if (fileInputStreamReader.read(bytes) > 0) {
+        String encodedFile;
+        encodedFile = Base64.getEncoder().encodeToString(bytes);
+        JsonObject body = new JsonObject();
+        body.addProperty("payload", encodedFile);
+        count = count + fileInputStreamReader.read(bytes);
 
-    Response response = client.post("/v3/travel/trip-parser", body);
-    return (TripDetail) Resource.fromObject(response, TripDetail.class);
+        Response response = client.post("/v3/travel/trip-parser", body);
+        return (TripDetail) Resource.fromObject(response, TripDetail.class);
+      }
+    }
+    return null;
   }
 
   /**