Change the way to construct a builder from `AutoValue_Foo.builder()` to `new AutoValue_Foo.Builder()` as discussed in API review.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=83896327
diff --git a/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueTest.java b/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueTest.java
index 91c6c3c..a05f8b5 100644
--- a/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueTest.java
+++ b/value/src/it/functional/src/test/java/com/google/auto/value/AutoValueTest.java
@@ -994,7 +994,7 @@
public abstract int foo();
public static Builder builder() {
- return AutoValue_AutoValueTest_BasicWithBuilder.builder();
+ return new AutoValue_AutoValueTest_BasicWithBuilder.Builder();
}
@AutoValue.Builder
@@ -1018,7 +1018,7 @@
@AutoValue
public abstract static class EmptyWithBuilder {
public static Builder builder() {
- return AutoValue_AutoValueTest_EmptyWithBuilder.builder();
+ return new AutoValue_AutoValueTest_EmptyWithBuilder.Builder();
}
@AutoValue.Builder
@@ -1039,11 +1039,11 @@
public abstract int integer();
public static Builder builder() {
- return AutoValue_AutoValueTest_TwoPropertiesWithBuilderClass.builder();
+ return new AutoValue_AutoValueTest_TwoPropertiesWithBuilderClass.Builder();
}
public static Builder builder(String string) {
- return AutoValue_AutoValueTest_TwoPropertiesWithBuilderClass.builder()
+ return new AutoValue_AutoValueTest_TwoPropertiesWithBuilderClass.Builder()
.string(string);
}
@@ -1076,7 +1076,7 @@
public abstract int integer();
public static Builder builder() {
- return AutoValue_AutoValueTest_ValidationWithBuilder.builder();
+ return new AutoValue_AutoValueTest_ValidationWithBuilder.Builder();
}
@AutoValue.Validate
@@ -1123,7 +1123,7 @@
public abstract U u();
public static <T extends Number & Comparable<T>, U extends T> Builder<T, U> builder() {
- return AutoValue_AutoValueTest_GenericsWithBuilder.builder();
+ return new AutoValue_AutoValueTest_GenericsWithBuilder.Builder<T, U>();
}
@AutoValue.Builder
@@ -1148,7 +1148,7 @@
public abstract T t();
public static <T extends Comparable<T>> Builder<T> builder() {
- return AutoValue_AutoValueTest_BuilderWithSet.builder();
+ return new AutoValue_AutoValueTest_BuilderWithSet.Builder<T>();
}
@AutoValue.Builder
@@ -1173,7 +1173,7 @@
public abstract int getAnInt();
public static Builder builder() {
- return AutoValue_AutoValueTest_BuilderWithSetAndGet.builder();
+ return new AutoValue_AutoValueTest_BuilderWithSetAndGet.Builder();
}
@AutoValue.Builder
diff --git a/value/src/main/java/com/google/auto/value/processor/autovalue.vm b/value/src/main/java/com/google/auto/value/processor/autovalue.vm
index 3657bfd..7756917 100644
--- a/value/src/main/java/com/google/auto/value/processor/autovalue.vm
+++ b/value/src/main/java/com/google/auto/value/processor/autovalue.vm
@@ -187,11 +187,7 @@
#end
#if ($builderTypeName != "")
- public static ${builderFormalTypes} ${builderTypeName}${builderActualTypes} builder() {
- return new Builder${builderActualTypes}();
- }
-
- private static final class Builder${builderFormalTypes} ##
+ static final class Builder${builderFormalTypes} ##
#if ($builderIsInterface) implements #else extends #end
${builderTypeName}${builderActualTypes} {
diff --git a/value/src/test/java/com/google/auto/value/processor/CompilationTest.java b/value/src/test/java/com/google/auto/value/processor/CompilationTest.java
index 88b28c0..d5321b2 100644
--- a/value/src/test/java/com/google/auto/value/processor/CompilationTest.java
+++ b/value/src/test/java/com/google/auto/value/processor/CompilationTest.java
@@ -613,11 +613,7 @@
" return h;",
" }",
"",
- " public static <T extends Number> Baz.Builder<T> builder() {",
- " return new Builder<T>();",
- " }",
- "",
- " private static final class Builder<T extends Number> implements Baz.Builder<T> {",
+ " static final class Builder<T extends Number> implements Baz.Builder<T> {",
" private final BitSet set$ = new BitSet(4);",
"",
" private int anInt;",
