diff --git a/core-kotlin-2/README.md b/core-kotlin-2/README.md
index 5249262fa3..b0f17beb39 100644
--- a/core-kotlin-2/README.md
+++ b/core-kotlin-2/README.md
@@ -4,11 +4,5 @@ This module contains articles about core Kotlin.
### Relevant articles:
-- [Kotlin Scope Functions](https://www.baeldung.com/kotlin-scope-functions)
-- [Kotlin Annotations](https://www.baeldung.com/kotlin-annotations)
-- [Split a List into Parts in Kotlin](https://www.baeldung.com/kotlin-split-list-into-parts)
-- [String Comparison in Kotlin](https://www.baeldung.com/kotlin-string-comparison)
-- [Guide to JVM Platform Annotations in Kotlin](https://www.baeldung.com/kotlin-jvm-annotations)
-- [Finding an Element in a List Using Kotlin](https://www.baeldung.com/kotlin-finding-element-in-list)
- [Kotlin Ternary Conditional Operator](https://www.baeldung.com/kotlin-ternary-conditional-operator)
- More articles: [[<-- prev]](/core-kotlin)
diff --git a/core-kotlin-modules/core-kotlin/README.md b/core-kotlin-modules/core-kotlin/README.md
new file mode 100644
index 0000000000..42f6486ad3
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin/README.md
@@ -0,0 +1,15 @@
+## Core Kotlin
+
+This module contains articles about Kotlin core features.
+
+### Relevant articles:
+- [Introduction to the Kotlin Language](https://www.baeldung.com/kotlin)
+- [Kotlin Java Interoperability](https://www.baeldung.com/kotlin-java-interoperability)
+- [Get a Random Number in Kotlin](https://www.baeldung.com/kotlin-random-number)
+- [Create a Java and Kotlin Project with Maven](https://www.baeldung.com/kotlin-maven-java-project)
+- [Guide to Sorting in Kotlin](https://www.baeldung.com/kotlin-sort)
+- [Creational Design Patterns in Kotlin: Builder](https://www.baeldung.com/kotlin-builder-pattern)
+- [Kotlin Scope Functions](https://www.baeldung.com/kotlin-scope-functions)
+- [Implementing a Binary Tree in Kotlin](https://www.baeldung.com/kotlin-binary-tree)
+- [JUnit 5 for Kotlin Developers](https://www.baeldung.com/junit-5-kotlin)
+- [Converting Kotlin Data Class from JSON using GSON](https://www.baeldung.com/kotlin-json-convert-data-class)
diff --git a/core-kotlin-modules/core-kotlin/pom.xml b/core-kotlin-modules/core-kotlin/pom.xml
new file mode 100644
index 0000000000..6e36b7c8ef
--- /dev/null
+++ b/core-kotlin-modules/core-kotlin/pom.xml
@@ -0,0 +1,29 @@
+
+
+ 4.0.0
+ core-kotlin
+ core-kotlin
+ jar
+
+
+ com.baeldung.core-kotlin-modules
+ core-kotlin-modules
+ 1.0.0-SNAPSHOT
+
+
+
+
+ org.junit.platform
+ junit-platform-runner
+ ${junit.platform.version}
+ test
+
+
+
+
+ 1.1.1
+
+
+
\ No newline at end of file
diff --git a/core-kotlin/src/main/java/com/baeldung/java/ArrayExample.java b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/interoperability/ArrayExample.java
similarity index 91%
rename from core-kotlin/src/main/java/com/baeldung/java/ArrayExample.java
rename to core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/interoperability/ArrayExample.java
index ef91db517b..93b9a3984a 100644
--- a/core-kotlin/src/main/java/com/baeldung/java/ArrayExample.java
+++ b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/interoperability/ArrayExample.java
@@ -1,4 +1,4 @@
-package com.baeldung.java;
+package com.baeldung.interoperability;
import java.io.File;
import java.io.FileReader;
diff --git a/core-kotlin/src/main/java/com/baeldung/java/Customer.java b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/interoperability/Customer.java
similarity index 91%
rename from core-kotlin/src/main/java/com/baeldung/java/Customer.java
rename to core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/interoperability/Customer.java
index 0156bf7b44..4a070a0f97 100644
--- a/core-kotlin/src/main/java/com/baeldung/java/Customer.java
+++ b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/interoperability/Customer.java
@@ -1,4 +1,4 @@
-package com.baeldung.java;
+package com.baeldung.interoperability;
public class Customer {
diff --git a/core-kotlin/src/main/java/com/baeldung/java/StringUtils.java b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/introduction/StringUtils.java
similarity index 77%
rename from core-kotlin/src/main/java/com/baeldung/java/StringUtils.java
rename to core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/introduction/StringUtils.java
index f405924cdf..1c477ce039 100644
--- a/core-kotlin/src/main/java/com/baeldung/java/StringUtils.java
+++ b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/introduction/StringUtils.java
@@ -1,4 +1,4 @@
-package com.baeldung.java;
+package com.baeldung.introduction;
public class StringUtils {
public static String toUpperCase(String name) {
diff --git a/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
similarity index 91%
rename from core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
rename to core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
index e2cc0f1e01..ac933d6228 100644
--- a/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
+++ b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
@@ -1,7 +1,6 @@
package com.baeldung.mavenjavakotlin;
import com.baeldung.mavenjavakotlin.services.JavaService;
-import com.baeldung.mavenjavakotlin.services.KotlinService;
public class Application {
diff --git a/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java b/core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
similarity index 100%
rename from core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
rename to core-kotlin-modules/core-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datastructures/Main.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/binarytree/Main.kt
similarity index 93%
rename from core-kotlin/src/main/kotlin/com/baeldung/datastructures/Main.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/binarytree/Main.kt
index 4fd8aa27c7..eee10fbd8b 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/datastructures/Main.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/binarytree/Main.kt
@@ -1,4 +1,4 @@
-package com.baeldung.datastructures
+package com.baeldung.binarytree
/**
* Example of how to use the {@link Node} class.
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datastructures/Node.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/binarytree/Node.kt
similarity index 97%
rename from core-kotlin/src/main/kotlin/com/baeldung/datastructures/Node.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/binarytree/Node.kt
index b81afe1e4c..464daed444 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/datastructures/Node.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/binarytree/Node.kt
@@ -1,13 +1,13 @@
-package com.baeldung.datastructures
+package com.baeldung.binarytree
/**
* An ADT for a binary search tree.
* Note that this data type is neither immutable nor thread safe.
*/
class Node(
- var key: Int,
- var left: Node? = null,
- var right: Node? = null) {
+ var key: Int,
+ var left: Node? = null,
+ var right: Node? = null) {
/**
* Return a node with given value. If no such node exists, return null.
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrder.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderApply.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderApply.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderApply.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderApply.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/FoodOrderNamed.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt
similarity index 100%
rename from core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/builder/Main.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/Example1.kt
similarity index 63%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/Example1.kt
index bca1e54a6c..aacd8f7915 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Example1.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/Example1.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
fun main(args: Array){
println("hello word")
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/Item.kt
similarity index 89%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/Item.kt
index 36994e4994..bb91dd1eae 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/Item.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/Item.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
open class Item(val id: String, val name: String = "unknown_name") {
open fun getIdOfItem(): String {
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/ItemService.kt
similarity index 98%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/ItemService.kt
index 88de1aa9be..dfcf17df7c 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/ItemService.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/ItemService.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
import java.util.*
diff --git a/core-kotlin-modules/core-kotlin-lang-oop/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/ListExtension.kt
similarity index 90%
rename from core-kotlin-modules/core-kotlin-lang-oop/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/ListExtension.kt
index da1773b7c9..e71292c60a 100644
--- a/core-kotlin-modules/core-kotlin-lang-oop/src/main/kotlin/com/baeldung/kotlin/ListExtension.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/ListExtension.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
import java.util.concurrent.ThreadLocalRandom
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/MathematicsOperations.kt
similarity index 75%
rename from core-kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/MathematicsOperations.kt
index 924f9d2323..0ed30ed5b4 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/kotlin/MathematicsOperations.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/introduction/MathematicsOperations.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
class MathematicsOperations {
fun addTwoNumbers(a: Int, b: Int): Int {
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
similarity index 70%
rename from core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
index 114b1c88df..10d6a792d8 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
@@ -1,4 +1,4 @@
-package com.baeldung.mavenjavakotlin.services
+package com.baeldung.mavenjavakotlin
class KotlinService {
diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/scope/ScopeFunctions.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/scope/ScopeFunctions.kt
similarity index 100%
rename from core-kotlin-2/src/main/kotlin/com/baeldung/scope/ScopeFunctions.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/scope/ScopeFunctions.kt
diff --git a/core-kotlin/src/main/kotlin/com/baeldung/sorting/SortingExample.kt b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/sorting/SortingExample.kt
similarity index 97%
rename from core-kotlin/src/main/kotlin/com/baeldung/sorting/SortingExample.kt
rename to core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/sorting/SortingExample.kt
index 2309d23c36..bf3163bc8f 100644
--- a/core-kotlin/src/main/kotlin/com/baeldung/sorting/SortingExample.kt
+++ b/core-kotlin-modules/core-kotlin/src/main/kotlin/com/baeldung/sorting/SortingExample.kt
@@ -1,7 +1,5 @@
package com.baeldung.sorting
-import kotlin.comparisons.*
-
fun sortMethodUsage() {
val sortedValues = mutableListOf(1, 2, 7, 6, 5, 6)
sortedValues.sort()
diff --git a/core-kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java b/core-kotlin-modules/core-kotlin/src/test/java/com/baeldung/introduction/JavaCallToKotlinUnitTest.java
similarity index 90%
rename from core-kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
rename to core-kotlin-modules/core-kotlin/src/test/java/com/baeldung/introduction/JavaCallToKotlinUnitTest.java
index 370f24785a..2c386eaad3 100644
--- a/core-kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java
+++ b/core-kotlin-modules/core-kotlin/src/test/java/com/baeldung/introduction/JavaCallToKotlinUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin;
+package com.baeldung.introduction;
import org.junit.Test;
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/datastructures/NodeTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/binarytree/NodeTest.kt
similarity index 93%
rename from core-kotlin/src/test/kotlin/com/baeldung/datastructures/NodeTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/binarytree/NodeTest.kt
index 8a46c5f6ec..6c5ff18be7 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/datastructures/NodeTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/binarytree/NodeTest.kt
@@ -1,7 +1,8 @@
-package com.baeldung.datastructures
+package com.baeldung.binarytree
import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
import org.junit.Before
import org.junit.Test
@@ -69,8 +70,10 @@ class NodeTest {
@Test
fun givenDepthTwo_whenPivotAtDepth2_then_Success() {
- val left = Node(1, Node(0), Node(2))
- val right = Node(5, Node(4), Node(6))
+ val left =
+ Node(1, Node(0), Node(2))
+ val right =
+ Node(5, Node(4), Node(6))
val n = Node(3, left, right)
assertEquals(left.left, n.find(0))
}
@@ -243,7 +246,8 @@ class NodeTest {
*/
@Test
fun givenTreeDepthOne_whenValueAbsent_thenNoChange() {
- val n = Node(1, Node(0), Node(2))
+ val n =
+ Node(1, Node(0), Node(2))
n.delete(3)
assertEquals(1, n.key)
assertEquals(2, n.right!!.key)
@@ -281,7 +285,11 @@ class NodeTest {
*/
@Test
fun givenTreeDepthTwo_whenNodeToDeleteHasOneChild_thenChangeTree() {
- val n = Node(2, Node(0, null, Node(1)), Node(3))
+ val n = Node(
+ 2,
+ Node(0, null, Node(1)),
+ Node(3)
+ )
n.delete(0)
assertEquals(2, n.key)
with(n.right!!) {
@@ -298,8 +306,13 @@ class NodeTest {
@Test
fun givenTreeDepthThree_whenNodeToDeleteHasTwoChildren_thenChangeTree() {
- val l = Node(2, Node(1), Node(5, Node(4), Node(6)))
- val r = Node(10, Node(9), Node(11))
+ val l = Node(
+ 2,
+ Node(1),
+ Node(5, Node(4), Node(6))
+ )
+ val r =
+ Node(10, Node(9), Node(11))
val n = Node(8, l, r)
n.delete(8)
assertEquals(6, n.key)
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/builder/BuilderPatternUnitTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/builder/BuilderPatternUnitTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/builder/BuilderPatternUnitTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/builder/BuilderPatternUnitTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/gson/GsonUnitTest.kt
similarity index 87%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/gson/GsonUnitTest.kt
index bdf44d3b49..9159be96be 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/gson/GsonUnitTest.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.gson
+package com.baeldung.gson
import com.google.gson.Gson
@@ -11,7 +11,7 @@ class GsonUnitTest {
@Test
fun givenObject_thenGetJSONString() {
- var jsonString = gson.toJson(TestModel(1,"Test"))
+ var jsonString = gson.toJson(TestModel(1, "Test"))
Assert.assertEquals(jsonString, "{\"id\":1,\"description\":\"Test\"}")
}
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/interoperability/ArrayTest.kt
similarity index 62%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/interoperability/ArrayTest.kt
index f7d1c53b13..406f19e89b 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ArrayTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/interoperability/ArrayTest.kt
@@ -1,7 +1,5 @@
-package com.baeldung.kotlin
+package com.baeldung.interoperability
-import com.baeldung.java.ArrayExample
-import com.baeldung.java.Customer
import org.junit.Test
import kotlin.test.assertEquals
@@ -9,7 +7,7 @@ class ArrayTest {
@Test
fun givenArray_whenValidateArrayType_thenComplete () {
- val ex = ArrayExample()
+ val ex = com.baeldung.interoperability.ArrayExample()
val numArray = intArrayOf(1, 2, 3)
assertEquals(ex.sumValues(numArray), 6)
@@ -17,7 +15,7 @@ class ArrayTest {
@Test
fun givenCustomer_whenGetSuperType_thenComplete() {
- val instance = Customer::class
+ val instance = com.baeldung.interoperability.Customer::class
val supertypes = instance.supertypes
assertEquals(supertypes[0].toString(), "kotlin.Any")
@@ -25,15 +23,15 @@ class ArrayTest {
@Test
fun givenCustomer_whenGetConstructor_thenComplete() {
- val instance = Customer::class.java
+ val instance = com.baeldung.interoperability.Customer::class.java
val constructors = instance.constructors
assertEquals(constructors.size, 1)
- assertEquals(constructors[0].name, "com.baeldung.java.Customer")
+ assertEquals(constructors[0].name, "com.baeldung.interoperability.Customer")
}
fun makeReadFile() {
- val ax = ArrayExample()
+ val ax = com.baeldung.interoperability.ArrayExample()
ax.writeList()
}
}
\ No newline at end of file
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/interoperability/CustomerTest.kt
similarity index 80%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/interoperability/CustomerTest.kt
index 6395dfcfed..7ed3bdfbec 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/CustomerTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/interoperability/CustomerTest.kt
@@ -1,6 +1,5 @@
-package com.baeldung.kotlin
+package com.baeldung.interoperability
-import com.baeldung.java.Customer
import org.junit.Test
import kotlin.test.assertEquals
@@ -8,7 +7,7 @@ class CustomerTest {
@Test
fun givenCustomer_whenNameAndLastNameAreAssigned_thenComplete() {
- val customer = Customer()
+ val customer = com.baeldung.interoperability.Customer()
// Setter method is being called
customer.firstName = "Frodo"
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/ItemServiceTest.kt
similarity index 92%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/ItemServiceTest.kt
index 3d730b1283..2ba14a7462 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/ItemServiceTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/ItemServiceTest.kt
@@ -1,9 +1,10 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
import org.junit.Test
import kotlin.test.assertNotNull
class ItemServiceTest {
+
@Test
fun givenItemId_whenGetForOptionalItem_shouldMakeActionOnNonNullValue() {
//given
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/KotlinJavaInteroperabilityTest.kt
similarity index 84%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/KotlinJavaInteroperabilityTest.kt
index 91ccaabf6f..5dddf9bfc9 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinJavaInteroperabilityTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/KotlinJavaInteroperabilityTest.kt
@@ -1,6 +1,5 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
-import com.baeldung.java.StringUtils
import org.junit.Test
import kotlin.test.assertEquals
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/LambdaTest.kt
similarity index 91%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/LambdaTest.kt
index 34217336a0..5e5166074e 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/LambdaTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/LambdaTest.kt
@@ -1,10 +1,11 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
import org.junit.Test
import kotlin.test.assertEquals
class LambdaTest {
+
@Test
fun givenListOfNumber_whenDoingOperationsUsingLambda_shouldReturnProperResult() {
//given
diff --git a/core-kotlin-modules/core-kotlin-lang-oop/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/ListExtensionTest.kt
similarity index 79%
rename from core-kotlin-modules/core-kotlin-lang-oop/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/ListExtensionTest.kt
index 7a496e7437..38f244297b 100644
--- a/core-kotlin-modules/core-kotlin-lang-oop/src/test/kotlin/com/baeldung/kotlin/ListExtensionTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/introduction/ListExtensionTest.kt
@@ -1,12 +1,12 @@
-package com.baeldung.kotlin
+package com.baeldung.introduction
-import com.baeldung.kotlin.ListExtension
import org.junit.Test
import kotlin.test.assertTrue
class ListExtensionTest {
+
@Test
- fun givenList_whenExecuteExtensionFunctionOnList_shouldReturnRandomElementOfList(){
+ fun givenList_whenExecuteExtensionFunctionOnList_shouldReturnRandomElementOfList() {
//given
val elements = listOf("a", "b", "c")
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/Calculator.kt
similarity index 91%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/Calculator.kt
index 1b61c05887..9f6e3ab2b9 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/Calculator.kt
@@ -1,4 +1,4 @@
-package com.baeldung.kotlin.junit5
+package com.baeldung.junit5
class Calculator {
fun add(a: Int, b: Int) = a + b
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/CalculatorUnitTest.kt
similarity index 97%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/CalculatorUnitTest.kt
index daaedca5a3..07cab3b76e 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/CalculatorUnitTest.kt
@@ -1,9 +1,9 @@
-package com.baeldung.kotlin.junit5
+package com.baeldung.junit5
import org.junit.jupiter.api.*
import org.junit.jupiter.api.function.Executable
-class CalculatorTest5 {
+class CalculatorUnitTest {
private val calculator = Calculator()
@Test
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/DivideByZeroException.kt
similarity index 64%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/DivideByZeroException.kt
index 60bc4e2944..5675367fd5 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/DivideByZeroException.kt
@@ -1,3 +1,3 @@
-package com.baeldung.kotlin.junit5
+package com.baeldung.junit5
class DivideByZeroException(val numerator: Int) : Exception()
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/SimpleUnitTest.kt
similarity index 88%
rename from core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/SimpleUnitTest.kt
index 15ff201430..e3fe998efd 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/junit5/SimpleUnitTest.kt
@@ -1,10 +1,10 @@
-package com.baeldung.kotlin.junit5
+package com.baeldung.junit5
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test
-class SimpleTest5 {
+class SimpleUnitTest {
@Test
fun `isEmpty should return true for empty lists`() {
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt
similarity index 100%
rename from core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/random/RandomNumberTest.kt
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/scope/ScopeFunctionsUnitTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/scope/ScopeFunctionsUnitTest.kt
similarity index 100%
rename from core-kotlin-2/src/test/kotlin/com/baeldung/scope/ScopeFunctionsUnitTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/scope/ScopeFunctionsUnitTest.kt
diff --git a/core-kotlin/src/test/kotlin/com/baeldung/sorting/SortingExampleKtTest.kt b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/sorting/SortingExampleKtTest.kt
similarity index 86%
rename from core-kotlin/src/test/kotlin/com/baeldung/sorting/SortingExampleKtTest.kt
rename to core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/sorting/SortingExampleKtTest.kt
index 8a94e29c2f..7ac0efa4ef 100644
--- a/core-kotlin/src/test/kotlin/com/baeldung/sorting/SortingExampleKtTest.kt
+++ b/core-kotlin-modules/core-kotlin/src/test/kotlin/com/baeldung/sorting/SortingExampleKtTest.kt
@@ -1,9 +1,8 @@
package com.baeldung.sorting
+import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.Assertions.*
-
class SortingExampleKtTest {
@Test
diff --git a/core-kotlin-modules/pom.xml b/core-kotlin-modules/pom.xml
index e49b5fb85d..304421ed20 100644
--- a/core-kotlin-modules/pom.xml
+++ b/core-kotlin-modules/pom.xml
@@ -15,6 +15,7 @@
+ core-kotlin
core-kotlin-advanced
core-kotlin-annotations
core-kotlin-collections
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index b5b8afb9ab..4476ef7225 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -4,16 +4,7 @@ This module contains articles about core Kotlin.
### Relevant articles:
-- [Introduction to the Kotlin Language](https://www.baeldung.com/kotlin)
-- [Kotlin Java Interoperability](https://www.baeldung.com/kotlin-java-interoperability)
-- [JUnit 5 for Kotlin Developers](https://www.baeldung.com/junit-5-kotlin)
-- [Create a Java and Kotlin Project with Maven](https://www.baeldung.com/kotlin-maven-java-project)
-- [Get a Random Number in Kotlin](https://www.baeldung.com/kotlin-random-number)
-- [Creational Design Patterns in Kotlin: Builder](https://www.baeldung.com/kotlin-builder-pattern)
- [Fuel HTTP Library with Kotlin](https://www.baeldung.com/kotlin-fuel)
- [Introduction to Kovenant Library for Kotlin](https://www.baeldung.com/kotlin-kovenant)
-- [Converting Kotlin Data Class from JSON using GSON](https://www.baeldung.com/kotlin-json-convert-data-class)
-- [Guide to Sorting in Kotlin](https://www.baeldung.com/kotlin-sort)
- [Dependency Injection for Kotlin with Injekt](https://www.baeldung.com/kotlin-dependency-injection-with-injekt)
-- [Implementing a Binary Tree in Kotlin](https://www.baeldung.com/kotlin-binary-tree)
- More articles: [[next -->]](/core-kotlin-2)
diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml
index 5fe8a47f62..b09192a03e 100644
--- a/core-kotlin/pom.xml
+++ b/core-kotlin/pom.xml
@@ -19,12 +19,6 @@
commons-lang3
${commons-lang3.version}
-
- org.junit.platform
- junit-platform-runner
- ${junit.platform.version}
- test
-
org.assertj
assertj-core
@@ -70,7 +64,6 @@
- 1.1.1
5.2.0
3.10.0
1.15.0