add config info to exception log content

Author: sealkingking

src/main/kotlin/wu/seal/jsontokotlin/IConfigManager.kt

@@ -123,7 +123,7 @@ interface IConfigManager {
             PropertiesComponent.getInstance().setValue(USER_UUID_KEY, value)
         }
 
-    var customAnnotaionImportClassString: String
+    var customAnnotationImportClassString: String
         get() = if (isTestModel) TestConfig.customAnnotaionImportClassString else PropertiesComponent.getInstance().getValue(
             USER_CUSTOM_JSON_LIB_ANNOTATION_IMPORT_CLASS, "import kotlinx.serialization.SerialName\n" +
                     "import kotlinx.serialization.Serializable"+"\n"

src/main/kotlin/wu/seal/jsontokotlin/feedback/Datas.kt

@@ -9,16 +9,25 @@ import java.util.*
  * Created by Seal.Wu on 2017/9/27.
  */
 data class ConfigInfo(
-    val uuid: String = UUID,
-    val pluginVersion: String = PLUGIN_VERSION,
-    val isPropertiesVar: Boolean = ConfigManager.isPropertiesVar,
-    val isCommentOff: Boolean = ConfigManager.isCommentOff,
-    val isOrderByAlphabetical: Boolean = ConfigManager.isOrderByAlphabetical,
-    val propertyTypeStrategy: String = ConfigManager.propertyTypeStrategy.name,
-    val initWithDefaultValue: Boolean = ConfigManager.initWithDefaultValue,
-    val targetJsonConverterLib: String = ConfigManager.targetJsonConverterLib.name,
-    val isInnerClassMode: Boolean = ConfigManager.isInnerClassModel,
-    val timeStamp: String = Date().time.toString(),
-    val daytime: String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date())
+        val uuid: String = UUID,
+        val pluginVersion: String = PLUGIN_VERSION,
+        val isPropertiesVar: Boolean = ConfigManager.isPropertiesVar,
+        val isCommentOff: Boolean = ConfigManager.isCommentOff,
+        val isOrderByAlphabetical: Boolean = ConfigManager.isOrderByAlphabetical,
+        val propertyTypeStrategy: String = ConfigManager.propertyTypeStrategy.name,
+        val initWithDefaultValue: Boolean = ConfigManager.initWithDefaultValue,
+        val targetJsonConverterLib: String = ConfigManager.targetJsonConverterLib.name,
+        val isInnerClassMode: Boolean = ConfigManager.isInnerClassModel,
+        val customAnnotationImportClassString: String = ConfigManager.customAnnotationImportClassString,
+        val customClassAnnotationFormatString: String = ConfigManager.customClassAnnotationFormatString,
+        val customPropertyAnnotationFormatString: String = ConfigManager.customPropertyAnnotationFormatString,
+        val enableMapType: Boolean = ConfigManager.enableMapType,
+        val enableAutoReformat: Boolean = ConfigManager.enableAutoReformat,
+        val enableMinimalAnnotation: Boolean = ConfigManager.enableMinimalAnnotation,
+        val parenClassTemplate: String = ConfigManager.parenClassTemplate,
+        val keywordPropertyValid: Boolean = ConfigManager.keywordPropertyValid,
+        val extensionsConfig: String = ConfigManager.extensionsConfig,
+        val timeStamp: String = Date().time.toString(),
+        val daytime: String = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).format(Date())
 
 )

src/main/kotlin/wu/seal/jsontokotlin/feedback/ExceptionHandler.kt

@@ -1,5 +1,7 @@
 package wu.seal.jsontokotlin.feedback
 
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import com.intellij.openapi.ui.Messages
 import java.io.PrintWriter
 import java.io.StringWriter
@@ -15,13 +17,18 @@ import java.util.*
 /**
  * handler the exception
  */
+
+val prettyPrintGson = GsonBuilder().setPrettyPrinting().create()
+
 fun getUncaughtExceptionHandler(jsonString: String, callBack: () -> Unit): Thread.UncaughtExceptionHandler = Thread.UncaughtExceptionHandler { _, e ->
     val logBuilder = StringBuilder()
+    logBuilder.append("\n\n")
     logBuilder.append("PluginVersion:$PLUGIN_VERSION\n")
     logBuilder.append("user: $UUID").append("\n")
     val time = SimpleDateFormat("yyyy-MM-dd HH:mm:ss E", Locale.CHINA).format(Date())
     logBuilder.append("createTime: $time").append("\n")
 
+    logBuilder.appendln().append(getConfigInfo()).appendln()
     val stringWriter = StringWriter()
     val printWriter = PrintWriter(stringWriter, true)
     e.printStackTrace(printWriter)
@@ -42,6 +49,11 @@ fun getUncaughtExceptionHandler(jsonString: String, callBack: () -> Unit): Threa
     callBack.invoke()
 }
 
+
+fun getConfigInfo(): String {
+    return prettyPrintGson.toJson(ConfigInfo())
+}
+
 fun dealWithException(jsonString: String, e: Throwable) {
     var jsonString1 = jsonString
     val yes = Messages.showYesNoDialog("Some thing execute wrong.\nAgree with publishing your JSON text to help us to solve the problem?", "Excuse me", Messages.getQuestionIcon())

src/main/kotlin/wu/seal/jsontokotlin/feedback/NetWork.kt

@@ -85,7 +85,7 @@ fun sendConfigInfo() {
 
         val outputStream = connection.outputStream
         val writer = outputStream.writer()
-        writer.write(Gson().toJson(ConfigInfo()))
+        writer.write(getConfigInfo())
         writer.flush()
         if (connection.responseCode != 200) {
             println(connection.responseMessage + "\n" + connection.errorStream.reader().readText())

src/main/kotlin/wu/seal/jsontokotlin/supporter/CustomJsonLibSupporter.kt

@@ -23,7 +23,7 @@ object CustomJsonLibSupporter : IJsonLibSupporter {
         get() = ConfigManager.customClassAnnotationFormatString
 
     override val annotationImportClassString: String
-        get() = ConfigManager.customAnnotaionImportClassString
+        get() = ConfigManager.customAnnotationImportClassString
 
 
     override fun getClassAnnotationBlockString(rawClassName: String): String {

src/main/kotlin/wu/seal/jsontokotlin/ui/SettingsAnnotationTab.kt

@@ -89,11 +89,11 @@ class SettingsAnnotationTab(layout: LayoutManager?, isDoubleBuffered: Boolean) :
         annotationImportClass.layout = BoxLayout(annotationImportClass, BoxLayout.PAGE_AXIS)
         val importClassLable = JBLabel("Annotation Import Class : ")
         annotationImportClass.addComponentIntoVerticalBoxAlignmentLeft(importClassLable)
-        val annotationImportClassTextArea = JTextArea(ConfigManager.customAnnotaionImportClassString)
+        val annotationImportClassTextArea = JTextArea(ConfigManager.customAnnotationImportClassString)
         annotationImportClassTextArea.minimumSize = JBDimension(460, 40)
         annotationImportClassTextArea.addFocusListener(object : FocusListener {
             override fun focusLost(e: FocusEvent?) {
-                ConfigManager.customAnnotaionImportClassString = annotationImportClassTextArea.text
+                ConfigManager.customAnnotationImportClassString = annotationImportClassTextArea.text
 
             }
 

src/test/kotlin/wu/seal/jsontokotlin/feedback/ConfigInfoTest.kt

@@ -22,5 +22,11 @@ class ConfigInfoTest {
         val info = ConfigInfo()
         val infoJson = Gson().toJson(info)
         infoJson.should.not.be.empty
+        println(infoJson)
+    }
+
+    @Test
+    fun getConfigTest() {
+        println(getConfigInfo())
     }
 }

src/test/kotlin/wu/seal/jsontokotlin/supporter/CustomJsonLibSupporterTest.kt

@@ -20,7 +20,7 @@ class CustomJsonLibSupporterTest {
     @org.junit.Test
     fun testAnnotationImportClass() {
 
-        println(ConfigManager.customAnnotaionImportClassString)
+        println(ConfigManager.customAnnotationImportClassString)
     }
 
     @org.junit.Test