Skip to content

Commit 80b8afb

Browse files
committed
Fix some minor code style issues (reported by checkstyle)
1 parent e8a45cb commit 80b8afb

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

src/main/java/com/kobylynskyi/graphql/codegen/generators/impl/FieldResolversGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ private List<File> generate(List<ExtendedFieldDefinition> fieldDefinitions,
5353
}
5454
Set<String> fieldNamesWithResolvers = mappingContext.getFieldNamesWithResolvers();
5555
List<ExtendedFieldDefinition> fieldDefsWithResolvers = fieldDefinitions.stream()
56-
.filter(fieldDef -> fieldNamesWithResolvers.contains(parentDefinition.getName() + "." + fieldDef.getName()))
56+
.filter(fieldDef ->
57+
fieldNamesWithResolvers.contains(parentDefinition.getName() + "." + fieldDef.getName()))
5758
.collect(toList());
5859

5960
List<File> generatedFiles = new ArrayList<>();

src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ public void combine(MappingConfig source) {
184184
customAnnotationsMapping = combineMap(customAnnotationsMapping, source.customAnnotationsMapping);
185185
directiveAnnotationsMapping = combineMap(directiveAnnotationsMapping, source.directiveAnnotationsMapping);
186186
resolverArgumentAnnotations = combineSet(resolverArgumentAnnotations, source.resolverArgumentAnnotations);
187-
parametrizedResolverAnnotations = combineSet(parametrizedResolverAnnotations, source.parametrizedResolverAnnotations);
187+
parametrizedResolverAnnotations = combineSet(parametrizedResolverAnnotations,
188+
source.parametrizedResolverAnnotations);
188189
generateAllMethodInProjection = getValueOrDefaultToThis(source,
189190
GraphQLCodegenConfiguration::getGenerateAllMethodInProjection);
190191
responseProjectionMaxDepth = getValueOrDefaultToThis(source,

src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,20 +400,28 @@ public Map<String, Set<String>> getParentInterfaceProperties() {
400400
return parentInterfaceProperties;
401401
}
402402

403+
/**
404+
* Get names of all the fields that require separate resolver class.
405+
* This includes fields from type definitions and interface definitions.
406+
*
407+
* @return a flat set of all field names that require resolver.
408+
*/
403409
public Set<String> getFieldNamesWithResolvers() {
404410
if (fieldNamesWithResolvers == null) {
405411
fieldNamesWithResolvers = new HashSet<>();
406412
for (ExtendedObjectTypeDefinition definition : document.getTypeDefinitions()) {
407413
definition.getFieldDefinitions().stream()
408414
.filter(fieldDef -> FieldDefinitionToParameterMapper.generateResolversForField(
409415
this, fieldDef, definition))
410-
.forEach(fieldDef -> fieldNamesWithResolvers.add(definition.getName() + "." + fieldDef.getName()));
416+
.forEach(fieldDef ->
417+
fieldNamesWithResolvers.add(definition.getName() + "." + fieldDef.getName()));
411418
}
412419
for (ExtendedInterfaceTypeDefinition definition : document.getInterfaceDefinitions()) {
413420
definition.getFieldDefinitions().stream()
414421
.filter(fieldDef -> FieldDefinitionToParameterMapper.generateResolversForField(
415422
this, fieldDef, definition))
416-
.forEach(fieldDef -> fieldNamesWithResolvers.add(definition.getName() + "." + fieldDef.getName()));
423+
.forEach(fieldDef ->
424+
fieldNamesWithResolvers.add(definition.getName() + "." + fieldDef.getName()));
417425
}
418426
}
419427
return fieldNamesWithResolvers;

src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ void generate_ResolverArgumentAnnotations() throws Exception {
213213
outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate();
214214

215215
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
216-
assertSameTrimmedContent(
217-
new File("src/test/resources/expected-classes/annotation/CreateEventMutationResolver_ArgumentAnnotations.java.txt"),
216+
assertSameTrimmedContent(new File("src/test/resources/expected-classes/annotation/" +
217+
"CreateEventMutationResolver_ArgumentAnnotations.java.txt"),
218218
getFileByName(files, "CreateEventMutationResolver.java"));
219219
assertSameTrimmedContent(
220220
new File("src/test/resources/expected-classes/annotation/QueryResolver_ArgumentAnnotations.java.txt"),
@@ -232,8 +232,8 @@ void generate_ParametrizedResolverAnnotations() throws Exception {
232232
outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate();
233233

234234
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
235-
assertSameTrimmedContent(
236-
new File("src/test/resources/expected-classes/annotation/EventPropertyResolver_ParametrizedResolverAnnotations.java.txt"),
235+
assertSameTrimmedContent(new File("src/test/resources/expected-classes/annotation/" +
236+
"EventPropertyResolver_ParametrizedResolverAnnotations.java.txt"),
237237
getFileByName(files, "EventPropertyResolver.java"));
238238
}
239239

src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,10 @@ private static void compareMappingConfigs(MappingConfig mappingConfig, MappingCo
168168
mappingConfig.getUseOptionalForNullableReturnTypes());
169169
assertEquals(expectedMappingConfig.getRelayConfig(), mappingConfig.getRelayConfig());
170170
assertEquals(expectedMappingConfig.getTypesAsInterfaces(), mappingConfig.getTypesAsInterfaces());
171-
assertEquals(expectedMappingConfig.getResolverArgumentAnnotations(), mappingConfig.getResolverArgumentAnnotations());
172-
assertEquals(expectedMappingConfig.getParametrizedResolverAnnotations(), mappingConfig.getParametrizedResolverAnnotations());
171+
assertEquals(expectedMappingConfig.getResolverArgumentAnnotations(),
172+
mappingConfig.getResolverArgumentAnnotations());
173+
assertEquals(expectedMappingConfig.getParametrizedResolverAnnotations(),
174+
mappingConfig.getParametrizedResolverAnnotations());
173175
}
174176

175177
@Test
@@ -327,7 +329,8 @@ void combineCustomWithCustom() {
327329
assertEquals("for", mappingConfig.getRelayConfig().getDirectiveArgumentName());
328330
assertEquals(new HashSet<>(Arrays.asList("User", "User2")), mappingConfig.getTypesAsInterfaces());
329331
assertEquals(new HashSet<>(Arrays.asList("Ann1", "Ann2")), mappingConfig.getResolverArgumentAnnotations());
330-
assertEquals(new HashSet<>(Arrays.asList("PAnn1", "PAnn2")), mappingConfig.getParametrizedResolverAnnotations());
332+
assertEquals(new HashSet<>(Arrays.asList("PAnn1", "PAnn2")),
333+
mappingConfig.getParametrizedResolverAnnotations());
331334
}
332335

333336
}

0 commit comments

Comments
 (0)