@@ -93,7 +93,7 @@ public GraphqlAntlrToLanguage(CommonTokenStream tokens) {
9393 public Document createDocument (GraphqlParser .DocumentContext ctx ) {
9494 Document .Builder document = Document .newDocument ();
9595 addCommonData (document , ctx );
96- document .definitions (ctx .definition ().stream ().map (definition -> createDefinition ( definition ) )
96+ document .definitions (ctx .definition ().stream ().map (this :: createDefinition )
9797 .collect (toList ()));
9898 return document .build ();
9999 }
@@ -129,14 +129,15 @@ protected OperationDefinition createOperationDefinition(GraphqlParser.OperationD
129129 }
130130
131131 protected OperationDefinition .Operation parseOperation (GraphqlParser .OperationTypeContext operationTypeContext ) {
132- if (operationTypeContext .getText ().equals ("query" )) {
133- return OperationDefinition .Operation .QUERY ;
134- } else if (operationTypeContext .getText ().equals ("mutation" )) {
135- return OperationDefinition .Operation .MUTATION ;
136- } else if (operationTypeContext .getText ().equals ("subscription" )) {
137- return OperationDefinition .Operation .SUBSCRIPTION ;
138- } else {
139- return assertShouldNeverHappen ("InternalError: unknown operationTypeContext=%s" , operationTypeContext .getText ());
132+ switch (operationTypeContext .getText ()) {
133+ case "query" :
134+ return OperationDefinition .Operation .QUERY ;
135+ case "mutation" :
136+ return OperationDefinition .Operation .MUTATION ;
137+ case "subscription" :
138+ return OperationDefinition .Operation .SUBSCRIPTION ;
139+ default :
140+ return assertShouldNeverHappen ("InternalError: unknown operationTypeContext=%s" , operationTypeContext .getText ());
140141 }
141142 }
142143
@@ -429,8 +430,8 @@ protected ObjectTypeExtensionDefinition createObjectTypeExtensionDefinition(Grap
429430 implementsInterfacesContext = implementsInterfacesContext .implementsInterfaces ();
430431 }
431432 def .implementz (implementz );
432- if (ctx .fieldsDefinition () != null ) {
433- def .fieldDefinitions (createFieldDefinitions (ctx .fieldsDefinition ()));
433+ if (ctx .extensionFieldsDefinition () != null ) {
434+ def .fieldDefinitions (createFieldDefinitions (ctx .extensionFieldsDefinition ()));
434435 }
435436 return def .build ();
436437 }
@@ -442,6 +443,14 @@ protected List<FieldDefinition> createFieldDefinitions(GraphqlParser.FieldsDefin
442443 return ctx .fieldDefinition ().stream ().map (this ::createFieldDefinition ).collect (toList ());
443444 }
444445
446+ protected List <FieldDefinition > createFieldDefinitions (GraphqlParser .ExtensionFieldsDefinitionContext ctx ) {
447+ if (ctx == null ) {
448+ return new ArrayList <>();
449+ }
450+ return ctx .fieldDefinition ().stream ().map (this ::createFieldDefinition ).collect (toList ());
451+ }
452+
453+
445454 protected FieldDefinition createFieldDefinition (GraphqlParser .FieldDefinitionContext ctx ) {
446455 FieldDefinition .Builder def = FieldDefinition .newFieldDefinition ();
447456 def .name (ctx .name ().getText ());
@@ -488,7 +497,7 @@ protected InterfaceTypeExtensionDefinition createInterfaceTypeExtensionDefinitio
488497 def .name (ctx .name ().getText ());
489498 addCommonData (def , ctx );
490499 def .directives (createDirectives (ctx .directives ()));
491- def .definitions (createFieldDefinitions (ctx .fieldsDefinition ()));
500+ def .definitions (createFieldDefinitions (ctx .extensionFieldsDefinition ()));
492501 return def .build ();
493502 }
494503
@@ -543,9 +552,9 @@ protected EnumTypeExtensionDefinition createEnumTypeExtensionDefinition(GraphqlP
543552 def .name (ctx .name ().getText ());
544553 addCommonData (def , ctx );
545554 def .directives (createDirectives (ctx .directives ()));
546- if (ctx .enumValueDefinitions () != null ) {
555+ if (ctx .extensionEnumValueDefinitions () != null ) {
547556 def .enumValueDefinitions (
548- ctx .enumValueDefinitions ().enumValueDefinition ().stream ().map (this ::createEnumValueDefinition ).collect (toList ()));
557+ ctx .extensionEnumValueDefinitions ().enumValueDefinition ().stream ().map (this ::createEnumValueDefinition ).collect (toList ()));
549558 }
550559 return def .build ();
551560 }
@@ -576,8 +585,8 @@ protected InputObjectTypeExtensionDefinition createInputObjectTypeExtensionDefin
576585 def .name (ctx .name ().getText ());
577586 addCommonData (def , ctx );
578587 def .directives (createDirectives (ctx .directives ()));
579- if (ctx .inputObjectValueDefinitions () != null ) {
580- def .inputValueDefinitions (createInputValueDefinitions (ctx .inputObjectValueDefinitions ().inputValueDefinition ()));
588+ if (ctx .extensionInputObjectValueDefinitions () != null ) {
589+ def .inputValueDefinitions (createInputValueDefinitions (ctx .extensionInputObjectValueDefinitions ().inputValueDefinition ()));
581590 }
582591 return def .build ();
583592 }
0 commit comments