|
42 | 42 | package org.graalvm.python.embedding.utils.jbang; |
43 | 43 |
|
44 | 44 | import java.io.BufferedReader; |
45 | | -import java.io.File; |
46 | | -import java.io.FileWriter; |
47 | | -import java.io.IOException; |
48 | | -import java.nio.file.Files; |
49 | | -import java.nio.file.Path; |
50 | | -import java.nio.file.Paths; |
51 | | -import java.nio.file.attribute.PosixFilePermission; |
52 | | -import java.util.ArrayList; |
53 | | -import java.util.Arrays; |
54 | | -import java.util.Comparator; |
55 | | -import java.util.Collection; |
56 | | -import java.util.HashSet; |
57 | | -import java.util.List; |
58 | | -import java.util.Map; |
59 | | -import java.util.HashMap; |
60 | | -import java.util.Map.Entry; |
61 | | -import java.util.stream.Collectors; |
62 | 45 |
|
63 | 46 | import java.io.File; |
64 | 47 | import java.io.FileWriter; |
65 | 48 | import java.io.IOException; |
66 | 49 | import java.io.InputStream; |
67 | 50 | import java.io.InputStreamReader; |
68 | | -import java.io.OutputStream; |
69 | 51 | import java.net.Proxy; |
70 | 52 | import java.net.Proxy.Type; |
71 | 53 | import java.net.ProxySelector; |
@@ -201,7 +183,7 @@ private static void generateFilelist(Path vfs) { |
201 | 183 | } catch (IOException e) { |
202 | 184 | throw new RuntimeException(e); |
203 | 185 | } |
204 | | - String[] a = ret.toArray(new String[ret.size()]); |
| 186 | + String[] a = ret.toArray(String[]::new); |
205 | 187 | Arrays.sort(a); |
206 | 188 | try (var wr = new FileWriter(filesList.toFile())) { |
207 | 189 | for (String f : a) { |
@@ -316,7 +298,7 @@ private static void runPip(Path venvDirectory, String command, String pkg) { |
316 | 298 | var newArgs = new ArrayList<String>(); |
317 | 299 | newArgs.add("-m"); |
318 | 300 | newArgs.add("pip"); |
319 | | - // addProxy(newArgs); |
| 301 | + addProxy(newArgs); |
320 | 302 | newArgs.add(command); |
321 | 303 | newArgs.add(pkg); |
322 | 304 |
|
@@ -412,8 +394,8 @@ private static void runProcess(ProcessBuilder pb) { |
412 | 394 | /** |
413 | 395 | * Ensures that the proxy url has a protocol. |
414 | 396 | * |
415 | | - * @param proxyAddress proxy server address |
416 | | - * @param protocol usually http or https |
| 397 | + * @param proxyAddress proxy server address |
| 398 | + * @param protocol usually http or https |
417 | 399 | * @return String representation of url of the proxy |
418 | 400 | */ |
419 | 401 | private static String fixProtocol(String proxyAddress, String protocol) { |
|
0 commit comments