#8630 use try-with-resources to close used resources

This commit is contained in:
Mohamed Karray
2018-08-31 09:55:45 +02:00
parent 2420c9141c
commit ed98d04be4
5 changed files with 80 additions and 132 deletions

View File

@@ -1,19 +1,19 @@
/**
* Copyright (c) 2010, Sebastian Sdorra
* All rights reserved.
*
* <p>
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* <p>
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of SCM-Manager; nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
* <p>
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -24,96 +24,49 @@
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* <p>
* http://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.util.HashMap;
import java.util.Map;
import java.util.Scanner;
/**
*
* @author Sebastian Sdorra
*/
public final class GitSubModuleParser
{
public final class GitSubModuleParser {
/**
* Constructs ...
*
*/
private GitSubModuleParser() {}
private GitSubModuleParser() {
}
//~--- methods --------------------------------------------------------------
/**
* //~--- methods --------------------------------------------------------------
*
*
* Method description
*
*
* @param content
*
* @return
*/
public static Map<String, SubRepository> parse(String content)
{
Map<String, SubRepository> subRepositories = new HashMap<String,
SubRepository>();
Scanner scanner = new Scanner(content);
SubRepository repository = null;
while (scanner.hasNextLine())
{
String line = scanner.nextLine();
if (Util.isNotEmpty(line))
{
line = line.trim();
if (line.startsWith("[") && line.endsWith("]"))
{
repository = new SubRepository();
}
else if (line.startsWith("path"))
{
subRepositories.put(getValue(line), repository);
}
else if (line.startsWith("url"))
{
repository.setRepositoryUrl(getValue(line));
public static Map<String, SubRepository> parse(String content) {
Map<String, SubRepository> subRepositories = new HashMap<>();
try (Scanner scanner = new Scanner(content)) {
SubRepository repository = null;
while (scanner.hasNextLine()) {
String line = scanner.nextLine();
if (Util.isNotEmpty(line)) {
line = line.trim();
if (line.startsWith("[") && line.endsWith("]")) {
repository = new SubRepository();
} else if (line.startsWith("path")) {
subRepositories.put(getValue(line), repository);
} else if (line.startsWith("url")) {
repository.setRepositoryUrl(getValue(line));
}
}
}
}
return subRepositories;
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param line
*
* @return
*/
private static String getValue(String line)
{
private static String getValue(String line) {
return line.split("=")[1].trim();
}
}