Add error check for inner classes in processor

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.Nullable;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.Nullable;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.os.Bundle;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.NonNull;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.LayoutRes;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.v4.widget.Space;

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

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.v4.util.Pools;

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

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.LayoutRes;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.IntDef;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.os.Parcel;

epoxy-model/src/main/java/com/airbnb/epoxy/EpoxyAttribute.java

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import java.lang.annotation.ElementType;

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

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.LayoutRes;

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

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import com.squareup.javapoet.AnnotationSpec;

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import com.squareup.javapoet.ClassName;

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

@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 import android.support.annotation.LayoutRes;
@@ -178,7 +163,15 @@ private void validateAccessibleViaGeneratedCode(Element attribute) throws
           enclosingElement.getSimpleName(), attribute.getSimpleName());
     }
 
-//    enclosingElement.getNestingKind()
+    // Nested classes must be static
+    if (enclosingElement.getNestingKind().isNested()) {
+      if (!enclosingElement.getModifiers().contains(STATIC)) {
+        throwError(
+            "Nested classes with %s annotations must be static. (class: %s, field: %s)",
+            EpoxyAttribute.class.getSimpleName(),
+            enclosingElement.getSimpleName(), attribute.getSimpleName());
+      }
+    }
 
     // Verify containing type.
     if (enclosingElement.getKind() != CLASS) {

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

@@ -1,18 +1,4 @@
-/*
- * Copyright (C) 2016 Airbnb, Inc.
- *
- * 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 com.airbnb.epoxy;
 
 class EpoxyProcessorException extends RuntimeException {

epoxy-processor/src/test/java/com/airbnb/epoxy/EpoxyProcessorTest.java

@@ -188,4 +188,16 @@ public void testModelThatDoesNotExtendEpoxyModelFails() {
         .failsToCompile()
         .withErrorContaining("must extend");
   }
+
+  @Test
+  public void testModelAsInnerClassFails() {
+    JavaFileObject model = JavaFileObjects
+        .forResource("ModelAsInnerClass.java");
+
+    assert_().about(javaSource())
+        .that(model)
+        .processedWith(new EpoxyProcessor())
+        .failsToCompile()
+        .withErrorContaining("Nested classes");
+  }
 }

epoxy-processor/src/test/resources/ModelAsInnerClass.java

@@ -0,0 +1,13 @@
+package com.airbnb.epoxy;
+
+public class ModelAsInnerClass {
+
+  class InnerClass extends EpoxyModel<Object> {
+    @EpoxyAttribute int valueInt;
+
+    @Override
+    protected int getDefaultLayout() {
+      return 0;
+    }
+  }
+}

epoxy-processor/src/test/resources/ModelWithPrivateInnerClass.java

@@ -7,7 +7,7 @@ protected int getDefaultLayout() {
     return 0;
   }
 
-  private class Test extends EpoxyModel<Object> {
+  private static class Test extends EpoxyModel<Object> {
     @EpoxyAttribute int value;
 
     @Override