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

scm-core/src/main/java/sonia/scm/repository/api/BundleCommandBuilder.java

@@ -140,7 +140,7 @@ public final class BundleCommandBuilder
     throws IOException
   {
     checkNotNull(sink, "byte sink is required");
-    logger.info("bundle {} to byte sink");
+    logger.info("bundle {} to byte sink", sink);
 
     return bundleCommand.bundle(new BundleCommandRequest(sink));
   }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitSubModuleParser.java

@@ -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();
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java

@@ -47,10 +47,9 @@ public class BranchRootResource {
    *
    * <strong>Note:</strong> This method requires "repository" privilege.
    *
-   * @param namespace the namespace of the repository
-   * @param name the name of the repository
+   * @param namespace  the namespace of the repository
+   * @param name       the name of the repository
    * @param branchName the name of the branch
-   *
    */
   @GET
   @Path("{branch}")
@@ -98,19 +97,20 @@ public class BranchRootResource {
                           @PathParam("branch") String branchName,
                           @DefaultValue("0") @QueryParam("page") int page,
                           @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws Exception {
-    RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name));
-    Repository repository = repositoryService.getRepository();
-    RepositoryPermissions.read(repository).check();
-    ChangesetPagingResult changesets = repositoryService.getLogCommand()
-      .setPagingStart(page)
-      .setPagingLimit(pageSize)
-      .setBranch(branchName)
-      .getChangesets();
-    if (changesets != null && changesets.getChangesets() != null) {
-      PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
-      return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository)).build();
-    } else {
-      return Response.ok().build();
+    try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
+      Repository repository = repositoryService.getRepository();
+      RepositoryPermissions.read(repository).check();
+      ChangesetPagingResult changesets = repositoryService.getLogCommand()
+        .setPagingStart(page)
+        .setPagingLimit(pageSize)
+        .setBranch(branchName)
+        .getChangesets();
+      if (changesets != null && changesets.getChangesets() != null) {
+        PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
+        return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository)).build();
+      } else {
+        return Response.ok().build();
+      }
     }
   }
 
@@ -120,8 +120,7 @@ public class BranchRootResource {
    * <strong>Note:</strong> This method requires "repository" privilege.
    *
    * @param namespace the namespace of the repository
-   * @param name the name of the repository
-   *
+   * @param name      the name of the repository
    */
   @GET
   @Path("")

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ChangesetRootResource.java

@@ -56,18 +56,19 @@ public class ChangesetRootResource {
   @TypeHint(CollectionDto.class)
   public Response getAll(@PathParam("namespace") String namespace, @PathParam("name") String name, @DefaultValue("0") @QueryParam("page") int page,
                          @DefaultValue("10") @QueryParam("pageSize") int pageSize) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
-    RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name));
-    Repository repository = repositoryService.getRepository();
-    RepositoryPermissions.read(repository).check();
-    ChangesetPagingResult changesets = repositoryService.getLogCommand()
-      .setPagingStart(page)
-      .setPagingLimit(pageSize)
-      .getChangesets();
-    if (changesets != null && changesets.getChangesets() != null) {
-      PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
-      return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository)).build();
-    } else {
-      return Response.ok().build();
+    try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
+      Repository repository = repositoryService.getRepository();
+      RepositoryPermissions.read(repository).check();
+      ChangesetPagingResult changesets = repositoryService.getLogCommand()
+        .setPagingStart(page)
+        .setPagingLimit(pageSize)
+        .getChangesets();
+      if (changesets != null && changesets.getChangesets() != null) {
+        PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
+        return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository)).build();
+      } else {
+        return Response.ok().build();
+      }
     }
   }
 
@@ -83,18 +84,19 @@ public class ChangesetRootResource {
   @TypeHint(ChangesetDto.class)
   @Path("{id}")
   public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("id") String id) throws IOException, RevisionNotFoundException, RepositoryNotFoundException {
-    RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name));
-    Repository repository = repositoryService.getRepository();
-    RepositoryPermissions.read(repository).check();
-    ChangesetPagingResult changesets = repositoryService.getLogCommand()
-      .setStartChangeset(id)
-      .setEndChangeset(id)
-      .getChangesets();
-    if (changesets != null && changesets.getChangesets() != null && changesets.getChangesets().size() == 1) {
-      PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
-      return Response.ok(changesetToChangesetDtoMapper.map(changesets.getChangesets().get(0), repository)).build();
-    } else {
-      return Response.status(Response.Status.NOT_FOUND).build();
+    try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) {
+      Repository repository = repositoryService.getRepository();
+      RepositoryPermissions.read(repository).check();
+      ChangesetPagingResult changesets = repositoryService.getLogCommand()
+        .setStartChangeset(id)
+        .setEndChangeset(id)
+        .getChangesets();
+      if (changesets != null && changesets.getChangesets() != null && changesets.getChangesets().size() == 1) {
+        PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
+        return Response.ok(changesetToChangesetDtoMapper.map(changesets.getChangesets().get(0), repository)).build();
+      } else {
+        return Response.status(Response.Status.NOT_FOUND).build();
+      }
     }
   }
 }

scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java

@@ -39,34 +39,27 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.hash.Hashing;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import sonia.scm.plugin.ExplodedSmp.PathTransformer;
 
-//~--- JDK imports ------------------------------------------------------------
-
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
 import java.net.URL;
-
 import java.nio.file.DirectoryStream;
 import java.nio.file.DirectoryStream.Filter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import java.text.SimpleDateFormat;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *
@@ -370,9 +363,10 @@ public final class PluginProcessor
 
     if (Files.exists(libDir))
     {
-      for (Path f : Files.newDirectoryStream(libDir, GLOB_JAR))
-      {
-        urls.add(f.toUri().toURL());
+      try (DirectoryStream<Path> pathDirectoryStream = Files.newDirectoryStream(libDir, GLOB_JAR)) {
+        for (Path f : pathDirectoryStream) {
+          urls.add(f.toUri().toURL());
+        }
       }
     }
 
@@ -656,7 +650,7 @@ public final class PluginProcessor
         break;
       }
     }
-    
+
     logger.debug("move installed archive to {}", installed);
 
     Files.move(archive, installed);