From a976a6a50659a2c26828428f18930cad90b25a7f Mon Sep 17 00:00:00 2001 From: Evgenii Sabirov Date: Mon, 7 Aug 2023 09:31:28 +0400 Subject: [PATCH 1/4] #1297 Allow to exclude fields from generated GraphQL objects --- docs/codegen-options.md | 1 + .../gradle/GraphQLCodegenGradleTask.java | 14 +++++++++++++ .../graphql/codegen/GraphQLCodegenMojo.java | 9 +++++++++ .../graphql/codegen/GraphQLCodegenKeys.scala | 2 ++ .../codegen/GraphQLCodegenPlugin.scala | 2 ++ .../FieldDefinitionToParameterMapper.java | 18 +++++++++++++++++ .../model/GraphQLCodegenConfiguration.java | 16 +++++++++++++-- .../graphql/codegen/model/MappingConfig.java | 13 ++++++++++-- .../graphql/codegen/model/MappingContext.java | 6 +++++- .../GraphQLCodegenFieldsResolversTest.java | 20 +++++++++++++++++++ 10 files changed, 96 insertions(+), 5 deletions(-) diff --git a/docs/codegen-options.md b/docs/codegen-options.md index a8b86b768..f42e47dec 100644 --- a/docs/codegen-options.md +++ b/docs/codegen-options.md @@ -37,6 +37,7 @@ | `directiveAnnotationsMapping` | Map(String,String[]) | Empty | *See [DirectiveAnnotationsMapping](#option-directiveannotationsmapping)* | | `fieldsWithResolvers` | Set(String) | Empty | Fields that require Resolvers should be defined here in format: `TypeName.fieldName` or `TypeName` or `@directive`. E.g.: `Person`, `Person.friends`, `@customResolver`. | | `fieldsWithoutResolvers` | Set(String) | Empty | Fields that DO NOT require Resolvers should be defined here in format: `TypeName.fieldName` or `TypeName` or `@directive`. Can be used in conjunction with `generateExtensionFieldsResolvers` option. E.g.: `Person`, `Person.friends`, `@noResolver`. | +| `fieldsToExcludeFromGeneration` | Set(String) | Empty | Fields to exclude from generation should be defined here in format: `TypeName.fieldName`. | | `resolverArgumentAnnotations` | Set(String) | Empty | Annotations that will be added to all resolver arguments. Can be used for [spring-graphql](https://github.com/spring-projects/spring-graphql) inegration by supplying: `org.springframework.graphql.data.method.annotation.Argument` | | `parametrizedResolverAnnotations` | Set(String) | Empty | Annotations that will be added to all parametrized resolver methods. Can be used for [spring-graphql](https://github.com/spring-projects/spring-graphql) inegration by supplying: `org.springframework.graphql.data.method.annotation.SchemaMapping(typeName="{{TYPE_NAME}}")` | | `generateParameterizedFieldsResolvers` | Boolean | True | If true, then generate separate `Resolver` interface for parametrized fields. If false, then add field to the type definition and ignore field parameters. | diff --git a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java index b0fb6066d..89eb7f255 100644 --- a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java +++ b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java @@ -94,6 +94,7 @@ public class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode private String generatedAnnotation; private Set fieldsWithResolvers = new HashSet<>(); private Set fieldsWithoutResolvers = new HashSet<>(); + private Set fieldsToExcludeFromGeneration = new HashSet<>(); private Set typesAsInterfaces = new HashSet<>(); private Set resolverArgumentAnnotations = new HashSet<>(); private Set parametrizedResolverAnnotations = new HashSet<>(); @@ -182,6 +183,8 @@ public void generate() throws Exception { fieldsWithResolvers != null ? fieldsWithResolvers : new HashSet<>()); mappingConfig.setFieldsWithoutResolvers( fieldsWithoutResolvers != null ? fieldsWithoutResolvers : new HashSet<>()); + mappingConfig.setFieldsToExcludeFromGeneration( + fieldsToExcludeFromGeneration != null ? fieldsToExcludeFromGeneration : new HashSet<>()); mappingConfig.setTypesAsInterfaces( typesAsInterfaces != null ? typesAsInterfaces : new HashSet<>()); mappingConfig.setResolverArgumentAnnotations( @@ -762,6 +765,17 @@ public void setFieldsWithoutResolvers(Set fieldsWithoutResolvers) { this.fieldsWithoutResolvers = fieldsWithoutResolvers; } + @Input + @Optional + @Override + public Set getFieldsToExcludeFromGeneration() { + return fieldsToExcludeFromGeneration; + } + + public void setFieldsToExcludeFromGeneration(Set fieldsToExcludeFromGeneration) { + this.fieldsToExcludeFromGeneration = fieldsToExcludeFromGeneration; + } + @Input @Optional @Override diff --git a/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java b/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java index aebc87214..25eac92e4 100644 --- a/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java +++ b/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java @@ -176,6 +176,9 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo @Parameter private String[] fieldsWithoutResolvers; + @Parameter + private String[] fieldsToExcludeFromGeneration; + @Parameter private RelayConfig relayConfig = new RelayConfig(); @@ -289,6 +292,7 @@ public void execute() throws MojoExecutionException { mappingConfig.setGenerateModelsWithPublicFields(generateModelsWithPublicFields); mappingConfig.setFieldsWithResolvers(mapToHashSet(fieldsWithResolvers)); mappingConfig.setFieldsWithoutResolvers(mapToHashSet(fieldsWithoutResolvers)); + mappingConfig.setFieldsToExcludeFromGeneration(mapToHashSet(fieldsToExcludeFromGeneration)); mappingConfig.setRelayConfig(relayConfig); mappingConfig.setGenerateClient(generateClient); @@ -586,6 +590,11 @@ public Set getFieldsWithoutResolvers() { return mapToHashSet(fieldsWithoutResolvers); } + @Override + public Set getFieldsToExcludeFromGeneration() { + return mapToHashSet(fieldsToExcludeFromGeneration); + } + @Override public Boolean getGenerateAllMethodInProjection() { return generateAllMethodInProjection; diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenKeys.scala b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenKeys.scala index fdc728527..a41e4121d 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenKeys.scala +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenKeys.scala @@ -84,6 +84,8 @@ trait GraphQLCodegenKeys { val fieldsWithoutResolvers = settingKey[util.Set[String]]("fieldsWithoutResolvers") + val fieldsToExcludeFromGeneration = settingKey[util.Set[String]]("fieldsToExcludeFromGeneration") + val typesAsInterfaces = settingKey[util.Set[String]]("typesAsInterfaces") val generateClient = settingKey[Boolean]("generateClient") diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala index ff91ea3d9..e1a0c6d97 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala @@ -110,6 +110,7 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co // field resolvers configs: fieldsWithResolvers := new JHashSet[String](), fieldsWithoutResolvers := new JHashSet[String](), + fieldsToExcludeFromGeneration := new JHashSet[String](), // various toggles: generateClient := MappingConfigConstants.DEFAULT_GENERATE_CLIENT, generateParameterizedFieldsResolvers := MappingConfigConstants.DEFAULT_GENERATE_PARAMETERIZED_FIELDS_RESOLVERS, @@ -167,6 +168,7 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co mappingConfig.setGenerateModelsForRootTypes((GraphQLCodegenConfig / generateModelsForRootTypes).value) mappingConfig.setFieldsWithResolvers((GraphQLCodegenConfig / fieldsWithResolvers).value) mappingConfig.setFieldsWithoutResolvers((GraphQLCodegenConfig / fieldsWithoutResolvers).value) + mappingConfig.setFieldsToExcludeFromGeneration((GraphQLCodegenConfig / fieldsToExcludeFromGeneration).value) mappingConfig.setTypesAsInterfaces((GraphQLCodegenConfig / typesAsInterfaces).value) mappingConfig.setGenerateClient((GraphQLCodegenConfig / generateClient).value) mappingConfig.setRequestSuffix((GraphQLCodegenConfig / requestSuffix).value) diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionToParameterMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionToParameterMapper.java index fb4bd5e1a..14d83d5f6 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionToParameterMapper.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionToParameterMapper.java @@ -11,6 +11,7 @@ import java.util.Collections; import java.util.List; +import java.util.Set; import static java.util.stream.Collectors.toList; @@ -34,6 +35,22 @@ public FieldDefinitionToParameterMapper(MapperFactory mapperFactory, this.inputValueDefinitionToParameterMapper = inputValueDefToParamMapper; } + /** + * Check whether the given field should be generated. + * + * @param mappingContext Global mapping context + * @param fieldDef GraphQL field definition + * @param parentDefinition Parent GraphQL definition + * @return true if field will be generated (included) in the object. false otherwise + */ + public static boolean generateField(MappingContext mappingContext, + ExtendedFieldDefinition fieldDef, + ExtendedDefinition parentDefinition) { + String fieldDefName = parentDefinition.getName() + "." + fieldDef.getName(); + Set fieldsToExcludeFromGeneration = mappingContext.getFieldsToExcludeFromGeneration(); + return !fieldsToExcludeFromGeneration.contains(fieldDefName); + } + /** * Check whether FieldResolver should be generated for a given field. * @@ -95,6 +112,7 @@ public List mapFields(MappingContext mappingContext, List fieldDefinitions, ExtendedDefinition parentDefinition) { return fieldDefinitions.stream() + .filter(fieldDef -> generateField(mappingContext, fieldDef, parentDefinition)) .filter(fieldDef -> !generateResolversForField(mappingContext, fieldDef, parentDefinition)) .map(fieldDef -> mapField(mappingContext, fieldDef, parentDefinition)) .collect(toList()); diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java index 1a8863bf5..387fd0f09 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java @@ -1,7 +1,5 @@ package com.kobylynskyi.graphql.codegen.model; -import com.kobylynskyi.graphql.codegen.generators.FreeMarkerTemplateType; - import java.io.File; import java.util.List; import java.util.Map; @@ -330,6 +328,20 @@ public interface GraphQLCodegenConfiguration { */ Set getFieldsWithoutResolvers(); + /** + * Fields that WILL NOT be generated. + * + *

Values should be defined here in format: TypeName.fieldName + * + *

E.g.: + *

    + *
  • {@code Person.friends}
    • + *
+ * + * @return Set of types and fields that should NOT be generated. + */ + Set getFieldsToExcludeFromGeneration(); + /** * Specifies whether return types of generated API interface should be wrapped into java.util.Optional * diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java index 93408d4b7..846cbabb1 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java @@ -1,7 +1,5 @@ package com.kobylynskyi.graphql.codegen.model; -import com.kobylynskyi.graphql.codegen.generators.FreeMarkerTemplateType; - import java.io.File; import java.util.HashMap; import java.util.HashSet; @@ -64,6 +62,7 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable fieldsWithResolvers = new HashSet<>(); private Set fieldsWithoutResolvers = new HashSet<>(); + private Set fieldsToExcludeFromGeneration = new HashSet<>(); // parent interfaces configs: private String queryResolverParentInterface; @@ -191,6 +190,7 @@ public void combine(MappingConfig source) { GraphQLCodegenConfiguration::getParametrizedInputSuffix); fieldsWithResolvers = combineSet(fieldsWithResolvers, source.fieldsWithResolvers); fieldsWithoutResolvers = combineSet(fieldsWithoutResolvers, source.fieldsWithoutResolvers); + fieldsToExcludeFromGeneration = combineSet(fieldsToExcludeFromGeneration, source.fieldsToExcludeFromGeneration); customTypesMapping = combineMap(customTypesMapping, source.customTypesMapping); customTemplates = combineMap(customTemplates, source.customTemplates); customAnnotationsMapping = combineMap(customAnnotationsMapping, source.customAnnotationsMapping); @@ -589,6 +589,15 @@ public void setFieldsWithoutResolvers(Set fieldsWithoutResolvers) { this.fieldsWithoutResolvers = fieldsWithoutResolvers; } + @Override + public Set getFieldsToExcludeFromGeneration() { + return fieldsToExcludeFromGeneration; + } + + public void setFieldsToExcludeFromGeneration(Set fieldsToExcludeFromGeneration) { + this.fieldsToExcludeFromGeneration = fieldsToExcludeFromGeneration; + } + @Override public String getQueryResolverParentInterface() { return queryResolverParentInterface; diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java index ec12f3c93..53aa83901 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java @@ -1,6 +1,5 @@ package com.kobylynskyi.graphql.codegen.model; -import com.kobylynskyi.graphql.codegen.generators.FreeMarkerTemplateType; import com.kobylynskyi.graphql.codegen.mapper.DataModelMapper; import com.kobylynskyi.graphql.codegen.mapper.DataModelMapperFactory; import com.kobylynskyi.graphql.codegen.mapper.FieldDefinitionToParameterMapper; @@ -265,6 +264,11 @@ public Set getFieldsWithoutResolvers() { return config.getFieldsWithoutResolvers(); } + @Override + public Set getFieldsToExcludeFromGeneration() { + return config.getFieldsToExcludeFromGeneration(); + } + @Override public Boolean getGenerateClient() { return config.getGenerateClient(); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenFieldsResolversTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenFieldsResolversTest.java index 2793dff5e..cb897cd6f 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenFieldsResolversTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenFieldsResolversTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.Collections; import java.util.HashMap; @@ -18,6 +19,7 @@ import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.junit.jupiter.api.Assertions.assertThrows; @ExtendWith(MaxQueryTokensExtension.class) class GraphQLCodegenFieldsResolversTest { @@ -140,6 +142,24 @@ void generate_FieldResolversViaDirective() throws Exception { getFileByName(files, "EventProperty.java")); } + @Test + void generate_WithFieldsToExcludeFromGeneration() throws Exception { + mappingConfig.setModelNamePrefix("Github"); + mappingConfig.setModelNameSuffix("TO"); + mappingConfig.setGenerateDataFetchingEnvironmentArgumentInApis(true); + mappingConfig.setFieldsToExcludeFromGeneration(Collections.singleton("AcceptTopicSuggestionPayload.topic")); + + generate("src/test/resources/schemas/github.graphqls"); + + File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); + + assertSameTrimmedContent(new File("src/test/resources/expected-classes/" + + "GithubAcceptTopicSuggestionPayloadTO.java.txt"), + getFileByName(files, "GithubAcceptTopicSuggestionPayloadTO.java")); + assertThrows(FileNotFoundException.class, + () -> getFileByName(files, "AcceptTopicSuggestionPayloadResolver.java")); + } + private void generate(String o) throws IOException { new JavaGraphQLCodegen(singletonList(o), outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo(mappingConfig)).generate(); From 38a7d1c67abb896d73fd1e1dcbf6e0cc738f02e8 Mon Sep 17 00:00:00 2001 From: Evgenii Sabirov Date: Mon, 7 Aug 2023 09:58:32 +0400 Subject: [PATCH 2/4] fix sbt formatting --- .../dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala index e1a0c6d97..06c352dde 100644 --- a/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala +++ b/plugins/sbt/graphql-java-codegen-sbt-plugin/src/main/scala/io/github/dreamylost/graphql/codegen/GraphQLCodegenPlugin.scala @@ -108,8 +108,8 @@ class GraphQLCodegenPlugin(configuration: Configuration, private[codegen] val co apiPackageName := None, modelPackageName := None, // field resolvers configs: - fieldsWithResolvers := new JHashSet[String](), - fieldsWithoutResolvers := new JHashSet[String](), + fieldsWithResolvers := new JHashSet[String](), + fieldsWithoutResolvers := new JHashSet[String](), fieldsToExcludeFromGeneration := new JHashSet[String](), // various toggles: generateClient := MappingConfigConstants.DEFAULT_GENERATE_CLIENT, From 9ea1292d5577ca276192de4f1ad217b4c7c4c1ae Mon Sep 17 00:00:00 2001 From: Evgenii Sabirov Date: Wed, 9 Aug 2023 08:15:14 +0400 Subject: [PATCH 3/4] extend MappingConfigTest --- .../graphql/codegen/model/MappingConfigTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java index 46b2452c6..a20f337d4 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java @@ -51,6 +51,7 @@ private static MappingConfig buildMappingConfig() { config.setApiRootInterfaceStrategy(ApiRootInterfaceStrategy.SINGLE_INTERFACE); config.setFieldsWithResolvers(new HashSet<>(singletonList("5"))); config.setFieldsWithoutResolvers(new HashSet<>(singleton("8"))); + config.setFieldsToExcludeFromGeneration(new HashSet<>(singleton("3"))); config.setRequestSuffix("6"); config.setResponseSuffix("10"); config.setResponseProjectionSuffix("7"); @@ -98,6 +99,7 @@ private static MappingConfig buildMappingConfig2() { config.setApiRootInterfaceStrategy(ApiRootInterfaceStrategy.DO_NOT_GENERATE); config.setFieldsWithResolvers(singleton("55")); config.setFieldsWithoutResolvers(singleton("88")); + config.setFieldsToExcludeFromGeneration(singleton("33")); config.setRequestSuffix("66"); config.setResponseSuffix("1010"); config.setResponseProjectionSuffix("77"); @@ -125,6 +127,7 @@ private static MappingConfig buildEmptyMappingConfig() { mappingConfig.setDirectiveAnnotationsMapping(null); mappingConfig.setFieldsWithResolvers(null); mappingConfig.setFieldsWithoutResolvers(null); + mappingConfig.setFieldsToExcludeFromGeneration(null); mappingConfig.setRelayConfig(null); return mappingConfig; } @@ -156,6 +159,7 @@ private static void compareMappingConfigs(MappingConfig mappingConfig, MappingCo mappingConfig.getGenerateExtensionFieldsResolvers()); assertEquals(expectedMappingConfig.getFieldsWithResolvers(), mappingConfig.getFieldsWithResolvers()); assertEquals(expectedMappingConfig.getFieldsWithoutResolvers(), mappingConfig.getFieldsWithoutResolvers()); + assertEquals(expectedMappingConfig.getFieldsToExcludeFromGeneration(), mappingConfig.getFieldsToExcludeFromGeneration()); assertEquals(expectedMappingConfig.getRequestSuffix(), mappingConfig.getRequestSuffix()); assertEquals(expectedMappingConfig.getResponseSuffix(), mappingConfig.getResponseSuffix()); assertEquals(expectedMappingConfig.getResponseProjectionSuffix(), mappingConfig.getResponseProjectionSuffix()); @@ -222,6 +226,7 @@ void combineDefaultWithCustom() { assertEquals(ApiRootInterfaceStrategy.SINGLE_INTERFACE, mappingConfig.getApiRootInterfaceStrategy()); assertEquals(singleton("5"), mappingConfig.getFieldsWithResolvers()); assertEquals(singleton("8"), mappingConfig.getFieldsWithoutResolvers()); + assertEquals(singleton("3"), mappingConfig.getFieldsToExcludeFromGeneration()); assertEquals("6", mappingConfig.getRequestSuffix()); assertEquals("10", mappingConfig.getResponseSuffix()); assertEquals("7", mappingConfig.getResponseProjectionSuffix()); @@ -268,6 +273,7 @@ void combineCustomWithDefault() { assertEquals(ApiRootInterfaceStrategy.SINGLE_INTERFACE, mappingConfig.getApiRootInterfaceStrategy()); assertEquals(singleton("5"), mappingConfig.getFieldsWithResolvers()); assertEquals(singleton("8"), mappingConfig.getFieldsWithoutResolvers()); + assertEquals(singleton("3"), mappingConfig.getFieldsToExcludeFromGeneration()); assertEquals("6", mappingConfig.getRequestSuffix()); assertEquals("10", mappingConfig.getResponseSuffix()); assertEquals("7", mappingConfig.getResponseProjectionSuffix()); @@ -320,6 +326,7 @@ void combineCustomWithCustom() { assertEquals(ApiRootInterfaceStrategy.DO_NOT_GENERATE, mappingConfig.getApiRootInterfaceStrategy()); assertEquals(new HashSet<>(Arrays.asList("5", "55")), mappingConfig.getFieldsWithResolvers()); assertEquals(new HashSet<>(Arrays.asList("8", "88")), mappingConfig.getFieldsWithoutResolvers()); + assertEquals(new HashSet<>(Arrays.asList("3", "33")), mappingConfig.getFieldsToExcludeFromGeneration()); assertEquals("66", mappingConfig.getRequestSuffix()); assertEquals("1010", mappingConfig.getResponseSuffix()); assertEquals("77", mappingConfig.getResponseProjectionSuffix()); From 745158ab9d85d23cd1d500de9756b701aa3158ee Mon Sep 17 00:00:00 2001 From: Evgenii Sabirov Date: Wed, 9 Aug 2023 08:18:30 +0400 Subject: [PATCH 4/4] formatting --- .../kobylynskyi/graphql/codegen/model/MappingConfigTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java index a20f337d4..786ee9e92 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java @@ -159,7 +159,8 @@ private static void compareMappingConfigs(MappingConfig mappingConfig, MappingCo mappingConfig.getGenerateExtensionFieldsResolvers()); assertEquals(expectedMappingConfig.getFieldsWithResolvers(), mappingConfig.getFieldsWithResolvers()); assertEquals(expectedMappingConfig.getFieldsWithoutResolvers(), mappingConfig.getFieldsWithoutResolvers()); - assertEquals(expectedMappingConfig.getFieldsToExcludeFromGeneration(), mappingConfig.getFieldsToExcludeFromGeneration()); + assertEquals(expectedMappingConfig.getFieldsToExcludeFromGeneration(), + mappingConfig.getFieldsToExcludeFromGeneration()); assertEquals(expectedMappingConfig.getRequestSuffix(), mappingConfig.getRequestSuffix()); assertEquals(expectedMappingConfig.getResponseSuffix(), mappingConfig.getResponseSuffix()); assertEquals(expectedMappingConfig.getResponseProjectionSuffix(), mappingConfig.getResponseProjectionSuffix());