From a811a48c3fea6331cd615e6735317fbcadf0793e Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 28 Jan 2018 17:18:15 +0800 Subject: [PATCH] minor fix to kotlin client genrator due to merge conflict --- .../codegen/languages/KotlinClientCodegen.java | 12 ++++-------- .../client/petstore/kotlin/.swagger-codegen/VERSION | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java index 86a3e67bccd..19d888efcf1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java @@ -1,23 +1,19 @@ package io.swagger.codegen.languages; +import io.swagger.codegen.CliOption; +import io.swagger.codegen.CodegenConstants; import io.swagger.codegen.CodegenType; import io.swagger.codegen.SupportingFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.util.HashMap; +import java.util.Map; public class KotlinClientCodegen extends AbstractKotlinCodegen { public static final String DATE_LIBRARY = "dateLibrary"; - - protected String groupId = "io.swagger"; - protected String artifactId = "kotlin-client"; - protected String artifactVersion = "1.0.0"; - protected String sourceFolder = "src/main/kotlin"; - protected String packageName = "io.swagger.client"; - protected String apiDocPath = "docs/"; - protected String modelDocPath = "docs/"; protected CodegenConstants.ENUM_PROPERTY_NAMING_TYPE enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.camelCase; static Logger LOGGER = LoggerFactory.getLogger(KotlinClientCodegen.class); diff --git a/samples/client/petstore/kotlin/.swagger-codegen/VERSION b/samples/client/petstore/kotlin/.swagger-codegen/VERSION index a6254504e40..855ff9501eb 100644 --- a/samples/client/petstore/kotlin/.swagger-codegen/VERSION +++ b/samples/client/petstore/kotlin/.swagger-codegen/VERSION @@ -1 +1 @@ -2.3.1 \ No newline at end of file +2.4.0-SNAPSHOT \ No newline at end of file