Merge pull request #695 from eclipse/cd_fixGuavaDeprecations

fixed guava deprecations
eclipse · Jan 20, 2019 · 1c8af3a · 1c8af3a
2 parents 20f4773 + ee995dd
commit 1c8af3a
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.xtend b/...se.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.xtend
@@ -41,7 +41,7 @@ class AnnotationTestingTest extends AbstractXtendCompilerTest {
 			assertTrue(compiledClass.declaredFields.exists[name=='baz'])
 			val targetFileUri = sourceFileUri.trimSegments(2).appendSegment("xtend-gen").appendSegment("out.txt")
 			val targetFile = new File (targetFileUri.toFileString)
-			val result = Files.toString(targetFile, Charset.defaultCharset)
+			val result = Files.asCharSource(targetFile, Charset.defaultCharset).read()
 			assertEquals("foo|bar|baz",result.trim)
 		]
 	}

diff --git a/....xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/batch/TestBatchCompiler.xtend b/....xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/batch/TestBatchCompiler.xtend
@@ -464,7 +464,7 @@ class TestBatchCompiler {
 	}
 
 	def private String getContents(String fileName) {
-		Files.toString(new File(fileName), Charsets.UTF_8)
+		Files.asCharSource(new File(fileName), Charsets.UTF_8).read()
 	}
 
 	@Test

diff --git a/...end.core.tests/src/org/eclipse/xtend/core/tests/javaconverter/JavaFileConverterTest.xtend b/...end.core.tests/src/org/eclipse/xtend/core/tests/javaconverter/JavaFileConverterTest.xtend
@@ -84,7 +84,7 @@ class JavaFileConverterTest extends AbstractXtendTestCase {
 			val javaFileProjRelPath = uri.toFileString().replace(srcProjectRoot.absolutePath, "")
 			println("Converting: " + javaFileProjRelPath);
 			var compileError = false
-			val String javaCode = Files.toString(file, Charset.defaultCharset());
+			val String javaCode = Files.asCharSource(file, Charset.defaultCharset()).read();
 
 			val xtendResult = converToXtend(file.name, javaCode)
 			val knownProblemsFound = xtendResult.problems.size
@@ -139,7 +139,7 @@ class JavaFileConverterTest extends AbstractXtendTestCase {
 			Files.createParentDirs(targetFile)
 			targetFile.createNewFile
 		}
-		Files.write(content, targetFile, Charset.defaultCharset)
+		Files.asCharSink(targetFile, Charset.defaultCharset).write(content)
 	}
 
 }
diff --git a/...tend.core.tests/src/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.xtend b/...tend.core.tests/src/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.xtend
@@ -66,7 +66,7 @@ class ActiveAnnotationsRuntimeTest extends AbstractReusableActiveAnnotationTests
 	protected def URI copyToDisk(String projectName, Pair<String,String> fileRepresentation) {
 		val file = new File(workspaceRoot, projectName+"/src/"+fileRepresentation.key)
 		file.parentFile.mkdirs
-		Files.write(fileRepresentation.value, file, Charset.defaultCharset)
+		Files.asCharSink(file, Charset.defaultCharset).write(fileRepresentation.value)
 		return URI.createFileURI(file.path)
 	}
 

diff --git a/...end.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.java b/...end.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/AnnotationTestingTest.java
@@ -68,7 +68,7 @@ public void testPath() {
           final URI targetFileUri = sourceFileUri.trimSegments(2).appendSegment("xtend-gen").appendSegment("out.txt");
           String _fileString = targetFileUri.toFileString();
           final File targetFile = new File(_fileString);
-          final String result = Files.toString(targetFile, Charset.defaultCharset());
+          final String result = Files.asCharSource(targetFile, Charset.defaultCharset()).read();
           Assert.assertEquals("foo|bar|baz", result.trim());
         } catch (Throwable _e) {
           throw Exceptions.sneakyThrow(_e);

diff --git a/...d.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/batch/TestBatchCompiler.java b/...d.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/batch/TestBatchCompiler.java
@@ -693,7 +693,7 @@ private boolean isSymlink(final File file) {
   private String getContents(final String fileName) {
     try {
       File _file = new File(fileName);
-      return com.google.common.io.Files.toString(_file, Charsets.UTF_8);
+      return com.google.common.io.Files.asCharSource(_file, Charsets.UTF_8).read();
     } catch (Throwable _e) {
       throw Exceptions.sneakyThrow(_e);
     }

diff --git a/...ore.tests/xtend-gen/org/eclipse/xtend/core/tests/javaconverter/JavaFileConverterTest.java b/...ore.tests/xtend-gen/org/eclipse/xtend/core/tests/javaconverter/JavaFileConverterTest.java
@@ -102,7 +102,7 @@ public boolean apply(final URI input) {
           final String javaFileProjRelPath = uri.toFileString().replace(srcProjectRoot.getAbsolutePath(), "");
           InputOutput.<String>println(("Converting: " + javaFileProjRelPath));
           boolean compileError = false;
-          final String javaCode = Files.toString(file, Charset.defaultCharset());
+          final String javaCode = Files.asCharSource(file, Charset.defaultCharset()).read();
           final JavaConverter.ConversionResult xtendResult = this.converToXtend(file.getName(), javaCode);
           final int knownProblemsFound = IterableExtensions.size(xtendResult.getProblems());
           String xtendCode = xtendResult.getXtendCode();
@@ -203,7 +203,7 @@ public void writeToFile(final File parent, final String fileName, final String c
         Files.createParentDirs(targetFile);
         targetFile.createNewFile();
       }
-      Files.write(content, targetFile, Charset.defaultCharset());
+      Files.asCharSink(targetFile, Charset.defaultCharset()).write(content);
     } catch (Throwable _e) {
       throw Exceptions.sneakyThrow(_e);
     }

diff --git a/...core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.java b/...core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/ActiveAnnotationsRuntimeTest.java
@@ -95,7 +95,7 @@ protected URI copyToDisk(final String projectName, final Pair<String, String> fi
       String _plus = ((projectName + "/src/") + _key);
       final File file = new File(this.workspaceRoot, _plus);
       file.getParentFile().mkdirs();
-      Files.write(fileRepresentation.getValue(), file, Charset.defaultCharset());
+      Files.asCharSink(file, Charset.defaultCharset()).write(fileRepresentation.getValue());
       return URI.createFileURI(file.getPath());
     } catch (Throwable _e) {
       throw Exceptions.sneakyThrow(_e);

diff --git a/org.eclipse.xtend.maven.plugin/src/test/java/org/eclipse/xtend/maven/MavenVerifierUtil.java b/org.eclipse.xtend.maven.plugin/src/test/java/org/eclipse/xtend/maven/MavenVerifierUtil.java
@@ -5,7 +5,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Paths;
 
 import org.apache.maven.it.VerificationException;
 import org.apache.maven.it.Verifier;
-Original file line number
+Diff line change
@@ Expand Up / @@ -464,7 +464,7 @@ class TestBatchCompiler { @@
     	}
     	def private String getContents(String fileName) {
-    		Files.toString(new File(fileName), Charsets.UTF_8)
+    		Files.asCharSource(new File(fileName), Charsets.UTF_8).read()
     	}
     	@Test
@@ Expand Down @@