revert: remove @feature

Earth-1610 · Nov 3, 2024 · 5a63f21 · 5a63f21
1 parent a6ebeab
commit 5a63f21
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 831 deletions.
diff --git a/commons/src/main/kotlin/com/itangcent/common/logger/ILogger.kt b/commons/src/main/kotlin/com/itangcent/common/logger/ILogger.kt
@@ -18,28 +18,16 @@ interface ILogger {
     fun error(msg: String)
 }
 
-@Deprecated("use traceWarn(e: Throwable, msg: String) instead")
 fun ILogger.traceWarn(msg: String, e: Throwable) {
     this.warn(msg)
     this.traceError(e)
 }
 
-fun ILogger.traceWarn(e: Throwable, msg: String) {
-    this.warn(msg)
-    this.traceError(e)
-}
-
-@Deprecated("use traceError(e: Throwable, msg: String) instead")
 fun ILogger.traceError(msg: String, e: Throwable) {
     this.error(msg)
     this.traceError(e)
 }
 
-fun ILogger.traceError(e: Throwable, msg: String) {
-    this.error(msg)
-    this.traceError(e)
-}
-
 fun ILogger.traceError(e: Throwable) {
     if (e !is ProcessCanceledException) {
         this.trace(ExceptionUtils.getStackTrace(e))

diff --git a/commons/src/main/kotlin/com/itangcent/common/spi/Setup.kt b/commons/src/main/kotlin/com/itangcent/common/spi/Setup.kt
@@ -1,5 +1,7 @@
 package com.itangcent.common.spi
 
+import com.itangcent.common.logger.ILogger
+import com.itangcent.common.logger.ILoggerProvider
 import com.itangcent.common.logger.Log
 import com.itangcent.common.logger.traceError
 import java.util.*

diff --git a/commons/src/main/kotlin/com/itangcent/common/spi/SpiUtils.kt b/commons/src/main/kotlin/com/itangcent/common/spi/SpiUtils.kt
@@ -109,11 +109,6 @@ object SpiUtils {
             loadStack.get().pop()
         }
     }
-
-    fun clearCache() {
-        serviceCache.clear()
-        serviceUltimateBeanCache.clear()
-    }
 }
 
 //background idea log

diff --git a/commons/src/main/kotlin/com/itangcent/common/utils/ConversionService.kt b/commons/src/main/kotlin/com/itangcent/common/utils/ConversionService.kt
diff --git a/commons/src/main/kotlin/com/itangcent/common/utils/GsonUtils.kt b/commons/src/main/kotlin/com/itangcent/common/utils/GsonUtils.kt
@@ -11,7 +11,6 @@ import com.itangcent.common.logger.Log
 import com.itangcent.common.logger.traceError
 import java.io.IOException
 import java.io.StringReader
-import java.lang.reflect.Type
 import kotlin.reflect.KClass
 
 
@@ -30,7 +29,7 @@ object GsonUtils : Log() {
                 .setLenient()
                 .buildWithObjectToNumberStrategy()
         } catch (e: Exception) {
-            LOG.traceError(e, "failed init GSON module [gson].")
+            LOG.traceError("failed init GSON module [gson].", e)
             Gson()
         }
     }
@@ -45,7 +44,7 @@ object GsonUtils : Log() {
                 .serializeNulls()
                 .buildWithObjectToNumberStrategy()
         } catch (e: Exception) {
-            LOG.traceError(e, "failed init GSON module [gsonWithNulls].")
+            LOG.traceError("failed init GSON module [gsonWithNulls].", e)
             Gson()
         }
     }
@@ -108,10 +107,6 @@ object GsonUtils : Log() {
         return gson.fromJson(json, cls.java)
     }
 
-    fun <T> fromJson(json: String, type: Type): T {
-        return gson.fromJson(json, type)
-    }
-
     inline fun <reified T> fromJson(json: String): T? {
         return fromJson(json, T::class.java)
     }