feat: Replace gson and jsoup with IntelliJ code style for JSON/XML/HT…

…ML formatting (#1119)

common-api/src/main/kotlin/com/itangcent/http/ApacheHttpClient.kt

@@ -3,8 +3,7 @@ package com.itangcent.http
 import com.itangcent.annotation.script.ScriptIgnore
 import com.itangcent.annotation.script.ScriptTypeName
 import com.itangcent.common.kit.toJson
-import com.itangcent.common.logger.ILogger
-import com.itangcent.common.spi.SpiUtils
+import com.itangcent.common.logger.Log
 import com.itangcent.common.utils.notNullOrEmpty
 import org.apache.http.HttpEntity
 import org.apache.http.NameValuePair
@@ -36,7 +35,7 @@ import javax.net.ssl.SSLContext
 
 @ScriptTypeName("httpClient")
 open class ApacheHttpClient : HttpClient {
-    companion object {
+    companion object : Log() {
         private fun String.createContentType(charset: String = "UTF-8"): ContentType {
             val contentType = ContentType.parse(this)
             return if (contentType.charset == null) {
@@ -155,8 +154,7 @@ open class ApacheHttpClient : HttpClient {
             val body = request.body()
             if (body != null) {
                 if (requestEntity != null) {
-                    SpiUtils.loadService(ILogger::class)
-                        ?.warn("The request with a body should not set content-type:${request.contentType()}")
+                    LOG.warn("The request with a body should not set content-type:${request.contentType()}")
                 }
                 requestEntity = when (body) {
                     is HttpEntity -> {

idea-plugin/build.gradle.kts

@@ -72,9 +72,6 @@ dependencies {
 
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0")
 
-    // https://mvnrepository.com/artifact/org.jsoup/jsoup
-    implementation("org.jsoup:jsoup:1.12.1")
-
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
     implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
 

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/postman/DefaultPostmanApiHelper.kt

@@ -11,7 +11,7 @@ import com.itangcent.http.HttpRequest
 import com.itangcent.http.HttpResponse
 import com.itangcent.http.contentType
 import com.itangcent.idea.plugin.settings.helper.PostmanSettingsHelper
-import com.itangcent.idea.utils.resolveGsonLazily
+import com.itangcent.idea.utils.GsonExUtils
 import com.itangcent.intellij.context.ActionContext
 import com.itangcent.intellij.extend.acquireGreedy
 import com.itangcent.intellij.extend.asJsonElement
@@ -208,7 +208,7 @@ open class DefaultPostmanApiHelper : PostmanApiHelper {
         val request = getHttpClient().put("$COLLECTION/$collectionId")
             .contentType(ContentType.APPLICATION_JSON)
             .header("x-api-key", postmanSettingsHelper.getPrivateToken())
-            .body(GsonUtils.toJson(linkedMapOf("collection" to apiInfo)).resolveGsonLazily())
+            .body(GsonUtils.toJson(linkedMapOf("collection" to apiInfo)).apply { GsonExUtils.resolveGsonLazily(this) })
 
         try {
             beforeRequest(request)

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/rule/RequestRuleWrap.kt

@@ -8,12 +8,12 @@ import com.itangcent.common.utils.*
 import com.itangcent.idea.plugin.api.export.*
 import com.itangcent.idea.plugin.api.export.core.*
 import com.itangcent.idea.psi.resource
-import com.itangcent.utils.setExts
 import com.itangcent.intellij.context.ActionContext
+import com.itangcent.intellij.extend.logger
 import com.itangcent.intellij.jvm.DuckTypeHelper
 import com.itangcent.intellij.jvm.JsonOption
 import com.itangcent.intellij.jvm.PsiClassHelper
-import com.itangcent.intellij.logger.Logger
+import com.itangcent.utils.setExts
 import java.util.*
 
 class RequestRuleWrap(private val methodExportContext: MethodExportContext?, private val request: Request) {
@@ -102,7 +102,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri
         val context = ActionContext.getContext()!!
         val resource = request.resource()
         if (resource == null) {
-            context.instance(Logger::class).warn("no resource be related with:${request}")
+            context.logger().warn("no resource be related with:${request}")
             return
         }
         val responseType = context.instance(DuckTypeHelper::class).findType(bodyClass, resource) ?: return
@@ -126,7 +126,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri
         val context = ActionContext.getContext()!!
         val resource = request.resource()
         if (resource == null) {
-            context.instance(Logger::class).warn("no resource be related with:${request}")
+            context.logger().warn("no resource be related with:${request}")
             return
         }
         val responseType = context.instance(DuckTypeHelper::class).findType(modelClass, resource)
@@ -141,7 +141,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri
         val context = ActionContext.getContext()!!
         val resource = request.resource()
         if (resource == null) {
-            context.instance(Logger::class).warn("no resource be related with:${request}")
+            context.logger().warn("no resource be related with:${request}")
             return
         }
         val responseType = context.instance(DuckTypeHelper::class).findType(modelClass, resource)
@@ -155,7 +155,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri
     )
     fun addModelClass(modelClass: String?) {
         ActionContext.getContext()
-            ?.instance(Logger::class)
+            ?.logger()
             ?.warn("addModelClass is deprecated, please use addModelClassAsFormParam instead of addModelClass")
         addModelClassAsFormParam(modelClass)
     }
@@ -348,7 +348,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri
         val context = ActionContext.getContext()!!
         val resource = request.resource()
         if (resource == null) {
-            context.instance(Logger::class).warn("no resource be related with:${request}")
+            context.logger().warn("no resource be related with:${request}")
             return
         }
         val responseType = context.instance(DuckTypeHelper::class).findType(bodyClass, resource)
@@ -363,7 +363,7 @@ class RequestRuleWrap(private val methodExportContext: MethodExportContext?, pri
         val context = ActionContext.getContext()!!
         val resource = request.resource()
         if (resource == null) {
-            context.instance(Logger::class).warn("no resource be related with:${request}")
+            context.logger().warn("no resource be related with:${request}")
             return
         }
         val responseType = context.instance(DuckTypeHelper::class).findType(bodyClass, resource)

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/suv/SuvApiExporter.kt

@@ -43,6 +43,7 @@ import com.itangcent.intellij.context.ActionContext
 import com.itangcent.intellij.extend.findCurrentMethod
 import com.itangcent.intellij.extend.guice.singleton
 import com.itangcent.intellij.extend.guice.with
+import com.itangcent.intellij.extend.logger
 import com.itangcent.intellij.extend.withBoundary
 import com.itangcent.intellij.file.DefaultLocalFileRepository
 import com.itangcent.intellij.file.LocalFileRepository
@@ -171,7 +172,7 @@ open class SuvApiExporter {
 
         fun exportApisFromMethod(actionContext: ActionContext, requests: List<DocWrapper>) {
 
-            this.logger = actionContext.instance(Logger::class)
+            this.logger = actionContext.logger()
 
             val actionContextBuilder = ActionContext.builder()
             actionContextBuilder.setParentContext(actionContext)
@@ -240,7 +241,7 @@ open class SuvApiExporter {
 
             builder.inheritFrom(actionContext, TipsHelper::class)
 
-//            builder.bindInstance(Logger::class, BeanWrapperProxies.wrap(Logger::class, actionContext.instance(Logger::class)))
+//            builder.bindInstance(Logger::class, BeanWrapperProxies.wrap(Logger::class, actionContext.logger()))
 
 //            builder.bind(Logger::class) { it.with(ConfigurableLogger::class).singleton() }
 //            builder.bind(Logger::class, "delegate.logger") { it.with(ConsoleRunnerLogger::class).singleton() }

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/api/export/yapi/YapiApiHelper.kt

@@ -6,8 +6,8 @@ import com.google.inject.ImplementedBy
 import com.itangcent.common.logger.traceError
 import com.itangcent.idea.plugin.api.export.core.Folder
 import com.itangcent.intellij.context.ActionContext
+import com.itangcent.intellij.extend.logger
 import com.itangcent.intellij.extend.sub
-import com.itangcent.intellij.logger.Logger
 
 
 @ImplementedBy(DefaultYapiApiHelper::class)
@@ -84,7 +84,7 @@ fun YapiApiHelper.getCartForFolder(folder: Folder, privateToken: String): CartIn
     try {
         cartId = findCart(privateToken, name)
     } catch (e: Exception) {
-        ActionContext.getContext()?.instance(Logger::class)
+        ActionContext.getContext()?.logger()
             ?.traceError("error to find cart [$name]", e)
         return null
     }

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/dialog/ApiCallDialog.kt

@@ -21,7 +21,10 @@ import com.itangcent.common.logger.traceError
 import com.itangcent.common.model.FormParam
 import com.itangcent.common.model.Request
 import com.itangcent.common.model.hasBodyOrForm
-import com.itangcent.common.utils.*
+import com.itangcent.common.utils.appendlnIfNotEmpty
+import com.itangcent.common.utils.notNullOrBlank
+import com.itangcent.common.utils.notNullOrEmpty
+import com.itangcent.common.utils.safe
 import com.itangcent.http.*
 import com.itangcent.idea.binder.DbBeanBinderFactory
 import com.itangcent.idea.icons.EasyIcons
@@ -32,6 +35,7 @@ import com.itangcent.idea.psi.resourceMethod
 import com.itangcent.idea.swing.onSelect
 import com.itangcent.idea.swing.onTextChange
 import com.itangcent.idea.utils.*
+import com.itangcent.intellij.context.ActionContext
 import com.itangcent.intellij.extend.rx.ThrottleHelper
 import com.itangcent.intellij.extend.withBoundary
 import com.itangcent.intellij.file.LocalFileRepository
@@ -40,8 +44,6 @@ import com.itangcent.suv.http.HttpClientProvider
 import org.apache.commons.lang3.RandomUtils
 import org.apache.commons.lang3.exception.ExceptionUtils
 import org.apache.http.entity.ContentType
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Document
 import java.awt.BorderLayout
 import java.awt.Dimension
 import java.awt.GridBagConstraints
@@ -1320,7 +1322,10 @@ class ApiCallDialog : ContextDialog(), ApiCallUI {
         super.onDispose()
     }
 
-    class ResponseStatus(var response: HttpResponse) {
+    class ResponseStatus(
+        var response: HttpResponse,
+        val actionContext: ActionContext = ActionContext.getContext()!!
+    ) {
 
         //auto format
         var isFormat: Boolean = true
@@ -1344,14 +1349,17 @@ class ApiCallDialog : ContextDialog(), ApiCallUI {
             return try {
                 val contentType = safe { response.contentType()?.let { ContentType.parse(it) } }
                 if (contentType != null) {
-                    if (contentType.mimeType.startsWith("text/html") || contentType.mimeType.startsWith("text/xml")) {
-                        val doc: Document = Jsoup.parse(getRawResult())
-                        doc.outputSettings().prettyPrint(true)
-                        return doc.outerHtml()
+                    if (contentType.mimeType.startsWith("text/html")) {
+                        return getRawResult()?.let { actionContext.instance(FormatterHelper::class).formatHtml(it) }
+                    }
+                    if (contentType.mimeType.startsWith("text/xml")) {
+                        return getRawResult()?.let { actionContext.instance(FormatterHelper::class).formatXml(it) }
+                    }
+                    if (contentType.mimeType.startsWith("application/json")) {
+                        return getRawResult()?.let { actionContext.instance(FormatterHelper::class).formatJson(it) }
                     }
                 }
-
-                getRawResult()?.let { GsonUtils.prettyJsonStr(it) }
+                getRawResult()
             } catch (e: Exception) {
                 getRawResult()
             }

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/dialog/ScriptExecutorDialog.kt

@@ -25,6 +25,7 @@ import com.itangcent.intellij.config.rule.RuleParser
 import com.itangcent.intellij.config.rule.StringRule
 import com.itangcent.intellij.config.rule.parseStringRule
 import com.itangcent.intellij.context.ActionContext
+import com.itangcent.intellij.extend.logger
 import com.itangcent.intellij.extend.rx.AutoComputer
 import com.itangcent.intellij.extend.rx.mutual
 import com.itangcent.intellij.jvm.DuckTypeHelper
@@ -618,7 +619,7 @@ class ScriptExecutorDialog : ContextDialog() {
             try {
                 delay = task()
             } catch (e: Throwable) {
-                actionContext.instance(Logger::class)
+                actionContext.logger()
                     .traceError("error to eval script", e)
             } finally {
                 schedule(delay ?: 3000)

idea-plugin/src/main/kotlin/com/itangcent/idea/plugin/settings/EnumProcessInitializer.kt

@@ -8,6 +8,7 @@ import com.itangcent.idea.plugin.settings.helper.RecommendConfigSettingsHelper
 import com.itangcent.idea.swing.MessagesHelper
 import com.itangcent.idea.swing.showChooseWithTipDialog
 import com.itangcent.intellij.context.ActionContext
+import com.itangcent.intellij.extend.logger
 import com.itangcent.intellij.logger.Logger
 
 class EnumProcessInitializer : Initializer {
@@ -34,7 +35,7 @@ class EnumProcessInitializer : Initializer {
                     propertiesComponent.setValue(ENUM_RECOMMEND_ITEMS_CONFIRMED_KEY, true)
                 }
             } catch (e: Exception) {
-                actionContext.instance(Logger::class).traceError("error in enumRecommendItemsConfirmed.", e)
+                actionContext.logger().traceError("error in enumRecommendItemsConfirmed.", e)
             }
         }
     }

idea-plugin/src/main/kotlin/com/itangcent/idea/utils/DefaultFileSaveHelper.kt

@@ -6,7 +6,7 @@ import com.google.inject.name.Named
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
 import com.intellij.openapi.util.io.FileUtil
 import com.itangcent.intellij.context.ActionContext
-import com.itangcent.intellij.logger.Logger
+import com.itangcent.intellij.extend.logger
 import com.itangcent.intellij.util.FileUtils
 import com.itangcent.intellij.util.ToolUtils
 import com.itangcent.utils.localPath
@@ -27,7 +27,7 @@ class DefaultFileSaveHelper : FileSaveHelper {
     private val lastImportedLocation: String? = null
 
     @Inject
-    private val actionContext: ActionContext? = null
+    private lateinit var actionContext: ActionContext
 
     override fun saveOrCopy(
         content: String?,
@@ -62,11 +62,13 @@ class DefaultFileSaveHelper : FileSaveHelper {
     ) {
         if (content == null) return
 
-        IdeaFileChooserHelper.create(actionContext!!, FileChooserDescriptorFactory
-            .createSingleFileOrFolderDescriptor()
-            .withTitle("Export Location")
-            .withDescription("Choose directory to export api to")
-            .withHideIgnored(false))
+        IdeaFileChooserHelper.create(
+            actionContext, FileChooserDescriptorFactory
+                .createSingleFileOrFolderDescriptor()
+                .withTitle("Export Location")
+                .withDescription("Choose directory to export api to")
+                .withHideIgnored(false)
+        )
             .lastSelectedLocation(getLastImportedLocation())
             .selectFile({ file ->
                 if (file.isDirectory) {
@@ -107,11 +109,13 @@ class DefaultFileSaveHelper : FileSaveHelper {
         onSaveFailed: (String?) -> Unit,
         onSaveCancel: () -> Unit,
     ) {
-        IdeaFileChooserHelper.create(actionContext!!, FileChooserDescriptorFactory
-            .createSingleFileOrFolderDescriptor()
-            .withTitle("Select Location")
-            .withDescription("Choose folder/file to save")
-            .withHideIgnored(false))
+        IdeaFileChooserHelper.create(
+            actionContext, FileChooserDescriptorFactory
+                .createSingleFileOrFolderDescriptor()
+                .withTitle("Select Location")
+                .withDescription("Choose folder/file to save")
+                .withHideIgnored(false)
+        )
             .lastSelectedLocation(getLastImportedLocation())
             .selectFile({ file ->
                 if (file.isDirectory) {
@@ -171,16 +175,15 @@ class DefaultFileSaveHelper : FileSaveHelper {
     }
 
     private fun copyAndLog(info: String, onCopy: () -> Unit) {
-        val logger: Logger = ActionContext.getContext()!!.instance(Logger::class)
         try {
             ToolUtils.copy2Clipboard(info)
-        } catch (e: HeadlessException) {
+        } catch (_: HeadlessException) {
         }
         onCopy()
         if (info.length > 10000) {
-            logger.info("Api data is too lager to show in console!")
+            actionContext.logger().info("Api data is too lager to show in console!")
         } else {
-            logger.log(info)
+            actionContext.logger().log(info)
         }
     }