Skip to content

Commit a922be1

Browse files
andimarekandimarek
committed
Renamed GraphQLFieldArgument to GraphQLArgument to reflect, that it also used as argument for directives
1 parent cf67a09 commit a922be1

File tree

13 files changed

+46
-47
lines changed

13 files changed

+46
-47
lines changed

‎src/main/java/graphql/Directives.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import graphql.schema.GraphQLNonNull;
66

77
import static graphql.Scalars.GraphQLBoolean;
8-
import static graphql.schema.GraphQLFieldArgument.newFieldArgument;
8+
import static graphql.schema.GraphQLArgument.newArgument;
99

1010
public class Directives {
1111

1212
public static GraphQLDirective IncludeDirective = GraphQLDirective.newDirective()
1313
.name("include")
1414
.description("Directs the executor to include this field or fragment only when the `if` argument is true")
1515
.argument(
16-
newFieldArgument()
16+
newArgument()
1717
.name("if")
1818
.type(new GraphQLNonNull(GraphQLBoolean))
1919
.description("Included when true.")
@@ -28,7 +28,7 @@ public class Directives {
2828
.name("skip")
2929
.description(" 'Directs the executor to skip this field or fragment when the `if`'argument is true.")
3030
.argument(
31-
newFieldArgument()
31+
newArgument()
3232
.name("skip")
3333
.type(new GraphQLNonNull(GraphQLBoolean))
3434
.description("Skipped when true")

‎src/main/java/graphql/execution/ValuesResolver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public Map<String, Object> getVariableValues(GraphQLSchema schema, List<Variable
1919
}
2020

2121

22-
public Map<String, Object> getArgumentValues(List<GraphQLFieldArgument> argumentTypes, List<Argument> arguments, Map<String, Object> variables) {
22+
public Map<String, Object> getArgumentValues(List<GraphQLArgument> argumentTypes, List<Argument> arguments, Map<String, Object> variables) {
2323
Map<String, Object> result = new LinkedHashMap<>();
2424
Map<String, Argument> argumentMap = argumentMap(arguments);
25-
for (GraphQLFieldArgument fieldArgument : argumentTypes) {
25+
for (GraphQLArgument fieldArgument : argumentTypes) {
2626
Argument argument = argumentMap.get(fieldArgument.getName());
2727
Object value = coerceValueAst(fieldArgument.getType(), argument.getValue(), variables);
2828
result.put(argument.getName(), value);

‎src/main/java/graphql/introspection/Schema.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public Object get(DataFetchingEnvironment environment) {
253253
.field(newFieldDefinition()
254254
.name("fields")
255255
.type(new GraphQLList(new GraphQLNonNull(__Field)))
256-
.argument(GraphQLFieldArgument.newFieldArgument()
256+
.argument(GraphQLArgument.newArgument()
257257
.name("includeDeprecated")
258258
.type(GraphQLBoolean)
259259
.defaultValue(false)
@@ -273,7 +273,7 @@ public Object get(DataFetchingEnvironment environment) {
273273
.field(newFieldDefinition()
274274
.name("enumValues")
275275
.type(new GraphQLList(new GraphQLNonNull(__EnumValue)))
276-
.argument(GraphQLFieldArgument.newFieldArgument()
276+
.argument(GraphQLArgument.newArgument()
277277
.name("includeDeprecated")
278278
.type(GraphQLBoolean)
279279
.defaultValue(false)

src/main/java/graphql/schema/GraphQLFieldArgument.java renamed to src/main/java/graphql/schema/GraphQLArgument.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package graphql.schema;
22

33

4-
public class GraphQLFieldArgument {
4+
public class GraphQLArgument {
55

66
private final String name;
77
private final String description;
88
private final GraphQLInputType type;
99
private final Object defaultValue;
1010

11-
public GraphQLFieldArgument(String name, String description, GraphQLInputType graphQLInputType, Object defaultValue) {
11+
public GraphQLArgument(String name, String description, GraphQLInputType graphQLInputType, Object defaultValue) {
1212
this.name = name;
1313
this.description = description;
1414
this.type = graphQLInputType;
1515
this.defaultValue = defaultValue;
1616
}
1717

18-
public GraphQLFieldArgument(String name, GraphQLInputType type) {
18+
public GraphQLArgument(String name, GraphQLInputType type) {
1919
this(name, null, type, null);
2020
}
2121

@@ -36,7 +36,7 @@ public String getDescription() {
3636
return description;
3737
}
3838

39-
public static Builder newFieldArgument() {
39+
public static Builder newArgument() {
4040
return new Builder();
4141
}
4242

@@ -68,8 +68,8 @@ public Builder defaultValue(Object defaultValue) {
6868
return this;
6969
}
7070

71-
public GraphQLFieldArgument build() {
72-
return new GraphQLFieldArgument(name, description, type, defaultValue);
71+
public GraphQLArgument build() {
72+
return new GraphQLArgument(name, description, type, defaultValue);
7373
}
7474
}
7575

‎src/main/java/graphql/schema/GraphQLDirective.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ public class GraphQLDirective {
88

99
private final String name;
1010
private final String description;
11-
private final List<GraphQLFieldArgument> arguments = new ArrayList<>();
11+
private final List<GraphQLArgument> arguments = new ArrayList<>();
1212
private final boolean onOperation;
1313
private final boolean onFragment;
1414
private final boolean onField;
1515

16-
public GraphQLDirective(String name, String description, List<GraphQLFieldArgument> arguments, boolean onOperation, boolean onFragment, boolean onField) {
16+
public GraphQLDirective(String name, String description, List<GraphQLArgument> arguments, boolean onOperation, boolean onFragment, boolean onField) {
1717
this.name = name;
1818
this.description = description;
1919
this.arguments.addAll(arguments);
@@ -26,7 +26,7 @@ public String getName() {
2626
return name;
2727
}
2828

29-
public List<GraphQLFieldArgument> getArguments() {
29+
public List<GraphQLArgument> getArguments() {
3030
return new ArrayList<>(arguments);
3131
}
3232

@@ -53,7 +53,7 @@ public static Builder newDirective() {
5353
public static class Builder {
5454

5555
private String name;
56-
private final List<GraphQLFieldArgument> arguments = new ArrayList<>();
56+
private final List<GraphQLArgument> arguments = new ArrayList<>();
5757
private String description;
5858
private boolean onOperation;
5959
private boolean onFragment;
@@ -69,7 +69,7 @@ public Builder description(String description) {
6969
return this;
7070
}
7171

72-
public Builder argument(GraphQLFieldArgument fieldArgument) {
72+
public Builder argument(GraphQLArgument fieldArgument) {
7373
arguments.add(fieldArgument);
7474
return this;
7575
}

‎src/main/java/graphql/schema/GraphQLFieldDefinition.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ public class GraphQLFieldDefinition {
1111
private final GraphQLOutputType type;
1212
private final DataFetcher dataFetcher;
1313
private final String deprecationReason;
14-
private final List<GraphQLFieldArgument> arguments = new ArrayList<>();
14+
private final List<GraphQLArgument> arguments = new ArrayList<>();
1515

1616

17-
public GraphQLFieldDefinition(String name, String description, GraphQLOutputType type, DataFetcher dataFetcher, List<GraphQLFieldArgument> arguments, String deprecationReason) {
17+
public GraphQLFieldDefinition(String name, String description, GraphQLOutputType type, DataFetcher dataFetcher, List<GraphQLArgument> arguments, String deprecationReason) {
1818
this.name = name;
1919
this.description = description;
2020
this.type = type;
@@ -39,7 +39,7 @@ public DataFetcher getDataFetcher() {
3939
return dataFetcher;
4040
}
4141

42-
public List<GraphQLFieldArgument> getArguments() {
42+
public List<GraphQLArgument> getArguments() {
4343
return new ArrayList<>(arguments);
4444
}
4545

@@ -65,7 +65,7 @@ public static class Builder {
6565
private String description;
6666
private GraphQLOutputType type;
6767
private DataFetcher dataFetcher;
68-
private List<GraphQLFieldArgument> arguments = new ArrayList<>();
68+
private List<GraphQLArgument> arguments = new ArrayList<>();
6969
private String deprecationReason;
7070

7171

@@ -99,12 +99,12 @@ public Object get(DataFetchingEnvironment environment) {
9999
return this;
100100
}
101101

102-
public Builder argument(GraphQLFieldArgument argument) {
102+
public Builder argument(GraphQLArgument argument) {
103103
this.arguments.add(argument);
104104
return this;
105105
}
106106

107-
public Builder argument(List<GraphQLFieldArgument> arguments) {
107+
public Builder argument(List<GraphQLArgument> arguments) {
108108
this.arguments.addAll(arguments);
109109
return this;
110110
}

‎src/main/java/graphql/schema/SchemaUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static void collectTypesForInterfaces(GraphQLInterfaceType interfaceType
4646

4747
for (GraphQLFieldDefinition fieldDefinition : interfaceType.getFieldDefinitions()) {
4848
collectTypes(fieldDefinition.getType(), result);
49-
for (GraphQLFieldArgument fieldArgument : fieldDefinition.getArguments()) {
49+
for (GraphQLArgument fieldArgument : fieldDefinition.getArguments()) {
5050
collectTypes(fieldArgument.getType(), result);
5151
}
5252
}
@@ -59,7 +59,7 @@ private static void collectTypesForObjects(GraphQLObjectType objectType, Map<Str
5959

6060
for (GraphQLFieldDefinition fieldDefinition : objectType.getFieldDefinitions()) {
6161
collectTypes(fieldDefinition.getType(), result);
62-
for (GraphQLFieldArgument fieldArgument : fieldDefinition.getArguments()) {
62+
for (GraphQLArgument fieldArgument : fieldDefinition.getArguments()) {
6363
collectTypes(fieldArgument.getType(), result);
6464
}
6565
}

‎src/main/java/graphql/validation/TypeInfo.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class TypeInfo implements QueryLanguageVisitor {
1818
List<GraphQLInputType> inputTypeStack = new ArrayList<>();
1919
List<GraphQLFieldDefinition> fieldDefStack = new ArrayList<>();
2020
GraphQLDirective directive;
21-
GraphQLFieldArgument argument;
21+
GraphQLArgument argument;
2222

2323

2424
public TypeInfo(GraphQLSchema graphQLSchema) {
@@ -104,14 +104,14 @@ private void enterImpl(VariableDefinition variableDefinition) {
104104

105105
private void enterImpl(Argument argument) {
106106
if (getDirective() != null) {
107-
GraphQLFieldArgument fieldArgument = find(getDirective().getArguments(), argument.getName());
107+
GraphQLArgument fieldArgument = find(getDirective().getArguments(), argument.getName());
108108
if (fieldArgument != null) {
109109
this.argument = fieldArgument;
110110
addInputType(fieldArgument.getType());
111111
}
112112
}
113113
if (getFieldDef() != null) {
114-
GraphQLFieldArgument fieldArgument = find(getFieldDef().getArguments(), argument.getName());
114+
GraphQLArgument fieldArgument = find(getFieldDef().getArguments(), argument.getName());
115115
if (fieldArgument != null) {
116116
this.argument = fieldArgument;
117117
addInputType(fieldArgument.getType());
@@ -138,8 +138,8 @@ private void enterImpl(ObjectField objectField) {
138138
addInputType(inputType);
139139
}
140140

141-
private GraphQLFieldArgument find(List<GraphQLFieldArgument> arguments, String name) {
142-
for (GraphQLFieldArgument argument : arguments) {
141+
private GraphQLArgument find(List<GraphQLArgument> arguments, String name) {
142+
for (GraphQLArgument argument : arguments) {
143143
if (argument.getName().equals(name)) return argument;
144144
}
145145
return null;
@@ -227,7 +227,7 @@ public GraphQLDirective getDirective() {
227227
return directive;
228228
}
229229

230-
public GraphQLFieldArgument getArgument() {
230+
public GraphQLArgument getArgument() {
231231
return argument;
232232
}
233233

‎src/main/java/graphql/validation/ValidationContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public GraphQLDirective getDirective() {
3434
return typeInfo.getDirective();
3535
}
3636

37-
public GraphQLFieldArgument getArgument() {
37+
public GraphQLArgument getArgument() {
3838
return typeInfo.getArgument();
3939
}
4040
}

‎src/main/java/graphql/validation/rules/ArgumentsOfCorrectType.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
import graphql.language.Argument;
5-
import graphql.schema.GraphQLFieldArgument;
5+
import graphql.schema.GraphQLArgument;
66
import graphql.validation.AbstractRule;
77
import graphql.validation.ValidationContext;
88
import graphql.validation.ValidationUtil;
@@ -19,7 +19,7 @@ public ArgumentsOfCorrectType(ValidationContext validationContext) {
1919

2020
@Override
2121
public void checkArgument(Argument argument) {
22-
GraphQLFieldArgument fieldArgument = validationContext.getArgument();
22+
GraphQLArgument fieldArgument = validationContext.getArgument();
2323
if (validationUtil.isValidLiteralValue(argument.getValue(), fieldArgument.getType())) {
2424

2525
}

0 commit comments

Comments
 (0)