diff --git a/build.gradle.kts b/build.gradle.kts index 142a284..eb3943d 100644 --- 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("min27604@gmail.com") url.set("https://github.com/sallyjellyy") } - + contributor { name.set("roach") email.set("dev0jsh@gmail.com") diff --git a/thing/src/main/kotlin/so/kciter/thing/Rule.kt b/thing/src/main/kotlin/so/kciter/thing/Rule.kt index a15823c..8f37bce 100644 --- 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( ) { companion object { operator fun invoke(init: RuleBuilder.() -> Unit): Rule { +// return if (RuleCache.rules.containsKey(this::class)) { +// @Suppress("UNCHECKED_CAST") +// RuleCache.rules[this::class] as Rule +// } else { +// val builder = RuleBuilder() +// val rule = builder.apply(init).build() +// RuleCache.rules[this::class] = rule +// +// rule +// } + val builder = RuleBuilder() 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 index c4e7ab7..7006ee3 100644 --- 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 { redactionRules.add(redaction) } - fun build(): Rule { - return if (RuleCache.rules.containsKey(this::class)) { - @Suppress("UNCHECKED_CAST") - RuleCache.rules[this::class] as Rule - } else { - val rule = Rule( - validationRules = validationRules, - normalizationRules = normalizationRules, - redactionRules = redactionRules - ) - RuleCache.rules[this::class] = rule - - rule - } - } + fun build(): Rule = + Rule( + validationRules = validationRules, + normalizationRules = normalizationRules, + redactionRules = redactionRules + ) }