Support repeated annotations in AnnotationContainer

[ccarbonellbh]

TypeDeclaration was updated to use AnnotationContainer (previously a List of Annotations), and the methods exposed only allow for adding a single instance of a given annotation. With the move to AnnotationContainer, I seem to no longer be able to generate code that looks like below:

@PropertySource(value = {"file:${properties.directory}/${properties.file}"}, ignoreResourceNotFound = true, factory = GenericPropertySourceFactory.class)
@PropertySource(value = {"file:${properties.directory}/qa-overrides.properties"}, ignoreResourceNotFound = true)
public class MyApplication extends SpringBootServletInitializer {
...

Is there a suggested way that this should now be handled? Should AnnotationContainer be modified to still support this workflow?

Thank you!

[mhalbritter]

Hello,

that's true, AnnotationContainer doesn't support repeated annotations.

As a workaround, until support for this has been implemented, you can use this workaround:

JavaTypeDeclaration test = compilationUnit.createTypeDeclaration("Test");
Annotation annotation1 = Annotation.of(ClassName.of(PropertySource.class))
    .set("value", "classpath:1.properties")
    .build();
Annotation annotation2 = Annotation.of(ClassName.of(PropertySource.class))
    .set("value", "classpath:2.properties")
    .build();
test.annotations()
    .add(ClassName.of(PropertySources.class),
            (annotation) -> annotation.set("value", annotation1, annotation2));

This uses PropertySources, which is the repeatable annotation container for PropertySource:

@Repeatable(PropertySources.class)
public @interface PropertySource {
   // ...
}

The generated code looks like this:

package com.example;

import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;

@PropertySources({ @PropertySource("classpath:1.properties"), @PropertySource("classpath:2.properties") })
class Test {

}

While this isn't optimal code, it compiles and works.

[ccarbonellbh]

@mhalbritter Thank you for the suggested workaround. I will use that approach until AnnotationContainer gets support for repeatable annotations!

[mhalbritter]

Superseded by #1670.