Merge pull request #1647 from guwirth/remove-guava

remove guava dependencies

Author: guwirth

cxx-checks/pom.xml

@@ -18,13 +18,11 @@
       <artifactId>cxx-squid</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
     <dependency>
       <groupId>org.sonarsource.sslr</groupId>
       <artifactId>sslr-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

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

@@ -19,12 +19,12 @@
  */
 package org.sonar.cxx.checks;
 
-import com.google.common.io.Files;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -61,7 +61,7 @@ public class ReservedNamesCheck extends SquidCheck<Grammar> implements CxxCharse
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readLines(getContext().getFile(), charset);
+      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }

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

@@ -19,12 +19,12 @@
  */
 package org.sonar.cxx.checks;
 
-import com.google.common.io.Files;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.regex.Pattern;
 import org.sonar.check.Priority;
@@ -58,7 +58,7 @@ public class UseCorrectIncludeCheck extends SquidCheck<Grammar> implements CxxCh
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readLines(getContext().getFile(), charset);
+      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }

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

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

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

@@ -19,12 +19,12 @@
  */
 package org.sonar.cxx.checks.metrics;
 
-import com.google.common.io.Files;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.List;
 import org.sonar.check.Priority;
 import org.sonar.check.Rule;
@@ -80,7 +80,7 @@ public void setCharset(Charset charset) {
   public void visitFile(AstNode astNode) {
     List<String> lines;
     try {
-      lines = Files.readLines(getContext().getFile(), charset);
+      lines = Files.readAllLines(getContext().getFile().toPath(), charset);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }

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

@@ -19,12 +19,12 @@
  */
 package org.sonar.cxx.checks.regex;
 
-import com.google.common.io.Files;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -118,15 +118,15 @@ public void visitFile(AstNode astNode) {
     if (isRegularExpression) {
       String fileContent;
       try {
-        fileContent = Files.toString(getContext().getFile(), charset);
+        fileContent = new String(Files.readAllBytes(getContext().getFile().toPath()), charset);
       } catch (IOException e) {
         throw new AnalysisException(e);
       }
       checkRegularExpression(fileContent);
     } else {
       List<String> lines;
       try {
-        lines = Files.readLines(getContext().getFile(), charset);
+        lines = Files.readAllLines(getContext().getFile().toPath(), charset);
       } catch (IOException e) {
         throw new IllegalStateException(e);
       }

cxx-checks/src/main/java/org/sonar/cxx/checks/regex/FileRegularExpressionCheck.java

@@ -19,12 +19,12 @@
  */
 package org.sonar.cxx.checks.regex;
 
-import com.google.common.io.Files;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.sonar.api.utils.PathUtils;
@@ -123,7 +123,7 @@ public void visitFile(AstNode fileNode) {
       if (!compare(invertFilePattern, matchFile())) {
         return;
       }
-      final String fileContent = Files.toString(getContext().getFile(), charset);
+      final String fileContent = new String(Files.readAllBytes(getContext().getFile().toPath()), charset);
       Matcher matcher = pattern.matcher(fileContent);
       if (compare(invertRegularExpression, matcher.find())) {
         getContext().createFileViolation(this, message);

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

@@ -19,12 +19,12 @@
  */
 package org.sonar.cxx.checks.regex;
 
-import com.google.common.io.Files;
 import com.sonar.sslr.api.AstNode;
 import com.sonar.sslr.api.Grammar;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -123,7 +123,7 @@ public void visitFile(AstNode fileNode) {
     if (compare(invertFilePattern, matchFile())) {
       List<String> lines;
       try {
-        lines = Files.readLines(getContext().getFile(), charset);
+        lines = Files.readAllLines(getContext().getFile().toPath(), charset);
       } catch (IOException e) {
         throw new IllegalStateException(e);
       }

cxx-lint/pom.xml

@@ -25,15 +25,15 @@
       <version>1.2.3</version>
       <scope>test</scope>
     </dependency>
-    <dependency>    
+    <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
       <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-check-api</artifactId>
-      <version>5.4</version>
+      <version>${sonar.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
@@ -57,6 +57,11 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

cxx-sensors/pom.xml

@@ -31,19 +31,16 @@
       <artifactId>cxx-checks</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.sonarsource.sslr</groupId>
       <artifactId>sslr-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
-    
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-testing-harness</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
@@ -57,10 +54,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -72,9 +65,8 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.7</version>
+      <version>2.9.8</version>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/com.googlecode.plist/dd-plist -->
     <dependency>
       <groupId>com.googlecode.plist</groupId>
       <artifactId>dd-plist</artifactId>
@@ -85,5 +77,10 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>