Code clean

Author: Vallasc

src/main/scala/Utils/FileUtils.scala

@@ -11,35 +11,33 @@ import com.google.cloud.storage.BlobId
 import java.io.ByteArrayInputStream
 import java.nio.channels.Channels
 import com.google.cloud.storage.BlobInfo
+import java.io.FileInputStream
+import java.io.File
+import java.io.FileOutputStream
 
 
 object FileUtils {
     val storage = StorageOptions.getDefaultInstance().getService()
 
     def getInputStream(stringPath: String): InputStream = {
         val isGS = stringPath.size > 5 && stringPath.indexOf("gs://") == 0
-        if(isGS) {
-            val content = storage.readAllBytes(getBlobIdFromPath(stringPath))
-            new ByteArrayInputStream(content)
-        } else {
-            val path = Paths.get(URI.create(stringPath))
-            Files.newInputStream(path)
-        }
+        if(isGS)
+            new ByteArrayInputStream(storage.readAllBytes(getBlobIdFromPath(stringPath)))
+        else
+            new FileInputStream(new File(stringPath))
     }
 
     def getOutputStream(stringPath: String): OutputStream = {
         val isGS = stringPath.size > 5 && stringPath.indexOf("gs://") == 0
         if(isGS) {
             val blobId = getBlobIdFromPath(stringPath)
-            //val blob = storage.get(blobId)
             val blobInfo = BlobInfo.newBuilder(blobId).build()
             val blob = storage.create(blobInfo)
             Channels.newOutputStream(blob.writer())
         } else {
-            val path = Paths.get(URI.create(stringPath))
-            if(!Files.exists(path))
-                Files.createFile(path)
-            Files.newOutputStream(path)
+            val file = new File(stringPath)
+            file.createNewFile()
+            new FileOutputStream(file, false)
         }
     }
 

src/main/scala/Utils/Utils.scala

@@ -3,11 +3,11 @@ import org.apache.spark.mllib.linalg.{Matrix, DenseMatrix, SparseMatrix, Matrice
 
 object Utils {
 
-    def time[R](block: => R): Long = {
+    def time[R](block: => R): (R, Long) = {
         val t0 = System.nanoTime()
         val result = block    // call-by-name
         val t1 = System.nanoTime()
-        (t1 - t0)/1000000 
+        (result, (t1 - t0)/1000000)
     }
 
     def matrixAsBreeze (matrix: Matrix): BDM[Double] = {