Skip to content

feat(plugin): new generate-graalvm-metadata Maven goal #1759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/graalvm-integration.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: GraaLVM Integration Tests
name: GraalVM Integration Tests

on:
workflow_call:
Expand All @@ -20,7 +20,7 @@ jobs:
working-directory: integration/graalvm
strategy:
matrix:
server: ['ktor-graalvm-server']
server: ['ktor-graalvm-server', 'maven-graalvm-server']

steps:
- name: Checkout Repository
Expand All @@ -40,20 +40,23 @@ jobs:
- name: Set up Gradle cache
uses: gradle/gradle-build-action@v2

- name: Build server
run: ./gradlew :${server}:build :${server}:nativeCompile
- name: Build native image
id: build_server
run: |
./gradlew :${server}:buildGraalVmNativeImage
echo "NATIVE_IMAGE=$(echo "${server}/build/native/nativeCompile/${server}")" >> $GITHUB_OUTPUT
env:
server: ${{ matrix.server }}

- name: Build and start the native image
- name: Start the native image
id: start_server
run: |
set -x
echo "starting server"
./${server}/build/native/nativeCompile/${server} &
./${nativeImage} &
echo "SERVER_PID=$(echo $!)" >> $GITHUB_OUTPUT
env:
server: ${{ matrix.server }}
nativeImage: ${{ steps.build_server.outputs.NATIVE_IMAGE }}

- name: Integration Test
run: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import org.gradle.accessors.dm.LibrariesForLibs
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.time.Duration
import java.time.Instant

plugins {
Expand Down
1 change: 1 addition & 0 deletions integration/graalvm/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ allprojects {
project.ext[key.toString()] = value
}
}
project.version = project.ext["version"]!!
}
25 changes: 25 additions & 0 deletions integration/graalvm/common-graalvm-server/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

@Suppress("DSL_SCOPE_VIOLATION") // TODO: remove once KTIJ-19369 / Gradle#22797 is fixed
plugins {
alias(libs.plugins.kotlin.jvm)
`maven-publish`
}

dependencies {
implementation("com.expediagroup", "graphql-kotlin-server")
implementation("com.expediagroup", "graphql-kotlin-hooks-provider")
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17"
}

// required for maven test
publishing {
publications {
create<MavenPublication>("maven") {
from(components["java"])
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.hooks
package com.expediagroup.graalvm.hooks

import com.expediagroup.graphql.generator.hooks.SchemaGeneratorHooks
import com.expediagroup.graphql.plugin.schema.hooks.SchemaGeneratorHooksProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.generator.scalars.ID
import com.expediagroup.graphql.server.operations.Query
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graalvm.ktor.schema.dataloader.EXAMPLE_LOADER
import com.expediagroup.graalvm.schema.dataloader.EXAMPLE_LOADER
import com.expediagroup.graphql.generator.scalars.ID
import com.expediagroup.graphql.server.operations.Query
import graphql.schema.DataFetchingEnvironment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.server.operations.Mutation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.server.operations.Query
import java.util.UUID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.server.operations.Query

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.server.operations.Query
import graphql.GraphqlErrorBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.generator.scalars.ID
import com.expediagroup.graphql.server.operations.Query
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.server.operations.Query

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graalvm.ktor.schema.model.InputOnly
import com.expediagroup.graalvm.ktor.schema.model.OutputOnly
import com.expediagroup.graalvm.schema.model.InputOnly
import com.expediagroup.graalvm.schema.model.OutputOnly
import com.expediagroup.graphql.server.operations.Query

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graalvm.ktor.schema.model.ExampleInterface
import com.expediagroup.graalvm.ktor.schema.model.ExampleUnion
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.graalvm.schema.model.ExampleInterface
import com.expediagroup.graalvm.schema.model.ExampleUnion
import com.expediagroup.graalvm.schema.model.FirstImpl
import com.expediagroup.graalvm.schema.model.FirstUnionMember
import com.expediagroup.graalvm.schema.model.SecondImpl
import com.expediagroup.graalvm.schema.model.SecondUnionMember
import com.expediagroup.graphql.server.operations.Query
import kotlin.random.Random

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graphql.server.operations.Query
import java.util.UUID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema
package com.expediagroup.graalvm.schema

import com.expediagroup.graalvm.ktor.schema.model.InputAndOutput
import com.expediagroup.graalvm.ktor.schema.model.InputOnly
import com.expediagroup.graalvm.ktor.schema.model.OutputOnly
import com.expediagroup.graalvm.schema.model.InputAndOutput
import com.expediagroup.graalvm.schema.model.InputOnly
import com.expediagroup.graalvm.schema.model.OutputOnly
import com.expediagroup.graphql.server.operations.Query

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema.dataloader
package com.expediagroup.graalvm.schema.dataloader

import com.expediagroup.graphql.dataloader.KotlinDataLoader
import com.expediagroup.graphql.generator.scalars.ID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema.model
package com.expediagroup.graalvm.schema.model

import com.expediagroup.graphql.generator.scalars.ID
import java.util.UUID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema.model
package com.expediagroup.graalvm.schema.model

import java.util.UUID
import kotlin.random.Random
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema.model
package com.expediagroup.graalvm.schema.model

import kotlin.random.Random

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema.model
package com.expediagroup.graalvm.schema.model

data class InputOnly(val id: Int)
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.expediagroup.graalvm.ktor.schema.model
package com.expediagroup.graalvm.schema.model

import kotlin.random.Random

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.expediagroup.graalvm.hooks.CustomHooksProvider
9 changes: 7 additions & 2 deletions integration/graalvm/ktor-graalvm-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {

dependencies {
implementation("com.expediagroup", "graphql-kotlin-ktor-server")
implementation("com.expediagroup", "graphql-kotlin-hooks-provider")
implementation(projects.commonGraalvmServer)
implementation(libs.logback)
implementation(libs.ktor.server.cio)
testImplementation(libs.junit.api)
Expand Down Expand Up @@ -48,6 +48,11 @@ graalvmNative {

graphql {
graalVm {
packages = listOf("com.expediagroup.graalvm.ktor")
packages = listOf("com.expediagroup.graalvm")
}
}

tasks.register("buildGraalVmNativeImage") {
dependsOn("build")
dependsOn("nativeCompile")
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@

package com.expediagroup.graalvm.ktor

import com.expediagroup.graalvm.hooks.CustomHooks
import com.expediagroup.graalvm.ktor.context.CustomContextFactory
import com.expediagroup.graalvm.ktor.hooks.CustomHooks
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.CustomScalarQuery
import com.expediagroup.graalvm.ktor.schema.EnumQuery
import com.expediagroup.graalvm.ktor.schema.ErrorQuery
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.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.graalvm.schema.ArgumentQuery
import com.expediagroup.graalvm.schema.AsyncQuery
import com.expediagroup.graalvm.schema.BasicMutation
import com.expediagroup.graalvm.schema.CustomScalarQuery
import com.expediagroup.graalvm.schema.EnumQuery
import com.expediagroup.graalvm.schema.ErrorQuery
import com.expediagroup.graalvm.schema.IdQuery
import com.expediagroup.graalvm.schema.InnerClassQuery
import com.expediagroup.graalvm.schema.ListQuery
import com.expediagroup.graalvm.schema.PolymorphicQuery
import com.expediagroup.graalvm.schema.ScalarQuery
import com.expediagroup.graalvm.schema.TypesQuery
import com.expediagroup.graalvm.schema.dataloader.ExampleDataLoader
import com.expediagroup.graalvm.schema.model.ExampleInterface
import com.expediagroup.graalvm.schema.model.ExampleUnion
import com.expediagroup.graalvm.schema.model.FirstImpl
import com.expediagroup.graalvm.schema.model.FirstUnionMember
import com.expediagroup.graalvm.schema.model.SecondImpl
import com.expediagroup.graalvm.schema.model.SecondUnionMember
import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistryFactory
import com.expediagroup.graphql.server.ktor.GraphQL
import com.expediagroup.graphql.server.ktor.graphQLGetRoute
Expand All @@ -53,7 +53,7 @@ fun main() {
embeddedServer(CIO, port = 8080, host = "0.0.0.0") {
install(GraphQL) {
schema {
packages = listOf("com.expediagroup.graalvm.ktor")
packages = listOf("com.expediagroup.graalvm")
queries = listOf(
ArgumentQuery(),
AsyncQuery(),
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
/*
* 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.model.InputOnly
import com.expediagroup.graalvm.schema.TypesQuery
import com.expediagroup.graalvm.schema.model.InputOnly
import com.expediagroup.graphql.server.ktor.GraphQL
import com.expediagroup.graphql.server.ktor.graphQLPostRoute
import com.expediagroup.graphql.server.types.GraphQLRequest
Expand All @@ -25,7 +41,7 @@ class TypesQueryTest {
application {
install(GraphQL) {
schema {
packages = listOf("com.expediagroup.graalvm.ktor.schema")
packages = listOf("com.expediagroup.graalvm")
queries = listOf(TypesQuery())
typeHierarchy = emptyMap()
}
Expand Down
Binary file not shown.
Loading