This is an automated email from the ASF dual-hosted git repository. andysch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git
commit 235bc39224ae5f4e05f86409110226b73c1b3460 Author: Andreas Schaefer <[email protected]> AuthorDate: Tue Mar 28 11:54:53 2023 -0700 SLING-10900 - Remvoed comments to prepare for release --- pom.xml | 1 - .../graphql/core/engine/DefaultQueryExecutor.java | 3 -- .../core/engine/DefaultQueryExecutorTest.java | 47 +--------------------- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/pom.xml b/pom.xml index 3c676a0..55760ba 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,6 @@ <version>20.1</version> <scope>provided</scope> </dependency> - <!-- The version 3.1.0, 3.1.1 are not valid Maven Bundles and so some IT tests fail --> <dependency> <groupId>com.graphql-java</groupId> <artifactId>java-dataloader</artifactId> diff --git a/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java b/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java index 421cec4..0c092f1 100644 --- a/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java +++ b/src/main/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutor.java @@ -304,7 +304,6 @@ public class DefaultQueryExecutor implements QueryExecutor { private DataFetcher<Object> getDataFetcher(FieldDefinition field, Resource currentResource) { DataFetcher<Object> result = null; -// final Directive d = field.getDirective(FETCHER_DIRECTIVE); final Directive d = field.getDirectives().stream().filter( i -> FETCHER_DIRECTIVE.equals(i.getName())).findFirst().orElse(null); if (d != null) { final String name = validateFetcherName(getDirectiveArgumentValue(d, FETCHER_NAME)); @@ -320,7 +319,6 @@ public class DefaultQueryExecutor implements QueryExecutor { private <T extends TypeDefinition<T>> TypeResolver getTypeResolver(TypeDefinition<T> typeDefinition, Resource currentResource) { TypeResolver resolver = null; -// final Directive d = typeDefinition.getDirective(RESOLVER_DIRECTIVE); final Directive d = typeDefinition.getDirectives().stream().filter( i -> RESOLVER_DIRECTIVE.equals(i.getName())).findFirst().orElse(null); if (d != null) { final String name = validateResolverName(getDirectiveArgumentValue(d, RESOLVER_NAME)); @@ -408,7 +406,6 @@ public class DefaultQueryExecutor implements QueryExecutor { private void handleConnectionTypes(ObjectTypeDefinition typeDefinition, TypeDefinitionRegistry typeRegistry) { for (FieldDefinition fieldDefinition : typeDefinition.getFieldDefinitions()) { -// Directive directive = fieldDefinition.getDirective("connection"); Directive directive = fieldDefinition.getDirectives().stream().filter( i -> "connection".equals(i.getName())).findFirst().orElse(null); if (directive != null) { if (directive.getArgument(CONNECTION_FOR) != null) { diff --git a/src/test/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutorTest.java b/src/test/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutorTest.java index e6fdf95..e824290 100644 --- a/src/test/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutorTest.java +++ b/src/test/java/org/apache/sling/graphql/core/engine/DefaultQueryExecutorTest.java @@ -254,6 +254,7 @@ public class DefaultQueryExecutorTest extends ResourceQueryTestBase { assertTrue("Failed to find expected field name: '" + expectedFieldname + "'", selectionSetFields.stream().anyMatch(f -> expectedFieldname.equals(f.getName()))); } + // In new graphql-java qualified field names are streamlined and so we don't have sub types // Assert it contains the expected results String[] expectedQualifiedName = new String[] { "boolValue", @@ -267,63 +268,19 @@ public class DefaultQueryExecutorTest extends ResourceQueryTestBase { "allTests/boolValue", "allTests/resourcePath", "unionTest", -// "unionTest/Human", -// "unionTest/Human/id", "unionTest/id", -// "unionTest/Human/address", "unionTest/address", -// "unionTest/Droid", -// "unionTest/Droid/id", -// "unionTest/Droid/primaryFunction", "unionTest/primaryFunction", "interfaceTest", "interfaceTest/id", -// "interfaceTest/Human", -// "interfaceTest/Human/address", "interfaceTest/address", -// "interfaceTest/Droid", "interfaceTest/primaryFunction" -// "interfaceTest/Droid/primaryFunction" }; for (String expectedQN : expectedQualifiedName) { assertTrue("Failed to find qualified field name: '" + expectedQN + "'", selectionSet.contains(expectedQN)); } -//TODO: No more inline fragments in 17.4 -> remove when done upgrading -// String[] expectedNonInlineQNs = new String[] { -// "boolValue", -// "resourcePath", -// "aTest", -// "aTest/test", -// "aTest/boolValue", -// "aTest/resourcePath", -// "allTests", -// "allTests/test", -// "allTests/boolValue", -// "allTests/resourcePath", -// "unionTest", -// "unionTest/Human/id", -// "unionTest/Human/address", -// "unionTest/Droid/id", -// "unionTest/Droid/primaryFunction", -// "interfaceTest", -// "interfaceTest/id", -// "interfaceTest/Human/address", -// "interfaceTest/Droid/primaryFunction" -// }; -// for (String expectedNonInlineQN : expectedNonInlineQNs) { -// assertFalse(Objects.requireNonNull(selectionSet.get(expectedNonInlineQN)).isInline()); -// } -// -// String[] expectedInlineQNs = new String[] { -// "unionTest/Human", -// "unionTest/Droid", -// "interfaceTest/Human", -// "interfaceTest/Droid" -// }; -// for (String expectedInlineQN : expectedInlineQNs) { -// assertTrue(Objects.requireNonNull(selectionSet.get(expectedInlineQN)).isInline()); -// } + // No more inline fragments in 17.4 or later String[] expectedSubFieldNames = new String[] { "test",
