refactor(plugins): Move classes with dependency on slf4j out of keel-…

…api (#1436) * refactor(plugins): Move classes with dependency on slf4j out of keel-api * chore(*): Avoid using lazy initializer as a workaround for plugin incompatibility
spinnaker · Aug 15, 2020 · 5de6fa0 · 5de6fa0
1 parent 2e90128
commit 5de6fa0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/plugins/ResourceHandler.kt b/keel-api/src/main/kotlin/com/netflix/spinnaker/keel/api/plugins/ResourceHandler.kt
@@ -27,8 +27,6 @@ import com.netflix.spinnaker.kork.plugins.api.internal.SpinnakerExtensionPoint
  *
  * @param S the spec type.
  * @param R the resolved model type.
- *
- * If those two are the same, use [SimpleResourceHandler] instead.
  */
 interface ResourceHandler<S : ResourceSpec, R : Any> : SpinnakerExtensionPoint {
   @JvmDefault

diff --git a/.../api/plugins/ResolvableResourceHandler.kt → .../api/plugins/ResolvableResourceHandler.kt b/.../api/plugins/ResolvableResourceHandler.kt → .../api/plugins/ResolvableResourceHandler.kt
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory
 abstract class ResolvableResourceHandler<S : ResourceSpec, R : Any>(
   private val resolvers: List<Resolver<*>>
 ) : ResourceHandler<S, R> {
-  protected val log: Logger by lazy { LoggerFactory.getLogger(javaClass) }
+  protected val log: Logger = LoggerFactory.getLogger(javaClass)
 
   /**
    * Applies any defaults / opinions to the resource as it is resolved into its [desired] state.

diff --git a/...keel/api/plugins/SimpleResourceHandler.kt → ...keel/api/plugins/SimpleResourceHandler.kt b/...keel/api/plugins/SimpleResourceHandler.kt → ...keel/api/plugins/SimpleResourceHandler.kt