fix: implement error handling in remoteConfigContent function (#1115)

tangcent · Mar 30, 2024 · 6b8b0ae · 6b8b0ae
1 parent f3f8aa8
commit 6b8b0ae
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/...n/src/main/kotlin/com/itangcent/idea/plugin/settings/helper/RemoteConfigSettingsHelper.kt b/...n/src/main/kotlin/com/itangcent/idea/plugin/settings/helper/RemoteConfigSettingsHelper.kt
@@ -41,7 +41,14 @@ class RemoteConfigSettingsHelper {
         return settingBinder.read().remoteConfig
             .parse()
             .filter { it.first }
-            .map { loadConfig(it.second) }
+            .mapNotNull {
+                try {
+                    loadConfig(it.second)
+                } catch (e: Exception) {
+                    logger.error("failed to load config: ${it.second}")
+                    null
+                }
+            }
     }
 
     fun loadConfig(url: String): ConfigContent {

diff --git a/idea-plugin/src/main/resources/.recommend.easy.api.config b/idea-plugin/src/main/resources/.recommend.easy.api.config
@@ -228,7 +228,7 @@ check_annotated_Validated=```
         return
     }
 ```
-check_groups=```
+check_groups_jakarta=```
     for(annMap in annMaps){
         def fieldGroups = annMap["groups"] ?: [helper.findClass("jakarta.validation.groups.Default")]
         def paramGroups = session.get("json-group") ?: [helper.findClass("jakarta.validation.groups.Default")]
@@ -245,17 +245,17 @@ check_groups=```
 field.required[@jakarta.validation.constraints.NotBlank]=groovy:```
     ${check_annotated_Validated}
     def annMaps = it.annMaps("jakarta.validation.constraints.NotBlank")
-    ${check_groups}
+    ${check_groups_jakarta}
 ```
 field.required[@jakarta.validation.constraints.NotNull]=groovy:```
     ${check_annotated_Validated}
     def annMaps = it.annMaps("jakarta.validation.constraints.NotNull")
-    ${check_groups}
+    ${check_groups_jakarta}
 ```
 field.required[@jakarta.validation.constraints.NotEmpty]=groovy:```
     ${check_annotated_Validated}
     def annMaps = it.annMaps("jakarta.validation.constraints.NotEmpty")
-    ${check_groups}
+    ${check_groups_jakarta}
 ```
 
 
@@ -291,7 +291,7 @@ check_annotated_Validated=```
         return
     }
 ```
-check_groups=```
+check_groups_javax=```
     for(annMap in annMaps){
         def fieldGroups = annMap["groups"] ?: [helper.findClass("javax.validation.groups.Default")]
         def paramGroups = session.get("json-group") ?: [helper.findClass("javax.validation.groups.Default")]
@@ -308,17 +308,17 @@ check_groups=```
 field.required[@javax.validation.constraints.NotBlank]=groovy:```
     ${check_annotated_Validated}
     def annMaps = it.annMaps("javax.validation.constraints.NotBlank")
-    ${check_groups}
+    ${check_groups_javax}
 ```
 field.required[@javax.validation.constraints.NotNull]=groovy:```
     ${check_annotated_Validated}
     def annMaps = it.annMaps("javax.validation.constraints.NotNull")
-    ${check_groups}
+    ${check_groups_javax}
 ```
 field.required[@javax.validation.constraints.NotEmpty]=groovy:```
     ${check_annotated_Validated}
     def annMaps = it.annMaps("javax.validation.constraints.NotEmpty")
-    ${check_groups}
+    ${check_groups_javax}
 ```
 
 #[is_file]*

diff --git a/...gin/src/test/kotlin/com/itangcent/idea/plugin/api/cache/CachedRequestClassExporterTest.kt b/...gin/src/test/kotlin/com/itangcent/idea/plugin/api/cache/CachedRequestClassExporterTest.kt
@@ -126,8 +126,7 @@ internal class CachedRequestClassExporterTest : PluginContextLightCodeInsightFix
         Mockito.verify(delegateClassExporter, times(1))
             .export(any(), any())
 
-        TimeUnit.SECONDS.sleep(10)//wait 10s to save cache
-
+        boundary.waitComplete(TimeUnit.SECONDS.toMillis(10),false)//wait 10s to save cache
         //export again
         val requestsAgain = ArrayList<Request>()
         classExporter.export(userCtrlPsiClass, requestOnly {