feat: @ExternalBuildables can now include/exclude abstract classes an…

…d interfaces
sundrio · Apr 23, 2021 · 97f007b · 97f007b
1 parent 0e184e0
commit 97f007b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/annotations/builder/src/main/java/io/sundr/builder/annotations/ExternalBuildables.java b/annotations/builder/src/main/java/io/sundr/builder/annotations/ExternalBuildables.java
@@ -41,6 +41,10 @@
 
   BuildableReference[] refs() default {};
 
+  boolean includeInterfaces() default true;
+
+  boolean includeAbstractClasses() default true;
+
   String[] value() default {};
 
   String[] includes() default {};

diff --git a/...builder/src/main/java/io/sundr/builder/internal/processor/ExternalBuildableProcessor.java b/...builder/src/main/java/io/sundr/builder/internal/processor/ExternalBuildableProcessor.java
@@ -95,10 +95,14 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
           for (TypeElement typeElement : typeElements) {
             final boolean isLazyCollectionInitEnabled = generated.lazyCollectionInitEnabled();
             final boolean isLazyMapInitEnabled = generated.lazyMapInitEnabled();
+            final boolean includeInterfaces = generated.includeInterfaces();
+            final boolean includeAbstractClasses = generated.includeAbstractClasses();
 
             TypeDef original = ElementTo.TYPEDEF.apply(ModelUtils.getClassElement(typeElement));
             String fqcn = original.getFullyQualifiedName();
-            boolean isBuildable = original.getKind() != Kind.ENUM && !original.isAbstract()
+            boolean isBuildable = original.getKind() != Kind.ENUM
+                && (includeAbstractClasses || !original.isAbstract())
+                && (includeInterfaces || original.getKind() != Kind.INTERFACE)
                 && isIncluded(fqcn, generated.includes()) && !isExcluded(fqcn, generated.excludes());
 
             TypeDef b = new TypeDefBuilder(original)
@@ -115,7 +119,15 @@ public void visit(PropertyBuilder builder) {
                   }
                 }).build();
 
-            if (b.getKind() == Kind.ENUM || b.isAbstract()) {
+            if (b.getKind() == Kind.ENUM) {
+              continue;
+            }
+
+            if (b.isAbstract() && !includeAbstractClasses) {
+              continue;
+            }
+
+            if (b.getKind() == Kind.INTERFACE && !includeInterfaces) {
               continue;
             }
 
@@ -134,6 +146,8 @@ public void visit(PropertyBuilder builder) {
         for (TypeElement ref : BuilderUtils.getBuildableReferences(ctx, generated)) {
           final boolean isLazyCollectionInitEnabled = generated.lazyCollectionInitEnabled();
           final boolean isLazyMapInitEnabled = generated.lazyMapInitEnabled();
+          final boolean includeInterfaces = generated.includeInterfaces();
+          final boolean includeAbstractClasses = generated.includeAbstractClasses();
 
           TypeDef original = ElementTo.TYPEDEF.apply(ModelUtils.getClassElement(ref));
           String fqcn = original.getFullyQualifiedName();
@@ -157,6 +171,17 @@ public void visit(PropertyBuilder builder) {
           if (r.getKind() == Kind.ENUM || r.isAbstract()) {
             continue;
           }
+          if (r.getKind() == Kind.ENUM) {
+            continue;
+          }
+
+          if (r.isAbstract() && !includeAbstractClasses) {
+            continue;
+          }
+
+          if (r.getKind() == Kind.INTERFACE && !includeInterfaces) {
+            continue;
+          }
 
           if (!isIncluded(r.getFullyQualifiedName(), generated.includes())) {
             continue;