Skip to content

Commit 53fa568

Browse files
committed
fix codestyle issue
1 parent ae59ca8 commit 53fa568

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ protected void initDefaultValues(MappingConfig mappingConfig) {
192192
mappingConfig.setAddGeneratedAnnotation(MappingConfigConstants.DEFAULT_ADD_GENERATED_ANNOTATION);
193193
}
194194
if (mappingConfig.getGenerateJacksonTypeIdResolver() == null) {
195-
mappingConfig.setGenerateJacksonTypeIdResolver(MappingConfigConstants.DEFAULT_GENERATE_JACKSON_TYPE_ID_RESOLVER);
195+
mappingConfig.setGenerateJacksonTypeIdResolver(
196+
MappingConfigConstants.DEFAULT_GENERATE_JACKSON_TYPE_ID_RESOLVER);
196197
}
197198
if (mappingConfig.getUseOptionalForNullableReturnTypes() == null) {
198199
mappingConfig.setUseOptionalForNullableReturnTypes(

src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,16 @@ default List<String> getAnnotations(MappingContext mappingContext, String graphQ
315315
annotations.addAll(annotationsToAdd);
316316
}
317317
} else if (Boolean.TRUE.equals(mappingContext.getGenerateJacksonTypeIdResolver()) && isUnion) {
318-
annotations.add("com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")");
318+
annotations.add("com.fasterxml.jackson.annotation.JsonTypeInfo(use = " +
319+
"com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")");
319320
String modelPackageName = DataModelMapper.getModelPackageName(mappingContext);
320321
if (modelPackageName == null) {
321322
modelPackageName = "";
322323
} else if (Utils.isNotBlank(modelPackageName)) {
323324
modelPackageName += ".";
324325
}
325-
annotations.add("com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" + modelPackageName + "GraphqlJacksonTypeIdResolver.class)");
326+
annotations.add("com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" + modelPackageName +
327+
"GraphqlJacksonTypeIdResolver.class)");
326328
}
327329

328330
Map<String, List<String>> directiveAnnotationsMapping = mappingContext.getDirectiveAnnotationsMapping();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,11 @@ public interface GraphQLCodegenConfiguration {
260260
Boolean getAddGeneratedAnnotation();
261261

262262
/**
263-
* Specifies whether generated union interfaces should be annotated with a Jackson type id resolver generated in model package.
263+
* Specifies whether generated union interfaces should be annotated with a Jackson type id resolver generated in
264+
* model package.
264265
*
265-
* @return <b>true</b> if union interfaces should be annotated with a Jackson type id resolver generated in model package
266+
* @return <b>true</b> if union interfaces should be annotated with a Jackson type id resolver generated in model
267+
* package
266268
*/
267269
Boolean getGenerateJacksonTypeIdResolver();
268270

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,15 @@ void generate_CheckFiles_with_model_package() throws Exception {
4848
File outputJavaClassesDir = new File("build/generated/com/kobylynskyi/graphql/unionresolver");
4949
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
5050
List<String> generatedFileNames = Arrays.stream(files).map(File::getName).sorted().collect(toList());
51-
assertEquals(Arrays.asList("GraphqlJacksonTypeIdResolver.java", "UnionMemberA.java", "UnionMemberB.java", "UnionToResolve.java"), generatedFileNames);
51+
List<String> expectedClasses = Arrays.asList("GraphqlJacksonTypeIdResolver.java", "UnionMemberA.java",
52+
"UnionMemberB.java", "UnionToResolve.java");
53+
assertEquals(expectedClasses, generatedFileNames);
5254

5355
for (File file : files) {
5456
assertSameTrimmedContent(
55-
new File(String.format("src/test/resources/expected-classes/jackson-resolver-union/%s.txt", file.getName())),
57+
new File(String.format(
58+
"src/test/resources/expected-classes/jackson-resolver-union/%s.txt",
59+
file.getName())),
5660
file);
5761
}
5862
}
@@ -64,11 +68,15 @@ void generate_CheckFiles_without_model_package() throws Exception {
6468
File outputJavaClassesDir = new File("build/generated");
6569
File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
6670
List<String> generatedFileNames = Arrays.stream(files).map(File::getName).sorted().collect(toList());
67-
assertEquals(Arrays.asList("GraphqlJacksonTypeIdResolver.java", "UnionMemberA.java", "UnionMemberB.java", "UnionToResolve.java"), generatedFileNames);
71+
List<String> expectedClasses = Arrays.asList("GraphqlJacksonTypeIdResolver.java", "UnionMemberA.java",
72+
"UnionMemberB.java", "UnionToResolve.java");
73+
assertEquals(Arrays.asList(expectedClasses, generatedFileNames);
6874

6975
for (File file : files) {
7076
assertSameTrimmedContent(
71-
new File(String.format("src/test/resources/expected-classes/jackson-resolver-union/without-model-package/%s.txt", file.getName())),
77+
new File(String.format(
78+
"src/test/resources/expected-classes/jackson-resolver-union/without-model-package/%s.txt",
79+
file.getName())),
7280
file);
7381
}
7482
}

0 commit comments

Comments
 (0)