svn commit: r1860673 - in /pivot/trunk: core/src/org/apache/pivot/io/FileSerializer.java web-server/src/org/apache/pivot/web/server/QueryServlet.java

[rw...@apache.org]

Author: rwhitcomb
Date: Wed Jun  5 17:56:38 2019
New Revision: 1860673

URL: http://svn.apache.org/viewvc?rev=1860673&view=rev
Log:
PIVOT-1044: Fix the remaining places in the "core" (that is, not
demos or tutorials) that still were using FileInputStream or
FileOutputStream.

Modified:
    pivot/trunk/core/src/org/apache/pivot/io/FileSerializer.java
    pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java

Modified: pivot/trunk/core/src/org/apache/pivot/io/FileSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/io/FileSerializer.java?rev=1860673&r1=1860672&r2=1860673&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/io/FileSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/io/FileSerializer.java Wed Jun  5 17:56:38 2019
@@ -19,11 +19,10 @@ package org.apache.pivot.io;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 import javax.activation.MimetypesFileTypeMap;
 
@@ -70,17 +69,12 @@ public class FileSerializer implements S
     @Override
     public File readObject(final InputStream inputStream) throws IOException, SerializationException {
         File file = File.createTempFile(getClass().getName(), null, tempFileDirectory);
-        OutputStream outputStream = null;
 
-        try {
-            outputStream = new BufferedOutputStream(new FileOutputStream(file), Constants.BUFFER_SIZE);
+        try (OutputStream outputStream =
+                 new BufferedOutputStream(Files.newOutputStream(file.toPath()), Constants.BUFFER_SIZE)) {
             for (int data = inputStream.read(); data != -1; data = inputStream.read()) {
                 outputStream.write((byte) data);
             }
-        } finally {
-            if (outputStream != null) {
-                outputStream.close();
-            }
         }
 
         return file;
@@ -91,18 +85,12 @@ public class FileSerializer implements S
      */
     @Override
     public void writeObject(final File file, final OutputStream outputStream) throws IOException,
-        SerializationException {
-        InputStream inputStream = null;
-
-        try {
-            inputStream = new BufferedInputStream(new FileInputStream(file), Constants.BUFFER_SIZE);
+            SerializationException {
+        try (InputStream inputStream =
+                new BufferedInputStream(Files.newInputStream(file.toPath()), Constants.BUFFER_SIZE)) {
             for (int data = inputStream.read(); data != -1; data = inputStream.read()) {
                 outputStream.write((byte) data);
             }
-        } finally {
-            if (inputStream != null) {
-                inputStream.close();
-            }
         }
     }
 

Modified: pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java?rev=1860673&r1=1860672&r2=1860673&view=diff
==============================================================================
--- pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java (original)
+++ pivot/trunk/web-server/src/org/apache/pivot/web/server/QueryServlet.java Wed Jun  5 17:56:38 2019
@@ -17,13 +17,13 @@
 package org.apache.pivot.web.server;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Iterator;
 
@@ -434,7 +434,7 @@ public abstract class QueryServlet exten
                 File tempFile = File.createTempFile(getClass().getName(), null);
 
                 // Serialize the result to an intermediary file
-                try (FileOutputStream fileOutputStream = new FileOutputStream(tempFile)) {
+                try (OutputStream fileOutputStream = Files.newOutputStream(tempFile.toPath())) {
                     serializer.writeObject(result, fileOutputStream);
                 } catch (SerializationException exception) {
                     throw new ServletException(exception);
@@ -444,7 +444,7 @@ public abstract class QueryServlet exten
                 response.setHeader(Constants.CONTENT_LENGTH_HEADER, String.valueOf(tempFile.length()));
 
                 // Write the contents of the file out to the response
-                try (FileInputStream fileInputStream = new FileInputStream(tempFile)) {
+                try (InputStream fileInputStream = Files.newInputStream(tempFile.toPath())) {
                     byte[] buffer = new byte[1024];
                     int nBytes;
                     do {