From aa676895d2ca226622ff5216d9e4f6cf673a36a5 Mon Sep 17 00:00:00 2001 From: Gesa HENTSCHKE Date: Tue, 30 Jul 2024 12:22:35 +0200 Subject: [PATCH 1/5] [#1045] replace removed FileUtil.transferStreams with transferTo method. fixes #1045 --- org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java index 17a96dd65..9a97054d9 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java @@ -57,7 +57,6 @@ import org.eclipse.core.filesystem.IFileInfo; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.IFileSystem; -import org.eclipse.core.internal.utils.FileUtil; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; @@ -1164,7 +1163,7 @@ private static CompositeChange toCompositeChange(WorkspaceEdit wsEdit, String na if (oldFile != null && oldFile.exists()) { try (var stream = new ByteArrayOutputStream((int) oldFile.getLocation().toFile().length()); InputStream inputStream = oldFile.getContents();) { - FileUtil.transferStreams(inputStream, stream, newURI.toString(), null); + inputStream.transferTo(stream); content = new String(stream.toByteArray()); encoding = oldFile.getCharset(); } catch (IOException | CoreException e) { From cd047ac347f6390c022076db80370d7215850178 Mon Sep 17 00:00:00 2001 From: Gesa HENTSCHKE Date: Tue, 30 Jul 2024 12:32:52 +0200 Subject: [PATCH 2/5] fix usage in tests --- .../org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java index 488381cf4..cdb288e96 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java @@ -13,7 +13,10 @@ *******************************************************************************/ package org.eclipse.lsp4e.test.edit; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,7 +33,6 @@ import java.util.Random; import org.eclipse.core.filesystem.EFS; -import org.eclipse.core.internal.utils.FileUtil; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -374,8 +376,7 @@ private String readContent(IFile targetFile) throws IOException, CoreException { try (ByteArrayOutputStream stream = new ByteArrayOutputStream( (int) targetFile.getLocation().toFile().length()); InputStream contentStream = targetFile.getContents();) { - FileUtil.transferStreams(contentStream, stream, targetFile.getFullPath().toString(), - new NullProgressMonitor()); + contentStream.transferTo(stream); // targetFile.getContents().transferTo(stream); return new String(stream.toByteArray()); } From 63b51deef1385a673c163a8d47a27785837b125f Mon Sep 17 00:00:00 2001 From: Gesa HENTSCHKE Date: Tue, 30 Jul 2024 12:34:30 +0200 Subject: [PATCH 3/5] remove comment --- .../src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java index cdb288e96..ebd1ce809 100644 --- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java +++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/edit/LSPEclipseUtilsTest.java @@ -377,7 +377,6 @@ private String readContent(IFile targetFile) throws IOException, CoreException { (int) targetFile.getLocation().toFile().length()); InputStream contentStream = targetFile.getContents();) { contentStream.transferTo(stream); - // targetFile.getContents().transferTo(stream); return new String(stream.toByteArray()); } } From abc99c856677138e05ec45604ea8201f7ae82f12 Mon Sep 17 00:00:00 2001 From: Gesa HENTSCHKE Date: Wed, 31 Jul 2024 21:12:24 +0200 Subject: [PATCH 4/5] Increase version for baseline check --- org.eclipse.lsp4e.test/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF index 959010f52..2dfb6f56b 100644 --- a/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF +++ b/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for language server bundle (Incubation) Bundle-SymbolicName: org.eclipse.lsp4e.test;singleton:=true -Bundle-Version: 0.15.14.qualifier +Bundle-Version: 0.15.15.qualifier Fragment-Host: org.eclipse.lsp4e Bundle-Vendor: Eclipse.org Bundle-RequiredExecutionEnvironment: JavaSE-17 From 9e136d511d66aeb45165bdad83277e76bb1f7071 Mon Sep 17 00:00:00 2001 From: Gesa HENTSCHKE Date: Thu, 1 Aug 2024 08:21:09 +0200 Subject: [PATCH 5/5] Increase version in pom.xml as well --- org.eclipse.lsp4e.test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.lsp4e.test/pom.xml b/org.eclipse.lsp4e.test/pom.xml index 5149165f6..bd8e32275 100644 --- a/org.eclipse.lsp4e.test/pom.xml +++ b/org.eclipse.lsp4e.test/pom.xml @@ -8,7 +8,7 @@ org.eclipse.lsp4e.test eclipse-test-plugin - 0.15.14-SNAPSHOT + 0.15.15-SNAPSHOT