From 1beadc5b4dfca2b117467908dcd1b31f088c3eb8 Mon Sep 17 00:00:00 2001 From: Robbert Noordzij Date: Fri, 23 Apr 2021 19:45:20 +0200 Subject: [PATCH] Fix checkstyle issues --- .../codegen/mapper/GraphQLTypeMapper.java | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java index a2d17f021..67446b153 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/GraphQLTypeMapper.java @@ -270,7 +270,7 @@ default List getAnnotations(MappingContext mappingContext, Type type, } default List getAnnotations(MappingContext mappingContext, ExtendedDefinition extendedDefinition) { - if(extendedDefinition == null) { + if (extendedDefinition == null) { return Collections.emptyList(); } @@ -283,42 +283,6 @@ default List 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 getJacksonTypeIdAnnotations(MappingContext mappingContext, NamedNode def) { - List 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 getAdditionalAnnotations(MappingContext mappingContext, String typeName) { - return new ArrayList<>(); - } - /** * Get annotations for a given GraphQL type * @@ -374,6 +338,42 @@ default List 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 getJacksonTypeIdAnnotations(MappingContext mappingContext, NamedNode def) { + List 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 getAdditionalAnnotations(MappingContext mappingContext, String typeName) { + return new ArrayList<>(); + } + /** * Get a list of annotations for a given directive based on mapping config *