Skip to content

Commit dc4a047

Browse files
martinbonninmartinbonnin
committed
make check pass
1 parent 5283588 commit dc4a047

File tree

6 files changed

+163
-63
lines changed

6 files changed

+163
-63
lines changed

‎apollo-execution-processor/src/main/kotlin/com/apollographql/execution/processor/codegen/SchemaDocumentBuilder.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ private fun SirDirective.codeBlock(): CodeBlock {
288288
}
289289
add(")\n")
290290
}
291-
return CodeBlock.of("%T(null, %S, %L)", AstDirective, name, arguments.map { it.codeBlock() }.joinToCode(prefix = "listOf(", suffix = ")"))
292291
}
293292

294293
private fun SirArgument.codeBlock(): CodeBlock {

‎sample-http4k/graphql/schema.graphqls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ directive @skip (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
157157

158158
directive @include (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
159159

160-
directive @deprecated (reason: String = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
160+
directive @deprecated (reason: String! = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
161161

162162
directive @defer (label: String, if: Boolean! = true) on FRAGMENT_SPREAD|INLINE_FRAGMENT
163163

‎sample-ktor/graphql/schema.graphqls

Lines changed: 159 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,162 @@ schema {
33
}
44

55
type Query {
6-
getPlaylist(id: String): Playlist
7-
}
8-
9-
"""
10-
A playlist
11-
"""
12-
type Playlist {
13-
"""
14-
The Spotify ID of the playlist.
15-
"""
16-
id: String
17-
"""
18-
The playlist description. _Only returned for modified, verified playlists, otherwise_ `null`
19-
"""
20-
description: String
21-
"""
22-
The name of the playlist.
23-
"""
24-
name: String
25-
"""
26-
The tracks in the playlist.
27-
"""
28-
tracks: [GetPlaylistTrack]
29-
}
30-
31-
interface AlbumBase {
32-
id: String
33-
name: String
34-
}
35-
36-
type AlbumObject implements AlbumBase {
37-
id: String
38-
name: String
39-
artists: [SimplifiedArtistObject]
40-
}
41-
42-
type QueueObject {
43-
currently_playing: CurrentlyPlaying
44-
}
45-
46-
union CurrentlyPlaying = TrackObject | EpisodeObject
47-
"""
48-
A track
49-
"""
50-
type GetPlaylistTrack {
51-
"""
52-
The Spotify ID for the track.
53-
"""
54-
id: String
55-
# more fields
56-
}
57-
58-
query GetPlaylist {
59-
getPlaylist(id: "42") {
60-
id
61-
name
62-
}
63-
}
6+
"""
7+
Greeting for name
8+
"""
9+
hello(name: String!): String!
10+
}
11+
12+
type __Schema {
13+
description: String
14+
15+
types: [__Type!]!
16+
17+
queryType: __Type!
18+
19+
mutationType: __Type
20+
21+
subscriptionType: __Type
22+
23+
directives: [__Directive!]!
24+
}
25+
26+
type __Type {
27+
kind: __TypeKind!
28+
29+
name: String
30+
31+
description: String
32+
33+
fields(includeDeprecated: Boolean = false): [__Field!]
34+
35+
interfaces: [__Type!]
36+
37+
possibleTypes: [__Type!]
38+
39+
enumValues(includeDeprecated: Boolean = false): [__EnumValue!]
40+
41+
inputFields(includeDeprecated: Boolean = false): [__InputValue!]
42+
43+
ofType: __Type
44+
45+
specifiedByURL: String
46+
}
47+
48+
enum __TypeKind {
49+
SCALAR
50+
51+
OBJECT
52+
53+
INTERFACE
54+
55+
UNION
56+
57+
ENUM
58+
59+
INPUT_OBJECT
60+
61+
LIST
62+
63+
NON_NULL
64+
}
65+
66+
type __Field {
67+
name: String!
68+
69+
description: String
70+
71+
args(includeDeprecated: Boolean = false): [__InputValue!]!
72+
73+
type: __Type!
74+
75+
isDeprecated: Boolean!
76+
77+
deprecationReason: String
78+
}
79+
80+
type __InputValue {
81+
name: String!
82+
83+
description: String
84+
85+
type: __Type!
86+
87+
defaultValue: String
88+
89+
isDeprecated: Boolean!
90+
91+
deprecationReason: String
92+
}
93+
94+
type __EnumValue {
95+
name: String!
96+
97+
description: String
98+
99+
isDeprecated: Boolean!
100+
101+
deprecationReason: String
102+
}
103+
104+
type __Directive {
105+
name: String!
106+
107+
description: String
108+
109+
locations: [__DirectiveLocation!]!
110+
111+
args(includeDeprecated: Boolean = false): [__InputValue!]!
112+
113+
isRepeatable: Boolean!
114+
}
115+
116+
enum __DirectiveLocation {
117+
QUERY
118+
119+
MUTATION
120+
121+
SUBSCRIPTION
122+
123+
FIELD
124+
125+
FRAGMENT_DEFINITION
126+
127+
FRAGMENT_SPREAD
128+
129+
INLINE_FRAGMENT
130+
131+
VARIABLE_DEFINITION
132+
133+
SCHEMA
134+
135+
SCALAR
136+
137+
OBJECT
138+
139+
FIELD_DEFINITION
140+
141+
ARGUMENT_DEFINITION
142+
143+
INTERFACE
144+
145+
UNION
146+
147+
ENUM
148+
149+
ENUM_VALUE
150+
151+
INPUT_OBJECT
152+
153+
INPUT_FIELD_DEFINITION
154+
}
155+
156+
directive @skip (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
157+
158+
directive @include (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
159+
160+
directive @deprecated (reason: String! = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
161+
162+
directive @defer (label: String, if: Boolean! = true) on FRAGMENT_SPREAD|INLINE_FRAGMENT
163+
164+
directive @specifiedBy (url: String!) on SCALAR

‎tests/directives/graphql/schema.graphqls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ directive @skip (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
174174

175175
directive @include (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
176176

177-
directive @deprecated (reason: String = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
177+
directive @deprecated (reason: String! = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
178178

179179
directive @defer (label: String, if: Boolean! = true) on FRAGMENT_SPREAD|INLINE_FRAGMENT
180180

‎tests/federation/graphql/schema.graphqls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ directive @skip (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
176176

177177
directive @include (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
178178

179-
directive @deprecated (reason: String = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
179+
directive @deprecated (reason: String! = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
180180

181181
directive @defer (label: String, if: Boolean! = true) on FRAGMENT_SPREAD|INLINE_FRAGMENT
182182

‎tests/integration/graphql/schema.graphqls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ directive @skip (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
174174

175175
directive @include (if: Boolean!) on FIELD|FRAGMENT_SPREAD|INLINE_FRAGMENT
176176

177-
directive @deprecated (reason: String = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
177+
directive @deprecated (reason: String! = "No longer supported") on FIELD_DEFINITION|ARGUMENT_DEFINITION|INPUT_FIELD_DEFINITION|ENUM_VALUE
178178

179179
directive @defer (label: String, if: Boolean! = true) on FRAGMENT_SPREAD|INLINE_FRAGMENT
180180

0 commit comments

Comments
 (0)