corrected generation of public constuctor for builder. #89

immutables · Mar 2, 2015 · cfb7f36 · cfb7f36
1 parent 07d139a
commit cfb7f36
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 15 deletions.
diff --git a/value-fixture/src/org/immutables/fixture/style/HaveBuilderNew.java b/value-fixture/src/org/immutables/fixture/style/HaveBuilderNew.java
@@ -0,0 +1,13 @@
+package org.immutables.fixture.style;
+
+import org.immutables.value.Value;
+
+@Value.Immutable
+@Value.Style(builder = "new")
+public interface HaveBuilderNew {
+  int a();
+
+  default void use() {
+    new ImmutableHaveBuilderNew.Builder().build();
+  }
+}
diff --git a/value-processor/src/org/immutables/value/processor/meta/Constitution.java b/value-processor/src/org/immutables/value/processor/meta/Constitution.java
@@ -205,38 +205,45 @@ String typeImmutableEnclosingSimpleName() {
   }
 
   private String typeBuilderSimpleName() {
-    Naming builderNaming = names().namings.typeBuilder;
+    boolean isOutside = isImplementationHidden() || isFactory();
-    if (isImplementationHidden() || isFactory()) {
+    Naming typeBuilderNaming = names().namings.typeBuilder;
+    if (isOutside) {
       // For outer builder we can override with constant builder naming, but not the default.
-      boolean isConstantDefault = builderNaming.isConstant()
+      boolean isConstantAndDefault = isConstantNamingEquals(typeBuilderNaming, BUILDER_CLASS_NAME);
-          && builderNaming.apply("").equals(BUILDER_CLASS_NAME);
 
-      if (isConstantDefault) {
+      if (isConstantAndDefault) {
-        builderNaming = builderNaming.requireNonConstant(Preference.SUFFIX);
+        typeBuilderNaming = typeBuilderNaming.requireNonConstant(Preference.SUFFIX);
       }
     }
-    return Naming.Usage.CAPITALIZED.apply(builderNaming.apply(names().raw));
+
+    return Naming.Usage.CAPITALIZED.apply(typeBuilderNaming.apply(names().raw));
   }
 
   @Value.Lazy
   public NameForms factoryBuilder() {
     boolean isOutside = isImplementationHidden() || isFactory();
-
+    Naming methodBuilderNaming = names().namings.builder;
-    Naming builderNaming = names().namings.builder;
     if (isOutside) {
-      boolean isConstantDefault = builderNaming.isConstant()
+      boolean isConstantAndDefault = isConstantNamingEquals(methodBuilderNaming, BUILDER_METHOD_NAME);
-          && builderNaming.apply("").equals(BUILDER_METHOD_NAME);
 
-      if (isConstantDefault) {
+      if (isConstantAndDefault) {
-        builderNaming = Naming.from(NEW_KEYWORD);
+        methodBuilderNaming = Naming.from(NEW_KEYWORD);
       }
     }
 
-    NameForms nameForms = isOutside
+    boolean haveConstructorOnBuilder = isOutside || isConstantNamingEquals(methodBuilderNaming, NEW_KEYWORD);
+
+    NameForms typeNameForms = haveConstructorOnBuilder
         ? typeBuilder()
         : typeImmutable();
 
-    return nameForms.applied(builderNaming.apply(names().raw));
+    return typeNameForms.applied(methodBuilderNaming.apply(names().raw));
+  }
+
+  private boolean isConstantNamingEquals(Naming naming, String constantNaming) {
+    return naming.isConstant()
+        && naming.apply("").equals(constantNaming);
+
   }
 
   @Value.Lazy