From fd2d59c3340b16c6f6f63e81f2f71feb6f9e4219 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Mon, 3 Dec 2018 14:01:29 +0100
Subject: [PATCH] Updated Kotlin docs

---
 .../main/asciidoc/spring-cloud-function.adoc  |   5 +-
 spring-cloud-function-kotlin/pom.xml          | 126 ++++++++++--------
 2 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/docs/src/main/asciidoc/spring-cloud-function.adoc b/docs/src/main/asciidoc/spring-cloud-function.adoc
index 7ff00a7b9..103d919af 100644
--- a/docs/src/main/asciidoc/spring-cloud-function.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-function.adoc
@@ -93,6 +93,9 @@ The above represents Kotlin lambdas configured as Spring beans. The signature of
 While mechanics of Kotlin-to-Java mapping are outside of the scope of this documentation, it is important to understand that the
 same rules for signature transformation outlined in "Java 8 function support" section are applied here as well.
 
+To enable Kotlin support all you need is to add `spring-cloud-function-kotlin` module to your classpath which contains the appropriate
+autoconfiguration and supporting classes.
+
 == Standalone Web Applications
 
 The `spring-cloud-function-web` module has autoconfiguration that
@@ -110,7 +113,7 @@ plain text and JSON.
 |===
 | Method | Path | Request | Response | Status
 
-| GET    | /{supplier} | - | Items from the named supplier              | 200 OK 
+| GET    | /{supplier} | - | Items from the named supplier              | 200 OK
 | POST   | /{consumer} | JSON object or text | Mirrors input and pushes request body into consumer           | 202 Accepted
 | POST   | /{consumer} | JSON array or text with new lines | Mirrors input and pushes body into consumer one by one | 202 Accepted
 | POST   | /{function} | JSON object or text | The result of applying the named function | 200 OK
diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml
index 33ce70101..1cff2a4e4 100644
--- a/spring-cloud-function-kotlin/pom.xml
+++ b/spring-cloud-function-kotlin/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -19,6 +20,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-context</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib-jdk8</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -29,69 +34,72 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib-jdk8</artifactId>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
-							<artifactId>kotlin-maven-plugin</artifactId>
-							<groupId>org.jetbrains.kotlin</groupId>
-							<version>1.2.71</version>
-							<executions>
-								<execution>
-									<id>compile</id>
-									<goals> <goal>compile</goal> </goals>
-									<configuration>
-										<sourceDirs>
-											<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-											<sourceDir>${project.basedir}/src/main/java</sourceDir>
-										</sourceDirs>
-									</configuration>
-								</execution>
-								<execution>
-									<id>test-compile</id>
-									<goals> <goal>test-compile</goal> </goals>
-									<configuration>
-										<sourceDirs>
-											<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-											<sourceDir>${project.basedir}/src/test/java</sourceDir>
-										</sourceDirs>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>
-						<plugin>
-										<groupId>org.apache.maven.plugins</groupId>
-										<artifactId>maven-compiler-plugin</artifactId>
-										<version>3.5.1</version>
-										<executions>
-											<!-- Replacing default-compile as it is treated specially by maven -->
-											<execution>
-												<id>default-compile</id>
-												<phase>none</phase>
-											</execution>
-											<!-- Replacing default-testCompile as it is treated specially by maven -->
-											<execution>
-												<id>default-testCompile</id>
-												<phase>none</phase>
-											</execution>
-											<execution>
-												<id>java-compile</id>
-												<phase>compile</phase>
-												<goals> <goal>compile</goal> </goals>
-											</execution>
-											<execution>
-												<id>java-test-compile</id>
-												<phase>test-compile</phase>
-												<goals> <goal>testCompile</goal> </goals>
-											</execution>
-										</executions>
-									</plugin>
+				<artifactId>kotlin-maven-plugin</artifactId>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<version>1.2.71</version>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<sourceDirs>
+								<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+								<sourceDir>${project.basedir}/src/main/java</sourceDir>
+							</sourceDirs>
+						</configuration>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<goals>
+							<goal>test-compile</goal>
+						</goals>
+						<configuration>
+							<sourceDirs>
+								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+								<sourceDir>${project.basedir}/src/test/java</sourceDir>
+							</sourceDirs>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<executions>
+					<!-- Replacing default-compile as it is treated specially by maven -->
+					<execution>
+						<id>default-compile</id>
+						<phase>none</phase>
+					</execution>
+					<!-- Replacing default-testCompile as it is treated specially by maven -->
+					<execution>
+						<id>default-testCompile</id>
+						<phase>none</phase>
+					</execution>
+					<execution>
+						<id>java-compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>java-test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>testCompile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>