Update for ktlint 1.0.0 (ktlint-maven-plugin 3.0.0). (jitsi#191)

bgrozev · Oct 3, 2023 · bebfb15 · bebfb15
1 parent f49982f
commit bebfb15
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 47 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,9 +6,7 @@ charset = utf-8
 [*.{kt,kts}]
 max_line_length=120
 
-# Comma-separated list of rules to disable (Since 0.34.0)
-# Note that rules in any ruleset other than the standard ruleset will need to be prefixed 
-# by the ruleset identifier.
+ktlint_code_style = intellij_idea
 
 # I find trailing commas annoying
 ktlint_standard_trailing-comma-on-call-site = disabled

diff --git a/jicoco-config/src/main/kotlin/org/jitsi/config/AbstractReadOnlyConfigurationService.kt b/jicoco-config/src/main/kotlin/org/jitsi/config/AbstractReadOnlyConfigurationService.kt
@@ -35,8 +35,7 @@ abstract class AbstractReadOnlyConfigurationService : ConfigurationService {
     protected val logger = LoggerImpl(this::class.qualifiedName)
     protected abstract val properties: Properties
 
-    override fun getString(propertyName: String): String? =
-        getProperty(propertyName)?.toString()?.trim()
+    override fun getString(propertyName: String): String? = getProperty(propertyName)?.toString()?.trim()
 
     override fun getString(propertyName: String, defaultValue: String?): String? =
         getString(propertyName) ?: defaultValue
@@ -47,17 +46,14 @@ abstract class AbstractReadOnlyConfigurationService : ConfigurationService {
     override fun getDouble(propertyName: String, defaultValue: Double): Double =
         getString(propertyName)?.toDouble() ?: defaultValue
 
-    override fun getInt(propertyName: String, defaultValue: Int): Int =
-        getString(propertyName)?.toInt() ?: defaultValue
+    override fun getInt(propertyName: String, defaultValue: Int): Int = getString(propertyName)?.toInt() ?: defaultValue
 
     override fun getLong(propertyName: String, defaultValue: Long): Long =
         getString(propertyName)?.toLong() ?: defaultValue
 
-    override fun getAllPropertyNames(): MutableList<String> =
-        properties.keys.map { it as String }.toMutableList()
+    override fun getAllPropertyNames(): MutableList<String> = properties.keys.map { it as String }.toMutableList()
 
-    override fun getProperty(propertyName: String): Any? =
-        properties[propertyName] ?: System.getProperty(propertyName)
+    override fun getProperty(propertyName: String): Any? = properties[propertyName] ?: System.getProperty(propertyName)
 
     override fun getPropertyNamesByPrefix(prefix: String, exactPrefixMatch: Boolean): MutableList<String> {
         val matchingPropNames = mutableListOf<String>()
@@ -86,57 +82,43 @@ abstract class AbstractReadOnlyConfigurationService : ConfigurationService {
         }
     }
 
-    override fun getConfigurationFilename(): String =
-        throw Exception("Unsupported")
+    override fun getConfigurationFilename(): String = throw Exception("Unsupported")
 
-    override fun getScHomeDirLocation(): String =
-        throw Exception("Unsupported")
+    override fun getScHomeDirLocation(): String = throw Exception("Unsupported")
 
-    override fun getScHomeDirName(): String =
-        throw Exception("Unsupported")
+    override fun getScHomeDirName(): String = throw Exception("Unsupported")
 
-    override fun addPropertyChangeListener(listener: PropertyChangeListener?) =
-        throw Exception("Unsupported")
+    override fun addPropertyChangeListener(listener: PropertyChangeListener?) = throw Exception("Unsupported")
 
     override fun addPropertyChangeListener(propertyName: String?, listener: PropertyChangeListener?) =
         throw Exception("Unsupported")
 
-    override fun addVetoableChangeListener(listener: ConfigVetoableChangeListener?) =
-        throw Exception("Unsupported")
+    override fun addVetoableChangeListener(listener: ConfigVetoableChangeListener?) = throw Exception("Unsupported")
 
     override fun addVetoableChangeListener(propertyName: String?, listener: ConfigVetoableChangeListener?) =
         throw Exception("Unsupported")
 
-    override fun removePropertyChangeListener(listener: PropertyChangeListener?) =
-        throw Exception("Unsupported")
+    override fun removePropertyChangeListener(listener: PropertyChangeListener?) = throw Exception("Unsupported")
 
     override fun removePropertyChangeListener(propertyName: String?, listener: PropertyChangeListener?) =
         throw Exception("Unsupported")
 
-    override fun removeVetoableChangeListener(listener: ConfigVetoableChangeListener?) =
-        throw Exception("Unsupported")
+    override fun removeVetoableChangeListener(listener: ConfigVetoableChangeListener?) = throw Exception("Unsupported")
 
     override fun removeVetoableChangeListener(propertyName: String?, listener: ConfigVetoableChangeListener?) =
         throw Exception("Unsupported")
 
-    override fun purgeStoredConfiguration() =
-        throw Exception("Unsupported")
+    override fun purgeStoredConfiguration() = throw Exception("Unsupported")
 
-    override fun storeConfiguration() =
-        throw Exception("Unsupported")
+    override fun storeConfiguration() = throw Exception("Unsupported")
 
-    override fun setProperties(properties: MutableMap<String, Any>?) =
-        throw Exception("Unsupported")
+    override fun setProperties(properties: MutableMap<String, Any>?) = throw Exception("Unsupported")
 
-    override fun setProperty(propertyName: String?, property: Any?) =
-        throw Exception("Unsupported")
+    override fun setProperty(propertyName: String?, property: Any?) = throw Exception("Unsupported")
 
-    override fun setProperty(propertyName: String?, property: Any?, isSystem: Boolean) =
-        throw Exception("Unsupported")
+    override fun setProperty(propertyName: String?, property: Any?, isSystem: Boolean) = throw Exception("Unsupported")
 
-    override fun removeProperty(propertyName: String?) =
-        throw Exception("Unsupported")
+    override fun removeProperty(propertyName: String?) = throw Exception("Unsupported")
 
-    override fun getPropertyNamesBySuffix(suffix: String?): MutableList<String> =
-        throw Exception("Unsupported")
+    override fun getPropertyNamesBySuffix(suffix: String?): MutableList<String> = throw Exception("Unsupported")
 }
diff --git a/jicoco-config/src/main/kotlin/org/jitsi/config/ConfigSourceWrapper.kt b/jicoco-config/src/main/kotlin/org/jitsi/config/ConfigSourceWrapper.kt
@@ -31,6 +31,5 @@ class ConfigSourceWrapper(
     override val name: String
         get() = innerSource.name
 
-    override fun getterFor(type: KType): (String) -> Any =
-        innerSource.getterFor(type)
+    override fun getterFor(type: KType): (String) -> Any = innerSource.getterFor(type)
 }
diff --git a/jicoco-config/src/main/kotlin/org/jitsi/config/JitsiConfig.kt b/jicoco-config/src/main/kotlin/org/jitsi/config/JitsiConfig.kt
@@ -35,16 +35,16 @@ class JitsiConfig {
         /**
          * A [ConfigSource] loaded via [ConfigFactory].
          */
-        var TypesafeConfig: ConfigSource = TypesafeConfigSource("typesafe config", loadNewConfig())
+        var typesafeConfig: ConfigSource = TypesafeConfigSource("typesafe config", loadNewConfig())
             private set
 
         private var numTypesafeReloads = 0
 
         /**
          * The 'new' [ConfigSource] that should be used by configuration properties.  Able to be changed for testing.
          */
-        private val _newConfig: ConfigSourceWrapper = ConfigSourceWrapper(TypesafeConfig).also {
-            logger.info("Initialized newConfig: ${TypesafeConfig.description}")
+        private val _newConfig: ConfigSourceWrapper = ConfigSourceWrapper(typesafeConfig).also {
+            logger.info("Initialized newConfig: ${typesafeConfig.description}")
         }
         val newConfig: ConfigSource
             get() = _newConfig
@@ -94,11 +94,11 @@ class JitsiConfig {
             logger.info("Reloading the Typesafe config source (previously reloaded $numTypesafeReloads times).")
             ConfigFactory.invalidateCaches()
             numTypesafeReloads++
-            TypesafeConfig = TypesafeConfigSource(
+            typesafeConfig = TypesafeConfigSource(
                 "typesafe config (reloaded $numTypesafeReloads times)",
                 loadNewConfig()
             )
-            _newConfig.innerSource = TypesafeConfig
+            _newConfig.innerSource = typesafeConfig
         }
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -121,7 +121,7 @@
             <plugin>
                 <groupId>com.github.gantsign.maven</groupId>
                 <artifactId>ktlint-maven-plugin</artifactId>
-                <version>2.0.0</version>
+                <version>3.0.0</version>
                 <configuration>
                     <sourceRoots>
                         <sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>