Merge branch 'master' into dependabot/maven/junit-junit-4.13.1

Author: oryan-block

pom.xml

@@ -17,7 +17,7 @@
         <kotlin.version>1.4.21</kotlin.version>
         <kotlin-coroutines.version>1.4.2</kotlin-coroutines.version>
         <jackson.version>2.10.3</jackson.version>
-        <graphql-java.version>16.1</graphql-java.version>
+        <graphql-java.version>16.2</graphql-java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

src/main/kotlin/graphql/kickstart/tools/relay/RelayConnectionFactory.kt

@@ -6,12 +6,18 @@ import graphql.language.*
 class RelayConnectionFactory : TypeDefinitionFactory {
 
     override fun create(existing: MutableList<Definition<*>>): List<Definition<*>> {
+        val connectionDirectives = findConnectionDirectives(existing)
+        if (connectionDirectives.isEmpty()) {
+            // do not add Relay definitions unless needed
+            return emptyList()
+        }
+
         val definitions = mutableListOf<Definition<*>>()
         val definitionsByName = existing.filterIsInstance<TypeDefinition<*>>()
             .associateBy { it.name }
             .toMutableMap()
 
-        findConnectionDirectives(existing)
+        connectionDirectives
             .flatMap { createDefinitions(it) }
             .forEach {
                 if (!definitionsByName.containsKey(it.name)) {

src/test/kotlin/graphql/kickstart/tools/relay/RelayConnectionFactoryTest.kt

@@ -0,0 +1,20 @@
+package graphql.kickstart.tools.relay
+
+import graphql.language.Definition
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class RelayConnectionFactoryTest {
+
+    @Test
+    fun `should not add new definition when no @connection directive`() {
+        // setup
+        val factory = RelayConnectionFactory()
+        val existing = mutableListOf<Definition<*>>()
+
+        val newDefinitions = factory.create(existing)
+
+        // expect
+        assertEquals(newDefinitions.size, 0)
+    }
+}