Skip to content

Commit 05fb8cc

Browse files
andimarekandimarek
committed
naming, cleanup
1 parent 1f67b2c commit 05fb8cc

29 files changed

Lines changed: 51 additions & 65 deletions

‎src/main/java/graphql/language/Argument.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public ChildrenContainer getNamedChildren() {
6161
@Override
6262
public Argument withNewChildren(ChildrenContainer newChildren) {
6363
return transform(builder -> builder
64-
.value(newChildren.getSingleValueOrNull(CHILD_VALUE))
64+
.value(newChildren.getChildOrNull(CHILD_VALUE))
6565
);
6666
}
6767

‎src/main/java/graphql/language/ArrayValue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public ChildrenContainer getNamedChildren() {
5151
@Override
5252
public ArrayValue withNewChildren(ChildrenContainer newChildren) {
5353
return transform(builder -> builder
54-
.values(newChildren.getList(CHILD_VALUES))
54+
.values(newChildren.getChildren(CHILD_VALUES))
5555
);
5656
}
5757

‎src/main/java/graphql/language/ChildrenContainer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ private ChildrenContainer(Map<String, List<Node>> children) {
1818
this.children.putAll(Assert.assertNotNull(children));
1919
}
2020

21-
public <T extends Node> List<T> getList(String key) {
21+
public <T extends Node> List<T> getChildren(String key) {
2222
return (List<T>) children.getOrDefault(key, new ArrayList<>());
2323
}
2424

25-
public <T extends Node> T getSingleValueOrNull(String key) {
25+
public <T extends Node> T getChildOrNull(String key) {
2626
List<? extends Node> result = children.getOrDefault(key, new ArrayList<>());
2727
if (result.size() > 1) {
2828
throw new IllegalStateException("children " + key + " is not a single value");

‎src/main/java/graphql/language/Directive.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ChildrenContainer getNamedChildren() {
8181
@Override
8282
public Directive withNewChildren(ChildrenContainer newChildren) {
8383
return transform(builder -> builder
84-
.arguments(newChildren.getList(CHILD_ARGUMENTS))
84+
.arguments(newChildren.getChildren(CHILD_ARGUMENTS))
8585
);
8686
}
8787

‎src/main/java/graphql/language/DirectiveDefinition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public ChildrenContainer getNamedChildren() {
8181
@Override
8282
public DirectiveDefinition withNewChildren(ChildrenContainer newChildren) {
8383
return transform(builder -> builder
84-
.inputValueDefinitions(newChildren.getList(CHILD_INPUT_VALUE_DEFINITIONS))
85-
.directiveLocations(newChildren.getList(CHILD_DIRECTIVE_LOCATION))
84+
.inputValueDefinitions(newChildren.getChildren(CHILD_INPUT_VALUE_DEFINITIONS))
85+
.directiveLocations(newChildren.getChildren(CHILD_DIRECTIVE_LOCATION))
8686
);
8787
}
8888

‎src/main/java/graphql/language/Document.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public ChildrenContainer getNamedChildren() {
5151
@Override
5252
public Document withNewChildren(ChildrenContainer newChildren) {
5353
return transform(builder -> builder
54-
.definitions(newChildren.getList(CHILD_DEFINITIONS))
54+
.definitions(newChildren.getChildren(CHILD_DEFINITIONS))
5555
);
5656
}
5757

‎src/main/java/graphql/language/EnumTypeDefinition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public ChildrenContainer getNamedChildren() {
8080
@Override
8181
public EnumTypeDefinition withNewChildren(ChildrenContainer newChildren) {
8282
return transform(builder -> builder
83-
.enumValueDefinitions(newChildren.getList(CHILD_ENUM_VALUE_DEFINITIONS))
84-
.directives(newChildren.getList(CHILD_DIRECTIVES))
83+
.enumValueDefinitions(newChildren.getChildren(CHILD_ENUM_VALUE_DEFINITIONS))
84+
.directives(newChildren.getChildren(CHILD_DIRECTIVES))
8585
);
8686
}
8787

‎src/main/java/graphql/language/EnumValueDefinition.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ChildrenContainer getNamedChildren() {
8181
@Override
8282
public EnumValueDefinition withNewChildren(ChildrenContainer newChildren) {
8383
return transform(builder -> builder
84-
.directives(newChildren.getList(CHILD_DIRECTIVES))
84+
.directives(newChildren.getChildren(CHILD_DIRECTIVES))
8585
);
8686
}
8787

‎src/main/java/graphql/language/Field.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public ChildrenContainer getNamedChildren() {
108108
@Override
109109
public Field withNewChildren(ChildrenContainer newChildren) {
110110
return transform(builder ->
111-
builder.arguments(newChildren.getList(CHILD_ARGUMENTS))
112-
.directives(newChildren.getList(CHILD_DIRECTIVES))
113-
.selectionSet(newChildren.getSingleValueOrNull(CHILD_SELECTION_SET))
111+
builder.arguments(newChildren.getChildren(CHILD_ARGUMENTS))
112+
.directives(newChildren.getChildren(CHILD_DIRECTIVES))
113+
.selectionSet(newChildren.getChildOrNull(CHILD_SELECTION_SET))
114114
);
115115
}
116116

‎src/main/java/graphql/language/FieldDefinition.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ public ChildrenContainer getNamedChildren() {
8787
@Override
8888
public FieldDefinition withNewChildren(ChildrenContainer newChildren) {
8989
return transform(builder -> builder
90-
.type(newChildren.getSingleValueOrNull(CHILD_TYPE))
91-
.inputValueDefinitions(newChildren.getList(CHILD_INPUT_VALUE_DEFINITION))
92-
.directives(newChildren.getList(CHILD_DIRECTIVES))
90+
.type(newChildren.getChildOrNull(CHILD_TYPE))
91+
.inputValueDefinitions(newChildren.getChildren(CHILD_INPUT_VALUE_DEFINITION))
92+
.directives(newChildren.getChildren(CHILD_DIRECTIVES))
9393
);
9494
}
9595

0 commit comments

Comments
 (0)