Merge pull request #10 from ashwini-desai/refactoring

Introduce codegen module
medly · Jul 9, 2020 · 92edcb4 · 92edcb4
2 parents 4a44ec9 + a1f0aa6
commit 92edcb4
Show file tree

Hide file tree

Showing 58 changed files with 135 additions and 264 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,7 @@ out
 .idea
 
 # Ignore mac specific directories
-.DS_Store
+.DS_Store
+
+#Ignore .kotlintest specific directory which lists test failures
+**/.kotlintest/
diff --git a/build.gradle b/build.gradle
@@ -1,47 +1,49 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
-    id 'application'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.72' apply false
 }
 
-repositories {
-    jcenter()
-    maven { url 'https://jitpack.io' }
-}
+subprojects {
+    apply plugin: 'org.jetbrains.kotlin.jvm'
 
-dependencies {
-    implementation platform('org.jetbrains.kotlin:kotlin-bom')
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    group = 'com.medly.apifi'
 
-    implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.16'
-    implementation 'org.openapitools:openapi-generator-cli:3.3.4'
-    implementation 'com.squareup:kotlinpoet:1.5.0'
+    repositories {
+        jcenter()
+    }
 
-    implementation 'com.github.medly:ktee:master-SNAPSHOT'
+    dependencies {
+        implementation platform('org.jetbrains.kotlin:kotlin-bom')
+        implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
-    implementation  'org.slf4j:slf4j-simple:1.7.30'
-    implementation 'org.apache.commons:commons-text:1.8'
+        testImplementation 'io.kotest:kotest-runner-junit5-jvm:4.1.1'
+        testImplementation 'io.kotest:kotest-assertions-core-jvm:4.1.1'
+        testImplementation 'io.kotest:kotest-property-jvm:4.1.1'
+        testImplementation 'io.kotest:kotest-runner-console-jvm:4.1.1'
+    }
 
-    testImplementation 'org.jetbrains.kotlin:kotlin-test'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
-    testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.4.2'
-}
-test {
-    useJUnitPlatform()
+    test {
+        useJUnitPlatform()
 
-    testLogging {
-        events "PASSED", "FAILED", "SKIPPED"
-        exceptionFormat "full"
+        testLogging {
+            events "PASSED", "FAILED", "SKIPPED"
+            exceptionFormat "full"
+        }
+    }
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
     }
 }
-application {
-    // Define the main class for the application.
-    mainClassName = 'apifi.AppKt'
-}
 
-jar {
-    manifest {
-        attributes 'Main-Class': "${mainClassName}"
+project(":codegen") {
+    dependencies {
+        implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.16'
+        implementation 'org.openapitools:openapi-generator-cli:3.3.4'
+        implementation 'com.squareup:kotlinpoet:1.5.0'
+
+        implementation  'org.slf4j:slf4j-simple:1.7.30'
+        implementation 'org.apache.commons:commons-text:1.8'
     }
-    from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 }
diff --git a/src/main/kotlin/apifi/App.kt → codegen/src/main/kotlin/apifi/App.kt b/src/main/kotlin/apifi/App.kt → codegen/src/main/kotlin/apifi/App.kt
diff --git a/src/main/kotlin/apifi/codegen/ApiBuilder.kt → ...c/main/kotlin/apifi/codegen/ApiBuilder.kt b/src/main/kotlin/apifi/codegen/ApiBuilder.kt → ...c/main/kotlin/apifi/codegen/ApiBuilder.kt
@@ -1,10 +1,11 @@
 package apifi.codegen
 
+import apifi.codegen.exceptions.Non200ResponseHandler
 import apifi.helpers.toKotlinPoetType
 import apifi.helpers.toTitleCase
-import apifi.parser.models.Operation
-import apifi.parser.models.ParamType
-import apifi.parser.models.Path
+import apifi.models.Operation
+import apifi.models.ParamType
+import apifi.models.Path
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 

diff --git a/...ain/kotlin/apifi/codegen/CodeGenerator.kt → ...ain/kotlin/apifi/codegen/CodeGenerator.kt b/...ain/kotlin/apifi/codegen/CodeGenerator.kt → ...ain/kotlin/apifi/codegen/CodeGenerator.kt
@@ -1,6 +1,7 @@
 package apifi.codegen
 
-import apifi.parser.models.Spec
+import apifi.codegen.exceptions.Non200ResponseHandler
+import apifi.models.Spec
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.TypeSpec
 

diff --git a/...ifi/codegen/ControllerInterfaceBuilder.kt → ...ifi/codegen/ControllerInterfaceBuilder.kt b/...ifi/codegen/ControllerInterfaceBuilder.kt → ...ifi/codegen/ControllerInterfaceBuilder.kt
@@ -1,8 +1,8 @@
 package apifi.codegen
 
 import apifi.helpers.toKotlinPoetType
-import apifi.parser.models.ParamType
-import apifi.parser.models.Path
+import apifi.models.ParamType
+import apifi.models.Path
 import com.squareup.kotlinpoet.*
 
 object ControllerInterfaceBuilder {

diff --git a/...ain/kotlin/apifi/codegen/HeaderBuilder.kt → ...ain/kotlin/apifi/codegen/HeaderBuilder.kt b/...ain/kotlin/apifi/codegen/HeaderBuilder.kt → ...ain/kotlin/apifi/codegen/HeaderBuilder.kt
@@ -1,6 +1,6 @@
 package apifi.codegen
 
-import apifi.parser.models.Param
+import apifi.models.Param
 import apifi.helpers.toCamelCase
 import apifi.helpers.toKotlinPoetType
 import com.squareup.kotlinpoet.AnnotationSpec

diff --git a/.../kotlin/apifi/codegen/ModelFileBuilder.kt → .../kotlin/apifi/codegen/ModelFileBuilder.kt b/.../kotlin/apifi/codegen/ModelFileBuilder.kt → .../kotlin/apifi/codegen/ModelFileBuilder.kt
@@ -1,7 +1,7 @@
 package apifi.codegen
 
 import apifi.helpers.toKotlinPoetType
-import apifi.parser.models.Model
+import apifi.models.Model
 import com.squareup.kotlinpoet.*
 
 object ModelFileBuilder {

diff --git a/...tlin/apifi/codegen/PathVariableBuilder.kt → ...tlin/apifi/codegen/PathVariableBuilder.kt b/...tlin/apifi/codegen/PathVariableBuilder.kt → ...tlin/apifi/codegen/PathVariableBuilder.kt
@@ -1,7 +1,7 @@
 package apifi.codegen
 
 import apifi.helpers.toKotlinPoetType
-import apifi.parser.models.Param
+import apifi.models.Param
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.ParameterSpec
 

diff --git a/...kotlin/apifi/codegen/QueryParamBuilder.kt → ...kotlin/apifi/codegen/QueryParamBuilder.kt b/...kotlin/apifi/codegen/QueryParamBuilder.kt → ...kotlin/apifi/codegen/QueryParamBuilder.kt
@@ -1,7 +1,7 @@
 package apifi.codegen
 
 import apifi.helpers.toKotlinPoetType
-import apifi.parser.models.Param
+import apifi.models.Param
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.ParameterSpec
 

diff --git a/...otlin/apifi/codegen/RequestBodyBuilder.kt → ...otlin/apifi/codegen/RequestBodyBuilder.kt b/...otlin/apifi/codegen/RequestBodyBuilder.kt → ...otlin/apifi/codegen/RequestBodyBuilder.kt
diff --git a/...lin/apifi/codegen/ExceptionFileBuilder.kt → ...odegen/exceptions/ExceptionFileBuilder.kt b/...lin/apifi/codegen/ExceptionFileBuilder.kt → ...odegen/exceptions/ExceptionFileBuilder.kt
@@ -1,5 +1,6 @@
-package apifi.codegen
+package apifi.codegen.exceptions
 
+import apifi.codegen.exceptions.ExceptionDetailsHolder
 import apifi.helpers.toKotlinPoetType
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy

diff --git a/...in/apifi/codegen/Non200ResponseHandler.kt → ...degen/exceptions/Non200ResponseHandler.kt b/...in/apifi/codegen/Non200ResponseHandler.kt → ...degen/exceptions/Non200ResponseHandler.kt
@@ -1,15 +1,15 @@
-package apifi.codegen
+package apifi.codegen.exceptions
 
 import org.apache.http.HttpStatus
 
 object Non200ResponseHandler {
 
     private val allExceptionDetailsHolder = listOf(
-        ExceptionDetailsHolder(HttpStatus.SC_BAD_REQUEST, "BadRequestException", "Bad Request"),
-        ExceptionDetailsHolder(HttpStatus.SC_UNAUTHORIZED, "UnauthorizedException", "Unauthorized Request"),
-        ExceptionDetailsHolder(HttpStatus.SC_FORBIDDEN, "ForbiddenException", "Forbidden Request"),
-        ExceptionDetailsHolder(HttpStatus.SC_NOT_FOUND, "NotFoundException", "Request Not Found"),
-        ExceptionDetailsHolder(HttpStatus.SC_INTERNAL_SERVER_ERROR, "InternalServerErrorException", "Internal server error occured")
+            ExceptionDetailsHolder(HttpStatus.SC_BAD_REQUEST, "BadRequestException", "Bad Request"),
+            ExceptionDetailsHolder(HttpStatus.SC_UNAUTHORIZED, "UnauthorizedException", "Unauthorized Request"),
+            ExceptionDetailsHolder(HttpStatus.SC_FORBIDDEN, "ForbiddenException", "Forbidden Request"),
+            ExceptionDetailsHolder(HttpStatus.SC_NOT_FOUND, "NotFoundException", "Request Not Found"),
+            ExceptionDetailsHolder(HttpStatus.SC_INTERNAL_SERVER_ERROR, "InternalServerErrorException", "Internal server error occured")
     )
 
     fun getExceptionClassFor(statuses: List<Int>) = statuses.map { status -> allExceptionDetailsHolder.find { it.status == status }?.exceptionClassName ?: "InternalServerErrorException" }

diff --git a/src/main/kotlin/apifi/helpers/Functions.kt → ...rc/main/kotlin/apifi/helpers/Functions.kt b/src/main/kotlin/apifi/helpers/Functions.kt → ...rc/main/kotlin/apifi/helpers/Functions.kt
diff --git a/src/main/kotlin/apifi/parser/models/Model.kt → ...gen/src/main/kotlin/apifi/models/Model.kt b/src/main/kotlin/apifi/parser/models/Model.kt → ...gen/src/main/kotlin/apifi/models/Model.kt
@@ -1,4 +1,4 @@
-package apifi.parser.models
+package apifi.models
 
 data class Model(
         val name: String,

diff --git a/src/main/kotlin/apifi/parser/models/Spec.kt → codegen/src/main/kotlin/apifi/models/Spec.kt b/src/main/kotlin/apifi/parser/models/Spec.kt → codegen/src/main/kotlin/apifi/models/Spec.kt
@@ -1,8 +1,7 @@
-package apifi.parser.models
+package apifi.models
 
 import io.swagger.v3.oas.models.PathItem
 import io.swagger.v3.oas.models.security.SecurityScheme
-import org.apache.http.HttpStatus
 
 data class Spec(val paths: List<Path>, val models: List<Model>, val securityRequirements: List<String>, val securityDefinitions: List<SecurityDefinition>)
 

diff --git a/src/main/kotlin/apifi/parser/ModelParser.kt → ...c/main/kotlin/apifi/parser/ModelParser.kt b/src/main/kotlin/apifi/parser/ModelParser.kt → ...c/main/kotlin/apifi/parser/ModelParser.kt
@@ -2,8 +2,8 @@ package apifi.parser
 
 import apifi.helpers.toCodeGenModel
 import apifi.helpers.toTitleCase
-import apifi.parser.models.Model
-import apifi.parser.models.Property
+import apifi.models.Model
+import apifi.models.Property
 import io.swagger.v3.oas.models.media.ArraySchema
 import io.swagger.v3.oas.models.media.ObjectSchema
 import io.swagger.v3.oas.models.media.Schema

diff --git a/src/main/kotlin/apifi/parser/PathsParser.kt → ...c/main/kotlin/apifi/parser/PathsParser.kt b/src/main/kotlin/apifi/parser/PathsParser.kt → ...c/main/kotlin/apifi/parser/PathsParser.kt
@@ -3,7 +3,7 @@ package apifi.parser
 import apifi.helpers.toCamelCase
 import apifi.helpers.toCodeGenModel
 import apifi.helpers.toTitleCase
-import apifi.parser.models.*
+import apifi.models.*
 import io.swagger.v3.oas.models.PathItem
 import io.swagger.v3.oas.models.Paths
 
@@ -20,7 +20,8 @@ object PathsParser {
                 val responses = ResponseBodyParser.parse(operation.responses, operationSpecifier)
                 models.addAll(request?.second ?: emptyList())
                 models.addAll(responses?.second ?: emptyList())
-                Operation(httpMethod, operation.operationId ?: toCamelCase(httpMethod.toString()),
+                Operation(httpMethod, operation.operationId
+                        ?: toCamelCase(httpMethod.toString()),
                         operation.tags, params, request?.first, responses?.first)
             }
             Path(endpoint, operations)

diff --git a/.../kotlin/apifi/parser/RequestBodyParser.kt → .../kotlin/apifi/parser/RequestBodyParser.kt b/.../kotlin/apifi/parser/RequestBodyParser.kt → .../kotlin/apifi/parser/RequestBodyParser.kt
@@ -2,8 +2,8 @@ package apifi.parser
 
 import apifi.parser.ModelParser.parseReference
 import apifi.parser.ModelParser.shouldCreateModel
-import apifi.parser.models.Model
-import apifi.parser.models.Request
+import apifi.models.Model
+import apifi.models.Request
 import io.swagger.v3.oas.models.media.ArraySchema
 import io.swagger.v3.oas.models.media.Schema
 import io.swagger.v3.oas.models.parameters.RequestBody

diff --git a/...kotlin/apifi/parser/ResponseBodyParser.kt → ...kotlin/apifi/parser/ResponseBodyParser.kt b/...kotlin/apifi/parser/ResponseBodyParser.kt → ...kotlin/apifi/parser/ResponseBodyParser.kt
@@ -1,8 +1,8 @@
 package apifi.parser
 
 import apifi.parser.ModelParser.parseReference
-import apifi.parser.models.Model
-import apifi.parser.models.Response
+import apifi.models.Model
+import apifi.models.Response
 import io.swagger.v3.oas.models.media.ArraySchema
 import io.swagger.v3.oas.models.media.Schema
 import io.swagger.v3.oas.models.responses.ApiResponses

diff --git a/...ain/kotlin/apifi/parser/SpecFileParser.kt → ...ain/kotlin/apifi/parser/SpecFileParser.kt b/...ain/kotlin/apifi/parser/SpecFileParser.kt → ...ain/kotlin/apifi/parser/SpecFileParser.kt
@@ -1,8 +1,8 @@
 package apifi.parser
 
-import apifi.parser.models.SecurityDefinition
-import apifi.parser.models.SecurityDefinitionType
-import apifi.parser.models.Spec
+import apifi.models.SecurityDefinition
+import apifi.models.SecurityDefinitionType
+import apifi.models.Spec
 import io.swagger.v3.oas.models.OpenAPI
 
 object SpecFileParser {

diff --git a/src/test-res/codegen/all-paths.yml → codegen/src/test-res/codegen/all-paths.yml b/src/test-res/codegen/all-paths.yml → codegen/src/test-res/codegen/all-paths.yml
diff --git a/src/test-res/codegen/expected-models → codegen/src/test-res/codegen/expected-models b/src/test-res/codegen/expected-models → codegen/src/test-res/codegen/expected-models
diff --git a/src/test-res/codegen/expected-pet-api → ...gen/src/test-res/codegen/expected-pet-api b/src/test-res/codegen/expected-pet-api → ...gen/src/test-res/codegen/expected-pet-api
diff --git a/src/test-res/codegen/expected-store-api → ...n/src/test-res/codegen/expected-store-api b/src/test-res/codegen/expected-store-api → ...n/src/test-res/codegen/expected-store-api
diff --git a/...er/models/with-cross-reference-schema.yml → ...er/models/with-cross-reference-schema.yml b/...er/models/with-cross-reference-schema.yml → ...er/models/with-cross-reference-schema.yml
diff --git a/...s/with-inline-request-response-schema.yml → ...s/with-inline-request-response-schema.yml b/...s/with-inline-request-response-schema.yml → ...s/with-inline-request-response-schema.yml
diff --git a/.../parser/models/with-non-200-responses.yml → .../parser/models/with-non-200-responses.yml b/.../parser/models/with-non-200-responses.yml → .../parser/models/with-non-200-responses.yml
diff --git a/...s/parser/models/with-responses-schema.yml → ...s/parser/models/with-responses-schema.yml b/...s/parser/models/with-responses-schema.yml → ...s/parser/models/with-responses-schema.yml
diff --git a/...es/parser/models/with-separate-schema.yml → ...es/parser/models/with-separate-schema.yml b/...es/parser/models/with-separate-schema.yml → ...es/parser/models/with-separate-schema.yml
diff --git a/...-res/parser/params/with-header-params.yml → ...-res/parser/params/with-header-params.yml b/...-res/parser/params/with-header-params.yml → ...-res/parser/params/with-header-params.yml
diff --git a/...test-res/parser/params/with-no-params.yml → ...test-res/parser/params/with-no-params.yml b/...test-res/parser/params/with-no-params.yml → ...test-res/parser/params/with-no-params.yml
diff --git a/...st-res/parser/params/with-path-params.yml → ...st-res/parser/params/with-path-params.yml b/...st-res/parser/params/with-path-params.yml → ...st-res/parser/params/with-path-params.yml
diff --git a/...t-res/parser/params/with-query-params.yml → ...t-res/parser/params/with-query-params.yml b/...t-res/parser/params/with-query-params.yml → ...t-res/parser/params/with-query-params.yml
diff --git a/...r/request/with-multipart-content-type.yml → ...r/request/with-multipart-content-type.yml b/...r/request/with-multipart-content-type.yml → ...r/request/with-multipart-content-type.yml
diff --git a/...hemes/with-basic-auth-security-scheme.yml → ...hemes/with-basic-auth-security-scheme.yml b/...hemes/with-basic-auth-security-scheme.yml → ...hemes/with-basic-auth-security-scheme.yml
diff --git a/...emes/with-bearer-auth-security-scheme.yml → ...emes/with-bearer-auth-security-scheme.yml b/...emes/with-bearer-auth-security-scheme.yml → ...emes/with-bearer-auth-security-scheme.yml
diff --git a/...emes/with-unsupported-security-scheme.yml → ...emes/with-unsupported-security-scheme.yml b/...emes/with-unsupported-security-scheme.yml → ...emes/with-unsupported-security-scheme.yml
diff --git a/...st/kotlin/apifi/codegen/ApiBuilderTest.kt → ...st/kotlin/apifi/codegen/ApiBuilderTest.kt b/...st/kotlin/apifi/codegen/ApiBuilderTest.kt → ...st/kotlin/apifi/codegen/ApiBuilderTest.kt
@@ -1,13 +1,13 @@
 package apifi.codegen
 
-import apifi.parser.models.*
+import apifi.models.*
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.TypeSpec
-import io.kotlintest.matchers.collections.shouldContain
-import io.kotlintest.matchers.collections.shouldContainExactlyInAnyOrder
-import io.kotlintest.matchers.string.shouldContain
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import io.kotest.matchers.collections.shouldContain
+import io.kotest.matchers.string.shouldContain
+import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 import io.swagger.v3.oas.models.PathItem
 
 class ApiBuilderTest : DescribeSpec({

diff --git a/...kotlin/apifi/codegen/CodeGeneratorTest.kt → ...kotlin/apifi/codegen/CodeGeneratorTest.kt b/...kotlin/apifi/codegen/CodeGeneratorTest.kt → ...kotlin/apifi/codegen/CodeGeneratorTest.kt
@@ -1,9 +1,9 @@
 package apifi.codegen
 
 import apifi.parser.SpecFileParser
-import io.kotlintest.matchers.collections.shouldNotContainInOrder
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import io.kotest.matchers.collections.shouldNotContainInOrder
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 import io.swagger.v3.parser.OpenAPIV3Parser
 import org.apache.commons.io.FileUtils
 

diff --git a/...codegen/ControllerInterfaceBuilderTest.kt → ...codegen/ControllerInterfaceBuilderTest.kt b/...codegen/ControllerInterfaceBuilderTest.kt → ...codegen/ControllerInterfaceBuilderTest.kt
@@ -1,8 +1,8 @@
 package apifi.codegen
 
-import apifi.parser.models.*
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import apifi.models.*
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 import io.swagger.v3.oas.models.PathItem
 
 class ControllerInterfaceBuilderTest : DescribeSpec({

diff --git a/...apifi/codegen/ExceptionFileBuilderTest.kt → ...apifi/codegen/ExceptionFileBuilderTest.kt b/...apifi/codegen/ExceptionFileBuilderTest.kt → ...apifi/codegen/ExceptionFileBuilderTest.kt
@@ -1,10 +1,12 @@
 package apifi.codegen
 
+import apifi.codegen.exceptions.ExceptionDetailsHolder
+import apifi.codegen.exceptions.ExceptionFileBuilder
 import com.squareup.kotlinpoet.TypeSpec
-import io.kotlintest.matchers.collections.shouldNotContainInOrder
-import io.kotlintest.matchers.string.shouldContain
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import io.kotest.matchers.collections.shouldNotContainInOrder
+import io.kotest.matchers.string.shouldContain
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 
 class ExceptionFileBuilderTest : DescribeSpec( {
 

diff --git a/...kotlin/apifi/codegen/HeaderBuilderTest.kt → ...kotlin/apifi/codegen/HeaderBuilderTest.kt b/...kotlin/apifi/codegen/HeaderBuilderTest.kt → ...kotlin/apifi/codegen/HeaderBuilderTest.kt
@@ -1,9 +1,9 @@
 package apifi.codegen
 
-import apifi.parser.models.Param
-import apifi.parser.models.ParamType
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import apifi.models.Param
+import apifi.models.ParamType
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 
 class HeaderBuilderTest : DescribeSpec({
     describe("HeaderBuilder") {

diff --git a/...lin/apifi/codegen/ModelFileBuilderTest.kt → ...lin/apifi/codegen/ModelFileBuilderTest.kt b/...lin/apifi/codegen/ModelFileBuilderTest.kt → ...lin/apifi/codegen/ModelFileBuilderTest.kt
@@ -1,9 +1,10 @@
 package apifi.codegen
 
-import apifi.parser.models.*
+import apifi.models.Model
+import apifi.models.Property
 import com.squareup.kotlinpoet.TypeSpec
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 
 class ModelFileBuilderTest : DescribeSpec({
 

diff --git a/...pifi/codegen/Non200ResponseHandlerTest.kt → ...pifi/codegen/Non200ResponseHandlerTest.kt b/...pifi/codegen/Non200ResponseHandlerTest.kt → ...pifi/codegen/Non200ResponseHandlerTest.kt
@@ -1,7 +1,8 @@
 package apifi.codegen
 
-import io.kotlintest.specs.StringSpec
-import io.kotlintest.shouldBe
+import apifi.codegen.exceptions.Non200ResponseHandler
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
 
 class Non200ResponseHandlerTest : StringSpec() {
 

diff --git a/.../apifi/codegen/PathVariableBuilderTest.kt → .../apifi/codegen/PathVariableBuilderTest.kt b/.../apifi/codegen/PathVariableBuilderTest.kt → .../apifi/codegen/PathVariableBuilderTest.kt
@@ -1,9 +1,9 @@
 package apifi.codegen
 
-import apifi.parser.models.Param
-import apifi.parser.models.ParamType
-import io.kotlintest.shouldBe
-import io.kotlintest.specs.DescribeSpec
+import apifi.models.Param
+import apifi.models.ParamType
+import io.kotest.matchers.shouldBe
+import io.kotest.core.spec.style.DescribeSpec
 
 class PathVariableBuilderTest : DescribeSpec({
     describe("PathVariableBuilder") {