Reformat code using editorconfig

LEDfan · LEDfan · commit 3e875a9e1b54 · 2021-07-26T15:12:58.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,27 @@
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+ij_kotlin_call_parameters_new_line_after_left_paren = false
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_method_parameters_new_line_after_left_paren = false
+ij_kotlin_method_parameters_right_paren_on_new_line = false
+ij_any_wrap_long_lines = false
+ij_formatter_off_tag = "@formatter:off"
+ij_formatter_on_tag = "@formatter:on"
+max_line_length = 256
+
+[*.{java,xml,yaml}]
+indent_style = space
+indent_size = 4
+charset = utf-8
+
+[*.gradle]
+indent_style = tab
+
+[Jenkinsfile}]
+indent_style = space
+indent_size = 4
+charset = utf-8
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/Operator.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/Operator.kt
@@ -49,7 +49,6 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.SendChannel
 import mu.KotlinLogging
 import org.slf4j.LoggerFactory
-import java.lang.IllegalStateException
 import kotlin.system.exitProcess
 
 
@@ -74,11 +73,11 @@ class Operator(client: NamespacedKubernetesClient? = null,
     val startupProbeInitialDelay: Int
 
     private val podSetCustomResourceDefinitionContext = CustomResourceDefinitionContext.Builder()
-            .withVersion("v1alpha1")
-            .withScope("Namespaced")
-            .withGroup("openanalytics.eu")
-            .withPlural("shinyproxies")
-            .build()
+        .withVersion("v1alpha1")
+        .withScope("Namespaced")
+        .withGroup("openanalytics.eu")
+        .withPlural("shinyproxies")
+        .build()
 
     private val informerFactory: SharedInformerFactory
     private val replicaSetInformer: SharedIndexInformer<ReplicaSet>
@@ -238,7 +237,7 @@ class Operator(client: NamespacedKubernetesClient? = null,
 
         fun setOperatorInstance(operator: Operator) {
             this._operatorInstance = operator
-       }
+        }
 
         fun getOperatorInstance(): Operator {
             _operatorInstance.let {
@@ -251,7 +250,7 @@ class Operator(client: NamespacedKubernetesClient? = null,
         }
     }
 
-    private fun<T> readConfigValue(constructorValue: T?, default: T, envVarName: String, convertor: (String) -> T): T {
+    private fun <T> readConfigValue(constructorValue: T?, default: T, envVarName: String, convertor: (String) -> T): T {
         val e = System.getenv(envVarName)
         val res = when {
             constructorValue != null -> constructorValue
@@ -267,4 +266,4 @@ class Operator(client: NamespacedKubernetesClient? = null,
 enum class Mode {
     CLUSTERED,
     NAMESPACED
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ConfigMapFactory.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ConfigMapFactory.kt
@@ -25,7 +25,6 @@ import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 import io.fabric8.kubernetes.api.model.ConfigMap
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder
 import io.fabric8.kubernetes.client.KubernetesClient
-import io.fabric8.kubernetes.client.KubernetesClientException
 import mu.KotlinLogging
 
 
@@ -60,4 +59,4 @@ class ConfigMapFactory(private val kubeClient: KubernetesClient) {
         logger.debug { "${shinyProxy.logPrefix(shinyProxyInstance)} [Component/ConfigMap] Created ${createdConfigMap.metadata.name}" }
     }
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/LabelFactory.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/LabelFactory.kt
@@ -22,32 +22,31 @@ package eu.openanalytics.shinyproxyoperator.components
 
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
-import java.lang.RuntimeException
 
 object LabelFactory {
 
     fun labelsForCurrentShinyProxyInstance(shinyProxy: ShinyProxy): Map<String, String> {
         return mapOf(
-                APP_LABEL to APP_LABEL_VALUE,
-                NAME_LABEL to shinyProxy.metadata.name,
-                INSTANCE_LABEL to shinyProxy.hashOfCurrentSpec
+            APP_LABEL to APP_LABEL_VALUE,
+            NAME_LABEL to shinyProxy.metadata.name,
+            INSTANCE_LABEL to shinyProxy.hashOfCurrentSpec
         )
     }
-    
+
     fun labelsForShinyProxyInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance): Map<String, String> {
         val hashOfSpec = shinyProxyInstance.hashOfSpec
         return mapOf(
-                APP_LABEL to APP_LABEL_VALUE,
-                NAME_LABEL to shinyProxy.metadata.name,
-                INSTANCE_LABEL to hashOfSpec
+            APP_LABEL to APP_LABEL_VALUE,
+            NAME_LABEL to shinyProxy.metadata.name,
+            INSTANCE_LABEL to hashOfSpec
         )
     }
 
     const val APP_LABEL = "app"
     const val APP_LABEL_VALUE = "shinyproxy"
     const val NAME_LABEL = "openanalytics.eu/sp-resource-name"
     const val INSTANCE_LABEL = "openanalytics.eu/sp-instance"
-    const val PROXIED_APP =  "openanalytics.eu/sp-proxied-app"
+    const val PROXIED_APP = "openanalytics.eu/sp-proxied-app"
     const val INGRESS_IS_LATEST = "openanalytics.eu/ingress-is-latest"
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecFactory.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecFactory.kt
@@ -24,7 +24,6 @@ import eu.openanalytics.shinyproxyoperator.Operator
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 import io.fabric8.kubernetes.api.model.*
-import java.nio.file.Paths
 
 class PodTemplateSpecFactory {
 
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecPatcher.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecPatcher.kt
@@ -26,14 +26,13 @@ import com.fasterxml.jackson.datatype.jsr353.JSR353Module
 import io.fabric8.kubernetes.api.model.HTTPGetAction
 import io.fabric8.kubernetes.api.model.IntOrString
 import io.fabric8.kubernetes.api.model.PodTemplateSpec
-import io.fabric8.kubernetes.client.internal.SerializationUtils
 import mu.KotlinLogging
 import javax.json.JsonPatch
 import javax.json.JsonStructure
 
 class PodTemplateSpecPatcher {
     private val mapper = ObjectMapper(YAMLFactory())
-    private val logger = KotlinLogging.logger {  }
+    private val logger = KotlinLogging.logger { }
 
     init {
         mapper.registerModule(JSR353Module())
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ResourceNameFactory.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ResourceNameFactory.kt
@@ -23,7 +23,6 @@ package eu.openanalytics.shinyproxyoperator.components
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 import mu.KotlinLogging
-import java.lang.IllegalStateException
 
 object ResourceNameFactory {
 
@@ -51,4 +50,4 @@ object ResourceNameFactory {
         return "sp-${shinyProxy.metadata.name}-ing-${shinyProxyInstance.hashOfSpec}".take(KUBE_RESOURCE_NAME_MAX_LENGTH)
     }
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/IReconcileListener.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/IReconcileListener.kt
@@ -23,7 +23,7 @@ package eu.openanalytics.shinyproxyoperator.controller
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 
-interface IReconcileListener  {
+interface IReconcileListener {
 
     fun onInstanceFullyReconciled(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance)
 
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/PodRetriever.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/PodRetriever.kt
@@ -25,7 +25,6 @@ import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 import io.fabric8.kubernetes.api.model.Pod
 import io.fabric8.kubernetes.api.model.PodList
-import io.fabric8.kubernetes.client.DefaultKubernetesClient
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient
 import io.fabric8.kubernetes.client.dsl.base.OperationContext
 import io.fabric8.kubernetes.client.informers.SharedIndexInformer
@@ -54,8 +53,8 @@ class PodRetriever(private val client: NamespacedKubernetesClient) {
     fun getPodsForShinyProxyInstance(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance): List<Pod> {
         val pods = arrayListOf<Pod>()
         val labels = mapOf(
-                LabelFactory.PROXIED_APP to "true",
-                LabelFactory.INSTANCE_LABEL to shinyProxyInstance.hashOfSpec
+            LabelFactory.PROXIED_APP to "true",
+            LabelFactory.INSTANCE_LABEL to shinyProxyInstance.hashOfSpec
         )
 
         val namespacesToCheck = if (shinyProxyInstance.isLatestInstance) {
@@ -95,4 +94,4 @@ class PodRetriever(private val client: NamespacedKubernetesClient) {
         return informers.keys
     }
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ResourceListener.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ResourceListener.kt
@@ -90,4 +90,4 @@ class ResourceListener<T : HasMetadata>(private val channel: SendChannel<ShinyPr
         return null
     }
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ResourceRetriever.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ResourceRetriever.kt
@@ -21,7 +21,6 @@
 package eu.openanalytics.shinyproxyoperator.controller
 
 import io.fabric8.kubernetes.api.model.ConfigMap
-import io.fabric8.kubernetes.api.model.Pod
 import io.fabric8.kubernetes.api.model.Service
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet
 import io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress
@@ -84,4 +83,4 @@ class ResourceRetriever(private val replicaSetLister: Lister<ReplicaSet>,
         return ingresses
     }
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ShinyProxyController.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ShinyProxyController.kt
@@ -40,7 +40,6 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import mu.KotlinLogging
-import kotlin.system.exitProcess
 
 
 class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
@@ -179,7 +178,6 @@ class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
     }
 
 
-
     private fun refreshShinyProxy(shinyProxy: ShinyProxy): ShinyProxy {
         return shinyProxyClient.inNamespace(shinyProxy.metadata.namespace).withName(shinyProxy.metadata.name).get()
     }
@@ -191,7 +189,7 @@ class ShinyProxyController(private val channel: Channel<ShinyProxyEvent>,
 
     private fun updateLatestMarker(shinyProxy: ShinyProxy, shinyProxyInstance: ShinyProxyInstance) {
         val latestInstance = shinyProxy.status.instances.firstOrNull { it.hashOfSpec == shinyProxy.hashOfCurrentSpec }
-                ?: return
+            ?: return
         if (latestInstance.isLatestInstance) {
             // already updated marker
             return
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ShinyProxyListener.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/controller/ShinyProxyListener.kt
@@ -20,7 +20,6 @@
  */
 package eu.openanalytics.shinyproxyoperator.controller
 
-import eu.openanalytics.shinyproxyoperator.Operator
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import eu.openanalytics.shinyproxyoperator.isInManagedNamespace
 import io.fabric8.kubernetes.client.informers.ResourceEventHandler
@@ -75,4 +74,4 @@ class ShinyProxyListener(private val channel: SendChannel<ShinyProxyEvent>,
     }
 
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxy.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxy.kt
@@ -29,7 +29,6 @@ import com.fasterxml.jackson.datatype.jsr353.JSR353Module
 import eu.openanalytics.shinyproxyoperator.sha1
 import io.fabric8.kubernetes.api.model.Namespaced
 import io.fabric8.kubernetes.client.CustomResource
-import java.lang.IllegalStateException
 import javax.json.JsonPatch
 
 data class ShinyProxy(val spec: JsonNode, val status: ShinyProxyStatus = ShinyProxyStatus()) : CustomResource(), Namespaced {
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxyStatus.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxyStatus.kt
@@ -29,7 +29,7 @@ import io.fabric8.kubernetes.api.model.KubernetesResource
 data class ShinyProxyStatus(val instances: ArrayList<ShinyProxyInstance> = arrayListOf()) : KubernetesResource {
 
     fun getInstanceByHash(hash: String): ShinyProxyInstance? {
-        return instances.find { it.hashOfSpec ==  hash}
+        return instances.find { it.hashOfSpec == hash }
     }
 
 }
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingres/IIngressController.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingres/IIngressController.kt
@@ -21,9 +21,8 @@
 package eu.openanalytics.shinyproxyoperator.ingres
 
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
-import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyInstance
 
 interface IIngressController {
 
     fun reconcile(shinyProxy: ShinyProxy)
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/skipper/IngressController.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/ingress/skipper/IngressController.kt
@@ -37,11 +37,11 @@ import kotlinx.coroutines.channels.Channel
 import mu.KotlinLogging
 
 class IngressController(
-        channel: Channel<ShinyProxyEvent>,
-        ingressInformer: SharedIndexInformer<Ingress>,
-        shinyProxyListener: Lister<ShinyProxy>,
-        kubernetesClient: KubernetesClient,
-        private val resourceRetriever: ResourceRetriever
+    channel: Channel<ShinyProxyEvent>,
+    ingressInformer: SharedIndexInformer<Ingress>,
+    shinyProxyListener: Lister<ShinyProxy>,
+    kubernetesClient: KubernetesClient,
+    private val resourceRetriever: ResourceRetriever
 ) : IIngressController {
 
     private val logger = KotlinLogging.logger {}
@@ -100,4 +100,4 @@ class IngressController(
         return replicaSets[0]
     }
 
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/isInManagedNamespace.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/isInManagedNamespace.kt
@@ -22,9 +22,8 @@ package eu.openanalytics.shinyproxyoperator
 
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import mu.KotlinLogging
-import java.lang.IllegalStateException
 
-val logger = KotlinLogging.logger {  }
+val logger = KotlinLogging.logger { }
 
 fun isInManagedNamespace(shinyProxy: ShinyProxy): Boolean {
     when (Operator.getOperatorInstance().mode) {
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/main.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/main.kt
@@ -20,14 +20,12 @@
  */
 package eu.openanalytics.shinyproxyoperator
 
-import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyList
 import eu.openanalytics.shinyproxyoperator.crd.DoneableShinyProxy
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
+import eu.openanalytics.shinyproxyoperator.crd.ShinyProxyList
 import io.fabric8.kubernetes.client.KubernetesClientException
 import io.fabric8.kubernetes.client.dsl.MixedOperation
 import io.fabric8.kubernetes.client.dsl.Resource
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import mu.KotlinLogging
 import kotlin.system.exitProcess
 
@@ -44,4 +42,4 @@ suspend fun main() {
         exception.printStackTrace()
         exitProcess(1)
     }
-}
+}
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/retry.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/retry.kt
@@ -21,8 +21,7 @@
 package eu.openanalytics.shinyproxyoperator
 
 import kotlinx.coroutines.delay
-import java.lang.RuntimeException
-import java.util.function.IntPredicate;
+import java.util.function.IntPredicate
 
 suspend fun retry(tries: Int, waitTime: Long, job: IntPredicate): Boolean {
     return retry(tries, waitTime, false, job)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -8,7 +8,7 @@
     </appender>
 
     <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
     <logger name="io.fabric8.kubernetes.client.informers" level="WARN" additivity="false">
@@ -31,4 +31,4 @@
         <appender-ref ref="STDOUT"/>
     </logger>
 
-</configuration>
+</configuration>
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/MainIntegrationTest.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/MainIntegrationTest.kt
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ChaosInterceptor.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/ChaosInterceptor.kt
diff --git a/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/IntegrationTestBase.kt b/src/test/kotlin/eu/openanalytics/shinyproxyoperator/helpers/IntegrationTestBase.kt

Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,4 @@ class ResourceListener<T : HasMetadata>(private val channel: SendChannel<ShinyPr`
`90`	`90`	`return null`
`91`	`91`	`}`
`92`	`92`
`93`		`-}`
	`93`	`+}`