Make component requirement fields come first in a component.

It just makes more sense that way; they're initialized first. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=229218068
google · Jan 15, 2019 · 0be7193 · 0be7193
1 parent fe232f5
commit 0be7193
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/java/dagger/internal/codegen/ComponentImplementation.java b/java/dagger/internal/codegen/ComponentImplementation.java
@@ -67,15 +67,15 @@ final class ComponentImplementation {
   // be component requirements, reference managers, framework fields, private method fields, ... etc
   enum FieldSpecKind {
 
+    /** A field required by the component, e.g. module instances. */
+    COMPONENT_REQUIREMENT_FIELD,
+
     /**
      * A field for the lock and cached value for {@linkplain PrivateMethodBindingExpression
      * private-method scoped bindings}.
      */
     PRIVATE_METHOD_SCOPED_FIELD,
 
-    /** A field required by the component, e.g. module instances. */
-    COMPONENT_REQUIREMENT_FIELD,
-
     /** A framework field for type T, e.g. {@code Provider<T>}. */
     FRAMEWORK_FIELD,
 

diff --git a/javatests/dagger/internal/codegen/ComponentProcessorTest.java b/javatests/dagger/internal/codegen/ComponentProcessorTest.java
@@ -1205,8 +1205,8 @@ public void testDefaultPackage() {
                 "  private Provider<A> aProvider;")
             .addLinesIn(
                 FAST_INIT_MODE,
-                "  private volatile Provider<A> aProvider;",
                 "  private final AComponent aComponent;",
+                "  private volatile Provider<A> aProvider;",
                 "",
                 "  private DaggerBComponent(AComponent aComponentParam) {",
                 "    this.aComponent = aComponentParam;",

diff --git a/javatests/dagger/internal/codegen/MapBindingComponentProcessorTest.java b/javatests/dagger/internal/codegen/MapBindingComponentProcessorTest.java
@@ -130,12 +130,12 @@ public void mapBindingsWithEnumKey() {
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestComponent implements TestComponent {",
+                "  private final MapModuleOne mapModuleOne;",
+                "  private final MapModuleTwo mapModuleTwo;",
                 "  private volatile Provider<Handler> provideAdminHandlerProvider;",
                 "  private volatile Provider<Handler> provideLoginHandlerProvider;",
                 "  private volatile Provider<Map<PathEnum, Provider<Handler>>>",
                 "      mapOfPathEnumAndProviderOfHandlerProvider;",
-                "  private final MapModuleOne mapModuleOne;",
-                "  private final MapModuleTwo mapModuleTwo;",
                 "",
                 "  private Provider<Handler> getProvideAdminHandlerProvider() {",
                 "    Object local = provideAdminHandlerProvider;",
@@ -538,12 +538,12 @@ public void mapBindingsWithStringKey() {
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestComponent implements TestComponent {",
+                "  private final MapModuleOne mapModuleOne;",
+                "  private final MapModuleTwo mapModuleTwo;",
                 "  private volatile Provider<Handler> provideAdminHandlerProvider;",
                 "  private volatile Provider<Handler> provideLoginHandlerProvider;",
                 "  private volatile Provider<Map<String, Provider<Handler>>>",
                 "      mapOfStringAndProviderOfHandlerProvider;",
-                "  private final MapModuleOne mapModuleOne;",
-                "  private final MapModuleTwo mapModuleTwo;",
                 "",
                 "  private Provider<Handler> getProvideAdminHandlerProvider() {",
                 "    Object local = provideAdminHandlerProvider;",
@@ -739,12 +739,12 @@ public void mapBindingsWithWrappedKey() {
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestComponent implements TestComponent {",
+                "  private final MapModuleOne mapModuleOne;",
+                "  private final MapModuleTwo mapModuleTwo;",
                 "  private volatile Provider<Handler> provideAdminHandlerProvider;",
                 "  private volatile Provider<Handler> provideLoginHandlerProvider;",
                 "  private volatile Provider<Map<WrappedClassKey, Provider<Handler>>>",
                 "      mapOfWrappedClassKeyAndProviderOfHandlerProvider;",
-                "  private final MapModuleOne mapModuleOne;",
-                "  private final MapModuleTwo mapModuleTwo;",
                 "",
                 "  private DaggerTestComponent(",
                 "      MapModuleOne mapModuleOneParam,",
@@ -953,10 +953,10 @@ public void mapBindingsWithNonProviderValue() {
                 "",
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestComponent implements TestComponent {",
-                "  private volatile Provider<Map<PathEnum, Handler>>",
-                "      mapOfPathEnumAndHandlerProvider;",
                 "  private final MapModuleOne mapModuleOne;",
                 "  private final MapModuleTwo mapModuleTwo;",
+                "  private volatile Provider<Map<PathEnum, Handler>>",
+                "      mapOfPathEnumAndHandlerProvider;",
                 "",
                 "  private Map<PathEnum, Handler> getMapOfPathEnumAndHandler() {",
                 "    return ImmutableMap.<PathEnum, Handler>of(",

diff --git a/javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java b/javatests/dagger/internal/codegen/ProductionComponentProcessorTest.java
@@ -251,13 +251,13 @@ public void simpleComponent() {
                 GENERATED_ANNOTATION,
                 "public final class DaggerTestClass_SimpleComponent",
                 "    implements TestClass.SimpleComponent, CancellationListener {",
+                "  private final TestClass.BModule bModule;",
                 "  private volatile Object productionImplementationExecutor =",
                 "      new MemoizedSentinel();",
                 "  private volatile Provider<Executor> productionImplementationExecutorProvider;",
                 "  private volatile Object productionComponentMonitor = new MemoizedSentinel();",
                 "  private volatile Provider<ProductionComponentMonitor> monitorProvider;",
                 "  private volatile Provider<TestClass.B> bProvider;",
-                "  private final TestClass.BModule bModule;",
                 "  private Producer<TestClass.A> aEntryPoint;",
                 "  private Provider<TestClass.SimpleComponent> simpleComponentProvider;",
                 "  private Producer<TestClass.B> bProducer;",