Skip to content

Commit acc0495

Browse files
andimarekandimarek
committed
make operation name optional
this implements a change in the graphql spec: https://github.com/facebook/graphql/pull/99/files
1 parent e95afc2 commit acc0495

File tree

6 files changed

+327
-310
lines changed

6 files changed

+327
-310
lines changed

‎src/main/grammar/Graphql.g4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fragmentDefinition
1111

1212
operationDefinition:
1313
selectionSet |
14-
operationType NAME variableDefinitions? directives? selectionSet;
14+
operationType NAME? variableDefinitions? directives? selectionSet;
1515

1616
operationType : 'query' | 'mutation';
1717

‎src/main/java/graphql/parser/antlr/GraphqlBaseVisitor.java‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// Generated from /Users/andi/dev/projects/graphql-java/src/main/grammar/Graphql.g4 by ANTLR 4.5
1+
// Generated from /Users/andi/dev/projects/graphql-java/src/main/grammar/Graphql.g4 by ANTLR 4.5.1
22
package graphql.parser.antlr;
3-
import org.antlr.v4.runtime.misc.NotNull;
43
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
54

65
/**
@@ -18,236 +17,236 @@ public class GraphqlBaseVisitor<T> extends AbstractParseTreeVisitor<T> implement
1817
* <p>The default implementation returns the result of calling
1918
* {@link #visitChildren} on {@code ctx}.</p>
2019
*/
21-
@Override public T visitDocument(@NotNull GraphqlParser.DocumentContext ctx) { return visitChildren(ctx); }
20+
@Override public T visitDocument(GraphqlParser.DocumentContext ctx) { return visitChildren(ctx); }
2221
/**
2322
* {@inheritDoc}
2423
*
2524
* <p>The default implementation returns the result of calling
2625
* {@link #visitChildren} on {@code ctx}.</p>
2726
*/
28-
@Override public T visitDefinition(@NotNull GraphqlParser.DefinitionContext ctx) { return visitChildren(ctx); }
27+
@Override public T visitDefinition(GraphqlParser.DefinitionContext ctx) { return visitChildren(ctx); }
2928
/**
3029
* {@inheritDoc}
3130
*
3231
* <p>The default implementation returns the result of calling
3332
* {@link #visitChildren} on {@code ctx}.</p>
3433
*/
35-
@Override public T visitOperationDefinition(@NotNull GraphqlParser.OperationDefinitionContext ctx) { return visitChildren(ctx); }
34+
@Override public T visitOperationDefinition(GraphqlParser.OperationDefinitionContext ctx) { return visitChildren(ctx); }
3635
/**
3736
* {@inheritDoc}
3837
*
3938
* <p>The default implementation returns the result of calling
4039
* {@link #visitChildren} on {@code ctx}.</p>
4140
*/
42-
@Override public T visitOperationType(@NotNull GraphqlParser.OperationTypeContext ctx) { return visitChildren(ctx); }
41+
@Override public T visitOperationType(GraphqlParser.OperationTypeContext ctx) { return visitChildren(ctx); }
4342
/**
4443
* {@inheritDoc}
4544
*
4645
* <p>The default implementation returns the result of calling
4746
* {@link #visitChildren} on {@code ctx}.</p>
4847
*/
49-
@Override public T visitVariableDefinitions(@NotNull GraphqlParser.VariableDefinitionsContext ctx) { return visitChildren(ctx); }
48+
@Override public T visitVariableDefinitions(GraphqlParser.VariableDefinitionsContext ctx) { return visitChildren(ctx); }
5049
/**
5150
* {@inheritDoc}
5251
*
5352
* <p>The default implementation returns the result of calling
5453
* {@link #visitChildren} on {@code ctx}.</p>
5554
*/
56-
@Override public T visitVariableDefinition(@NotNull GraphqlParser.VariableDefinitionContext ctx) { return visitChildren(ctx); }
55+
@Override public T visitVariableDefinition(GraphqlParser.VariableDefinitionContext ctx) { return visitChildren(ctx); }
5756
/**
5857
* {@inheritDoc}
5958
*
6059
* <p>The default implementation returns the result of calling
6160
* {@link #visitChildren} on {@code ctx}.</p>
6261
*/
63-
@Override public T visitVariable(@NotNull GraphqlParser.VariableContext ctx) { return visitChildren(ctx); }
62+
@Override public T visitVariable(GraphqlParser.VariableContext ctx) { return visitChildren(ctx); }
6463
/**
6564
* {@inheritDoc}
6665
*
6766
* <p>The default implementation returns the result of calling
6867
* {@link #visitChildren} on {@code ctx}.</p>
6968
*/
70-
@Override public T visitDefaultValue(@NotNull GraphqlParser.DefaultValueContext ctx) { return visitChildren(ctx); }
69+
@Override public T visitDefaultValue(GraphqlParser.DefaultValueContext ctx) { return visitChildren(ctx); }
7170
/**
7271
* {@inheritDoc}
7372
*
7473
* <p>The default implementation returns the result of calling
7574
* {@link #visitChildren} on {@code ctx}.</p>
7675
*/
77-
@Override public T visitSelectionSet(@NotNull GraphqlParser.SelectionSetContext ctx) { return visitChildren(ctx); }
76+
@Override public T visitSelectionSet(GraphqlParser.SelectionSetContext ctx) { return visitChildren(ctx); }
7877
/**
7978
* {@inheritDoc}
8079
*
8180
* <p>The default implementation returns the result of calling
8281
* {@link #visitChildren} on {@code ctx}.</p>
8382
*/
84-
@Override public T visitSelection(@NotNull GraphqlParser.SelectionContext ctx) { return visitChildren(ctx); }
83+
@Override public T visitSelection(GraphqlParser.SelectionContext ctx) { return visitChildren(ctx); }
8584
/**
8685
* {@inheritDoc}
8786
*
8887
* <p>The default implementation returns the result of calling
8988
* {@link #visitChildren} on {@code ctx}.</p>
9089
*/
91-
@Override public T visitField(@NotNull GraphqlParser.FieldContext ctx) { return visitChildren(ctx); }
90+
@Override public T visitField(GraphqlParser.FieldContext ctx) { return visitChildren(ctx); }
9291
/**
9392
* {@inheritDoc}
9493
*
9594
* <p>The default implementation returns the result of calling
9695
* {@link #visitChildren} on {@code ctx}.</p>
9796
*/
98-
@Override public T visitAlias(@NotNull GraphqlParser.AliasContext ctx) { return visitChildren(ctx); }
97+
@Override public T visitAlias(GraphqlParser.AliasContext ctx) { return visitChildren(ctx); }
9998
/**
10099
* {@inheritDoc}
101100
*
102101
* <p>The default implementation returns the result of calling
103102
* {@link #visitChildren} on {@code ctx}.</p>
104103
*/
105-
@Override public T visitArguments(@NotNull GraphqlParser.ArgumentsContext ctx) { return visitChildren(ctx); }
104+
@Override public T visitArguments(GraphqlParser.ArgumentsContext ctx) { return visitChildren(ctx); }
106105
/**
107106
* {@inheritDoc}
108107
*
109108
* <p>The default implementation returns the result of calling
110109
* {@link #visitChildren} on {@code ctx}.</p>
111110
*/
112-
@Override public T visitArgument(@NotNull GraphqlParser.ArgumentContext ctx) { return visitChildren(ctx); }
111+
@Override public T visitArgument(GraphqlParser.ArgumentContext ctx) { return visitChildren(ctx); }
113112
/**
114113
* {@inheritDoc}
115114
*
116115
* <p>The default implementation returns the result of calling
117116
* {@link #visitChildren} on {@code ctx}.</p>
118117
*/
119-
@Override public T visitFragmentSpread(@NotNull GraphqlParser.FragmentSpreadContext ctx) { return visitChildren(ctx); }
118+
@Override public T visitFragmentSpread(GraphqlParser.FragmentSpreadContext ctx) { return visitChildren(ctx); }
120119
/**
121120
* {@inheritDoc}
122121
*
123122
* <p>The default implementation returns the result of calling
124123
* {@link #visitChildren} on {@code ctx}.</p>
125124
*/
126-
@Override public T visitInlineFragment(@NotNull GraphqlParser.InlineFragmentContext ctx) { return visitChildren(ctx); }
125+
@Override public T visitInlineFragment(GraphqlParser.InlineFragmentContext ctx) { return visitChildren(ctx); }
127126
/**
128127
* {@inheritDoc}
129128
*
130129
* <p>The default implementation returns the result of calling
131130
* {@link #visitChildren} on {@code ctx}.</p>
132131
*/
133-
@Override public T visitFragmentDefinition(@NotNull GraphqlParser.FragmentDefinitionContext ctx) { return visitChildren(ctx); }
132+
@Override public T visitFragmentDefinition(GraphqlParser.FragmentDefinitionContext ctx) { return visitChildren(ctx); }
134133
/**
135134
* {@inheritDoc}
136135
*
137136
* <p>The default implementation returns the result of calling
138137
* {@link #visitChildren} on {@code ctx}.</p>
139138
*/
140-
@Override public T visitFragmentName(@NotNull GraphqlParser.FragmentNameContext ctx) { return visitChildren(ctx); }
139+
@Override public T visitFragmentName(GraphqlParser.FragmentNameContext ctx) { return visitChildren(ctx); }
141140
/**
142141
* {@inheritDoc}
143142
*
144143
* <p>The default implementation returns the result of calling
145144
* {@link #visitChildren} on {@code ctx}.</p>
146145
*/
147-
@Override public T visitTypeCondition(@NotNull GraphqlParser.TypeConditionContext ctx) { return visitChildren(ctx); }
146+
@Override public T visitTypeCondition(GraphqlParser.TypeConditionContext ctx) { return visitChildren(ctx); }
148147
/**
149148
* {@inheritDoc}
150149
*
151150
* <p>The default implementation returns the result of calling
152151
* {@link #visitChildren} on {@code ctx}.</p>
153152
*/
154-
@Override public T visitValue(@NotNull GraphqlParser.ValueContext ctx) { return visitChildren(ctx); }
153+
@Override public T visitValue(GraphqlParser.ValueContext ctx) { return visitChildren(ctx); }
155154
/**
156155
* {@inheritDoc}
157156
*
158157
* <p>The default implementation returns the result of calling
159158
* {@link #visitChildren} on {@code ctx}.</p>
160159
*/
161-
@Override public T visitValueWithVariable(@NotNull GraphqlParser.ValueWithVariableContext ctx) { return visitChildren(ctx); }
160+
@Override public T visitValueWithVariable(GraphqlParser.ValueWithVariableContext ctx) { return visitChildren(ctx); }
162161
/**
163162
* {@inheritDoc}
164163
*
165164
* <p>The default implementation returns the result of calling
166165
* {@link #visitChildren} on {@code ctx}.</p>
167166
*/
168-
@Override public T visitEnumValue(@NotNull GraphqlParser.EnumValueContext ctx) { return visitChildren(ctx); }
167+
@Override public T visitEnumValue(GraphqlParser.EnumValueContext ctx) { return visitChildren(ctx); }
169168
/**
170169
* {@inheritDoc}
171170
*
172171
* <p>The default implementation returns the result of calling
173172
* {@link #visitChildren} on {@code ctx}.</p>
174173
*/
175-
@Override public T visitArrayValue(@NotNull GraphqlParser.ArrayValueContext ctx) { return visitChildren(ctx); }
174+
@Override public T visitArrayValue(GraphqlParser.ArrayValueContext ctx) { return visitChildren(ctx); }
176175
/**
177176
* {@inheritDoc}
178177
*
179178
* <p>The default implementation returns the result of calling
180179
* {@link #visitChildren} on {@code ctx}.</p>
181180
*/
182-
@Override public T visitArrayValueWithVariable(@NotNull GraphqlParser.ArrayValueWithVariableContext ctx) { return visitChildren(ctx); }
181+
@Override public T visitArrayValueWithVariable(GraphqlParser.ArrayValueWithVariableContext ctx) { return visitChildren(ctx); }
183182
/**
184183
* {@inheritDoc}
185184
*
186185
* <p>The default implementation returns the result of calling
187186
* {@link #visitChildren} on {@code ctx}.</p>
188187
*/
189-
@Override public T visitObjectValue(@NotNull GraphqlParser.ObjectValueContext ctx) { return visitChildren(ctx); }
188+
@Override public T visitObjectValue(GraphqlParser.ObjectValueContext ctx) { return visitChildren(ctx); }
190189
/**
191190
* {@inheritDoc}
192191
*
193192
* <p>The default implementation returns the result of calling
194193
* {@link #visitChildren} on {@code ctx}.</p>
195194
*/
196-
@Override public T visitObjectValueWithVariable(@NotNull GraphqlParser.ObjectValueWithVariableContext ctx) { return visitChildren(ctx); }
195+
@Override public T visitObjectValueWithVariable(GraphqlParser.ObjectValueWithVariableContext ctx) { return visitChildren(ctx); }
197196
/**
198197
* {@inheritDoc}
199198
*
200199
* <p>The default implementation returns the result of calling
201200
* {@link #visitChildren} on {@code ctx}.</p>
202201
*/
203-
@Override public T visitObjectField(@NotNull GraphqlParser.ObjectFieldContext ctx) { return visitChildren(ctx); }
202+
@Override public T visitObjectField(GraphqlParser.ObjectFieldContext ctx) { return visitChildren(ctx); }
204203
/**
205204
* {@inheritDoc}
206205
*
207206
* <p>The default implementation returns the result of calling
208207
* {@link #visitChildren} on {@code ctx}.</p>
209208
*/
210-
@Override public T visitObjectFieldWithVariable(@NotNull GraphqlParser.ObjectFieldWithVariableContext ctx) { return visitChildren(ctx); }
209+
@Override public T visitObjectFieldWithVariable(GraphqlParser.ObjectFieldWithVariableContext ctx) { return visitChildren(ctx); }
211210
/**
212211
* {@inheritDoc}
213212
*
214213
* <p>The default implementation returns the result of calling
215214
* {@link #visitChildren} on {@code ctx}.</p>
216215
*/
217-
@Override public T visitDirectives(@NotNull GraphqlParser.DirectivesContext ctx) { return visitChildren(ctx); }
216+
@Override public T visitDirectives(GraphqlParser.DirectivesContext ctx) { return visitChildren(ctx); }
218217
/**
219218
* {@inheritDoc}
220219
*
221220
* <p>The default implementation returns the result of calling
222221
* {@link #visitChildren} on {@code ctx}.</p>
223222
*/
224-
@Override public T visitDirective(@NotNull GraphqlParser.DirectiveContext ctx) { return visitChildren(ctx); }
223+
@Override public T visitDirective(GraphqlParser.DirectiveContext ctx) { return visitChildren(ctx); }
225224
/**
226225
* {@inheritDoc}
227226
*
228227
* <p>The default implementation returns the result of calling
229228
* {@link #visitChildren} on {@code ctx}.</p>
230229
*/
231-
@Override public T visitType(@NotNull GraphqlParser.TypeContext ctx) { return visitChildren(ctx); }
230+
@Override public T visitType(GraphqlParser.TypeContext ctx) { return visitChildren(ctx); }
232231
/**
233232
* {@inheritDoc}
234233
*
235234
* <p>The default implementation returns the result of calling
236235
* {@link #visitChildren} on {@code ctx}.</p>
237236
*/
238-
@Override public T visitTypeName(@NotNull GraphqlParser.TypeNameContext ctx) { return visitChildren(ctx); }
237+
@Override public T visitTypeName(GraphqlParser.TypeNameContext ctx) { return visitChildren(ctx); }
239238
/**
240239
* {@inheritDoc}
241240
*
242241
* <p>The default implementation returns the result of calling
243242
* {@link #visitChildren} on {@code ctx}.</p>
244243
*/
245-
@Override public T visitListType(@NotNull GraphqlParser.ListTypeContext ctx) { return visitChildren(ctx); }
244+
@Override public T visitListType(GraphqlParser.ListTypeContext ctx) { return visitChildren(ctx); }
246245
/**
247246
* {@inheritDoc}
248247
*
249248
* <p>The default implementation returns the result of calling
250249
* {@link #visitChildren} on {@code ctx}.</p>
251250
*/
252-
@Override public T visitNonNullType(@NotNull GraphqlParser.NonNullTypeContext ctx) { return visitChildren(ctx); }
251+
@Override public T visitNonNullType(GraphqlParser.NonNullTypeContext ctx) { return visitChildren(ctx); }
253252
}

‎src/main/java/graphql/parser/antlr/GraphqlLexer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated from /Users/andi/dev/projects/graphql-java/src/main/grammar/Graphql.g4 by ANTLR 4.5
1+
// Generated from /Users/andi/dev/projects/graphql-java/src/main/grammar/Graphql.g4 by ANTLR 4.5.1
22
package graphql.parser.antlr;
33

44
import org.antlr.v4.runtime.*;
@@ -7,11 +7,10 @@
77
import org.antlr.v4.runtime.atn.LexerATNSimulator;
88
import org.antlr.v4.runtime.atn.PredictionContextCache;
99
import org.antlr.v4.runtime.dfa.DFA;
10-
import org.antlr.v4.runtime.misc.NotNull;
1110

1211
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
1312
public class GraphqlLexer extends Lexer {
14-
static { RuntimeMetaData.checkVersion("4.5", RuntimeMetaData.VERSION); }
13+
static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
1514

1615
protected static final DFA[] _decisionToDFA;
1716
protected static final PredictionContextCache _sharedContextCache =
@@ -72,7 +71,7 @@ public String[] getTokenNames() {
7271
}
7372

7473
@Override
75-
@NotNull
74+
7675
public Vocabulary getVocabulary() {
7776
return VOCABULARY;
7877
}

0 commit comments

Comments
 (0)