@@ -270,7 +270,7 @@ default List<String> getAnnotations(MappingContext mappingContext, Type<?> type,
270270 }
271271
272272 default List <String > getAnnotations (MappingContext mappingContext , ExtendedDefinition <?, ?> extendedDefinition ) {
273- if (extendedDefinition == null ) {
273+ if (extendedDefinition == null ) {
274274 return Collections .emptyList ();
275275 }
276276
@@ -283,42 +283,6 @@ default List<String> getAnnotations(MappingContext mappingContext, String name)
283283 return getAnnotations (mappingContext , name , name , null , Collections .emptyList (), false , null );
284284 }
285285
286- /**
287- * Get Jackson type id resolver annotations
288- *
289- * @param mappingContext Global mapping context
290- * @param def GraphQL definition
291- * @return list of Jackson type id resolver annotations
292- */
293- default List <String > getJacksonTypeIdAnnotations (MappingContext mappingContext , NamedNode <?> def ) {
294- List <String > defaults = new ArrayList <>();
295- if (Boolean .TRUE .equals (mappingContext .getGenerateJacksonTypeIdResolver ())
296- && def instanceof UnionTypeDefinition ) {
297- defaults .add ("com.fasterxml.jackson.annotation.JsonTypeInfo(use = " +
298- "com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \" __typename\" )" );
299- String modelPackageName = DataModelMapper .getModelPackageName (mappingContext );
300- if (modelPackageName == null ) {
301- modelPackageName = "" ;
302- } else if (Utils .isNotBlank (modelPackageName )) {
303- modelPackageName += "." ;
304- }
305- defaults .add (getJacksonResolverTypeIdAnnotation (modelPackageName ));
306- }
307- return defaults ;
308- }
309-
310- /**
311- * Get language specific Jackson type id resolver annotation
312- *
313- * @param modelPackageName Model package name property
314- * @return language specific Jackson type id resolver annotation
315- */
316- String getJacksonResolverTypeIdAnnotation (String modelPackageName );
317-
318- default List <String > getAdditionalAnnotations (MappingContext mappingContext , String typeName ) {
319- return new ArrayList <>();
320- }
321-
322286 /**
323287 * Get annotations for a given GraphQL type
324288 *
@@ -374,6 +338,42 @@ default List<String> getAnnotations(MappingContext mappingContext, String graphQ
374338 return annotations ;
375339 }
376340
341+ /**
342+ * Get Jackson type id resolver annotations
343+ *
344+ * @param mappingContext Global mapping context
345+ * @param def GraphQL definition
346+ * @return list of Jackson type id resolver annotations
347+ */
348+ default List <String > getJacksonTypeIdAnnotations (MappingContext mappingContext , NamedNode <?> def ) {
349+ List <String > defaults = new ArrayList <>();
350+ if (Boolean .TRUE .equals (mappingContext .getGenerateJacksonTypeIdResolver ())
351+ && def instanceof UnionTypeDefinition ) {
352+ defaults .add ("com.fasterxml.jackson.annotation.JsonTypeInfo(use = " +
353+ "com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property = \" __typename\" )" );
354+ String modelPackageName = DataModelMapper .getModelPackageName (mappingContext );
355+ if (modelPackageName == null ) {
356+ modelPackageName = "" ;
357+ } else if (Utils .isNotBlank (modelPackageName )) {
358+ modelPackageName += "." ;
359+ }
360+ defaults .add (getJacksonResolverTypeIdAnnotation (modelPackageName ));
361+ }
362+ return defaults ;
363+ }
364+
365+ /**
366+ * Get language specific Jackson type id resolver annotation
367+ *
368+ * @param modelPackageName Model package name property
369+ * @return language specific Jackson type id resolver annotation
370+ */
371+ String getJacksonResolverTypeIdAnnotation (String modelPackageName );
372+
373+ default List <String > getAdditionalAnnotations (MappingContext mappingContext , String typeName ) {
374+ return new ArrayList <>();
375+ }
376+
377377 /**
378378 * Get a list of annotations for a given directive based on mapping config
379379 *
0 commit comments