resolve conflicts

Author: fabiotadashi

core-kotlin-modules/core-kotlin-collections-set/src/test/kotlin/com/baeldung/addListToSet/AddListContentToSetUnitTest.kt

@@ -0,0 +1,53 @@
+package com.baeldung.addListToSet
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class AddListContentToSetUnitTest {
+
+    @Test
+    fun `test adding list contents to set programmatically`() {
+        val list = listOf("apple", "banana", "orange")
+        val set = addListToSet(list)
+        assertEquals(setOf("apple", "banana", "orange"), set)
+    }
+
+    @Test
+    fun `test adding list contents to set using addAll() method`() {
+        val list = listOf("apple", "banana", "orange")
+        val set = mutableSetOf<String>()
+        set.addAll(list)
+        assertEquals(setOf("apple", "banana", "orange"), set)
+    }
+
+    @Test
+    fun `test adding list contents to set using toSet() method`() {
+        val list = listOf("apple", "banana", "orange")
+        val set = list.toSet()
+        assertEquals(setOf("apple", "banana", "orange"), set)
+    }
+
+    @Test
+    fun `test adding list contents to set using plus operator`() {
+        val set = setOf<String>()
+        val list = listOf("apple", "banana", "orange")
+        val newSet = set + list
+        assertEquals(setOf("apple", "banana", "orange"), newSet)
+    }
+
+    @Test
+    fun `test adding list contents to set using union method`() {
+        val set = setOf<String>()
+        val list = listOf("apple", "banana", "orange")
+        val newSet = set.union(list)
+        assertEquals(setOf("apple", "banana", "orange"), newSet)
+    }
+
+    fun addListToSet(list: List<String>): Set<String> {
+        val set = mutableSetOf<String>()
+        for (element in list) {
+            set.add(element)
+        }
+        return set
+    }
+}

core-kotlin-modules/core-kotlin-concurrency-3/README.md

@@ -0,0 +1,5 @@
+## Core Kotlin Concurrency
+
+This module contains articles about concurrency in Kotlin.
+
+### Relevant articles:

core-kotlin-modules/core-kotlin-concurrency-3/pom.xml

@@ -0,0 +1,28 @@
+<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>
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>core-kotlin-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>core-kotlin-concurrency-3</artifactId>
+    <packaging>jar</packaging>
+
+    <name>core-kotlin-concurrency-3</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

core-kotlin-modules/core-kotlin-concurrency-3/src/main/java/com/baeldung/comparedelays/CompareDelays.kt

@@ -0,0 +1,38 @@
+package com.baeldung.comparedelays
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
+
+val lock = Object()
+
+fun main() {
+    runBlocking(Dispatchers.Default) {
+        launch(Dispatchers.IO) {
+            testWaitThread1()
+        }
+        launch(Dispatchers.IO) {
+            testWaitThread2()
+        }
+    }
+}
+
+fun testWaitThread1() = synchronized(lock) {
+    lock.wait()
+    println("Print first")
+}
+
+fun testWaitThread2() = synchronized(lock) {
+    println("Print second")
+    lock.notify()
+}
+fun sleepMethod() {
+    println("Thread 1 is sleeping...")
+    Thread.sleep(2000) // Sleep for 2 seconds
+    println("Thread 1 woke up!")
+}
+fun delayMethod() = runBlocking {
+    println("Coroutine 1 is delaying...")
+    delay(2000) // Delay for 2 seconds
+    println("Coroutine 1 resumed!")
+}

core-kotlin-modules/core-kotlin-date-time/src/test/kotlin/com/baeldung/currentdatetime/CurrentDateTImeUnitTest.kt

@@ -53,7 +53,7 @@ class CurrentDateTImeUnitTest {
 
         val current = LocalDateTime.of(
             calendar.get(Calendar.YEAR),
-            calendar.get(Calendar.MONTH),
+            calendar.get(Calendar.MONTH) + 1,
             calendar.get(Calendar.DAY_OF_MONTH),
             calendar.get(Calendar.HOUR_OF_DAY),
             calendar.get(Calendar.MINUTE),
@@ -72,4 +72,4 @@ class CurrentDateTImeUnitTest {
 
         Assertions.assertThat(current).isNotNull()
     }
-}
+}

core-kotlin-modules/core-kotlin-lang-4/README.md

@@ -7,4 +7,5 @@ This module contains articles about core features in the Kotlin language.
 - [Difference Between !! and ? in Kotlin](https://www.baeldung.com/kotlin/nullability-operators-difference)
 - [Using Kotlin when() Clause for <, <=, >=, and == Comparisons](https://www.baeldung.com/kotlin/when-clause-comparisons)
 - [Difference Between “it” and “this” Keywords in Kotlin](https://www.baeldung.com/kotlin/it-vs-this-keywords)
+- [Data Objects in Kotlin](https://www.baeldung.com/kotlin/data-object-basics)
 - [[<-- prev]](/core-kotlin-modules/core-kotlin-lang-3)

core-kotlin-modules/core-kotlin-lang-4/src/main/kotlin/com/baeldung/dataobjects/DataObjectsExample.kt

@@ -0,0 +1,14 @@
+package com.baeldung.dataobjects
+
+class DataObjectsExample {
+    data class MyDataClass(val name: String)
+    object MyRegularObject
+    data object MyDataObject
+
+    // print
+    fun printObjects() {
+        println(MyDataClass("Jon")) // prints: MyDataClass(name=Jon)
+        println(MyRegularObject.toString()) // prints: DataObjects$MyRegularObject@1b6d3586
+        println(MyDataObject) // prints: MyDataObject
+    }
+}

core-kotlin-modules/pom.xml

@@ -61,6 +61,7 @@
         <module>core-kotlin-string-conversions</module>
         <module>core-kotlin-files</module>
         <module>core-kotlin-operators</module>
+        <module>core-kotlin-concurrency-3</module>
     </modules>
 
 </project>

kotlin-json/src/test/kotlin/com/baeldung/kotlin/deserializestringobject/DeserializeStringObjectUnitTest.kt

@@ -0,0 +1,62 @@
+package com.baeldung.kotlin.deserializestringobject
+
+import com.fasterxml.jackson.databind.JsonNode
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
+
+class DeserializeStringObjectUnitTest {
+    @Test
+    fun `extract values from JSON string using Gson`(){
+        val gson = Gson()
+        val jsonString = "{\"name\":\"John\", \"age\":30, \"city\":\"New York\"}"
+        val jsonObject = gson.fromJson(jsonString, JsonObject::class.java)
+        val name = jsonObject.get("name").asString
+        val city = jsonObject.get("city").asString
+        val age = jsonObject.get("age").asInt
+
+
+        assertEquals("John", name)
+        assertEquals("New York", city)
+        assertEquals(30, age)
+        assertEquals("{\"name\":\"John\",\"age\":30,\"city\":\"New York\"}", jsonObject.toString())
+    }
+
+    @Test
+    fun `extract values from JSON string using Kotlinx serialization`(){
+        val json = Json { ignoreUnknownKeys = true }
+        val jsonString = "{\"name\":\"John\", \"age\":30, \"city\":\"New York\"}"
+        val jsonObject = json.parseToJsonElement(jsonString).jsonObject
+        val name = jsonObject["name"]?.jsonPrimitive?.content
+        val city = jsonObject["city"]?.jsonPrimitive?.content
+        val age = jsonObject["age"]?.jsonPrimitive?.int
+
+
+        assertEquals("John", name)
+        assertEquals("New York", city)
+        assertEquals(30, age)
+        assertEquals("{\"name\":\"John\",\"age\":30,\"city\":\"New York\"}", jsonObject.toString())
+    }
+
+    @Test
+    fun `extract values from JSON string using Jackson library`(){
+        val objectMapper = jacksonObjectMapper()
+        val jsonString = "{\"name\":\"John\", \"age\":30, \"city\":\"New York\"}"
+        val jsonObject = objectMapper.readValue<JsonNode>(jsonString)
+        val name = jsonObject.get("name").asText()
+        val city = jsonObject.get("city").asText()
+        val age = jsonObject.get("age").asInt()
+
+        assertEquals("John", name)
+        assertEquals("New York", city)
+        assertEquals(30, age)
+        assertEquals("{\"name\":\"John\",\"age\":30,\"city\":\"New York\"}", jsonObject.toString())
+    }
+}

kotlin-ktor/build.gradle.kts

@@ -17,16 +17,21 @@ dependencies {
     implementation("com.expediagroup", "graphql-kotlin-ktor-server", graphQLKotlinVersion)
     implementation("com.expediagroup", "graphql-kotlin-client-jackson", graphQLKotlinVersion)
 
+    implementation("io.ktor", "ktor-client-core", ktorVersion)
     implementation("io.ktor", "ktor-server-core", ktorVersion)
     implementation("io.ktor", "ktor-server-netty", ktorVersion)
     implementation("io.ktor", "ktor-server-websockets", ktorVersion)
     implementation("io.ktor","ktor-server-status-pages", ktorVersion)
-
     implementation("io.ktor", "ktor-server-thymeleaf-jvm", ktorVersion)
+    implementation("io.ktor", "ktor-client-auth", ktorVersion)
+    implementation("io.ktor", "ktor-client-websockets", ktorVersion)
+    implementation("io.ktor", "ktor-serialization-jackson", ktorVersion)
+    implementation("io.ktor", "ktor-client-content-negotiation", ktorVersion)
+
     implementation("ch.qos.logback","logback-classic", logbackVersion)
 
+    testImplementation("io.ktor", "ktor-client-mock", ktorVersion)
     testImplementation("io.ktor", "ktor-server-tests", ktorVersion)
-    testImplementation("io.ktor", "ktor-client-content-negotiation", ktorVersion)
     testImplementation("io.ktor", "ktor-serialization-kotlinx-json", ktorVersion)
     testImplementation("org.jetbrains.kotlin", "kotlin-test-junit", kotlinTestUnit)
     testImplementation("org.seleniumhq.selenium", "selenium-java", seleniumVersion)