Skip to content

Fix checkstyle issues #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2021
Merged

Fix checkstyle issues #667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ default List<String> getAnnotations(MappingContext mappingContext, Type<?> type,
}

default List<String> getAnnotations(MappingContext mappingContext, ExtendedDefinition<?, ?> extendedDefinition) {
if(extendedDefinition == null) {
if (extendedDefinition == null) {
return Collections.emptyList();
}

Expand All @@ -283,42 +283,6 @@ default List<String> getAnnotations(MappingContext mappingContext, String name)
return getAnnotations(mappingContext, name, name, null, Collections.emptyList(), false, null);
}

/**
* Get Jackson type id resolver annotations
*
* @param mappingContext Global mapping context
* @param def GraphQL definition
* @return list of Jackson type id resolver annotations
*/
default List<String> getJacksonTypeIdAnnotations(MappingContext mappingContext, NamedNode<?> def) {
List<String> defaults = new ArrayList<>();
if (Boolean.TRUE.equals(mappingContext.getGenerateJacksonTypeIdResolver())
&& def instanceof UnionTypeDefinition) {
defaults.add("com.fasterxml.jackson.annotation.JsonTypeInfo(use = " +
"com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")");
String modelPackageName = DataModelMapper.getModelPackageName(mappingContext);
if (modelPackageName == null) {
modelPackageName = "";
} else if (Utils.isNotBlank(modelPackageName)) {
modelPackageName += ".";
}
defaults.add(getJacksonResolverTypeIdAnnotation(modelPackageName));
}
return defaults;
}

/**
* Get language specific Jackson type id resolver annotation
*
* @param modelPackageName Model package name property
* @return language specific Jackson type id resolver annotation
*/
String getJacksonResolverTypeIdAnnotation(String modelPackageName);

default List<String> getAdditionalAnnotations(MappingContext mappingContext, String typeName) {
return new ArrayList<>();
}

/**
* Get annotations for a given GraphQL type
*
Expand Down Expand Up @@ -374,6 +338,42 @@ default List<String> getAnnotations(MappingContext mappingContext, String graphQ
return annotations;
}

/**
* Get Jackson type id resolver annotations
*
* @param mappingContext Global mapping context
* @param def GraphQL definition
* @return list of Jackson type id resolver annotations
*/
default List<String> getJacksonTypeIdAnnotations(MappingContext mappingContext, NamedNode<?> def) {
List<String> defaults = new ArrayList<>();
if (Boolean.TRUE.equals(mappingContext.getGenerateJacksonTypeIdResolver())
&& def instanceof UnionTypeDefinition) {
defaults.add("com.fasterxml.jackson.annotation.JsonTypeInfo(use = " +
"com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \"__typename\")");
String modelPackageName = DataModelMapper.getModelPackageName(mappingContext);
if (modelPackageName == null) {
modelPackageName = "";
} else if (Utils.isNotBlank(modelPackageName)) {
modelPackageName += ".";
}
defaults.add(getJacksonResolverTypeIdAnnotation(modelPackageName));
}
return defaults;
}

/**
* Get language specific Jackson type id resolver annotation
*
* @param modelPackageName Model package name property
* @return language specific Jackson type id resolver annotation
*/
String getJacksonResolverTypeIdAnnotation(String modelPackageName);

default List<String> getAdditionalAnnotations(MappingContext mappingContext, String typeName) {
return new ArrayList<>();
}

/**
* Get a list of annotations for a given directive based on mapping config
*
Expand Down