Merge pull request #69 from aPureBase/data-loader-idea-testing

New DataLoader executor

Author: jeggy

.gitignore

@@ -1,3 +1,5 @@
+.idea/vcs.xml
+.idea/inspectionProfiles
 
 # Created by https://www.gitignore.io/api/java,gradle,intellij+all
 # Edit at https://www.gitignore.io/?templates=java,gradle,intellij+all

.idea/.name

@@ -1,8 +1,9 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.3.50"
+    id "org.jetbrains.kotlin.jvm" version "1.3.61"
     id "com.github.ben-manes.versions" version "0.24.0"
     id "com.jfrog.bintray" version "1.8.4"
     id "maven-publish"
+    id "jacoco"
 }
 
 allprojects {
@@ -26,9 +27,12 @@ allprojects {
 
 
         testCompile "io.netty:netty-all:$netty_version"
-        testCompile "junit:junit:$junit_version"
         testCompile "org.hamcrest:hamcrest:$hamcrest_version"
         testCompile "org.amshove.kluent:kluent:$kluent_version"
+        testCompile "org.junit.jupiter:junit-jupiter-api:$junit_version"
+        testCompile "org.junit.jupiter:junit-jupiter-params:$junit_version"
+        testRuntime "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+        testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-debug:$coroutine_version"
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {
@@ -75,5 +79,12 @@ allprojects {
             }
         }
     }
+
+
+
+
+    test {
+        useJUnitPlatform()
+    }
 }
 

build.gradle

@@ -1,17 +1,18 @@
 # KGraphQL version
-version=0.9.2
+version=0.10.0
 
 # Dependencies
 kotlin_version=1.3.50
 coroutine_version=1.3.2
 jackson_version=2.9.7
 caffeine_version=2.8.0
-
+serialization_version=0.14.0
+kDataLoader_version=0.1.1
 
 # Test-Dependencies
 kotlin_html_version=0.6.12
 netty_version=4.1.42.Final
-junit_version=4.12
+junit_version=5.5.2
 kluent_version=1.56
 hamcrest_version=2.2
 

gradle.properties

@@ -1,7 +1,7 @@
 package com.apurebase.kgraphql
 
 import org.amshove.kluent.shouldEqual
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 class KtorFeatureTest {
     @Test

kgraphql-ktor/src/test/kotlin/com/apurebase/kgraphql/KtorFeatureTest.kt

@@ -1,3 +1,7 @@
 dependencies {
     compile "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
+    compile "de.nidomiro:KDataLoader:$kDataLoader_version"
+
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version" // JVM dependency
 }

kgraphql/build.gradle

@@ -2,7 +2,7 @@ package com.apurebase.kgraphql
 
 import com.apurebase.kgraphql.schema.model.FunctionWrapper
 import kotlinx.coroutines.runBlocking
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.ThreadLocalRandom
 import java.util.concurrent.TimeUnit

kgraphql/src/jmh/kotlin/com/apurebase/kgraphql/FunctionExecutionBenchmark.kt

@@ -5,7 +5,7 @@ import org.openjdk.jmh.annotations.*
 import java.util.concurrent.ThreadLocalRandom
 import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.*
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 @State(Scope.Benchmark)
 @Warmup(iterations = 5)

kgraphql/src/jmh/kotlin/com/apurebase/kgraphql/ParallelExecutionBenchmark.kt

@@ -7,7 +7,7 @@ import com.apurebase.kgraphql.schema.Schema
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import kotlinx.coroutines.runBlocking
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.TimeUnit
 

kgraphql/src/jmh/kotlin/com/apurebase/kgraphql/SimpleExecutionOverheadBenchmark.kt

@@ -1,5 +1,8 @@
 package com.apurebase.kgraphql
 
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.Channel
+import kotlin.coroutines.EmptyCoroutineContext
 import kotlin.reflect.KClass
 import kotlin.reflect.KParameter
 import kotlin.reflect.KType
@@ -30,3 +33,34 @@ internal fun KType.getIterableElementType(): KType? {
 
 internal fun not(boolean: Boolean) = !boolean
 
+
+
+internal suspend fun <T, R> Collection<T>.toMapAsync(
+    dispatcher: CoroutineDispatcher = Dispatchers.Default,
+    block: suspend (T) -> R
+): Map<T, R> = coroutineScope {
+    val channel = Channel<Pair<T, R>>()
+    val jobs = map { item ->
+        launch(dispatcher) {
+            try {
+                val res = block(item)
+                channel.send(item to res)
+            } catch (e: Exception) {
+                channel.close(e)
+            }
+        }
+    }
+    val resultMap = mutableMapOf<T, R>()
+    repeat(size) {
+        try {
+            val (item, result) = channel.receive()
+            resultMap[item] = result
+        } catch (e: Exception) {
+            jobs.forEach { job: Job -> job.cancel() }
+            throw e
+        }
+    }
+
+    channel.close()
+    resultMap
+}