moved getByKey method from Env object

VKCOM · Dec 8, 2023 · abada63 · abada63
1 parent 873420b
commit abada63
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/com/vk/admstorm/env/Env.kt b/src/main/kotlin/com/vk/admstorm/env/Env.kt
@@ -67,6 +67,8 @@ data class EnvConfig(
     var services: List<Service> = listOf(),
 )
 
+fun List<Service>.getByKey(key: String) = firstOrNull { it.key == key }
+
 object Env {
     private val LOG = logger<Env>()
 
@@ -75,8 +77,6 @@ object Env {
     private var myIsResolved = false
     var data = EnvConfig()
 
-    fun List<Service>.getByKey(key: String) = firstOrNull { it.key == key }
-
     private fun checkPropertyNotEmpty(name: String, value: String) =
         value.ifEmpty { throw IllegalArgumentException(name) }
 

diff --git a/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/ABMarker.kt b/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/ABMarker.kt
@@ -1,7 +1,7 @@
 package com.vk.admstorm.highlight.markers.admmarker
 
 import com.vk.admstorm.env.Env
-import com.vk.admstorm.env.Env.getByKey
+import com.vk.admstorm.env.getByKey
 import com.vk.admstorm.highlight.markers.impl.IMarkerBrowser
 import com.vk.admstorm.ui.AdmIcons
 

diff --git a/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/BufferMarker.kt b/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/BufferMarker.kt
@@ -1,7 +1,7 @@
 package com.vk.admstorm.highlight.markers.admmarker
 
 import com.vk.admstorm.env.Env
-import com.vk.admstorm.env.Env.getByKey
+import com.vk.admstorm.env.getByKey
 import com.vk.admstorm.highlight.markers.impl.IMarkerBrowser
 import com.vk.admstorm.ui.AdmIcons
 

diff --git a/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/LoggerMarker.kt b/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/LoggerMarker.kt
@@ -1,7 +1,7 @@
 package com.vk.admstorm.highlight.markers.admmarker
 
 import com.vk.admstorm.env.Env
-import com.vk.admstorm.env.Env.getByKey
+import com.vk.admstorm.env.getByKey
 import com.vk.admstorm.highlight.markers.impl.IMarkerBrowser
 import com.vk.admstorm.ui.AdmIcons
 

diff --git a/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/StatshouseMarker.kt b/src/main/kotlin/com/vk/admstorm/highlight/markers/admmarker/StatshouseMarker.kt
@@ -1,7 +1,7 @@
 package com.vk.admstorm.highlight.markers.admmarker
 
 import com.vk.admstorm.env.Env
-import com.vk.admstorm.env.Env.getByKey
+import com.vk.admstorm.env.getByKey
 import com.vk.admstorm.highlight.markers.impl.IMarkerBrowser
 import com.vk.admstorm.ui.AdmIcons