#433 Builder.Include to include constructor and factory builders from

external classes

builder/src/org/immutables/builder/Builder.java

@@ -78,6 +78,12 @@
   @Target(ElementType.CONSTRUCTOR)
   public @interface Constructor {}
 
+  @Documented
+  @Target({ElementType.TYPE, ElementType.PACKAGE})
+  public @interface Include {
+    Class<?>[] value();
+  }
+
   /**
    * Factory method parameter might be turned into builder parameter using this annotation.
    * 

builder/test/org/immutables/builder/fixture/Externals.java

@@ -0,0 +1,30 @@
+/*
+   Copyright 2016 Immutables Authors and Contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
+package org.immutables.builder.fixture;
+
+import org.immutables.builder.Builder;
+import org.immutables.builder.fixture.external.ConsClass;
+
+@Builder.Include(ConsClass.class)
+public class Externals {
+  void use() {
+    ConsClassBuilder consBuilder = new ConsClassBuilder();
+    consBuilder.c("c").d(true).build();
+
+    CreateConsClassBuilder createBuilder = new CreateConsClassBuilder();
+    createBuilder.a(1).b(2).build();
+  }
+}

builder/test/org/immutables/builder/fixture/Pogo.java

@@ -30,7 +30,7 @@ public Pogo(@Builder.Parameter int a, String b, @Builder.Switch RetentionPolicy
     this.policy = policy;
   }
 
-  public static void main(String... args) {
+  void use() {
     Pogo pogo = new PogoBuilder(1)
         .b("a")
         .runtimePolicy()

cases/src/org/immutables/cases/Cases.java → builder/test/org/immutables/builder/fixture/external/ConsClass.java

@@ -13,19 +13,18 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package org.immutables.cases;
+package org.immutables.builder.fixture.external;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
+public class ConsClass {
+  final String c;
+  final boolean d;
 
-/**
- * Umbrella annotation which groups nested annotation for generation of visitor-like constructs for
- * ADT-like case classes.
- */
-@Target({})
-public @interface Cases {
-  @Target({ElementType.PACKAGE, ElementType.TYPE})
-  public @interface Chain {
+  public ConsClass(String c, boolean d) {
+    this.c = c;
+    this.d = d;
+  }
 
+  public static String createConsClass(int a, int b) {
+    return "CONS" + a + ":" + b;
   }
 }

generator-processor/pom.xml

@@ -93,6 +93,7 @@
 
                   <artifactSet>
                     <includes>
+                      <include>org.immutables:cases</include>
                       <include>org.immutables:generator</include>
                       <include>org.immutables:generator-processor</include>
                       <include>org.parboiled:parboiled-java</include>

generator/src/org/immutables/generator/PostprocessingMachine.java

@@ -15,7 +15,6 @@
  */
 package org.immutables.generator;
 
-import com.google.common.base.CharMatcher;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashMultimap;

pom.xml

@@ -52,7 +52,7 @@
     <module>value-processor</module>
     <module>value-fixture</module>
     <module>serial</module>
-    <module>cases</module>
+    <module>trees</module>
     <module>encode</module>
   </modules>
 
@@ -100,7 +100,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- artifacts of retro version used for self-bootstrap complilation -->
-    <retro.version>2.2.10</retro.version>
+    <retro.version>2.2.12</retro.version>
   </properties>
 
   <build>

cases/pom.xml → trees/pom.xml

@@ -21,10 +21,10 @@
     <groupId>org.immutables</groupId>
     <version>2.2.13-SNAPSHOT</version>
   </parent>
-  <artifactId>cases</artifactId>
+  <artifactId>trees</artifactId>
 
   <name>${project.groupId}.${project.artifactId}</name>
-  <description>Experimental and incomplete stuff goes here.</description>
+  <description>Stuff related to immutable object trees, including parboiled as and transformers.</description>
 
   <dependencies>
     <!-- it's better have just 'value' dep, but due to some maven 3.3.1 bug,
@@ -66,25 +66,7 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.atlassian.fugue</groupId>
-      <artifactId>fugue</artifactId>
-      <version>2.6.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.atlassian.fugue</groupId>
-      <artifactId>fugue</artifactId>
-      <version>3.0.0</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>spring-milestones</id>
-      <url>http://repo.spring.io/libs-milestone/</url>
-    </repository>
-  </repositories>
   <profiles>
     <profile>
       <id>lint-javadoc</id>

cases/test/org/immutables/trees/ast/SampleTree.java → trees/test/org/immutables/trees/ast/SampleTree.java

@@ -15,7 +15,6 @@
  */
 package org.immutables.trees.ast;
 
-import com.atlassian.fugue.Option;
 import com.google.common.base.Optional;
 import java.util.List;
 import org.immutables.trees.Trees;
@@ -49,10 +48,6 @@ interface Operator extends Expression {
 
     Optional<String> position();
 
-    Option<String> fugue2Option();
-
-    io.atlassian.fugue.Option<String> fugue3Option();
-
     enum Kind {
       PLUS,
       MINUS

value-processor/src/org/immutables/value/processor/Processor.java

@@ -15,6 +15,7 @@
  */
 package org.immutables.value.processor;
 
+import org.immutables.value.processor.meta.FIncludeMirror;
 import org.immutables.value.processor.meta.FConstructorMirror;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Multimap;
@@ -40,7 +41,8 @@
     ModifiableMirror.QUALIFIED_NAME,
     ValueUmbrellaMirror.QUALIFIED_NAME,
     FactoryMirror.QUALIFIED_NAME,
-    FConstructorMirror.QUALIFIED_NAME
+    FConstructorMirror.QUALIFIED_NAME,
+    FIncludeMirror.QUALIFIED_NAME
 })
 public final class Processor extends AbstractGenerator {
   @Override

value-processor/src/org/immutables/value/processor/meta/BuilderMirrors.java

@@ -26,6 +26,11 @@ private BuilderMirrors() {}
   @Mirror.Annotation("org.immutables.builder.Builder.Constructor")
   public @interface FConstructor {}
 
+  @Mirror.Annotation("org.immutables.builder.Builder.Include")
+  public @interface FInclude {
+    Class<?>[] value();
+  }
+
   @Mirror.Annotation("org.immutables.builder.Builder.Parameter")
   public @interface FParameter {}
 

value-processor/src/org/immutables/value/processor/meta/Constitution.java

@@ -54,7 +54,7 @@ public abstract class Constitution {
   @Value.Lazy
   public Generics generics() {
     return new Generics(protoclass(),
-        protoclass().kind() == Kind.DEFINED_CONSTRUCTOR
+        protoclass().kind().isConstructor()
             ? protoclass().sourceElement().getEnclosingElement()
             : protoclass().sourceElement());
   }
@@ -169,13 +169,16 @@ public NameForms typeValue() {
           : typeImmutable();
     }
     if (isFactory()) {
-      if (protoclass().kind() == Kind.DEFINED_CONSTRUCTOR) {
+
+      if (protoclass().kind().isConstructor()) {
+        TypeElement enclosingType = (TypeElement) protoclass().sourceElement().getEnclosingElement();
+
         return ImmutableConstitution.NameForms.builder()
-            .simple(protoclass().declaringType().get().element().getSimpleName().toString())
-            .relativeRaw(protoclass().declaringType().get().name())
+            .simple(enclosingType.getSimpleName().toString())
+            .relativeRaw(enclosingType.getQualifiedName().toString())
             .genericArgs(generics().args())
             .relativeAlreadyQualified(true)
-            .packageOf(implementationPackage())
+            .packageOf(NA_ERROR)
             .visibility(protoclass().visibility())
             .build();
       }
@@ -235,7 +238,7 @@ public boolean hasEnclosingNonvalue() {
    */
   @Value.Lazy
   public NameForms typeAbstract() {
-    if (protoclass().kind() == Kind.DEFINED_CONSTRUCTOR) {
+    if (protoclass().kind().isConstructor()) {
       return typeValue();
     }
 
@@ -373,16 +376,18 @@ private boolean isConstantNamingEquals(Naming naming, String name) {
   @Value.Lazy
   public AppliedNameForms factoryOf() {
     if (isFactory()) {
-      String invoke = protoclass().kind() == Kind.DEFINED_CONSTRUCTOR
+      TypeElement enclosingType = (TypeElement) protoclass().sourceElement().getEnclosingElement();
+
+      String invoke = protoclass().kind().isConstructor()
           ? "new"
           : protoclass().sourceElement().getSimpleName().toString();
 
       return ImmutableConstitution.NameForms.builder()
-          .simple(protoclass().declaringType().get().element().getSimpleName().toString())
-          .relativeRaw(protoclass().declaringType().get().name())
+          .simple(enclosingType.getSimpleName().toString())
+          .relativeRaw(enclosingType.getQualifiedName().toString())
           .genericArgs(generics().args())
           .relativeAlreadyQualified(true)
-          .packageOf(implementationPackage())
+          .packageOf(NA_ERROR)
           .visibility(protoclass().visibility())
           .build()
           .applied(invoke);