closed leaked streams

Author: alexander-shustanov

src/main/kotlin/com/haulmont/cuba/cli/generation/Snippets.kt

@@ -26,7 +26,7 @@ class Snippets(private val snippetsPath: Path) {
 
     operator fun get(name: String): String {
         if (name !in snippets) {
-            snippets[name] = Files.newInputStream(snippetsPath.resolve(name)).reader().readText()
+            snippets[name] = Files.newInputStream(snippetsPath.resolve(name)).use { stream -> stream.reader().readText() }
         }
         return snippets[name]!!
     }

src/main/kotlin/com/haulmont/cuba/cli/generation/TemplateProcessor.kt

@@ -152,19 +152,19 @@ class TemplateProcessor(templateBasePath: Path, private val bindings: Map<String
         return kClass.memberProperties.first { it.name == name }.getter.call(obj)!!
     }
 
-    fun copy(subPath: Path, to: Path = projectRoot, filter: PathFilter = {true}) {
+    fun copy(subPath: Path, to: Path = projectRoot, filter: PathFilter = { true }) {
         process(templatePath.resolve(subPath), to, false, filter)
     }
 
-    fun copy(subPath: String, to: Path = projectRoot, filter: PathFilter = {true}) {
+    fun copy(subPath: String, to: Path = projectRoot, filter: PathFilter = { true }) {
         process(templatePath.resolve(subPath), to, false, filter)
     }
 
-    fun transform(subPath: Path, to: Path = projectRoot, filter: PathFilter = {true}) {
+    fun transform(subPath: Path, to: Path = projectRoot, filter: PathFilter = { true }) {
         process(templatePath.resolve(subPath), to, true, filter)
     }
 
-    fun transform(subPath: String, to: Path = projectRoot, filter: PathFilter = {true}) {
+    fun transform(subPath: String, to: Path = projectRoot, filter: PathFilter = { true }) {
         process(templatePath.resolve(subPath), to, true, filter)
     }
 
@@ -188,7 +188,9 @@ class TemplateProcessor(templateBasePath: Path, private val bindings: Map<String
 
         check(Files.isRegularFile(filePath)) { "Only file may be saved to output stream" }
 
-        Files.newInputStream(filePath).copyTo(to)
+        Files.newInputStream(filePath).use {
+            it.copyTo(to)
+        }
     }
 
     fun transformWhole(to: Path = projectRoot) {
@@ -225,8 +227,9 @@ class TemplateProcessor(templateBasePath: Path, private val bindings: Map<String
                         .takeIf { Files.exists(it) }
                         ?.let {
                             Files.newInputStream(it)
-                                    .bufferedReader()
-                                    .readText()
+                                    .use { stream ->
+                                        stream.bufferedReader().readText()
+                                    }
                         }
     }
 }

src/main/kotlin/com/haulmont/cuba/cli/generation/VelocityHelper.kt

@@ -38,8 +38,9 @@ class VelocityHelper {
     }
 
     fun generate(inputPath: Path, vc: VelocityContext): String {
-        val templateText = Files.newInputStream(inputPath)
-                .bufferedReader().readText()
+        val templateText = Files.newInputStream(inputPath).use {
+            it.bufferedReader().readText()
+        }
         val templateName = generate(templateText, inputPath.fileName.toString(), vc)
 
         return generate(templateText, templateName, vc)

src/main/kotlin/com/haulmont/cuba/cli/generation/XmlUtils.kt

@@ -37,8 +37,10 @@ import javax.xml.parsers.ParserConfigurationException
 private val writer: PrintWriter by kodein.instance()
 private val printHelper: PrintHelper by kodein.instance()
 
-fun parse(path: Path): Document = Files.newInputStream(path).let(::InputSource).let {
-    createDocumentBuilder().parse(it)
+fun parse(path: Path): Document = Files.newInputStream(path).use { stream ->
+    InputSource(stream).let {
+        createDocumentBuilder().parse(it)
+    }
 }
 
 fun parse(xml: String): Document = xml.let(::StringReader).let(::InputSource).let {