Make generated models from views inherit constructors from base model

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
 
-  ext.KOTLIN_VERSION = "1.1.50"
+  ext.KOTLIN_VERSION = "1.1.51"
   ext.ANDROID_PLUGIN_VERSION = "3.0.0-beta7"
 
   repositories {

epoxy-adapter/src/main/java/com/airbnb/epoxy/EpoxyModel.java

@@ -283,6 +283,17 @@ private static long hashString64Bit(CharSequence str) {
     return result;
   }
 
+  /**
+   * Return the default layout resource to be used when creating views for this model. The resource
+   * will be inflated to create a view for the model; additionally the layout int is used as the
+   * views type in the RecyclerView.
+   * <p>
+   * This can be left unimplemented if you use the {@link EpoxyModelClass} annotation to define a
+   * layout.
+   * <p>
+   * This default value can be overridden with {@link #layout(int)} at runtime to change the layout
+   * dynamically.
+   */
   @LayoutRes
   protected abstract int getDefaultLayout();
 

epoxy-processor/src/main/java/com/airbnb/epoxy/BasicGeneratedModelInfo.java

@@ -9,21 +9,17 @@
 import java.util.List;
 
 import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
 import static com.airbnb.epoxy.Utils.getElementByName;
 import static com.airbnb.epoxy.Utils.getEpoxyObjectType;
 
- class BasicGeneratedModelInfo extends GeneratedModelInfo {
+class BasicGeneratedModelInfo extends GeneratedModelInfo {
 
   private final Elements elementUtils;
 
@@ -38,7 +34,7 @@ class BasicGeneratedModelInfo extends GeneratedModelInfo {
       typeVariableNames.add(TypeVariableName.get(typeParameterElement));
     }
 
-    collectOriginalClassConstructors(superClassElement);
+    constructors.addAll(getClassConstructors(superClassElement));
     collectMethodsReturningClassType(superClassElement, typeUtils);
 
     if (!typeVariableNames.isEmpty()) {
@@ -83,39 +79,22 @@ protected ClassName buildGeneratedModelName(TypeElement classElement) {
     return ClassName.get(packageName, className + GENERATED_CLASS_NAME_SUFFIX);
   }
 
-  /**
-   * Get information about constructors of the original class so we can duplicate them in the
-   * generated class and call through to super with the proper parameters
-   */
-  private void collectOriginalClassConstructors(TypeElement originalClass) {
-    for (Element subElement : originalClass.getEnclosedElements()) {
-      if (subElement.getKind() == ElementKind.CONSTRUCTOR
-          && !subElement.getModifiers().contains(Modifier.PRIVATE)) {
-        ExecutableElement castedSubElement = ((ExecutableElement) subElement);
-        List<? extends VariableElement> params = castedSubElement.getParameters();
-        constructors
-            .add(new ConstructorInfo(subElement.getModifiers(), buildParamSpecs(params),
-                castedSubElement.isVarArgs()));
+  private void buildAnnotationLists(List<? extends AnnotationMirror> annotationMirrors) {
+    for (AnnotationMirror annotationMirror : annotationMirrors) {
+      if (!annotationMirror.getElementValues().isEmpty()) {
+        // Not supporting annotations with values for now
+        continue;
       }
+
+      ClassName annotationClass =
+          ClassName.bestGuess(annotationMirror.getAnnotationType().toString());
+      if (annotationClass.equals(ClassName.get(EpoxyModelClass.class))) {
+        // Don't include our own annotation
+        continue;
+      }
+
+      AnnotationSpec annotationSpec = AnnotationSpec.builder(annotationClass).build();
+      annotations.add(annotationSpec);
     }
   }
-
-   private void buildAnnotationLists(List<? extends AnnotationMirror> annotationMirrors) {
-     for (AnnotationMirror annotationMirror : annotationMirrors) {
-       if (!annotationMirror.getElementValues().isEmpty()) {
-         // Not supporting annotations with values for now
-         continue;
-       }
-
-       ClassName annotationClass =
-           ClassName.bestGuess(annotationMirror.getAnnotationType().toString());
-       if (annotationClass.equals(ClassName.get(EpoxyModelClass.class))) {
-         // Don't include our own annotation
-         continue;
-       }
-
-       AnnotationSpec annotationSpec = AnnotationSpec.builder(annotationClass).build();
-       annotations.add(annotationSpec);
-     }
-   }
 }

epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelInfo.java

@@ -71,6 +71,27 @@ abstract class GeneratedModelInfo {
    */
   Size layoutParams = Size.NONE;
 
+  /**
+   * Get information about constructors of the original class so we can duplicate them in the
+   * generated class and call through to super with the proper parameters
+   */
+  protected static List<ConstructorInfo> getClassConstructors(TypeElement classElement) {
+    List<ConstructorInfo> constructors = new ArrayList<>(2);
+
+    for (Element subElement : classElement.getEnclosedElements()) {
+      if (subElement.getKind() == ElementKind.CONSTRUCTOR
+          && !subElement.getModifiers().contains(Modifier.PRIVATE)) {
+
+        ExecutableElement constructor = ((ExecutableElement) subElement);
+        List<? extends VariableElement> params = constructor.getParameters();
+        constructors.add(new ConstructorInfo(subElement.getModifiers(), buildParamSpecs(params),
+            constructor.isVarArgs()));
+      }
+    }
+
+    return constructors;
+  }
+
   /**
    * Get information about methods returning class type of the original class so we can duplicate
    * them in the generated class for chaining purposes
@@ -102,7 +123,7 @@ protected void collectMethodsReturningClassType(TypeElement modelClass, Types ty
     }
   }
 
-  protected List<ParameterSpec> buildParamSpecs(List<? extends VariableElement> params) {
+  protected static List<ParameterSpec> buildParamSpecs(List<? extends VariableElement> params) {
     List<ParameterSpec> result = new ArrayList<>();
 
     for (VariableElement param : params) {