From 31c65f649ad38bee6bb0b14c0e14188cdd6283fc Mon Sep 17 00:00:00 2001 From: Tomasz Lelek Date: Wed, 25 Jan 2017 19:30:06 +0100 Subject: [PATCH] BAEL-614 java/kotlin interop --- .../kotlin/com/baeldung/kotlin/ItemService.kt | 6 +++++- .../baeldung/kotlin/MathematicsOperations.kt | 7 +++++++ .../baeldung/kotlin/JavaCallToKotlinTest.java | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt create mode 100644 kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt index 96e297115b..88de1aa9be 100644 --- a/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt +++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt @@ -24,13 +24,17 @@ class ItemManager(val categoryId: String, val dbConnection: String) { fun makeAnalyisOfCategory(catId: String): Unit { val result = if (catId == "100") "Yes" else "No" println(result) - + `object`() } fun sum(a: Int, b: Int): Int { return a + b } + fun `object`(): String { + return "this is object" + } + } fun main(args: Array) { diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt new file mode 100644 index 0000000000..924f9d2323 --- /dev/null +++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt @@ -0,0 +1,7 @@ +package com.baeldung.kotlin + +class MathematicsOperations { + fun addTwoNumbers(a: Int, b: Int): Int { + return a + b + } +} \ No newline at end of file diff --git a/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java b/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java new file mode 100644 index 0000000000..cfad7cefd4 --- /dev/null +++ b/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java @@ -0,0 +1,17 @@ +package com.baeldung.kotlin; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class JavaCallToKotlinTest { + @Test + public void givenKotlinClass_whenCallFromJava_shouldProduceResults() { + //when + int res = new MathematicsOperations().addTwoNumbers(2, 4); + + //then + assertEquals(6, res); + + } +}