From cfd8644b841c587c60830d73f3fc5de4793d5f44 Mon Sep 17 00:00:00 2001 From: Erik Pragt Date: Sun, 10 Apr 2022 16:19:34 +1000 Subject: [PATCH 1/2] Replaced Javafaker with Datafaker since the former is no longer maintained. --- graphql-dgs-mocking/build.gradle.kts | 4 +--- .../netflix/graphql/mocking/MockGraphQLVisitor.kt | 15 ++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/graphql-dgs-mocking/build.gradle.kts b/graphql-dgs-mocking/build.gradle.kts index 9956e41ef..28649f8e8 100644 --- a/graphql-dgs-mocking/build.gradle.kts +++ b/graphql-dgs-mocking/build.gradle.kts @@ -16,8 +16,6 @@ dependencies { api("com.graphql-java:graphql-java") - implementation("com.github.javafaker:javafaker:1.+") { - exclude("org.yaml", "snakeyaml") - } + implementation("net.datafaker:datafaker:1.3.0") implementation("org.slf4j:slf4j-api") } diff --git a/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt b/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt index 3d73361ac..f9dad96b0 100644 --- a/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt +++ b/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt @@ -16,7 +16,7 @@ package com.netflix.graphql.mocking -import com.github.javafaker.Faker +import net.datafaker.Faker import graphql.schema.* import graphql.util.TraversalControl import graphql.util.TraverserContext @@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory class MockGraphQLVisitor(private val mockConfig: Map, private val mockFetchers: MutableMap>) : GraphQLTypeVisitorStub() { private val logger: Logger = LoggerFactory.getLogger(this.javaClass) private val providedRoots: MutableList = mutableListOf() + private val faker = Faker() override fun visitGraphQLFieldDefinition(node: GraphQLFieldDefinition?, context: TraverserContext?): TraversalControl { val pathForNode = getPathForNode(context?.parentNodes, node) @@ -49,7 +50,7 @@ class MockGraphQLVisitor(private val mockConfig: Map, private val else -> return super.visitGraphQLFieldDefinition(node, context) } - val mockedValues = (0..Faker().number().numberBetween(0, 10)) + val mockedValues = (0..faker.number().numberBetween(0, 10)) .map { generateDataForScalar(wrappedType) } .toList() DataFetcher { mockedValues } @@ -66,11 +67,11 @@ class MockGraphQLVisitor(private val mockConfig: Map, private val private fun generateDataForScalar(type: String): Any { return when (type) { - "String" -> Faker().book().title() - "Boolean" -> Faker().bool().bool() - "Int" -> Faker().number().randomDigit() - "Float" -> Faker().number().randomDouble(2, 0, 100000) - "ID" -> Faker().number().digit() + "String" -> faker.book().title() + "Boolean" -> faker.bool().bool() + "Int" -> faker.number().randomDigit() + "Float" -> faker.number().randomDouble(2, 0, 100000) + "ID" -> faker.number().digit() else -> Object() } } From 014bbd1f24645842c1f6f992fb13d1d8cfc72e76 Mon Sep 17 00:00:00 2001 From: Erik Pragt Date: Sun, 10 Apr 2022 18:13:28 +1000 Subject: [PATCH 2/2] Reordered imports --- .../kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt b/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt index f9dad96b0..134b83ae0 100644 --- a/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt +++ b/graphql-dgs-mocking/src/main/kotlin/com/netflix/graphql/mocking/MockGraphQLVisitor.kt @@ -16,10 +16,10 @@ package com.netflix.graphql.mocking -import net.datafaker.Faker import graphql.schema.* import graphql.util.TraversalControl import graphql.util.TraverserContext +import net.datafaker.Faker import org.slf4j.Logger import org.slf4j.LoggerFactory