Lift return out of try

code-asher · code-asher · commit 4fd748210447 · 2023-04-06T10:14:15.000-08:00
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderCLIManager.kt
@@ -124,20 +124,20 @@ class CoderCLIManager @JvmOverloads constructor(deployment: URL, destinationDir:
      * Return the entity tag for the binary on disk, if any.
      */
     private fun getBinaryETag(): String? {
-        try {
+        return try {
             val md = MessageDigest.getInstance("SHA-1")
             val fis = FileInputStream(localBinaryPath.toFile())
             val dis = DigestInputStream(BufferedInputStream(fis), md)
             fis.use {
                 while (dis.read() != -1) {
                 }
             }
-            return HexBinaryAdapter().marshal(md.digest()).lowercase()
+            HexBinaryAdapter().marshal(md.digest()).lowercase()
         } catch (e: FileNotFoundException) {
-            return null
+            null
         } catch (e: Exception) {
             logger.warn("Unable to calculate hash for ${localBinaryPath.toAbsolutePath()}", e)
-            return null
+            null
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -124,20 +124,20 @@ class CoderCLIManager @JvmOverloads constructor(deployment: URL, destinationDir:`
`124`	`124`	`* Return the entity tag for the binary on disk, if any.`
`125`	`125`	`*/`
`126`	`126`	`private fun getBinaryETag(): String? {`
`127`		`- try {`
	`127`	`+ return try {`
`128`	`128`	`val md = MessageDigest.getInstance("SHA-1")`
`129`	`129`	`val fis = FileInputStream(localBinaryPath.toFile())`
`130`	`130`	`val dis = DigestInputStream(BufferedInputStream(fis), md)`
`131`	`131`	`fis.use {`
`132`	`132`	`while (dis.read() != -1) {`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`- return HexBinaryAdapter().marshal(md.digest()).lowercase()`
	`135`	`+ HexBinaryAdapter().marshal(md.digest()).lowercase()`
`136`	`136`	`} catch (e: FileNotFoundException) {`
`137`		`- return null`
	`137`	`+ null`
`138`	`138`	`} catch (e: Exception) {`
`139`	`139`	`logger.warn("Unable to calculate hash for ${localBinaryPath.toAbsolutePath()}", e)`
`140`		`- return null`
	`140`	`+ null`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`