Merge branch 'main' into dependabot/npm_and_yarn/core/main/typescript…

…-5.7.2
ExpediaGroup · Dec 1, 2024 · 07533e5 · 07533e5
2 parents 7b96717 + 72f438c
commit 07533e5
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 23 deletions.
diff --git a/generator/pom.xml b/generator/pom.xml
@@ -40,12 +40,12 @@
         <sdkVersion>0.0.1-SNAPSHOT</sdkVersion>
 
         <!-- Versions -->
-        <kotlin.version>2.0.21</kotlin.version>
+        <kotlin.version>2.1.0</kotlin.version>
         <openapi-generator.version>7.10.0</openapi-generator.version>
 
         <!-- 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)
diff --git a/generator/src/main/resources/dependencies/package.json b/generator/src/main/resources/dependencies/package.json
@@ -12,8 +12,8 @@
   "devDependencies": {
     "prettier": "3.4.1",
     "prettier-plugin-organize-imports": "4.1.0",
-    "typedoc": "0.26.11",
-    "typedoc-plugin-markdown": "4.2.10",
+    "typedoc": "0.27.1",
+    "typedoc-plugin-markdown": "4.3.0",
     "typedoc-plugin-missing-exports": "3.1.0"
   }
 }
diff --git a/generator/src/main/resources/templates/expediagroup-sdk/typedoc.mustache b/generator/src/main/resources/templates/expediagroup-sdk/typedoc.mustache
@@ -10,7 +10,6 @@
   "excludeInternal": true,
   "excludeExternals": true,
   "excludeReferences": true,
-  "hideParameterTypesInTitle": true,
   "hideGenerator": true,
   "githubPages": false,
   "readme": "none",

diff --git a/generator/src/test/resources/exemplar-docs/client/classes/ExemplarClient.md b/generator/src/test/resources/exemplar-docs/client/classes/ExemplarClient.md
@@ -14,7 +14,9 @@
 
 #### Parameters
 
-• **configurations**: [`ClientConfigurations`](../core/interfaces/ClientConfigurations.md)
+##### configurations
+
+[`ClientConfigurations`](../core/interfaces/ClientConfigurations.md)
 
 #### Returns
 

diff --git a/...c/test/resources/exemplar-docs/client/core/classes/AxiosClientConfigurations.md b/...c/test/resources/exemplar-docs/client/core/classes/AxiosClientConfigurations.md
@@ -10,9 +10,13 @@
 
 #### Parameters
 
-• **endpoint**: `string` = `Constant.ENDPOINT`
+##### endpoint
 
-• **requestTimeout**: `number` = `Constant.TEN_SECONDS_IN_MILLIS`
+`string` = `Constant.ENDPOINT`
+
+##### requestTimeout
+
+`number` = `Constant.TEN_SECONDS_IN_MILLIS`
 
 #### Returns
 

diff --git a/generator/src/test/resources/exemplar-docs/models/classes/ErrorCause.md b/generator/src/test/resources/exemplar-docs/models/classes/ErrorCause.md
@@ -12,7 +12,9 @@ The object used to describe a cause for an error, containing both human-readable
 
 #### Parameters
 
-• **errorCause**: [`ErrorCauseProperties`](../interfaces/ErrorCauseProperties.md)
+##### errorCause
+
+[`ErrorCauseProperties`](../interfaces/ErrorCauseProperties.md)
 
 #### Returns
 

diff --git a/generator/src/test/resources/exemplar-docs/models/classes/Greeting.md b/generator/src/test/resources/exemplar-docs/models/classes/Greeting.md
@@ -10,7 +10,9 @@
 
 #### Parameters
 
-• **greeting**: [`GreetingProperties`](../interfaces/GreetingProperties.md)
+##### greeting
+
+[`GreetingProperties`](../interfaces/GreetingProperties.md)
 
 #### Returns
 

diff --git a/generator/src/test/resources/exemplar-docs/models/classes/ModelError.md b/generator/src/test/resources/exemplar-docs/models/classes/ModelError.md
@@ -12,7 +12,9 @@ The object used the describe an error, containing both human-readable and in a m
 
 #### Parameters
 
-• **error**: [`ModelErrorProperties`](../interfaces/ModelErrorProperties.md)
+##### error
+
+[`ModelErrorProperties`](../interfaces/ModelErrorProperties.md)
 
 #### Returns