chore(deps): Bump com.github.gantsign.maven:ktlint-maven-plugin from …

…3.2.0 to 3.3.0 in /generator (#402)
ExpediaGroup · Dec 1, 2024 · eb40154 · eb40154
1 parent 7579f5b
commit eb40154
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/generator/pom.xml b/generator/pom.xml
@@ -45,7 +45,7 @@
 
         <!-- Plugin Versions -->
         <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
-        <ktlint-plugin.version>3.2.0</ktlint-plugin.version>
+        <ktlint-plugin.version>3.3.0</ktlint-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>

diff --git a/generator/src/main/kotlin/com/expediagroup/sdk/generators/openapi/Discriminator.kt b/generator/src/main/kotlin/com/expediagroup/sdk/generators/openapi/Discriminator.kt
@@ -23,15 +23,14 @@ internal data class Discriminator(
     val value: String,
 )
 
-internal fun getParentDiscriminator(model: CodegenModel): Discriminator? {
-    return model.parentModel?.discriminator?.let {
+internal fun getParentDiscriminator(model: CodegenModel): Discriminator? =
+    model.parentModel?.discriminator?.let {
         Discriminator(
             it.propertyBaseName,
             it.propertyName,
             it.mappedModels.find { mappedModel -> mappedModel.modelName.equals(model.classname) }!!.mappingName,
         )
     }
-}
 
 internal fun getDiscriminators(model: CodegenModel): MutableList<String> {
     val discriminators: MutableList<String> = model.parentModel?.let { getDiscriminators(model.parentModel) } ?: mutableListOf()

diff --git a/generator/src/main/kotlin/com/expediagroup/sdk/generators/openapi/ModelTemplate.kt b/generator/src/main/kotlin/com/expediagroup/sdk/generators/openapi/ModelTemplate.kt
@@ -18,7 +18,10 @@ package com.expediagroup.sdk.generators.openapi
 import org.openapitools.codegen.api.TemplateDefinition
 import org.openapitools.codegen.api.TemplateFileType.Model
 
-class ModelTemplate(templateFile: String, destinationFilename: String) : TemplateDefinition(templateFile, destinationFilename) {
+class ModelTemplate(
+    templateFile: String,
+    destinationFilename: String,
+) : TemplateDefinition(templateFile, destinationFilename) {
     init {
         templateType = Model
     }

diff --git a/generator/src/main/kotlin/com/expediagroup/sdk/generators/openapi/MustacheHelpers.kt b/generator/src/main/kotlin/com/expediagroup/sdk/generators/openapi/MustacheHelpers.kt
@@ -66,11 +66,12 @@ val mustacheHelpers =
                 model.parentModel?.let {
                     val discriminators: MutableList<String> = getDiscriminators(model)
                     writer.write("super({\n")
-                    it.allVars.filterNot { variable ->
-                        variable.isDiscriminator || discriminators.contains(variable.baseName)
-                    }.forEach { variable ->
-                        writer.write("${variable.name}: ${model.classVarName}.${variable.name},\n")
-                    }
+                    it.allVars
+                        .filterNot { variable ->
+                            variable.isDiscriminator || discriminators.contains(variable.baseName)
+                        }.forEach { variable ->
+                            writer.write("${variable.name}: ${model.classVarName}.${variable.name},\n")
+                        }
                     writer.write("})")
                 }
             }

diff --git a/generator/src/main/kotlin/com/expediagroup/sdk/model/Exception.kt b/generator/src/main/kotlin/com/expediagroup/sdk/model/Exception.kt
@@ -15,8 +15,17 @@
  */
 package com.expediagroup.sdk.model
 
-open class GeneratorException(message: String, cause: Throwable? = null) : RuntimeException(message, cause)
+open class GeneratorException(
+    message: String,
+    cause: Throwable? = null,
+) : RuntimeException(message, cause)
 
-class ClientGenerationException(message: String, cause: Throwable? = null) : GeneratorException(message, cause)
+class ClientGenerationException(
+    message: String,
+    cause: Throwable? = null,
+) : GeneratorException(message, cause)
 
-class PreProcessingException(message: String, cause: Throwable? = null) : GeneratorException(message, cause)
+class PreProcessingException(
+    message: String,
+    cause: Throwable? = null,
+) : GeneratorException(message, cause)