Skip to content

Fix Sonar issues #666

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 2 commits into from
Apr 23, 2021
Merged

Fix Sonar issues #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab63567
Fix null check
Apr 23, 2021
0b57d1a
Remove code duplication
Apr 23, 2021
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
10 changes: 7 additions & 3 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,11 @@ default List<String> getAnnotations(MappingContext mappingContext, Type<?> type,
}

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

NamedNode<?> def = extendedDefinition.getDefinition();
return getAnnotations(mappingContext, extendedDefinition.getName(), extendedDefinition.getName(), null,
extendedDefinition.getDirectives(), false, def);
}
Expand All @@ -286,7 +290,7 @@ default List<String> getAnnotations(MappingContext mappingContext, String name)
* @param def GraphQL definition
* @return list of Jackson type id resolver annotations
*/
default List<String> getJacksonTypeIdAnnotations(MappingContext mappingContext, NamedNode def) {
default List<String> getJacksonTypeIdAnnotations(MappingContext mappingContext, NamedNode<?> def) {
List<String> defaults = new ArrayList<>();
if (Boolean.TRUE.equals(mappingContext.getGenerateJacksonTypeIdResolver())
&& def instanceof UnionTypeDefinition) {
Expand Down Expand Up @@ -329,7 +333,7 @@ default List<String> getAdditionalAnnotations(MappingContext mappingContext, Str
*/
default List<String> getAnnotations(MappingContext mappingContext, String graphQLTypeName, String name,
String parentTypeName, List<Directive> directives, boolean mandatory,
NamedNode def) {
NamedNode<?> def) {
List<String> annotations = new ArrayList<>();
if (mandatory) {
String possiblyPrimitiveType = mappingContext.getCustomTypesMapping()
Expand Down
24 changes: 9 additions & 15 deletions src/main/java/com/kobylynskyi/graphql/codegen/model/definitions/ExtendedDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
* Base class for all GraphQL definition types that contains base definition and its extensions
Expand Down Expand Up @@ -101,18 +102,9 @@ public List<String> getJavaDocFromComments() {
* @return list of directive names
*/
public List<String> getDirectiveNames() {
List<String> directives = new ArrayList<>();
if (this.definition instanceof DirectivesContainer) {
List<Directive> definitionDirectives = ((DirectivesContainer<?>) this.definition).getDirectives();
if (!Utils.isEmpty(definitionDirectives)) {
definitionDirectives.stream().map(Directive::getName).forEach(directives::add);
}
this.extensions.stream().filter(Objects::nonNull)
.map(DirectivesContainer.class::cast)
.map(DirectivesContainer::getDirectives).filter(Objects::nonNull)
.forEach(ds -> ds.forEach(d -> directives.add(((Directive) d).getName())));
}
return directives;
return getDirectives().stream()
.map(Directive::getName)
.collect(Collectors.toList());
}

/**
Expand All @@ -127,10 +119,12 @@ public List<Directive> getDirectives() {
if (!Utils.isEmpty(definitionDirectives)) {
directives.addAll(definitionDirectives);
}
this.extensions.stream().filter(Objects::nonNull)
this.extensions.stream()
.filter(Objects::nonNull)
.map(DirectivesContainer.class::cast)
.map(DirectivesContainer::getDirectives).filter(Objects::nonNull)
.forEach(ds -> ds.forEach(d -> directives.add(((Directive) d))));
.map(DirectivesContainer::getDirectives)
.filter(dc -> !Utils.isEmpty(dc))
.forEach(directives::addAll);
}
return directives;
}
Expand Down