chore: Deprecate Spec Processing Logic (#221)

ExpediaGroup · Jun 18, 2023 · c3df6f7 · c3df6f7
1 parent 8005566
commit c3df6f7
Show file tree

Hide file tree

Showing 18 changed files with 154 additions and 1,261 deletions.
diff --git a/.github/workflows/generator-verify.yml b/.github/workflows/generator-verify.yml
@@ -23,7 +23,7 @@ jobs:
         working-directory: generator/openapi
         run: |
           mvn clean install
-          mvn exec:java "-Dnamespace=exemplar" "-DsdkVersion=0.0.1-exemplar" "-Dspec=${{ secrets.SPEC_FILE }}"
+          mvn exec:java "-Dnamespace=exemplar" "-DsdkVersion=1.0.0" "-Dspec=./src/test/resources/exemplar.yaml"
       - uses: actions/upload-artifact@v2
         with:
           name: sdk

diff --git a/...tor/openapi/src/main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/Constant.kt b/...tor/openapi/src/main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/Constant.kt
diff --git a/...penapi/src/main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/Discriminator.kt b/...penapi/src/main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/Discriminator.kt
@@ -36,6 +36,7 @@ internal fun getParentDiscriminator(model: CodegenModel): MutableList<Discrimina
     }
     return discriminators
 }
+
 internal data class Discriminator(
     val originalName: String,
     val name: String,

diff --git a/.../src/main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/OpenApiSdkGenerator.kt b/.../src/main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/OpenApiSdkGenerator.kt
@@ -15,7 +15,6 @@
  */
 package com.expediagroup.openworld.sdk.generators.openapi
 
-import com.expediagroup.openworld.sdk.generators.openapi.processor.YamlProcessor
 import com.expediagroup.openworld.sdk.model.ClientGenerationException
 import com.expediagroup.openworld.sdk.product.Product
 import com.expediagroup.openworld.sdk.product.ProductFamily
@@ -27,13 +26,6 @@ import org.openapitools.codegen.CodegenConstants
 import org.openapitools.codegen.DefaultGenerator
 import org.openapitools.codegen.SupportingFile
 import org.openapitools.codegen.config.CodegenConfigurator
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.nio.file.Files
-import java.util.Base64
-import java.util.zip.ZipInputStream
-import kotlin.io.path.writeBytes
 
 /**
  * Configures the OpenAPI Generator based on command line parameters to generate an EG Travel SDK project
@@ -81,12 +73,9 @@ class OpenApiSdkGenerator {
         try {
             val product = Product(namespace, programmingLanguage)
             val config = CodegenConfigurator().apply {
-                val path = prepareSpecFile()
-                val processedFilePath = preProcessSpecFile(path)
-
                 setGeneratorName("kotlin")
                 setTemplateDir("templates/openworld-sdk")
-                setInputSpec(processedFilePath)
+                setInputSpec(inputFile)
                 setOutputDir(outputDirectory)
                 setArtifactId(product.artifactId)
                 setArtifactVersion(version)
@@ -147,30 +136,4 @@ class OpenApiSdkGenerator {
             throw ClientGenerationException("Failed to generate SDK", e)
         }
     }
-
-    private fun preProcessSpecFile(path: String): String {
-        val yamlProcessor = YamlProcessor(path, namespace)
-        return yamlProcessor.process()
-    }
-
-    private fun prepareSpecFile(): String {
-        val buffer = ByteArray(1024)
-        val zipInputStream = ZipInputStream(FileInputStream(prepareTmpZipFile()))
-        val tempFile = Files.createTempFile("", zipInputStream.nextEntry?.name).toFile()
-        val fileOutputStream = FileOutputStream(tempFile)
-        var len: Int
-        while (zipInputStream.read(buffer).also { len = it } > 0) {
-            fileOutputStream.write(buffer, 0, len)
-        }
-        zipInputStream.closeEntry()
-        fileOutputStream.close()
-        zipInputStream.close()
-        return tempFile.absolutePath
-    }
-
-    private fun prepareTmpZipFile(): File {
-        val tmpFile = Files.createTempFile("", "tmp")
-        tmpFile.writeBytes(Base64.getDecoder().decode(inputFile))
-        return tmpFile.toFile()
-    }
 }
diff --git a/...main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/processor/FunctionalList.kt b/...main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/processor/FunctionalList.kt
diff --git a/.../main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/processor/FunctionalMap.kt b/.../main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/processor/FunctionalMap.kt
diff --git a/.../main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/processor/YamlProcessor.kt b/.../main/kotlin/com/expediagroup/openworld/sdk/generators/openapi/processor/YamlProcessor.kt
diff --git a/generator/openapi/src/main/kotlin/com/expediagroup/openworld/sdk/product/Product.kt b/generator/openapi/src/main/kotlin/com/expediagroup/openworld/sdk/product/Product.kt
@@ -15,7 +15,7 @@
  */
 package com.expediagroup.openworld.sdk.product
 
-import com.expediagroup.openworld.sdk.generators.openapi.Constant
+val NON_ALPHANUMERIC_REGEX = Regex("[^a-zA-Z0-9]")
 
 class Product(
     inputNamespace: String,
@@ -26,7 +26,7 @@ class Product(
         ProgrammingLanguage.from(programmingLanguage)
     )
 
-    val namespace: String = inputNamespace.replace(Constant.NON_ALPHANUMERIC_REGEX, "").lowercase()
+    val namespace: String = inputNamespace.replace(NON_ALPHANUMERIC_REGEX, "").lowercase()
 
     val apiPackage: String
         get() = "com.expediagroup.openworld.sdk.$namespace.client"