SC-1431 - try-with-resources pattern.

mickael-caro-sonarsource · mickael-caro-sonarsource · commit 9fa93aca19fb · 2019-11-21T15:31:12.000+01:00
diff --git a/api/src/main/java/org/sonarsource/scanner/api/internal/ServerConnection.java b/api/src/main/java/org/sonarsource/scanner/api/internal/ServerConnection.java
@@ -75,15 +75,13 @@ public void downloadFile(String urlPath, Path toFile) throws IOException {
     }
     String url = baseUrlWithoutTrailingSlash + urlPath;
     logger.debug(format("Download %s to %s", url, toFile.toAbsolutePath().toString()));
-    ResponseBody responseBody = callUrl(url);
 
-    try (InputStream in = responseBody.byteStream()) {
+    try (ResponseBody responseBody = callUrl(url);
+         InputStream in = responseBody.byteStream()) {
       Files.copy(in, toFile, StandardCopyOption.REPLACE_EXISTING);
     } catch (IOException | RuntimeException e) {
       Utils.deleteQuietly(toFile);
       throw e;
-    }finally {
-      responseBody.close();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -75,15 +75,13 @@ public void downloadFile(String urlPath, Path toFile) throws IOException {`
`75`	`75`	`}`
`76`	`76`	`String url = baseUrlWithoutTrailingSlash + urlPath;`
`77`	`77`	`logger.debug(format("Download %s to %s", url, toFile.toAbsolutePath().toString()));`
`78`		`- ResponseBody responseBody = callUrl(url);`
`79`	`78`
`80`		`- try (InputStream in = responseBody.byteStream()) {`
	`79`	`+ try (ResponseBody responseBody = callUrl(url);`
	`80`	`+ InputStream in = responseBody.byteStream()) {`
`81`	`81`	`Files.copy(in, toFile, StandardCopyOption.REPLACE_EXISTING);`
`82`	`82`	`} catch (IOException \| RuntimeException e) {`
`83`	`83`	`Utils.deleteQuietly(toFile);`
`84`	`84`	`throw e;`
`85`		`- }finally {`
`86`		`- responseBody.close();`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`