replace tab with spaces, minor code format change (#8774)

OpenAPITools · Feb 22, 2021 · 764a3b0 · 764a3b0
1 parent e6b4434
commit 764a3b0
Show file tree

Hide file tree

Showing 26 changed files with 292 additions and 285 deletions.
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class.mustache
@@ -26,12 +26,12 @@ data class {{classname}} (
 {
 {{/vendorExtensions.x-has-data-class-body}}
 {{#serializableModel}}
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 {{/serializableModel}}
 {{#hasEnums}}
-	{{#vars}}
+    {{#vars}}
     {{#isEnum}}
     /**
     * {{{description}}}

diff --git a/...-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache b/...-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache
@@ -32,16 +32,16 @@ plugins {
 }
 
 dependencies {
-	val kotlinxCoroutinesVersion="1.2.0"
+    val kotlinxCoroutinesVersion="1.2.0"
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.jetbrains.kotlin:kotlin-reflect")
 {{^reactive}}
     compile("org.springframework.boot:spring-boot-starter-web")
 {{/reactive}}
 {{#reactive}}
-	compile("org.springframework.boot:spring-boot-starter-webflux")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
-	compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
+    compile("org.springframework.boot:spring-boot-starter-webflux")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$kotlinxCoroutinesVersion")
 {{/reactive}}
 {{#swaggerAnnotations}}
     compile("io.swagger:swagger-annotations:1.5.21")
@@ -55,12 +55,12 @@ dependencies {
         exclude(module = "junit")
     }
 {{#reactive}}
-	testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
+    testCompile("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
 {{/reactive}}
 }
 
 repositories {
-	maven { url = uri("https://repo1.maven.org/maven2") }
-	maven { url = uri("https://repo.spring.io/snapshot") }
-	maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo1.maven.org/maven2") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/...les/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/...les/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
@@ -7,7 +7,7 @@
     <version>{{artifactVersion}}</version>
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
@@ -83,20 +83,20 @@
             <artifactId>spring-boot-starter-web</artifactId>
 {{/reactive}}
 {{#reactive}}
-	        <artifactId>spring-boot-starter-webflux</artifactId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
 {{/reactive}}
         </dependency>
 {{#reactive}}
-	    <dependency>
-		    <groupId>org.jetbrains.kotlinx</groupId>
-		    <artifactId>kotlinx-coroutines-core</artifactId>
-		    <version>${kotlinx-coroutines.version}</version>
-	    </dependency>
-	    <dependency>
-		    <groupId>org.jetbrains.kotlinx</groupId>
-		    <artifactId>kotlinx-coroutines-reactor</artifactId>
-		    <version>${kotlinx-coroutines.version}</version>
-	    </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-reactor</artifactId>
+            <version>${kotlinx-coroutines.version}</version>
+        </dependency>
 {{/reactive}}
 
         {{#swaggerAnnotations}}
@@ -148,34 +148,34 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/...-generator/src/main/resources/kotlin-spring/libraries/spring-boot/settingsGradle.mustache b/...-generator/src/main/resources/kotlin-spring/libraries/spring-boot/settingsGradle.mustache
@@ -1,15 +1,15 @@
 pluginManagement {
-	repositories {
-		maven { url = uri("https://repo.spring.io/snapshot") }
-		maven { url = uri("https://repo.spring.io/milestone") }
-		gradlePluginPortal()
-	}
-	resolutionStrategy {
-		eachPlugin {
-			if (requested.id.id == "org.springframework.boot") {
-				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
-			}
-		}
-	}
+    repositories {
+        maven { url = uri("https://repo.spring.io/snapshot") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "org.springframework.boot") {
+                useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+            }
+        }
+    }
 }
-rootProject.name = "{{artifactId}}"
+rootProject.name = "{{artifactId}}"
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache
@@ -5,11 +5,12 @@ package {{package}}
 {{#reactive}}
 import kotlinx.coroutines.flow.Flow;
 {{/reactive}}
+
 {{#operations}}
 interface {{classname}}Service {
 {{#operation}}
 
-	{{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}}
+    {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}}
 {{/operation}}
 }
 {{/operations}}
diff --git a/...petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ApiResponse.kt b/...petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/ApiResponse.kt
@@ -25,8 +25,8 @@ data class ApiResponse (
     val message: kotlin.String? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/...er/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt b/...er/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Category.kt
@@ -23,8 +23,8 @@ data class Category (
     val name: kotlin.String? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/...erver/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt b/...erver/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Order.kt
@@ -32,9 +32,9 @@ data class Order (
     val complete: kotlin.Boolean? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
     /**
     * Order Status
     * Values: placed,approved,delivered

diff --git a/.../server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt b/.../server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Pet.kt
@@ -34,9 +34,9 @@ data class Pet (
     val status: Pet.Status? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
     /**
     * pet status in the store
     * Values: available,pending,sold

diff --git a/.../server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt b/.../server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/Tag.kt
@@ -23,8 +23,8 @@ data class Tag (
     val name: kotlin.String? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/...server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt b/...server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/models/User.kt
@@ -36,8 +36,8 @@ data class User (
     val userStatus: kotlin.Int? = null
 ) : Serializable 
 {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 }
 
diff --git a/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate/build.gradle.kts
@@ -32,7 +32,7 @@ plugins {
 }
 
 dependencies {
-	val kotlinxCoroutinesVersion="1.2.0"
+    val kotlinxCoroutinesVersion="1.2.0"
     compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.jetbrains.kotlin:kotlin-reflect")
     compile("org.springframework.boot:spring-boot-starter-web")
@@ -48,7 +48,7 @@ dependencies {
 }
 
 repositories {
-	maven { url = uri("https://repo1.maven.org/maven2") }
-	maven { url = uri("https://repo.spring.io/snapshot") }
-	maven { url = uri("https://repo.spring.io/milestone") }
+    maven { url = uri("https://repo1.maven.org/maven2") }
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
diff --git a/samples/server/petstore/kotlin-springboot-delegate/pom.xml b/samples/server/petstore/kotlin-springboot-delegate/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0.0</version>
     <properties>
         <kotlin.version>1.3.30</kotlin.version>
-	    <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
+        <kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
         <javax-annotation-version>1.3.2</javax-annotation-version>
     </properties>
     <parent>
@@ -127,34 +127,34 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>