commit

Author: OmarAlJarrah

build.gradle.kts

@@ -1,9 +1,9 @@
 import java.time.Duration
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("jvm") version "2.1.10"
-    id("maven-publish")
-    id("signing")
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
@@ -12,11 +12,39 @@ version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
+    gradlePluginPortal()
     maven {
         url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
     }
 }
 
+subprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+    apply(plugin = "org.jetbrains.kotlin.jvm")
+
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
+    }
+
+    kotlin {
+        jvmToolchain(21)
+        target {
+            compilerOptions {
+                jvmTarget = JvmTarget.JVM_1_8
+            }
+        }
+    }
+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
 nexusPublishing {
     repositories {
         sonatype {
@@ -31,13 +59,14 @@ nexusPublishing {
     }
 }
 
-dependencies {
-    testImplementation(kotlin("test"))
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
 kotlin {
     jvmToolchain(21)
 }
+
+tasks.register("prepareSpecs") {
+    dependsOn("mergeSpecs", "transformSpecs")
+
+    File("$rootDir", "specs/specs.yaml")
+}
+
+apply("gradle-tasks/specs.gradle.kts")

buildSrc/src/main/kotlin/com/expediagroup/sdk/xap/generator/mustache/AllowedMediaTypesLambda.kt

@@ -0,0 +1,25 @@
+package com.expediagroup.sdk.xap.generator.mustache
+
+import com.samskivert.mustache.Mustache
+import com.samskivert.mustache.Template
+import java.io.Serializable
+import java.io.Writer
+import org.openapitools.codegen.CodegenResponse
+
+class AllowedMediaTypesLambda : Mustache.Lambda, Serializable {
+    override fun execute(
+        fragment: Template.Fragment,
+        writer: Writer,
+    ) {
+        val response: CodegenResponse = fragment.context() as CodegenResponse
+        if (response.is2xx) {
+            val mediaTypes: List<String> =
+                response.content.keys.filter {
+                    !it.contains("xml", ignoreCase = true)
+                }
+
+            val context = mapOf("mediaTypes" to mediaTypes)
+            fragment.execute(context, writer)
+        }
+    }
+}

generator/build.gradle.kts

@@ -1,12 +1,8 @@
-import com.samskivert.mustache.Mustache
-import com.samskivert.mustache.Template
-import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask
 import org.openapitools.codegen.CodegenConstants
-import org.openapitools.codegen.CodegenResponse
-import java.io.Serializable
-import java.io.Writer
+import com.expediagroup.sdk.xap.generator.mustache.AllowedMediaTypesLambda
 
 plugins {
+    `kotlin-dsl`
     kotlin("jvm") version "2.1.10"
     id("com.expediagroup.sdk.openapigenerator") version "0.0.3-beta-SNAPSHOT"
     id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
@@ -15,13 +11,6 @@ plugins {
 group = "com.expediagroup.sdk"
 version = "1.0-SNAPSHOT"
 
-repositories {
-    mavenCentral()
-    maven {
-        url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-    }
-}
-
 dependencies {
     api("org.openapitools:openapi-generator:7.11.0")
     testImplementation(kotlin("test"))
@@ -38,6 +27,7 @@ kotlin {
 openApiGenerate {
     inputSpec = System.getProperty("inputSpec") ?: "$projectDir/src/main/resources/specs.yaml"
 
+    packageName = "com.expediagroup.sdk.xap"
     invokerPackage = "com.expediagroup.sdk.xap"
     apiPackage = "com.expediagroup.sdk.xap.operations"
     modelPackage = "com.expediagroup.sdk.xap.models"
@@ -54,30 +44,9 @@ openApiGenerate {
     outputDir = "$rootDir/xap-sdk/src/main/kotlin"
 
     additionalProperties.put(CodegenConstants.ENUM_PROPERTY_NAMING, "UPPERCASE")
-    additionalProperties.put("allowedMediaTypes", Lambdas.AllowedMediaTypesLambda())
+    additionalProperties.put("allowedMediaTypes", AllowedMediaTypesLambda())
 
     configOptions.put("sourceFolder", "")
 
     globalProperties.put("supportingFiles", "Room.kt")
 }
-
-
-class Lambdas {
-    class AllowedMediaTypesLambda : Mustache.Lambda, Serializable {
-        override fun execute(
-            fragment: Template.Fragment,
-            writer: Writer,
-        ) {
-            val response: CodegenResponse = fragment.context() as CodegenResponse
-            if (response.is2xx) {
-                val mediaTypes: List<String> =
-                    response.content.keys.filter {
-                        !it.contains("xml", ignoreCase = true)
-                    }
-
-                val context = mapOf("mediaTypes" to mediaTypes)
-                fragment.execute(context, writer)
-            }
-        }
-    }
-}

generator/tasks/lambdas.gradle.kts

@@ -0,0 +1,2 @@
+
+

gradle-tasks/specs.gradle.kts

@@ -0,0 +1,19 @@
+tasks.register("mergeSpecs") {
+    exec {
+        commandLine(
+            "npx openapi-merge-cli".split(" ")
+        )
+        workingDir = File(rootDir, "specs")
+    }
+}
+
+tasks.register("transformSpecs") {
+    dependsOn("mergeSpecs")
+
+    exec {
+        commandLine(
+            "npx --yes -p @expediagroup/spec-transformer cli --headers --operationIdsToTags -i specs.yaml -o specs.yaml"
+        )
+        workingDir = File(rootDir, "specs")
+    }
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Sun Mar 02 20:01:10 EET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal