Skip to content

Commit a27e207

Browse files
authored
Allow empty deprecation messages (#6779)
* Allow empty deprecation messages * add test
1 parent 0460af9 commit a27e207

File tree

10 files changed

+55
-20
lines changed

10 files changed

+55
-20
lines changed

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/Deprecated.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import com.squareup.kotlinpoet.AnnotationSpec
66
internal fun deprecatedAnnotation(message: String) = AnnotationSpec
77
.builder(KotlinSymbols.Deprecated)
88
.apply {
9-
if (message.isNotBlank()) {
10-
addMember("message = %S", message)
11-
}
9+
addMember("message = %S", message)
1210
}
1311
.build()

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/TestOperation.graphql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ query TestQuery($episode: Episode) {
44
name
55
deprecated
66
deprecatedBool
7+
deprecatedEmptyReason
78
}
89
}

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/TestQuery.java.expected

Lines changed: 18 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/adapter/TestQuery_ResponseAdapter.java.expected

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/selections/TestQuerySelections.java.expected

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_ResponseAdapter.kt.expected

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/selections/TestQuerySelections.kt.expected

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/apollo-compiler/src/test/graphql/com/example/deprecation/schema.graphqls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ type Character {
1010
name: String!
1111
deprecated: String! @deprecated
1212
deprecatedBool: Boolean! @deprecated
13+
deprecatedEmptyReason: String! @deprecated(reason: "")
1314
}

libraries/apollo-compiler/src/test/graphql/com/example/measurements

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// If you updated the codegen and test fixtures, you should commit this file too.
33

44
Test: Total LOC:
5-
aggregate-all 200014
6-
aggregate-kotlin-responseBased 62779
5+
aggregate-all 200049
6+
aggregate-kotlin-responseBased 62793
77
aggregate-kotlin-operationBased 41065
88
aggregate-kotlin-compat 0
9-
aggregate-java-operationBased 96170
9+
aggregate-java-operationBased 96191
1010

1111
java-operationBased-fragments_with_defer_and_include_directives 5747
1212
kotlin-operationBased-fragments_with_defer_and_include_directives 3409
@@ -133,13 +133,13 @@ kotlin-operationBased-fragment_spread_with_nested_fields
133133
java-operationBased-monomorphic 648
134134
java-operationBased-interface_always_nested 644
135135
kotlin-responseBased-union_fragment 641
136+
java-operationBased-deprecation 639
136137
kotlin-responseBased-used_arguments 639
137138
java-operationBased-capitalized_fields 626
138139
java-operationBased-field_with_include_directive 625
139140
java-operationBased-hero_with_review 625
140141
kotlin-operationBased-operationbased2_ex8 625
141142
java-operationBased-recursive_selection 622
142-
java-operationBased-deprecation 618
143143
kotlin-operationBased-union_fragment 607
144144
kotlin-responseBased-java_android_annotations 606
145145
kotlin-responseBased-java_apollo_optionals 606
@@ -205,9 +205,9 @@ kotlin-operationBased-typename_always_first
205205
java-operationBased-merged_include 451
206206
java-operationBased-operation_id_generator 451
207207
kotlin-operationBased-path_vs_flat_accessors 448
208+
kotlin-responseBased-deprecation 444
208209
kotlin-responseBased-hero_name 441
209210
kotlin-responseBased-interface_always_nested 432
210-
kotlin-responseBased-deprecation 430
211211
kotlin-responseBased-enum_field 430
212212
kotlin-operationBased-root_query_fragment 424
213213
kotlin-responseBased-inline_fragment_for_non_optional_field 423

0 commit comments

Comments
 (0)