Skip to content

Commit df5a152

Browse files
committed
Added DirectiveContainer
1 parent 2147e75 commit df5a152

14 files changed

Lines changed: 53 additions & 164 deletions
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package graphql.language;
2+
3+
4+
import java.util.List;
5+
import java.util.Map;
6+
7+
import static graphql.language.NodeUtil.directivesByName;
8+
9+
/**
10+
* Represents a language node that has a name
11+
*/
12+
public interface DirectivesContainer<T extends DirectivesContainer> extends NamedNode<T> {
13+
14+
/**
15+
* @return a list of directives associated with the type or field
16+
*/
17+
List<Directive> getDirectives();
18+
19+
/**
20+
* @return a a map of directives by directive name
21+
*/
22+
default Map<String, Directive> getDirectivesByName() {
23+
return directivesByName(getDirectives());
24+
}
25+
26+
/**
27+
* Returns a named directive
28+
*
29+
* @param directiveName the name of the directive to retrieve
30+
*
31+
* @return the directive or null if there is one one with that name
32+
*/
33+
default Directive getDirective(String directiveName) {
34+
return getDirectivesByName().get(directiveName);
35+
}
36+
}

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55

66
import java.util.ArrayList;
77
import java.util.List;
8-
import java.util.Map;
98

10-
import static graphql.language.NodeUtil.directivesByName;
11-
12-
public class EnumTypeDefinition extends AbstractNode<EnumTypeDefinition> implements TypeDefinition<EnumTypeDefinition>, NamedNode<EnumTypeDefinition> {
9+
public class EnumTypeDefinition extends AbstractNode<EnumTypeDefinition> implements TypeDefinition<EnumTypeDefinition>, DirectivesContainer<EnumTypeDefinition> {
1310
private final String name;
1411
private Description description;
1512
private final List<EnumValueDefinition> enumValueDefinitions;
@@ -37,15 +34,6 @@ public List<Directive> getDirectives() {
3734
return directives;
3835
}
3936

40-
public Map<String, Directive> getDirectivesByName() {
41-
return directivesByName(directives);
42-
}
43-
44-
public Directive getDirective(String directiveName) {
45-
return getDirectivesByName().get(directiveName);
46-
}
47-
48-
4937
@Override
5038
public String getName() {
5139
return name;

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

11-
public class EnumValueDefinition extends AbstractNode<EnumValueDefinition> implements NamedNode<EnumValueDefinition> {
10+
public class EnumValueDefinition extends AbstractNode<EnumValueDefinition> implements DirectivesContainer<EnumValueDefinition> {
1211
private final String name;
1312
private Description description;
1413
private final List<Directive> directives;
@@ -38,14 +37,6 @@ public List<Directive> getDirectives() {
3837
return directives;
3938
}
4039

41-
public Map<String, Directive> getDirectivesByName() {
42-
return NodeUtil.directivesByName(directives);
43-
}
44-
45-
public Directive getDirective(String directiveName) {
46-
return getDirectivesByName().get(directiveName);
47-
}
48-
4940
@Override
5041
public List<Node> getChildren() {
5142
List<Node> result = new ArrayList<>();

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77

88
import java.util.ArrayList;
99
import java.util.List;
10-
import java.util.Map;
11-
12-
import static graphql.language.NodeUtil.directivesByName;
1310

1411
/*
1512
* This is provided to a DataFetcher, therefore it is a public API.
1613
* This might change in the future.
1714
*/
1815
@PublicApi
19-
public class Field extends AbstractNode<Field> implements Selection<Field>, NamedNode<Field> {
16+
public class Field extends AbstractNode<Field> implements Selection<Field>, DirectivesContainer<Field> {
2017

2118
private String name;
2219
private String alias;
@@ -95,15 +92,6 @@ public List<Directive> getDirectives() {
9592
return directives;
9693
}
9794

98-
public Map<String, Directive> getDirectivesByName() {
99-
return directivesByName(directives);
100-
}
101-
102-
public Directive getDirective(String directiveName) {
103-
return getDirectivesByName().get(directiveName);
104-
}
105-
106-
10795
public void setDirectives(List<Directive> directives) {
10896
this.directives = directives;
10997
}

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

11-
import static graphql.language.NodeUtil.directivesByName;
12-
13-
public class FieldDefinition extends AbstractNode<FieldDefinition> implements NamedNode<FieldDefinition> {
10+
public class FieldDefinition extends AbstractNode<FieldDefinition> implements DirectivesContainer<FieldDefinition> {
1411
private final String name;
1512
private Type type;
1613
private Description description;
@@ -60,15 +57,6 @@ public List<Directive> getDirectives() {
6057
return directives;
6158
}
6259

63-
public Map<String, Directive> getDirectivesByName() {
64-
return directivesByName(directives);
65-
}
66-
67-
public Directive getDirective(String directiveName) {
68-
return getDirectivesByName().get(directiveName);
69-
}
70-
71-
7260
@Override
7361
public List<Node> getChildren() {
7462
List<Node> result = new ArrayList<>();
@@ -85,7 +73,7 @@ public boolean isEqualTo(Node o) {
8573

8674
FieldDefinition that = (FieldDefinition) o;
8775

88-
return NodeUtil.isEqualTo(this.name,that.name) ;
76+
return NodeUtil.isEqualTo(this.name, that.name);
8977
}
9078

9179
@Override

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77

88
import java.util.ArrayList;
99
import java.util.List;
10-
import java.util.Map;
11-
12-
import static graphql.language.NodeUtil.directivesByName;
1310

1411
/**
1512
* Provided to the DataFetcher, therefore public API
1613
*/
1714
@PublicApi
18-
public class FragmentDefinition extends AbstractNode<FragmentDefinition> implements Definition<FragmentDefinition>, NamedNode<FragmentDefinition> {
15+
public class FragmentDefinition extends AbstractNode<FragmentDefinition> implements Definition<FragmentDefinition>, DirectivesContainer<FragmentDefinition> {
1916

2017
private String name;
2118
private TypeName typeCondition;
@@ -61,14 +58,6 @@ public List<Directive> getDirectives() {
6158
return directives;
6259
}
6360

64-
public Map<String, Directive> getDirectivesByName() {
65-
return directivesByName(directives);
66-
}
67-
68-
public Directive getDirective(String directiveName) {
69-
return getDirectivesByName().get(directiveName);
70-
}
71-
7261
public void setDirectives(List<Directive> directives) {
7362
this.directives = directives;
7463
}

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

11-
import static graphql.language.NodeUtil.directivesByName;
12-
13-
public class FragmentSpread extends AbstractNode<FragmentSpread> implements Selection<FragmentSpread>, NamedNode<FragmentSpread> {
10+
public class FragmentSpread extends AbstractNode<FragmentSpread> implements Selection<FragmentSpread>, DirectivesContainer<FragmentSpread> {
1411

1512
private String name;
1613
private List<Directive> directives = new ArrayList<>();
@@ -39,15 +36,6 @@ public List<Directive> getDirectives() {
3936
return directives;
4037
}
4138

42-
public Map<String, Directive> getDirectivesByName() {
43-
return directivesByName(directives);
44-
}
45-
46-
public Directive getDirective(String directiveName) {
47-
return getDirectivesByName().get(directiveName);
48-
}
49-
50-
5139
public void setDirectives(List<Directive> directives) {
5240
this.directives = directives;
5341
}

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

11-
import static graphql.language.NodeUtil.directivesByName;
12-
13-
public class InputObjectTypeDefinition extends AbstractNode<InputObjectTypeDefinition> implements TypeDefinition<InputObjectTypeDefinition>, NamedNode<InputObjectTypeDefinition> {
10+
public class InputObjectTypeDefinition extends AbstractNode<InputObjectTypeDefinition> implements TypeDefinition<InputObjectTypeDefinition>, DirectivesContainer<InputObjectTypeDefinition> {
1411
private final String name;
1512
private Description description;
1613
private final List<Directive> directives;
@@ -30,14 +27,6 @@ public List<Directive> getDirectives() {
3027
return directives;
3128
}
3229

33-
public Map<String, Directive> getDirectivesByName() {
34-
return directivesByName(directives);
35-
}
36-
37-
public Directive getDirective(String directiveName) {
38-
return getDirectivesByName().get(directiveName);
39-
}
40-
4130
public List<InputValueDefinition> getInputValueDefinitions() {
4231
return inputValueDefinitions;
4332
}
@@ -70,8 +59,8 @@ public boolean isEqualTo(Node o) {
7059

7160
InputObjectTypeDefinition that = (InputObjectTypeDefinition) o;
7261

73-
return NodeUtil.isEqualTo(this.name,that.name) ;
74-
}
62+
return NodeUtil.isEqualTo(this.name, that.name);
63+
}
7564

7665
@Override
7766
public InputObjectTypeDefinition deepCopy() {

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

11-
import static graphql.language.NodeUtil.directivesByName;
12-
13-
public class InputValueDefinition extends AbstractNode<InputValueDefinition> implements NamedNode<InputValueDefinition> {
10+
public class InputValueDefinition extends AbstractNode<InputValueDefinition> implements DirectivesContainer<InputValueDefinition> {
1411
private final String name;
1512
private Type type;
1613
private Value defaultValue;
@@ -68,15 +65,6 @@ public List<Directive> getDirectives() {
6865
return directives;
6966
}
7067

71-
public Map<String, Directive> getDirectivesByName() {
72-
return directivesByName(directives);
73-
}
74-
75-
public Directive getDirective(String directiveName) {
76-
return getDirectivesByName().get(directiveName);
77-
}
78-
79-
8068
@Override
8169
public List<Node> getChildren() {
8270
List<Node> result = new ArrayList<>();

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
import java.util.ArrayList;
88
import java.util.List;
9-
import java.util.Map;
109

11-
import static graphql.language.NodeUtil.directivesByName;
12-
13-
public class InterfaceTypeDefinition extends AbstractNode<InterfaceTypeDefinition> implements TypeDefinition<InterfaceTypeDefinition>, NamedNode<InterfaceTypeDefinition> {
10+
public class InterfaceTypeDefinition extends AbstractNode<InterfaceTypeDefinition> implements TypeDefinition<InterfaceTypeDefinition>, DirectivesContainer<InterfaceTypeDefinition> {
1411
private final String name;
1512
private Description description;
1613
private final List<FieldDefinition> definitions;
@@ -34,14 +31,6 @@ public List<Directive> getDirectives() {
3431
return directives;
3532
}
3633

37-
public Map<String, Directive> getDirectivesByName() {
38-
return directivesByName(directives);
39-
}
40-
41-
public Directive getDirective(String directiveName) {
42-
return getDirectivesByName().get(directiveName);
43-
}
44-
4534
@Override
4635
public String getName() {
4736
return name;
@@ -70,7 +59,7 @@ public boolean isEqualTo(Node o) {
7059

7160
InterfaceTypeDefinition that = (InterfaceTypeDefinition) o;
7261

73-
return NodeUtil.isEqualTo(this.name,that.name) ;
62+
return NodeUtil.isEqualTo(this.name, that.name);
7463
}
7564

7665
@Override

0 commit comments

Comments
 (0)