#134: Removed usages & references to JCenter

Author: jeggy

build.gradle.kts

@@ -14,7 +14,6 @@ plugins {
 
 allprojects {
     repositories {
-        jcenter()
         mavenCentral()
     }
 }

docs/content/Installation/index.md

@@ -3,16 +3,16 @@ title: Getting Started
 weight: 1
 ---
 
-[![Bintray](https://api.bintray.com/packages/apurebase/apurebase/kgraphql/images/download.svg)](https://bintray.com/apurebase/apurebase/kgraphql)
+[![Maven Central](https://img.shields.io/maven-central/v/com.apurebase/kgraphql.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.apurebase%22%20AND%20a:%22kgraphql%22)
 
-KGraphQL is pushed to bintray repository and also linked to JCenter. It requires kotlin compiler version 1.3.x and require kotlin runtime of the same version as a dependency.
+KGraphQL is pushed to MavenCentral repository. It requires kotlin compiler version 1.4.x and require kotlin runtime of the same version as a dependency.
 
 === "Kotlin Gradle Script"
-    Add Bintray JCenter repository:
+    Add Maven Central repository:
 
     ```kotlin
     repositories {
-      jcenter()
+      mavenCentral()
     }
     ```
 
@@ -24,11 +24,11 @@ KGraphQL is pushed to bintray repository and also linked to JCenter. It requires
 
 
 === "Gradle"
-    Add Bintray JCenter repository:
+    Add Maven Central repository:
 
     ```groovy
     repositories {
-      jcenter()
+      mavenCentral()
     }
     ```
 
@@ -40,14 +40,14 @@ KGraphQL is pushed to bintray repository and also linked to JCenter. It requires
 
 
 === "Maven"
-    Add Bintray JCenter repository to section:
+    Add Maven Central repository to section:
 
     ```xml
     <repositories>
-      <repository>
-        <id>jcenter</id>
-        <url>https://jcenter.bintray.com/</url>
-      </repository>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2</url>
+        </repository>
     </repositories>
     ```
 

gradle.properties

@@ -1,12 +1,12 @@
 # KGraphQL version
-version=0.17.5
+version=0.17.6
 
 # Dependencies
 coroutine_version=1.3.9
 jackson_version=2.12.2
 caffeine_version=3.0.0
 serialization_version=1.0.0-RC
-kDataLoader_version=0.1.1
+kDataLoader_version=0.3.0
 ktor_version=1.5.2
 
 # Test-Dependencies
@@ -26,6 +26,6 @@ jacoco_version=0.8.5
 
 # Example Dependencies
 logback_version=1.2.1
-exposed_version=0.21.1
+exposed_version=0.30.2
 h2_version=1.4.200
 hikari_version=4.0.3

kgraphql-ktor/build.gradle.kts

@@ -31,7 +31,6 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junit_version")
     testImplementation("org.amshove.kluent:kluent:$kluent_version")
-    testImplementation("me.lazmaid.kraph:kraph:0.6.1")
     testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
     testImplementation("io.ktor:ktor-auth:$ktor_version")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junit_version")

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

@@ -0,0 +1,69 @@
+package com.apurebase.kgraphql
+
+import kotlinx.serialization.json.*
+
+// MARK: Using this is a temporary solution as JCenter is closed down.
+//       We should either create our own GraphQL client or find some other active library to do this for us.
+
+
+fun graphqlQuery(block: Kraph.() -> Unit): Kraph {
+    return Kraph("query").apply(block)
+}
+fun graphqlMutation(block: Kraph.() -> Unit): Kraph {
+    return Kraph("mutation").apply(block)
+}
+
+class Kraph(
+    private val type: String,
+    private val variables: MutableList<Kraph.Variable> = mutableListOf(),
+    private val root: Boolean = true,
+): List<Kraph.Variable> by variables {
+
+    private val fields = mutableListOf<Kraph>()
+
+    fun field(name: String) = fields.add(Kraph(name, variables, false))
+    fun field(name: String, block: Kraph.() -> Unit) = fields.add(Kraph(name, variables, false).apply(block))
+
+    data class Variable(
+        val name: String,
+        val typeName: String,
+        val value: JsonElement,
+    )
+
+    fun variable(name: String, typeName: String, block: JsonObjectBuilder.() -> Unit) = variables.add(
+        Variable(name, typeName, buildJsonObject(block))
+    )
+    fun variable(name: String, typeName: String, value: String) = variables.add(
+        Variable(name, typeName, JsonPrimitive(value))
+    )
+    fun variable(name: String, typeName: String, value: Int) = variables.add(
+        Variable(name, typeName, JsonPrimitive(value))
+    )
+
+    private fun print(): String = buildString {
+        append("$type ")
+        if (variables.isNotEmpty() && root) {
+            append("MyQuery(${variables.joinToString(",") { "\$${it.name}: ${it.typeName}" }})")
+        }
+        if (fields.isNotEmpty()) {
+            appendLine("{")
+            fields.map { appendLine(it.print()) }
+            appendLine("}")
+        } else appendLine()
+    }
+
+    fun build(): String = buildString {
+        append("{")
+        append("\"query\": \"${print()}\"")
+
+        if (variables.isNotEmpty()) {
+            append(",")
+            append("\"variables\": {")
+            variables.map {
+                append("\"${it.name}\": ${it.value}")
+            }
+            append("}")
+        }
+        append("}")
+    }
+}

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

@@ -2,7 +2,7 @@ package com.apurebase.kgraphql
 
 import io.ktor.application.*
 import io.ktor.auth.*
-import io.ktor.util.*
+import kotlinx.serialization.json.*
 import org.amshove.kluent.shouldBeEqualTo
 import org.junit.jupiter.api.Test
 
@@ -18,10 +18,8 @@ class KtorFeatureTest : KtorTest() {
             }
         }
 
-        server {
-            query {
-                field("hello")
-            }
+        server("query") {
+            field("hello")
         } shouldBeEqualTo "{\"data\":{\"hello\":\"World!\"}}"
 
     }
@@ -34,10 +32,8 @@ class KtorFeatureTest : KtorTest() {
             }
         }
 
-        server {
-            mutation {
-                field("hello")
-            }
+        server("mutation") {
+            field("hello")
         } shouldBeEqualTo "{\"data\":{\"hello\":\"World! mutation\"}}"
 
     }
@@ -69,19 +65,15 @@ class KtorFeatureTest : KtorTest() {
             }
         }
 
-        server {
-            query {
-                fieldObject("actor") {
-                    field("name(addStuff: true)")
-                }
+        server("query") {
+            field("actor") {
+                field("name(addStuff: true)")
             }
         } shouldBeEqualTo "{\"data\":{\"actor\":{\"name\":\"${georgeName}STUFF\"}}}"
 
-        server {
-            query {
-                fieldObject("actor") {
-                    field("nickname")
-                }
+        server("query") {
+            field("actor") {
+                field("nickname")
             }
         } shouldBeEqualTo "{\"data\":{\"actor\":{\"nickname\":\"Hodor and $georgeName\"}}}"
     }
@@ -100,14 +92,21 @@ class KtorFeatureTest : KtorTest() {
             query("test") { resolver { input: InputTwo -> "success: $input" } }
         }
 
-        val variables = """
-            {"one":{"enum":"M1","id":"M1"},"quantity":3434,"tokens":["23","34","21","434"]}
-        """.trimIndent()
+        server("query") {
+            field("test(input: \$two)")
 
-        server {
-            query {
-                field("test(input: \$two)")
-                variable("two", "InputTwo!", variables)
+            variable("two", "InputTwo!") {
+                putJsonObject("one") {
+                    put("enum", "M1")
+                    put("id", "M1")
+                }
+                put("quantity", 3434)
+                putJsonArray("tokens") {
+                    add("23")
+                    add("34")
+                    add("21")
+                    add("434")
+                }
             }
         } shouldBeEqualTo "{\"data\":{\"test\":\"success: InputTwo(one=InputOne(enum=M1, id=M1), quantity=3434, tokens=[23, 34, 21, 434])\"}}"
     }

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

@@ -5,13 +5,12 @@ import io.ktor.application.*
 import io.ktor.auth.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
-import io.ktor.util.*
-import me.lazmaid.kraph.Kraph
+
 
 open class KtorTest {
 
-    fun withServer(ctxBuilder: ContextBuilder.(ApplicationCall) -> Unit = {}, block: SchemaBuilder.() -> Unit): (Kraph.() -> Unit) -> String {
-        return {
+    fun withServer(ctxBuilder: ContextBuilder.(ApplicationCall) -> Unit = {}, block: SchemaBuilder.() -> Unit): (String, Kraph.() -> Unit) -> String {
+        return { type, kraph ->
             withTestApplication({
                 install(Authentication) {
                     basic {
@@ -33,7 +32,11 @@ open class KtorTest {
                     uri = "graphql"
                     method = HttpMethod.Post
                     addHeader(HttpHeaders.ContentType, "application/json;charset=UTF-8")
-                    setBody(Kraph { it(this) }.toRequestString())
+                    setBody(when(type.toLowerCase().trim()) {
+                        "query" -> graphqlQuery(kraph).build()
+                        "mutation" -> graphqlMutation(kraph).build()
+                        else -> throw TODO("$type is not a valid graphql operation type")
+                    }.also(::println))
                 }.response.content!!
             }
         }