review fix

Author: Hidanio

src/main/kotlin/com/vk/admstorm/actions/CreateHasteAction.kt

@@ -20,16 +20,16 @@ class CreateHasteAction : AdmActionBase() {
 
         executeOnPooledThread {
             val link = HastebinService.getInstance(e.project!!).createHaste(copyText)
-            var isUnavailable = false
 
-            if (link != null) {
+            val text = if (link != null) {
                 MyUtils.copyToClipboard(link)
+                "Link to hastebin copied to clipboard"
             } else {
-                isUnavailable = true
+                "Hastebin service unavailable. Try again later"
             }
 
             AdmNotification()
-                .withTitle(if (isUnavailable) "Hastebin service unavailable. Try again later" else "Link to hastebin copied to clipboard")
+                .withTitle(text)
                 .show()
         }
     }

src/main/kotlin/com/vk/admstorm/actions/SendLogsToHastebinAction.kt

@@ -12,19 +12,20 @@ class SendLogsToHastebinAction : AdmActionBase() {
         val project = e.project ?: return
         val hasteLink = HastebinService.getInstance(project).createHaste(readIdeaLogFile())
 
-        val notification = if (hasteLink != null) {
-            AdmNotification("Thanks for logs!")
-                .withTitle("Logs successfully sent to Hastebin")
-                .withActions(AdmNotification.Action("Copy hastebin link") { _, notification ->
-                    MyUtils.copyToClipboard(hasteLink)
-                    notification.expire()
-                })
-        } else {
+        if (hasteLink == null) {
             AdmNotification()
                 .withTitle("Hastebin service unavailable. Try again later")
+                .show(project)
+            return
         }
 
-        notification.show(project)
+        AdmNotification("Thanks for logs!")
+            .withTitle("Logs successfully sent to Hastebin")
+            .withActions(AdmNotification.Action("Copy hastebin link") { _, notification ->
+                MyUtils.copyToClipboard(hasteLink)
+                notification.expire()
+            })
+            .show(project)
     }
 
     override fun beforeUpdate(e: AnActionEvent) {

src/main/kotlin/com/vk/admstorm/executors/BaseRemoteExecutor.kt

@@ -91,16 +91,16 @@ abstract class BaseRemoteExecutor(protected val project: Project, toolName: Stri
         executeOnPooledThread {
             val output = outputListener.output.stdout + outputListener.output.stderr
             val link = HastebinService.getInstance(e.project!!).createHaste(output)
-            var isUnavailable = false
 
-            if (link != null) {
+            val text = if (link != null) {
                 copyToClipboard(link)
+                "Link to hastebin copied to clipboard"
             } else {
-                isUnavailable = true
+                "Hastebin service unavailable. Try again later"
             }
 
             AdmNotification()
-                .withTitle(if (isUnavailable) "Hastebin service unavailable. Try again later" else "Link to hastebin copied to clipboard")
+                .withTitle(text)
                 .show()
         }
     }

src/main/kotlin/com/vk/admstorm/playground/KphpPlaygroundWindow.kt

@@ -129,20 +129,20 @@ require_once 'vendor/autoload.php';
 
             executeOnPooledThread {
                 val link = HastebinService.getInstance(myProject).createHaste(content)
-                if (link != null) {
-                    MyUtils.copyToClipboard(link)
-
-                    invokeLater {
-                        myShareLabel.text = "Link copied"
-                        myShareLabel.isVisible = true
-                        invokeAfter(2000) {
-                            myShareLabel.isVisible = false
-                        }
-                    }
-                } else {
+                if (link == null) {
                     AdmNotification()
                         .withTitle("Hastebin service unavailable. Try again later")
                         .show()
+                    return@executeOnPooledThread
+                }
+
+                MyUtils.copyToClipboard(link)
+                invokeLater {
+                    myShareLabel.text = "Link copied"
+                    myShareLabel.isVisible = true
+                    invokeAfter(2000) {
+                        myShareLabel.isVisible = false
+                    }
                 }
             }
         }

src/main/kotlin/com/vk/admstorm/services/HastebinService.kt

@@ -10,6 +10,7 @@ import com.vk.admstorm.env.getByKey
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import java.net.HttpURLConnection
 import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
@@ -39,27 +40,27 @@ class HastebinService {
         val request = HttpRequest.newBuilder()
             .uri(URI.create("$hastLink/documents"))
             .POST(HttpRequest.BodyPublishers.ofString(data))
-            .timeout(Duration.ofSeconds(10)).build()
+            .timeout(Duration.ofSeconds(10))
+            .build()
 
         val response = httpClient.send(request, HttpResponse.BodyHandlers.ofString())
-        if (response.statusCode() != 200) {
-            LOG.error(
-                "Something wrong with Hastebin service:" +
-                        " status code ${response.statusCode()}, error: ${response.body()}"
-            )
+        if (response.statusCode() != HttpURLConnection.HTTP_OK ) {
+            LOG.error("Error sending the request (status code: ${response.statusCode()}, body: ${response.body()})")
             return null
         }
 
         val jsonResponse = Json.parseToJsonElement(response.body())
         if(jsonResponse !is JsonObject){
-            LOG.error(
-                "Something wrong with Hastebin service:" +
-                        " status code ${response.statusCode()}, error: ${response.body()}"
-            )
+            LOG.error("Error parsing the request (body: ${response.body()})")
             return null
         }
 
         val value = jsonResponse["key"]?.jsonPrimitive?.content
+        if (value == null) {
+            LOG.error("JsonResponse returned null value")
+            return null
+        }
+
         return "$hastLink/${value}"
     }
 }