Simplify Process streams handling

akurtakov · akurtakov · commit 0f40e0b7d1dd · 2024-12-19T15:39:37.000+02:00
Use the input/errorReader methods to avoid manual wrapping of the
streams.
diff --git a/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessLauncher.java b/containers/org.eclipse.linuxtools.docker.core/src/org/eclipse/linuxtools/internal/docker/core/ProcessLauncher.java
@@ -16,8 +16,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
@@ -171,20 +169,16 @@ private String[] extractResult(final Process process) {
 			process.waitFor();
 			if (process.exitValue() == 0) {
 				final List<String> result = new ArrayList<>();
-				try (final InputStream inputStream = process.getInputStream();
-						final BufferedReader buff = new BufferedReader(
-								new InputStreamReader(inputStream))) {
+				try (final BufferedReader buff = process.inputReader()) {
 					String line;
 					while ((line = buff.readLine()) != null) {
 						result.add(line);
 					}
 				}
 				return result.toArray(new String[0]);
 			} else {
-					final StringBuilder errorMessage = new StringBuilder();
-				try (final InputStream errorStream = process.getErrorStream();
-						final BufferedReader buff = new BufferedReader(
-								new InputStreamReader(errorStream))) {
+				final StringBuilder errorMessage = new StringBuilder();
+				try (final BufferedReader buff = process.errorReader()) {
 					String line;
 					while ((line = buff.readLine()) != null) {
 						errorMessage.append(line).append('\n'); // $NON-NLS-1$
diff --git a/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/InitializeLaunchConfigurations.java b/containers/org.eclipse.linuxtools.docker.editor.ls/src/org/eclipse/linuxtools/docker/editor/ls/InitializeLaunchConfigurations.java
@@ -12,7 +12,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -41,7 +40,7 @@ public static String getNodeJsLocation() {
 		BufferedReader reader = null;
 		try {
 			Process p = Runtime.getRuntime().exec(command);
-			reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+			reader = p.inputReader();
 			res = reader.readLine();
 		} catch (IOException e) {
 			// try other defaults
diff --git a/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java b/gcov/org.eclipse.linuxtools.gcov.core/src/org/eclipse/linuxtools/internal/gcov/parser/CovManager.java
@@ -22,7 +22,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -274,7 +273,7 @@ private String getWinOSType() {
                 Process process = Runtime.getRuntime().exec(new String[] {"sh", "-c", "echo $OSTYPE"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
                 String firstLine = null;
-                try (BufferedReader stdout = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+				try (BufferedReader stdout = process.inputReader()) {
                     firstLine = stdout.readLine();
                 }
                 if (firstLine != null) {
@@ -457,14 +456,13 @@ private static final class ThreadConsumer extends Thread {
         @Override
         public void run() {
             try {
-                populateGCDAFiles(p.getInputStream());
+				populateGCDAFiles(p.inputReader());
             } catch (IOException e) {
             }
         }
 
-        private void populateGCDAFiles(InputStream s) throws IOException {
-            InputStreamReader isr = new InputStreamReader(s);
-            LineNumberReader lnr = new LineNumberReader(isr);
+		private void populateGCDAFiles(BufferedReader r) throws IOException {
+			LineNumberReader lnr = new LineNumberReader(r);
             String line = null;
             while ((line = lnr.readLine()) != null) {
                 if (line.endsWith(".gcda")) //$NON-NLS-1$
diff --git a/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/GprofTest.java b/gprof/org.eclipse.linuxtools.gprof.test/src/org/eclipse/linuxtools/internal/gprof/test/GprofTest.java
@@ -17,8 +17,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -53,9 +51,8 @@ public static Stream<Arguments> testDirs() {
         boolean addr2line2_16 = false;
         try {
             Process p = Runtime.getRuntime().exec("addr2line --version");
-            InputStream is = p.getInputStream();
-            LineNumberReader reader = new LineNumberReader(
-                    new InputStreamReader(is));
+			LineNumberReader reader = new LineNumberReader(
+					p.inputReader());
             String line;
             while ((line = reader.readLine()) != null) {
                 if (line.contains("addr2line 2.16.")) {
diff --git a/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/utils/Aggregator.java b/gprof/org.eclipse.linuxtools.gprof/src/org/eclipse/linuxtools/internal/gprof/utils/Aggregator.java
@@ -14,7 +14,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 
 import org.eclipse.cdt.utils.spawner.ProcessFactory;
@@ -91,7 +90,7 @@ final static class ProcessReader extends Thread {
         @Override
         public void run() {
             try {
-                LineNumberReader lnr = new LineNumberReader(new InputStreamReader(p.getErrorStream()));
+				LineNumberReader lnr = new LineNumberReader(p.errorReader());
                 do {
                     String s = lnr.readLine();
                     if (s == null)
diff --git a/man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/internal/man/parser/ManParser.java b/man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/internal/man/parser/ManParser.java
@@ -26,6 +26,7 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
@@ -124,8 +125,7 @@ public InputStream getManPage(String page, boolean html,
 			Process process = builder.start();
 			stdout = process.getInputStream();
 		} catch (IOException e) {
-			Bundle bundle = FrameworkUtil.getBundle(this.getClass());
-			Platform.getLog(bundle).log(Status.error(e.getMessage()));
+			ILog.get().log(Status.error(e.getMessage()));
 		}
 		return stdout;
 	}
@@ -148,8 +148,7 @@ public StringBuilder getRawManPage(String manPage) {
 				sb.append(reader.lines().collect(Collectors.joining("\n"))); //$NON-NLS-1$
 			}
 		} catch (IOException e) {
-			Bundle bundle = FrameworkUtil.getBundle(this.getClass());
-			Platform.getLog(bundle).log(Status.error(e.getMessage()));
+			ILog.get().log(Status.error(e.getMessage()));
 		}
 		return sb;
 	}
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/AbstractDataManipulator.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/AbstractDataManipulator.java
@@ -85,16 +85,16 @@ public void performCommand(String[] cmd, int fd) {
 
             switch (fd) {
             case 2:
-                buffData = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
-                buffTemp = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+                buffData = proc.errorReader();
+                buffTemp = proc.inputReader();
                 readStream(buffTemp, temp);
                 readStream(buffData, data);
                 break;
             case 1:
                 // fall through to default case
             default:
-                buffData = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-                buffTemp = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+                buffData = proc.inputReader();
+                buffTemp = proc.errorReader();
                 readStream(buffData, data);
                 readStream(buffTemp, temp);
                 break;
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -14,7 +14,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.URI;
 import java.util.ArrayList;
@@ -167,7 +166,7 @@ private static Map<String,List<String>> loadEventList(ILaunchConfiguration confi
              * Old versions of Perf will send events list to stderr instead of stdout
              * Checking if stdout is empty then read from stderr
              */
-            input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            input = p.inputReader();
 
         } catch( IOException e ) {
             logException(e);
@@ -234,7 +233,7 @@ public static PerfVersion getPerfVersion(ILaunchConfiguration config) {
             return null;
         }
 
-        BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        BufferedReader input = p.inputReader();
 
         String perfVersion = spitStream(input, "Perf --version", null); //$NON-NLS-1$
         int index = perfVersion.indexOf('-');
@@ -401,8 +400,8 @@ public static void report(ILaunchConfiguration config, IPath workingDir, IProgre
                 PerfPlugin.getDefault().setWorkingDir(workingDir);
             }
 
-            input = new BufferedReader(new InputStreamReader(p.getInputStream()));
-            error = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+            input = p.inputReader();
+            error = p.errorReader();
             //spitting error stream moved to end of while loop, due to commenting of p.waitFor()
         } catch( IOException e ) {
             logException(e);
@@ -590,8 +589,8 @@ private static void parseRemoteReport(ILaunchConfiguration config,
                                     al.add(sb.toString());
                                     p = RuntimeProcessFactory.getFactory().exec(al.toArray(new String[]{}), project);
                                 }
-                                input = new BufferedReader(new InputStreamReader(p.getInputStream()));
-                                error = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+                                input = p.inputReader();
+                                error = p.errorReader();
                             } catch (IOException e) {
                                 logException(e);
                             }
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/launch/PerfLaunchConfigDelegate.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/launch/PerfLaunchConfigDelegate.java
@@ -22,7 +22,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.net.URI;
@@ -163,8 +162,7 @@ public void launch(ILaunchConfiguration config, String mode,
                 MessageConsoleStream stream = console.newMessageStream();
 
                 if (pProxy != null) {
-                    try (BufferedReader error = new BufferedReader(
-                            new InputStreamReader(pProxy.getErrorStream()))) {
+                    try (BufferedReader error = pProxy.errorReader()) {
                         String err = error.readLine();
                         while (err != null) {
                             stream.println(err);
diff --git a/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/utils/STNM.java b/profiling/org.eclipse.linuxtools.binutils/src/org/eclipse/linuxtools/binutils/utils/STNM.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2018 STMicroelectronics and others.
- * 
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -15,8 +15,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -66,12 +64,11 @@ private void init(String command, String[] params, String file, IProject project
             System.arraycopy(params, 0, args, 1, params.length);
         }
         Process process = CdtSpawnerProcessFactory.getFactory().exec(args, project);
-        parseOutput(process.getInputStream());
+		parseOutput(process.inputReader());
         process.destroy();
     }
 
-    private void parseOutput(InputStream stream) throws IOException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+	private void parseOutput(BufferedReader reader) throws IOException {
         String line;
 
         // See matcher.java for regular expression string data definitions.
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/src/org/eclipse/linuxtools/internal/ssh/proxy/SSHProxyManager.java b/profiling/org.eclipse.linuxtools.ssh.proxy/src/org/eclipse/linuxtools/internal/ssh/proxy/SSHProxyManager.java
@@ -16,7 +16,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collections;
@@ -26,6 +25,7 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.linuxtools.profiling.launch.IRemoteCommandLauncher;
@@ -91,12 +91,12 @@ public Map<String, String> getEnv(URI uri) throws CoreException {
         Process p = cmdLauncher.execute(new Path("/bin/env"), new String[] {}, new String[] {}, null, null); //$NON-NLS-1$
 
         String errorLine;
-        try (BufferedReader error = new BufferedReader(new InputStreamReader(p.getErrorStream()))){
+		try (BufferedReader error = p.errorReader()) {
             if((errorLine = error.readLine()) != null){
                 throw new IOException(errorLine);
             }
         } catch (IOException e) {
-			Activator.getDefault().getLog().log(Status.error(e.getMessage(), e));
+			ILog.get().log(Status.error(e.getMessage(), e));
             return Collections.emptyMap();
         }
         /*
@@ -116,8 +116,7 @@ public Map<String, String> getEnv(URI uri) throws CoreException {
         Pattern variablePattern = Pattern.compile("^(.+)=([^\\(\\)\\s{].*|)$"); //$NON-NLS-1$
         Matcher m;
 
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
-                p.getInputStream()))) {
+		try (BufferedReader reader = p.inputReader()) {
             String readLine = reader.readLine();
             while (readLine != null) {
                 m = variablePattern.matcher(readLine);
@@ -127,7 +126,7 @@ public Map<String, String> getEnv(URI uri) throws CoreException {
                 readLine = reader.readLine();
             }
         } catch (IOException e) {
-			Activator.getDefault().getLog().log(Status.error(e.getMessage(), e));
+			ILog.get().log(Status.error(e.getMessage(), e));
             return Collections.emptyMap();
         }
         return env;
@@ -153,7 +152,7 @@ private URI sanitizeURI(URI uri) {
                 return new URI(SCHEME_ID, uri.getRawUserInfo(), uri.getHost(), uri.getPort(), uri.getRawPath()
                         , uri.getRawQuery(), uri.getRawFragment());
             } catch (URISyntaxException e) {
-				Activator.getDefault().getLog().log(Status.error(e.getMessage(), e));
+				ILog.get().log(Status.error(e.getMessage(), e));
             }
         }
         return uri;
diff --git a/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/RuntimeProcessFactory.java b/profiling/org.eclipse.linuxtools.tools.launch.core/src/org/eclipse/linuxtools/tools/launch/core/factory/RuntimeProcessFactory.java
@@ -15,7 +15,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -107,7 +106,7 @@ public String whichCommand(String command, IProject project) throws IOException
 					new NullProgressMonitor());
 			if (pProxy != null) {
 				ArrayList<String> lines = new ArrayList<>();
-				try (BufferedReader reader = new BufferedReader(new InputStreamReader(pProxy.getInputStream()))) {
+				try (BufferedReader reader = pProxy.inputReader()) {
 					String readLine = reader.readLine();
 					while (readLine != null) {
 						lines.add(readLine);
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapView.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapView.java
@@ -18,7 +18,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
@@ -222,8 +221,7 @@ private void createHelpActions() {
             public void run() {
                 try {
                     Process pr = RuntimeProcessFactory.getFactory().exec("stap -V", null); //$NON-NLS-1$
-                    BufferedReader buf = new BufferedReader(
-                            new InputStreamReader(pr.getErrorStream()));
+					BufferedReader buf = pr.errorReader();
                     String line = ""; //$NON-NLS-1$
                     String message = ""; //$NON-NLS-1$
 
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/PreferenceInitializer.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/preferences/PreferenceInitializer.java
@@ -16,7 +16,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -68,7 +67,7 @@ private String getKernelSourceLocation(){
         String version = ""; //$NON-NLS-1$
         try {
             Process process = RuntimeProcessFactory.getFactory().exec("uname -r", null, null);//$NON-NLS-1$
-            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+			BufferedReader reader = process.inputReader();
             version = reader.readLine();
         } catch (IOException e) {
             // Could not run uname use an empty String
diff --git a/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java b/vagrant/org.eclipse.linuxtools.vagrant.core/src/org/eclipse/linuxtools/internal/vagrant/core/VagrantConnection.java
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindRemoteProxyLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindRemoteProxyLaunchDelegate.java

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import java.util.Properties;`
`27`	`27`	`import java.util.stream.Collectors;`
`28`	`28`
	`29`	`+import org.eclipse.core.runtime.ILog;`
`29`	`30`	`import org.eclipse.core.runtime.IStatus;`
`30`	`31`	`import org.eclipse.core.runtime.Platform;`
`31`	`32`	`import org.eclipse.core.runtime.Status;`
`@@ -124,8 +125,7 @@ public InputStream getManPage(String page, boolean html,`
`124`	`125`	`Process process = builder.start();`
`125`	`126`	`stdout = process.getInputStream();`
`126`	`127`	`} catch (IOException e) {`
`127`		`- Bundle bundle = FrameworkUtil.getBundle(this.getClass());`
`128`		`- Platform.getLog(bundle).log(Status.error(e.getMessage()));`
	`128`	`+ ILog.get().log(Status.error(e.getMessage()));`
`129`	`129`	`}`
`130`	`130`	`return stdout;`
`131`	`131`	`}`
`@@ -148,8 +148,7 @@ public StringBuilder getRawManPage(String manPage) {`
`148`	`148`	`sb.append(reader.lines().collect(Collectors.joining("\n"))); //$NON-NLS-1$`
`149`	`149`	`}`
`150`	`150`	`} catch (IOException e) {`
`151`		`- Bundle bundle = FrameworkUtil.getBundle(this.getClass());`
`152`		`- Platform.getLog(bundle).log(Status.error(e.getMessage()));`
	`151`	`+ ILog.get().log(Status.error(e.getMessage()));`
`153`	`152`	`}`
`154`	`153`	`return sb;`
`155`	`154`	`}`