use IFile bulk API

Author: EcljpseB0T

resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java

@@ -424,11 +424,8 @@ public void delete(IResource target, int flags, IProgressMonitor monitor) throws
 	 * are not considered.
 	 */
 	private boolean descriptionChanged(IFile descriptionFile, byte[] newContents) {
-		//buffer size: twice the description length, but maximum 8KB
-		int bufsize = newContents.length > 4096 ? 8192 : newContents.length * 2;
-		try (
-			InputStream oldStream = new BufferedInputStream(descriptionFile.getContents(true), bufsize);
-		) {
+		try {
+			InputStream oldStream = new ByteArrayInputStream(descriptionFile.readAllBytes());
 			InputStream newStream = new ByteArrayInputStream(newContents);
 			//compare streams char by char, ignoring line endings
 			int newChar = newStream.read();

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java

@@ -24,7 +24,6 @@
 import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace;
 import static org.junit.Assert.assertThrows;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -488,9 +487,7 @@ private void modifyFileInWorkspace(final IFile file) throws IOException, CoreExc
 			fileInputStream.transferTo(originalContentStream);
 			String originalContent = new String(originalContentStream.toByteArray(), StandardCharsets.UTF_8);
 			String newContent = originalContent + "w";
-			ByteArrayInputStream modifiedContentStream = new ByteArrayInputStream(
-					newContent.getBytes(StandardCharsets.UTF_8));
-			file.setContents(modifiedContentStream, false, false, null);
+			file.setContents(newContent.getBytes(StandardCharsets.UTF_8), false, false, null);
 		}
 	}
 

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java

@@ -39,7 +39,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
-import java.io.ByteArrayInputStream;
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.internal.resources.Resource;
@@ -2550,7 +2549,7 @@ public void testProjectDeletion_Bug347220() throws CoreException {
 
 		// modify the file to create an entry in the history
 		monitor.prepare();
-		file.setContents(new ByteArrayInputStream(createRandomString().getBytes()), true, true, monitor);
+		file.setContents(createRandomString().getBytes(), true, true, monitor);
 		monitor.assertUsedUp();
 
 		// delete the project and check that its metadata is also deleted

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java

@@ -273,7 +273,7 @@ public void testFileVariableRemoved() throws Exception {
 		assertNotNull("5.1", file.getLocation());
 		assertExistsInFileSystem(file);
 		// the contents must be the original ones
-		assertTrue("5.3", compareContent(file.getContents(true), createInputStream("contents for a file")));
+		assertEquals("5.3", "contents for a file", file.readString());
 	}
 
 	/**
@@ -330,7 +330,7 @@ public void testFileProjectVariableRemoved() throws Exception {
 		assertNotNull("5.1", file.getLocation());
 		assertExistsInFileSystem(file);
 		// the contents must be the original ones
-		assertTrue("5.3", compareContent(file.getContents(true), createInputStream("contents for a file")));
+		assertEquals("5.3", "contents for a file", file.readString());
 	}
 
 	/**
@@ -509,7 +509,7 @@ public void testFileProjectRelativeVariableRemoved() throws Exception {
 		assertDoesNotExistInWorkspace(file);
 
 		file.createLink(variableBasedLocation, IResource.ALLOW_MISSING_LOCAL, null);
-		file.setContents(createInputStream("contents for a file"), IResource.FORCE, null);
+		file.setContents("contents for a file".getBytes(), IResource.FORCE, null);
 
 		// now the file exists in both workspace and file system
 		assertExistsInWorkspace(file);
@@ -545,7 +545,7 @@ public void testFileProjectRelativeVariableRemoved() throws Exception {
 		assertNotNull("5.1", file.getLocation());
 		assertExistsInFileSystem(file);
 		// the contents must be the original ones
-		assertTrue("5.3", compareContent(file.getContents(true), createInputStream("contents for a file")));
+		assertEquals("5.3", "contents for a file", file.readString());
 	}
 
 	/**
@@ -859,7 +859,7 @@ public void testVariableChanged() throws Exception {
 		assertExistsInWorkspace(file);
 		assertExistsInFileSystem(file);
 		// the contents must be the original ones
-		assertTrue("5.3", compareContent(file.getContents(true), createInputStream("contents for a file")));
+		assertEquals("5.3", "contents for a file", file.readString());
 	}
 
 	/**
@@ -925,7 +925,7 @@ public void testProjectVariableChanged() throws Exception {
 		assertExistsInWorkspace(file);
 		assertExistsInFileSystem(file);
 		// the contents must be the original ones
-		assertTrue("5.3", compareContent(file.getContents(true), createInputStream("contents for a file")));
+		assertEquals("5.3", "contents for a file", file.readString());
 	}
 
 	/**

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/WorkspaceTest.java

@@ -319,7 +319,7 @@ public void setUp() throws Exception {
 		assertTrue(fileTarget.exists());
 		String testString = createRandomString();
 		monitor = new FussyProgressMonitor();
-		fileTarget.setContents(createInputStream(testString), true, false, monitor);
+		fileTarget.setContents(testString.getBytes(), true, false, monitor);
 		monitor.assertUsedUp();
 		try (InputStream content = fileTarget.getContents(false)) {
 			assertTrue("get not equal set", compareContent(content, createInputStream(testString)));

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java

@@ -134,16 +134,14 @@ public void testGetContentsTrue() throws Exception {
 
 		// Touch on file-system
 		touchInFilesystem(f);
-		try (InputStream in = f.getContents(true)) {
-		}
+		f.readAllBytes();
 
 		// Wait for auto-refresh to happen
 		Job.getJobManager().wakeUp(ResourcesPlugin.FAMILY_AUTO_REFRESH);
 		Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, createTestMonitor());
 
 		// File is now in sync.
-		try (InputStream in = f.getContents()) {
-		}
+		f.readAllBytes();
 
 		// Test that getContent(true) on an out-if-sync deleted file throws a CoreException
 		// with IResourceStatus.RESOURCE_NOT_FOUND error code.

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java

@@ -471,9 +471,7 @@ public void testGetContents_1GBZD4S() throws Throwable {
 		});
 		IResourceChangeListener listener = event -> {
 			listenerInMainThreadCallback.set(() -> {
-				try (InputStream is = target.getContents(true)) {
-					assertTrue("4.0", compareContent(createInputStream(newContents), is));
-				}
+				assertEquals("4.0", newContents, target.readString());
 			});
 		};
 		try {