Merge pull request #867 from guwirth/revert-readAllLines

revert java.nio.file.Files.readAllLines usage

Author: guwirth

cxx-checks/src/main/java/org/sonar/cxx/checks/FileHeaderCheck.java

@@ -20,11 +20,12 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.List;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
@@ -98,15 +99,15 @@ public void visitFile(AstNode astNode) {
     if (isRegularExpression) {
       String fileContent;
       try {
-        fileContent = new String(Files.readAllBytes(getContext().getFile().toPath()), charset);
+        fileContent = Files.toString(getContext().getFile(), charset);
       } catch (IOException e) {
         throw new AnalysisException(e);
       }
       checkRegularExpression(fileContent);
     } else {
       List<String> lines;
       try {
-        lines = Files.readAllLines(getContext().getFile().toPath(), charset);
+        lines = Files.readLines(getContext().getFile(), charset);
       } catch (IOException e) {
         throw new IllegalStateException(e);
       }

cxx-checks/src/main/java/org/sonar/cxx/checks/IndentationCheck.java

@@ -20,11 +20,12 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Stack;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
@@ -148,7 +149,7 @@ public void leaveFile(AstNode node) {
   private int getTabColumn(Token token) {
     if (fileLines == null) {
       try {
-        fileLines = Files.readAllLines(getContext().getFile().toPath(), charset);
+        fileLines = Files.readLines(getContext().getFile(), charset);
       } catch (IOException e) {
         throw new IllegalStateException(e);
       }

cxx-checks/src/main/java/org/sonar/cxx/checks/LineRegularExpressionCheck.java

@@ -20,13 +20,14 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
@@ -107,7 +108,7 @@ public void visitFile(AstNode fileNode) {
       if (compare(invertFilePattern, matchFile())) {
         List<String> lines;
         try {
-          lines = Files.readAllLines(getContext().getFile().toPath(), charset);
+          lines = Files.readLines(getContext().getFile(), charset);
         } catch (IOException e) {
           throw new IllegalStateException(e);
         }

cxx-checks/src/main/java/org/sonar/cxx/checks/ReservedNamesCheck.java

@@ -20,10 +20,11 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.List;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.cxx.api.CxxKeyword;
@@ -61,7 +62,7 @@ public void init() {
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
+      lines = Files.readLines(getContext().getFile(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }

cxx-checks/src/main/java/org/sonar/cxx/checks/TabCharacterCheck.java

@@ -20,10 +20,11 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.List;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.cxx.visitors.CxxCharsetAwareVisitor;
@@ -68,7 +69,7 @@ public void setCharset(Charset charset) {
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
+      lines = Files.readLines(getContext().getFile(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }

cxx-checks/src/main/java/org/sonar/cxx/checks/TooLongLineCheck.java

@@ -20,10 +20,11 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.List;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
@@ -75,7 +76,7 @@ public void setCharset(Charset charset) {
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
+      lines = Files.readLines(getContext().getFile(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }

cxx-checks/src/main/java/org/sonar/cxx/checks/UseCorrectIncludeCheck.java

@@ -20,11 +20,12 @@
 package org.sonar.cxx.checks;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import com.google.common.io.Files;
+
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
 import org.sonar.cxx.visitors.CxxCharsetAwareVisitor;
@@ -70,7 +71,7 @@ public void init() {
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
+      lines = Files.readLines(getContext().getFile(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }