Merge pull request #3 from xenit-eu/multiline-wrapper-annotations

Override multiline settings for wrapper annotations

settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'eu.xenit.enterprise-conventions.oss' version '0.2.0'
+    id 'eu.xenit.enterprise-conventions.oss' version '0.4.0'
 }
 
 rootProject.name = 'bard'

src/main/java/eu/xenit/contentcloud/bard/AnnotationSpec.java

@@ -59,7 +59,12 @@ void emit(CodeWriter codeWriter, boolean inline) throws IOException {
     } else if (members.size() == 1 && members.containsKey("value")) {
       // @Named("foo")
       codeWriter.emit("@$T(", type);
-      emitAnnotationValues(codeWriter, whitespace, memberSeparator, members.get("value"));
+      if (hasOnlyAnnotations(members.get("value"))) {
+        // override inlining logic when emitting annotation that wraps array of annotations
+        emitAnnotationValues(codeWriter, "\n", ",\n", members.get("value"));
+      } else {
+        emitAnnotationValues(codeWriter, whitespace, memberSeparator, members.get("value"));
+      }
       codeWriter.emit(")");
     } else {
       // Inline:
@@ -84,6 +89,10 @@ void emit(CodeWriter codeWriter, boolean inline) throws IOException {
     }
   }
 
+  private boolean hasOnlyAnnotations(List<CodeBlock> blocks) {
+    return blocks.stream().allMatch(b -> b.toString().trim().startsWith("@"));
+  }
+
   private void emitAnnotationValues(CodeWriter codeWriter, String whitespace,
       String memberSeparator, List<CodeBlock> values) throws IOException {
     if (values.size() == 1) {

src/test/java/eu/xenit/contentcloud/bard/AnnotationSpecTest.java

@@ -328,4 +328,27 @@ public class IsAnnotated {
   private String toString(TypeSpec typeSpec) {
     return JavaFile.builder("com.squareup.tacos", typeSpec).build().toString();
   }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  public @interface SubAnnotation {
+    String name() default "foo";
+  }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  public @interface HasSubAnnotations {
+    SubAnnotation[] value();
+  }
+
+  @Test public void arrayOfAnnotations() {
+    AnnotationSpec.Builder builder = AnnotationSpec.builder(HasSubAnnotations.class);
+    builder.addMember("value", "$L", AnnotationSpec.builder(SubAnnotation.class).addMember("name", "$S", "bar").build());
+    builder.addMember("value", "$L", AnnotationSpec.builder(SubAnnotation.class).addMember("name", "$S", "baz").build());
+    builder.addMember("value", "$L", AnnotationSpec.builder(SubAnnotation.class).addMember("name", "$S", "baq").build());
+    assertThat(builder.build().toString()).isEqualTo(
+            "@eu.xenit.contentcloud.bard.AnnotationSpecTest.HasSubAnnotations({\n"
+                    + "    @eu.xenit.contentcloud.bard.AnnotationSpecTest.SubAnnotation(name = \"bar\"),\n"
+                    + "    @eu.xenit.contentcloud.bard.AnnotationSpecTest.SubAnnotation(name = \"baz\"),\n"
+                    + "    @eu.xenit.contentcloud.bard.AnnotationSpecTest.SubAnnotation(name = \"baq\")\n"
+                    + "})");
+  }
 }