Replace Guava CharStreams with normal JDK 1.8 streams

johnmay · egonw · commit 2b195240e208 · 2022-01-01T11:32:07.000+01:00
diff --git a/legacy/src/test/java/org/openscience/cdk/smiles/smarts/parser/RecursiveTest.java b/legacy/src/test/java/org/openscience/cdk/smiles/smarts/parser/RecursiveTest.java
@@ -18,10 +18,11 @@
  */
 package org.openscience.cdk.smiles.smarts.parser;
 
+import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.stream.Collectors;
 
-import com.google.common.io.CharStreams;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -456,7 +457,8 @@ public void testBasicAmineOnDrugs() throws Exception {
 
         int nmatch = 0;
         int nmol = 0;
-        for (String smi : CharStreams.readLines(new InputStreamReader(ins))) {
+        for (String smi : new BufferedReader(new InputStreamReader(ins)).lines()
+                                                                        .collect(Collectors.toList())) {
             IAtomContainer container = sp.parseSmiles(smi.split("\t")[0]);
             if (sqt.matches(container)) {
                 nmatch++;
diff --git a/storage/ioformats/src/main/java/org/openscience/cdk/io/FormatFactory.java b/storage/ioformats/src/main/java/org/openscience/cdk/io/FormatFactory.java
@@ -19,28 +19,26 @@
  */
 package org.openscience.cdk.io;
 
+import org.openscience.cdk.io.formats.IChemFormat;
+import org.openscience.cdk.io.formats.IChemFormatMatcher;
+import org.openscience.cdk.io.formats.IChemFormatMatcher.MatchResult;
+import org.openscience.cdk.io.formats.XYZFormat;
+import org.openscience.cdk.tools.ILoggingTool;
+import org.openscience.cdk.tools.LoggingToolFactory;
+
 import java.io.BufferedReader;
 import java.io.CharArrayReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
-
-import org.openscience.cdk.io.formats.IChemFormat;
-import org.openscience.cdk.io.formats.IChemFormatMatcher;
-import org.openscience.cdk.io.formats.IChemFormatMatcher.MatchResult;
-import org.openscience.cdk.io.formats.XYZFormat;
-import org.openscience.cdk.tools.ILoggingTool;
-import org.openscience.cdk.tools.LoggingToolFactory;
-
-import com.google.common.io.CharStreams;
+import java.util.stream.Collectors;
 
 /**
  * A factory for recognizing chemical file formats. Formats
@@ -177,7 +175,7 @@ public IChemFormat guessFormat(InputStream input) throws IOException {
   
     private  IChemFormat getMatchResult( BufferedReader buffer) throws IOException{
     	 /* Search file for a line containing an identifying keyword */
-        List<String> lines = Collections.unmodifiableList(CharStreams.readLines(buffer));
+        List<String> lines = buffer.lines().collect(Collectors.toList());
         Set<MatchResult> results = new TreeSet<MatchResult>();
 
         for (IChemFormatMatcher format : formats) {
diff --git a/storage/ioformats/src/test/java/org/openscience/cdk/io/formats/ChemFormatMatcherTest.java b/storage/ioformats/src/test/java/org/openscience/cdk/io/formats/ChemFormatMatcherTest.java
@@ -27,8 +27,8 @@
 import java.io.StringReader;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.stream.Collectors;
 
-import com.google.common.io.CharStreams;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -51,7 +51,7 @@ public void testChemFormatMatcherSet() {
 
     protected boolean matches(String header) throws IOException {
         BufferedReader reader = new BufferedReader(new StringReader(header));
-        return matcher.matches(CharStreams.readLines(reader)).matched();
+        return matcher.matches(reader.lines().collect(Collectors.toList())).matched();
     }
 
     @Test
