cleanup example app

Author: dariuszkuc

integration/graalvm/ktor-graalvm-server/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.expediagroup.graphql.plugin.gradle.graphql
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
@@ -10,6 +11,7 @@ plugins {
 
 dependencies {
     implementation("com.expediagroup", "graphql-kotlin-ktor-server")
+    implementation("com.expediagroup", "graphql-kotlin-hooks-provider")
     implementation(libs.logback)
     implementation(libs.ktor.server.cio)
     testImplementation(libs.kotlin.test)
@@ -31,25 +33,18 @@ graalvmNative {
     toolchainDetection.set(false)
     binaries {
         named("main") {
-            fallback.set(false)
             verbose.set(true)
-
             buildArgs.add("--initialize-at-build-time=io.ktor,kotlin,ch.qos.logback,org.slf4j")
-            buildArgs.add("--trace-object-instantiation=java.util.jar.JarFile")
-
-            buildArgs.add("-H:+InstallExitHandlers")
-            buildArgs.add("-H:+ReportUnsupportedElementsAtRuntime")
             buildArgs.add("-H:+ReportExceptionStackTraces")
-
-            imageName.set("graal-server")
-//            mainClass.set("org.test.Main")
         }
         metadataRepository {
             enabled.set(true)
         }
     }
 }
 
-val graphQLGraalVmMetadata by tasks.getting(com.expediagroup.graphql.plugin.gradle.tasks.GraphQLGraalVmMetadataTask::class) {
-    packages.set(listOf("com.expediagroup.graalvm.ktor"))
+graphql {
+    graalVm {
+        packages = listOf("com.expediagroup.graalvm.ktor")
+    }
 }

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/Application.kt

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor
 
 import com.expediagroup.graalvm.ktor.context.CustomContextFactory
@@ -6,21 +22,22 @@ import com.expediagroup.graalvm.ktor.schema.ArgumentQuery
 import com.expediagroup.graalvm.ktor.schema.AsyncQuery
 import com.expediagroup.graalvm.ktor.schema.BasicMutation
 import com.expediagroup.graalvm.ktor.schema.ContextualQuery
-import com.expediagroup.graalvm.ktor.schema.DataClassQuery
+import com.expediagroup.graalvm.ktor.schema.CustomScalarQuery
 import com.expediagroup.graalvm.ktor.schema.EnumQuery
 import com.expediagroup.graalvm.ktor.schema.ErrorQuery
-import com.expediagroup.graalvm.ktor.schema.ExampleInterface
-import com.expediagroup.graalvm.ktor.schema.ExampleUnion
-import com.expediagroup.graalvm.ktor.schema.FirstImpl
-import com.expediagroup.graalvm.ktor.schema.FirstUnionMember
+import com.expediagroup.graalvm.ktor.schema.IdQuery
+import com.expediagroup.graalvm.ktor.schema.model.ExampleInterface
+import com.expediagroup.graalvm.ktor.schema.model.ExampleUnion
 import com.expediagroup.graalvm.ktor.schema.InnerClassQuery
 import com.expediagroup.graalvm.ktor.schema.ListQuery
 import com.expediagroup.graalvm.ktor.schema.PolymorphicQuery
 import com.expediagroup.graalvm.ktor.schema.ScalarQuery
-import com.expediagroup.graalvm.ktor.schema.SecondImpl
-import com.expediagroup.graalvm.ktor.schema.SecondUnionMember
 import com.expediagroup.graalvm.ktor.schema.TypesQuery
 import com.expediagroup.graalvm.ktor.schema.dataloader.ExampleDataLoader
+import com.expediagroup.graalvm.ktor.schema.model.FirstImpl
+import com.expediagroup.graalvm.ktor.schema.model.FirstUnionMember
+import com.expediagroup.graalvm.ktor.schema.model.SecondImpl
+import com.expediagroup.graalvm.ktor.schema.model.SecondUnionMember
 import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistryFactory
 import com.expediagroup.graphql.server.ktor.GraphQL
 import com.expediagroup.graphql.server.ktor.graphQLGetRoute
@@ -41,14 +58,15 @@ fun main() {
                     ArgumentQuery(),
                     AsyncQuery(),
                     ContextualQuery(),
-                    DataClassQuery(),
+                    CustomScalarQuery(),
                     EnumQuery(),
                     ErrorQuery(),
+                    IdQuery(),
                     InnerClassQuery(),
+                    ListQuery(),
                     PolymorphicQuery(),
                     ScalarQuery(),
-                    TypesQuery(),
-                    ListQuery()
+                    TypesQuery()
                 )
                 mutations = listOf(
                     BasicMutation()

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/context/CustomContextFactory.kt

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor.context
 
 import com.expediagroup.graphql.generator.extensions.plus
@@ -8,6 +24,6 @@ import java.util.UUID
 
 class CustomContextFactory : DefaultKtorGraphQLContextFactory() {
     override suspend fun generateContext(request: ApplicationRequest): GraphQLContext {
-        return super.generateContext(request).plus(mapOf("custom" to UUID.randomUUID().toString()))
+        return super.generateContext(request).plus(mapOf("custom" to (request.headers["X-Custom-Header"] ?: UUID.randomUUID().toString())))
     }
 }

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/hooks/CustomHooks.kt

@@ -1,6 +1,23 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor.hooks
 
 import com.expediagroup.graphql.generator.hooks.SchemaGeneratorHooks
+import com.expediagroup.graphql.plugin.schema.hooks.SchemaGeneratorHooksProvider
 import graphql.language.StringValue
 import graphql.schema.Coercing
 import graphql.schema.CoercingParseLiteralException
@@ -19,6 +36,10 @@ class CustomHooks : SchemaGeneratorHooks {
     }
 }
 
+class CustomHooksProvider : SchemaGeneratorHooksProvider {
+    override fun hooks(): SchemaGeneratorHooks = CustomHooks()
+}
+
 val graphqlUUIDType: GraphQLScalarType = GraphQLScalarType.newScalar()
     .name("UUID")
     .description("A type representing a formatted java.util.UUID")

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/schema/ArgumentQuery.kt

@@ -1,12 +1,29 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor.schema
 
 import com.expediagroup.graphql.generator.scalars.ID
 import com.expediagroup.graphql.server.operations.Query
-import java.util.UUID
 
+/**
+ * Queries verifying passing scalar arguments.
+ */
 class ArgumentQuery : Query {
-    fun idArg(arg: ID): ID = ID(arg.value.reversed())
-    fun optionalIdArg(arg: ID? = null): ID? = arg?.let { ID(it.value.reversed()) }
+
     fun stringArg(arg: String): String = arg.reversed()
     fun optionalStringArg(arg: String? = null): String? = arg?.reversed()
     fun intArg(arg: Int): Int = arg.inc()
@@ -15,8 +32,6 @@ class ArgumentQuery : Query {
     fun optionalDoubleArg(arg: Double? = null): Double? = arg?.inc()
     fun booleanArg(arg: Boolean): Boolean = arg.not()
     fun optionalBooleanArg(arg: Boolean? = null): Boolean? = arg?.not()
-//    fun customScalarArg(arg: UUID): UUID = arg
-//    fun optionalCustomScalarArg(arg: UUID? = null): UUID? = arg
     fun manyOptionalArgs(
         idArg: ID? = null,
         stringArg: String? = null,
@@ -28,13 +43,4 @@ class ArgumentQuery : Query {
     } else {
         null
     }
-//    fun listArg(arg: List<String>): List<String> = arg.reversed()
-//    fun optionalListArg(arg: List<String>? = null): List<String>? = arg?.reversed()
-    fun objectArg(arg: SimpleType): SimpleType = arg
-    fun optionalObjectArg(arg: SimpleType? = null): SimpleType? = arg
-//    fun listObjectArg(arg: List<SimpleType>): String = UUID.randomUUID().toString()
-}
-
-data class SimpleType(val id: Int, val description: String) {
-    fun outputOnly(): String = UUID.randomUUID().toString()
 }

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/schema/AsyncQuery.kt

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor.schema
 
 import com.expediagroup.graalvm.ktor.schema.dataloader.EXAMPLE_LOADER
@@ -9,6 +25,9 @@ import kotlinx.coroutines.delay
 import java.util.concurrent.CompletableFuture
 import kotlin.random.Random
 
+/**
+ * Queries verifying async models.
+ */
 class AsyncQuery : Query {
     private val random: Random = Random(100)
 

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/schema/BasicMutation.kt

@@ -1,7 +1,26 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor.schema
 
 import com.expediagroup.graphql.server.operations.Mutation
 
+/**
+ * Example mutation.
+ */
 class BasicMutation : Mutation {
     fun mutate(arg: String): String = arg.reversed()
 }

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/schema/ContextualQuery.kt

@@ -1,8 +1,27 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.expediagroup.graalvm.ktor.schema
 
 import com.expediagroup.graphql.server.operations.Query
 import graphql.schema.DataFetchingEnvironment
 
+/**
+ * Query verifying ability to retrieve contextual data.
+ */
 class ContextualQuery : Query {
     fun contextualQuery(env: DataFetchingEnvironment): String = env.graphQlContext.getOrDefault("custom", "defaultValue")
 }

integration/graalvm/ktor-graalvm-server/src/main/kotlin/com/expediagroup/graalvm/ktor/schema/CustomScalarQuery.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.expediagroup.graalvm.ktor.schema
+
+import com.expediagroup.graphql.server.operations.Query
+import java.util.UUID
+
+/**
+ * Queries used to verify custom scalar functionality.
+ */
+class CustomScalarQuery : Query {
+    fun customScalarQuery(): UUID = UUID.randomUUID()
+    fun nullableCustomScalarQuery(): UUID? = null
+    fun customScalarArg(arg: UUID): UUID = arg
+    fun optionalCustomScalarArg(arg: UUID? = null): UUID? = arg
+}