Merge pull request square#416 from google/moe_writing_branch_from_5dd…

…e42d7df308206a2f3329d0e7b8ee1fd5e2926

Sync changes via MOE from google internal

compiler/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.dagger</groupId>
     <artifactId>dagger-parent</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.6-snapshot</version>
   </parent>
 
   <artifactId>dagger-compiler</artifactId>

compiler/src/it/functional-tests/pom.xml

@@ -22,7 +22,7 @@ limitations under the License.
   <parent>
     <groupId>com.google.dagger</groupId>
     <artifactId>dagger-parent</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.6-snapshot</version>
   </parent>
   <groupId>dagger.tests</groupId>
   <artifactId>functional-tests</artifactId>

compiler/src/it/functional-tests/src/main/java/test/A.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/AbstractMembersInjectingBaseClass.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/AbstractMiddleClassWithoutMembers.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 abstract class AbstractMiddleClassWithoutMembers extends AbstractMembersInjectingBaseClass {

compiler/src/it/functional-tests/src/main/java/test/B.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/BasicAbstractClassComponent.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/BasicComponent.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/BooleanKey.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.MapKey;

compiler/src/it/functional-tests/src/main/java/test/BoundedGenericComponent.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/BoundedGenericModule.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Module;

compiler/src/it/functional-tests/src/main/java/test/BoundedGenerics.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import java.util.List;

compiler/src/it/functional-tests/src/main/java/test/ByteKey.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.MapKey;

compiler/src/it/functional-tests/src/main/java/test/CharKey.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.MapKey;

compiler/src/it/functional-tests/src/main/java/test/ComplexGenerics.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Lazy;

compiler/src/it/functional-tests/src/main/java/test/ComponentDependsOnGeneratedCode.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/ComponentSupertypeDependsOnGeneratedCode.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/ComponentSupertypeDependsOnGeneratedCodeInterface.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 interface ComponentSupertypeDependsOnGeneratedCodeInterface {

compiler/src/it/functional-tests/src/main/java/test/ComponentWithReusableBindings.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/ComponentsWithNestedModules.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/Generic.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/Generic2.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/GenericChild.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/GenericComponent.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/GenericDoubleReferences.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/GenericNoDeps.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/GenericParent.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;

compiler/src/it/functional-tests/src/main/java/test/InjectedThing.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Lazy;

compiler/src/it/functional-tests/src/main/java/test/Injector.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Lazy;

compiler/src/it/functional-tests/src/main/java/test/ModuleWithConflictingNames.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 The Dagger Authors.
+ *
+ * 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 test;
+
+import dagger.Module;
+import dagger.Provides;
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+/**
+ * Module with bindings that might result in generated factories with conflicting field and
+ * parameter names.
+ */
+@Module
+final class ModuleWithConflictingNames {
+  @Provides
+  static Object object(int foo, Provider<String> fooProvider) {
+    return foo + fooProvider.get();
+  }
+
+  /**
+   * A class that might result in a generated factory with conflicting field and parameter names.
+   */
+  static class InjectedClassWithConflictingNames {
+    final int foo;
+    final Provider<String> fooProvider;
+
+    @Inject
+    InjectedClassWithConflictingNames(int foo, Provider<String> fooProvider) {
+      this.foo = foo;
+      this.fooProvider = fooProvider;
+    }
+  }
+}

compiler/src/it/functional-tests/src/main/java/test/MultibindingComponent.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/MultibindingComponentWithMultibindingsInterface.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/MultibindingDependency.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 interface MultibindingDependency {

compiler/src/it/functional-tests/src/main/java/test/MultibindingModule.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.Module;

compiler/src/it/functional-tests/src/main/java/test/MultibindingsInterfaceModule.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Module;

compiler/src/it/functional-tests/src/main/java/test/MultibindsModule.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Module;

compiler/src/it/functional-tests/src/main/java/test/NeedsFactory.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import com.google.auto.factory.AutoFactory;

compiler/src/it/functional-tests/src/main/java/test/NestedAnnotationContainer.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.MapKey;

compiler/src/it/functional-tests/src/main/java/test/NonComponentDependencyComponent.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/NullableModule.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Module;

compiler/src/it/functional-tests/src/main/java/test/NumberClassKey.java

@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package test;
 
 import dagger.MapKey;

compiler/src/it/functional-tests/src/main/java/test/OuterClassBar.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/OuterClassFoo.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import dagger.Component;

compiler/src/it/functional-tests/src/main/java/test/ReferencesGeneric.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package test;
 
 import javax.inject.Inject;