Reformat and single liner read* methods

core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy

@@ -10,13 +10,14 @@ class ReadFile {
     int readFileLineByLine(String filePath) {
         File file = new File(filePath)
         def line, noOfLines = 0;
+
         file.withReader { reader ->
-            while ((line = reader.readLine())!=null)
+            while ((line = reader.readLine()) != null) {
-            {
                 println "${line}"
                 noOfLines++
             }
         }
+
         return noOfLines
     }
 
@@ -26,9 +27,7 @@ class ReadFile {
      * @return
      */
     List<String> readFileInList(String filePath) {
-        File file = new File(filePath)
+        return new File(filePath).readLines()
-        def lines = file.readLines()
-        return lines
     }
 
     /**
@@ -37,9 +36,7 @@ class ReadFile {
      * @return
      */
     String readFileString(String filePath) {
-        File file = new File(filePath)
+        return new File(filePath).text
-        String fileContent = file.text
-        return fileContent
     }
 
     /**
@@ -48,9 +45,7 @@ class ReadFile {
      * @return
      */
     String readFileStringWithCharset(String filePath) {
-        File file = new File(filePath)
+        return new File(filePath).getText("UTF-8")
-        String utf8Content = file.getText("UTF-8")
-        return utf8Content
     }
 
     /**
@@ -59,9 +54,7 @@ class ReadFile {
      * @return
      */
     byte[] readBinaryFile(String filePath) {
-        File file = new File(filePath)
+        return new File(filePath).bytes
-        byte[] binaryContent = file.bytes
-        return binaryContent
     }
 
     /**
@@ -85,16 +78,14 @@ class ReadFile {
         def array = new File("src/main/resources/fileContent.txt") as String[]
 
         // eachline  
-        new File("src/main/resources/fileContent.txt").eachLine { line ->
+        new File("src/main/resources/fileContent.txt").eachLine { println it }
-            println line
-        }
 
         //newInputStream with eachLine
-        def is = new File("src/main/resources/fileContent.txt").newInputStream()
+
-        is.eachLine {
+        // try-with-resources automatically closes BufferedInputStream resource
-            println it
+        try (def inputStream = new File("src/main/resources/fileContent.txt").newInputStream()) {
+            inputStream.eachLine { println it }
         }
-        is.close()
 
         // withInputStream
         new File("src/main/resources/fileContent.txt").withInputStream { stream ->
@@ -103,5 +94,4 @@ class ReadFile {
             }
         }
     }
-
 }

core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy

@@ -1,7 +1,6 @@
 package com.baeldung.file
 
 import spock.lang.Specification
-import spock.lang.Ignore
 
 class ReadFileUnitTest extends Specification {
 
@@ -14,44 +13,49 @@ class ReadFileUnitTest extends Specification {
     def 'Should return number of lines in File using ReadFile.readFileLineByLine given filePath'() {
         given:
         def filePath = "src/main/resources/fileContent.txt"
+
         when:
         def noOfLines = readFile.readFileLineByLine(filePath)
+
         then:
         noOfLines
         noOfLines instanceof Integer
-            assert noOfLines, 3
+        noOfLines == 3
     }
 
     def 'Should return File Content in list of lines using ReadFile.readFileInList given filePath'() {
         given:
         def filePath = "src/main/resources/fileContent.txt"
+
         when:
         def lines = readFile.readFileInList(filePath)
+
         then:
         lines
         lines instanceof List<String>
-            assert lines.size(), 3
+        lines.size() == 3
     }
 
     def 'Should return file content in string using ReadFile.readFileString given filePath'() {
         given:
         def filePath = "src/main/resources/fileContent.txt"
+
         when:
         def fileContent = readFile.readFileString(filePath)
+
         then:
         fileContent
         fileContent instanceof String
-            fileContent.contains("""Line 1 : Hello World!!!
+        fileContent.contains(["Line 1 : Hello World!!!", "Line 2 : This is a file content.", "Line 3 : String content"].join("\r\n"))
-Line 2 : This is a file content.
-Line 3 : String content""")
-    
     }
 
     def 'Should return UTF-8 encoded file content in string using ReadFile.readFileStringWithCharset given filePath'() {
         given:
         def filePath = "src/main/resources/utf8Content.html"
+
         when:
         def encodedContent = readFile.readFileStringWithCharset(filePath)
+
         then:
         encodedContent
         encodedContent instanceof String
@@ -60,12 +64,13 @@ Line 3 : String content""")
     def 'Should return binary file content in byte array using ReadFile.readBinaryFile given filePath'() {
         given:
         def filePath = "src/main/resources/sample.png"
+
         when:
         def binaryContent = readFile.readBinaryFile(filePath)
+
         then:
         binaryContent
         binaryContent instanceof byte[]
         binaryContent.length == 329
     }
-    
 }