Use try-with-resource

ngrinder-controller/src/main/java/org/ngrinder/common/util/FileDownloadUtils.java

@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 package org.ngrinder.common.util;
 
@@ -59,12 +59,10 @@ public static boolean downloadFile(HttpServletResponse response, File file) {
 		response.addHeader("Content-Disposition", "attachment;filename=" + file.getName());
 		response.setContentType("application/octet-stream");
 		response.addHeader("Content-Length", "" + file.length());
-		InputStream fis = null;
 		byte[] buffer = new byte[FILE_DOWNLOAD_BUFFER_SIZE];
-		OutputStream toClient = null;
-		try {
-			fis = new BufferedInputStream(new FileInputStream(file));
-			toClient = new BufferedOutputStream(response.getOutputStream());
+
+		try (InputStream fis = new BufferedInputStream(new FileInputStream(file));
+			 OutputStream toClient = new BufferedOutputStream(response.getOutputStream())) {
 			int readLength;
 			while (((readLength = fis.read(buffer)) != -1)) {
 				toClient.write(buffer, 0, readLength);
@@ -76,10 +74,8 @@ public static boolean downloadFile(HttpServletResponse response, File file) {
 		} catch (IOException e) {
 			LOGGER.error("read file error:" + file.getAbsolutePath(), e);
 			result = false;
-		} finally {
-			IOUtils.closeQuietly(fis);
-			IOUtils.closeQuietly(toClient);
 		}
+
 		return result;
 	}
 }

ngrinder-controller/src/main/java/org/ngrinder/common/util/FileUtils.java

@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 package org.ngrinder.common.util;
 
@@ -18,11 +18,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import static org.apache.commons.io.IOUtils.copy;
+
 /**
  * Convenient File utilities.
  *
@@ -39,17 +40,11 @@ public abstract class FileUtils {
 	 * @since 3.2
 	 */
 	public static void copyResourceToFile(String resourcePath, File file) {
-		InputStream io = null;
-		FileOutputStream fos = null;
-		try {
-			io = new ClassPathResource(resourcePath).getInputStream();
-			fos = new FileOutputStream(file);
-			IOUtils.copy(io, fos);
+		try (InputStream io = new ClassPathResource(resourcePath).getInputStream();
+			 FileOutputStream fos = new FileOutputStream(file)) {
+			copy(io, fos);
 		} catch (IOException e) {
 			LOGGER.error("error while writing {}", resourcePath, e);
-		} finally {
-			IOUtils.closeQuietly(io);
-			IOUtils.closeQuietly(fos);
 		}
 	}
 }

ngrinder-controller/src/main/java/org/ngrinder/home/service/HomeService.java

@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -9,7 +9,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 package org.ngrinder.home.service;
 
@@ -88,37 +88,39 @@ public Map<String, String> getUserDefinedMessageSources(String locale) {
 	 */
 	public List<PanelEntry> getPanelEntries(String feedURL, int maxSize, boolean includeReply) {
 		SyndFeedInput input = new SyndFeedInput();
-		XmlReader reader = null;
 		HttpURLConnection feedConnection = null;
+
 		try {
 			List<PanelEntry> panelEntries = new ArrayList<>();
 			URL url = new URL(feedURL);
 			feedConnection = (HttpURLConnection) url.openConnection();
 			feedConnection.setConnectTimeout(8000);
 			feedConnection.setReadTimeout(8000);
-			reader = new XmlReader(feedConnection);
-			SyndFeed feed = input.build(reader);
-			int count = 0;
-
-			for (Object eachObj : feed.getEntries()) {
-				SyndEntryImpl each = cast(eachObj);
-				if (!includeReply && StringUtils.startsWithIgnoreCase(each.getTitle(), "Re: ")) {
-					continue;
-				}
-				if (count++ >= maxSize) {
-					break;
+
+			try (XmlReader reader = new XmlReader(feedConnection)) {
+				SyndFeed feed = input.build(reader);
+				int count = 0;
+
+				for (Object eachObj : feed.getEntries()) {
+					SyndEntryImpl each = cast(eachObj);
+					if (!includeReply && StringUtils.startsWithIgnoreCase(each.getTitle(), "Re: ")) {
+						continue;
+					}
+					if (count++ >= maxSize) {
+						break;
+					}
+					panelEntries.add(getPanelEntry(each));
 				}
-				panelEntries.add(getPanelEntry(each));
+				Collections.sort(panelEntries);
+				return panelEntries;
 			}
-			Collections.sort(panelEntries);
-			return panelEntries;
+
 		} catch (Exception e) {
 			LOG.error("Error while patching the feed entries for {} : {}", feedURL, e.getMessage());
 		} finally {
 			if (feedConnection != null) {
 				feedConnection.disconnect();
 			}
-			IOUtils.closeQuietly(reader);
 		}
 		return Collections.emptyList();
 	}

ngrinder-controller/src/main/java/org/ngrinder/infra/config/Config.java

@@ -19,7 +19,6 @@
   import net.grinder.util.ListenerSupport.Informer;
   import org.apache.commons.io.FileUtils;
   import org.apache.commons.io.FilenameUtils;
-  import org.apache.commons.io.IOUtils;
   import org.apache.commons.lang.StringUtils;
   import org.ngrinder.common.constant.ClusterConstants;
   import org.ngrinder.common.constant.ControllerConstants;
@@ -348,17 +347,13 @@ protected Home resolveExHome() {
 	 * Load internal properties which is not modifiable by user.
 	 */
 	protected void loadInternalProperties() {
-		InputStream inputStream = null;
 		Properties properties = new Properties();
-		try {
-			inputStream = new ClassPathResource("/internal.properties").getInputStream();
+		try (InputStream inputStream = new ClassPathResource("/internal.properties").getInputStream()) {
 			properties.load(inputStream);
 			internalProperties = new PropertiesWrapper(properties, internalPropertiesKeyMapper);
 		} catch (IOException e) {
 			CoreLogger.LOGGER.error("Error while load internal.properties", e);
 			internalProperties = new PropertiesWrapper(properties, internalPropertiesKeyMapper);
-		} finally {
-			IOUtils.closeQuietly(inputStream);
 		}
 	}
 

ngrinder-controller/src/main/java/org/ngrinder/infra/spring/ApiExceptionHandlerResolver.java

@@ -85,9 +85,10 @@ public ModelAndView resolveException(HttpServletRequest request, HttpServletResp
 		Throwable throwable = ExceptionUtils.sanitize(ex);
 
 		StringWriter out = new StringWriter();
-		PrintWriter printWriter = new PrintWriter(out);
-		throwable.printStackTrace(printWriter);
-		IOUtils.closeQuietly(printWriter);
+
+		try (PrintWriter printWriter = new PrintWriter(out)) {
+			throwable.printStackTrace(printWriter);
+		}
 
 		Map<String, Object> jsonResponse = buildMap(
 			JSON_SUCCESS, false,

ngrinder-controller/src/main/java/org/ngrinder/perftest/controller/PerfTestController.java

@@ -127,9 +127,8 @@ public void showLog(User user, @PathVariable("id") long id, @RemainedPath String
 		response.reset();
 		response.setContentType("text/plain");
 		response.setCharacterEncoding("UTF-8");
-		FileInputStream fileInputStream = null;
-		try {
-			fileInputStream = new FileInputStream(targetFile);
+
+		try (FileInputStream fileInputStream = new FileInputStream(targetFile)) {
 			ServletOutputStream outputStream = response.getOutputStream();
 			if (FilenameUtils.isExtension(targetFile.getName(), "zip")) {
 				// Limit log view to 1MB
@@ -141,8 +140,6 @@ public void showLog(User user, @PathVariable("id") long id, @RemainedPath String
 			}
 		} catch (Exception e) {
 			CoreLogger.LOGGER.error("Error while processing log. {}", targetFile, e);
-		} finally {
-			IOUtils.closeQuietly(fileInputStream);
 		}
 	}
 

ngrinder-controller/src/main/java/org/ngrinder/perftest/service/AgentManager.java

@@ -28,7 +28,6 @@
 import net.grinder.engine.controller.AgentControllerIdentityImplementation;
 import net.grinder.message.console.AgentControllerState;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.ngrinder.agent.service.AgentPackageService;
@@ -332,9 +331,8 @@ public Set<AgentStatus> getAttachedAgentStatusSetConnectingToPort(final int sing
 	public synchronized AgentUpdateGrinderMessage onAgentDownloadRequested(String version, int offset) {
 		final int updateChunkSize = getUpdateChunkSize();
 		byte[] buffer = new byte[updateChunkSize];
-		RandomAccessFile agentPackageReader = null;
-		try {
-			agentPackageReader = new RandomAccessFile(agentPackageService.createAgentPackage(), "r");
+
+		try (RandomAccessFile agentPackageReader = new RandomAccessFile(agentPackageService.createAgentPackage(), "r")) {
 			agentPackageReader.seek(offset);
 			int count = agentPackageReader.read(buffer, 0, updateChunkSize);
 			byte[] bytes = buffer;
@@ -347,8 +345,6 @@ public synchronized AgentUpdateGrinderMessage onAgentDownloadRequested(String ve
 					CRC32ChecksumUtils.getCRC32Checksum(bytes));
 		} catch (Exception e) {
 			LOGGER.error("Error while reading agent package, its offset is {} and details {}:", offset, e);
-		} finally {
-			IOUtils.closeQuietly(agentPackageReader);
 		}
 		return AgentUpdateGrinderMessage.getNullAgentUpdateGrinderMessage(version);
 	}