1
1
/*
2
- * Copyright 2002-2019 the original author or authors.
2
+ * Copyright 2002-2022 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
29
29
import static org .assertj .core .api .Assertions .assertThat ;
30
30
31
31
/**
32
- * Tests for {@link TypeMappedAnnotation}. See also
33
- * {@link MergedAnnotationsTests} for a much more extensive collection of tests.
32
+ * Tests for {@link TypeMappedAnnotation}. See also {@link MergedAnnotationsTests}
33
+ * for a much more extensive collection of tests.
34
34
*
35
35
* @author Phillip Webb
36
36
*/
@@ -145,75 +145,66 @@ private AnnotationTypeMapping getMapping(Annotation annotation,
145
145
}
146
146
147
147
@ Retention (RetentionPolicy .RUNTIME )
148
- static @interface ExplicitMirror {
148
+ @interface ExplicitMirror {
149
149
150
150
@ AliasFor ("b" )
151
151
String a () default "" ;
152
152
153
153
@ AliasFor ("a" )
154
154
String b () default "" ;
155
-
156
155
}
157
156
158
157
@ ExplicitMirror (a = "test" )
159
158
static class WithExplicitMirrorA {
160
-
161
159
}
162
160
163
161
@ ExplicitMirror (b = "test" )
164
162
static class WithExplicitMirrorB {
165
-
166
163
}
167
164
168
165
@ Retention (RetentionPolicy .RUNTIME )
169
166
@ ExplicitAliasMetaAnnotationTarget (nonAliased = "nonAliased" )
170
- static @interface ExplicitAliasToMetaAnnotation {
167
+ @interface ExplicitAliasToMetaAnnotation {
171
168
172
169
@ AliasFor (annotation = ExplicitAliasMetaAnnotationTarget .class )
173
170
String aliased () default "" ;
174
-
175
171
}
176
172
177
173
@ Retention (RetentionPolicy .RUNTIME )
178
- static @interface ExplicitAliasMetaAnnotationTarget {
174
+ @interface ExplicitAliasMetaAnnotationTarget {
179
175
180
176
String aliased () default "" ;
181
177
182
178
String nonAliased () default "" ;
183
-
184
179
}
185
180
186
181
@ ExplicitAliasToMetaAnnotation (aliased = "aliased" )
187
182
private static class WithExplicitAliasToMetaAnnotation {
188
-
189
183
}
190
184
191
185
@ Retention (RetentionPolicy .RUNTIME )
192
- @ ConventionAliasMetaAnnotationTarget
193
- static @interface ConventionAliasToMetaAnnotation {
186
+ @interface ConventionAliasMetaAnnotationTarget {
194
187
195
188
String value () default "" ;
196
189
197
190
String convention () default "" ;
198
-
199
191
}
200
192
201
193
@ Retention (RetentionPolicy .RUNTIME )
202
- static @interface ConventionAliasMetaAnnotationTarget {
194
+ @ ConventionAliasMetaAnnotationTarget
195
+ @interface ConventionAliasToMetaAnnotation {
203
196
204
197
String value () default "" ;
205
198
206
199
String convention () default "" ;
207
-
208
200
}
209
201
210
202
@ ConventionAliasToMetaAnnotation (value = "value" , convention = "convention" )
211
203
private static class WithConventionAliasToMetaAnnotation {
212
-
213
204
}
214
205
215
206
@ Retention (RetentionPolicy .RUNTIME )
216
- static @interface ArrayTypes {
207
+ @interface ArrayTypes {
217
208
218
209
String [] stringValue ();
219
210
@@ -238,32 +229,28 @@ private static class WithConventionAliasToMetaAnnotation {
238
229
ExplicitMirror [] annotationValue ();
239
230
240
231
ExampleEnum [] enumValue ();
241
-
242
232
}
243
233
244
234
enum ExampleEnum {ONE ,TWO ,THREE }
245
235
246
236
@ Retention (RetentionPolicy .RUNTIME )
247
- static @interface NestedContainer {
237
+ @interface NestedContainer {
248
238
249
239
Nested value ();
250
-
251
240
}
252
241
253
242
@ Retention (RetentionPolicy .RUNTIME )
254
- static @interface Nested {
243
+ @interface Nested {
255
244
256
245
String value () default "" ;
257
-
258
246
}
259
247
260
248
@ Retention (RetentionPolicy .RUNTIME )
261
- static @interface ClassAttributes {
249
+ @interface ClassAttributes {
262
250
263
251
Class <?> classValue ();
264
252
265
253
Class <?>[] classArrayValue ();
266
-
267
254
}
268
255
269
256
}
0 commit comments