Remove cache process

kciter · Jul 6, 2023 · eb4d1bf · eb4d1bf
1 parent d8d6873
commit eb4d1bf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ subprojects {
   apply(plugin = "signing")
 
   group = "so.kciter"
-  version = "0.0.7"
+  version = "0.0.8"
 
   tasks {
     compileKotlin {
@@ -109,7 +109,7 @@ subprojects {
             email.set("[email protected]")
             url.set("https://github.com/sallyjellyy")
           }
-          
+
           contributor {
             name.set("roach")
             email.set("[email protected]")

diff --git a/thing/src/main/kotlin/so/kciter/thing/Rule.kt b/thing/src/main/kotlin/so/kciter/thing/Rule.kt
@@ -13,6 +13,17 @@ class Rule<T>(
 ) {
   companion object {
     operator fun <T> invoke(init: RuleBuilder<T>.() -> Unit): Rule<T> {
+//      return if (RuleCache.rules.containsKey(this::class)) {
+//        @Suppress("UNCHECKED_CAST")
+//        RuleCache.rules[this::class] as Rule<T>
+//      } else {
+//        val builder = RuleBuilder<T>()
+//        val rule = builder.apply(init).build()
+//        RuleCache.rules[this::class] = rule
+//
+//        rule
+//      }
+
       val builder = RuleBuilder<T>()
       return builder.apply(init).build()
     }

diff --git a/thing/src/main/kotlin/so/kciter/thing/RuleBuilder.kt b/thing/src/main/kotlin/so/kciter/thing/RuleBuilder.kt
@@ -37,19 +37,10 @@ open class RuleBuilder<T> {
     redactionRules.add(redaction)
   }
 
-  fun build(): Rule<T> {
-    return if (RuleCache.rules.containsKey(this::class)) {
-      @Suppress("UNCHECKED_CAST")
-      RuleCache.rules[this::class] as Rule<T>
-    } else {
-      val rule = Rule(
-        validationRules = validationRules,
-        normalizationRules = normalizationRules,
-        redactionRules = redactionRules
-      )
-      RuleCache.rules[this::class] = rule
-
-      rule
-    }
-  }
+  fun build(): Rule<T> =
+    Rule(
+      validationRules = validationRules,
+      normalizationRules = normalizationRules,
+      redactionRules = redactionRules
+    )
 }