Regression fix: Support for binding to interface types with binds fac…

…tory methods.

compiler/ast/src/main/kotlin/motif/ast/compiler/CompilerType.kt

@@ -81,9 +81,12 @@ class CompilerType(
             return type
         }
 
-        val superType = MoreTypes.nonObjectSuperclass(env.typeUtils, env.elementUtils, type).orNull() ?: return null
-
-        return getMatchingSuperType(baseType, superType)
+        return env.typeUtils.directSupertypes(type)
+                .asSequence()
+                .mapNotNull { superType ->
+                    getMatchingSuperType(baseType, superType as DeclaredType)
+                }
+                .firstOrNull()
     }
 
     override fun equals(other: Any?): Boolean {

tests/src/main/java/testcases/E042_binds_invalid_wildcard_extends/A.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E042_binds_invalid_wildcard_extends;
+
+public class A<T> implements B<T> {}

tests/src/main/java/testcases/E042_binds_invalid_wildcard_extends/B.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E042_binds_invalid_wildcard_extends;
+
+interface B<T> {}

tests/src/main/java/testcases/E042_binds_invalid_wildcard_extends/Scope.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E042_binds_invalid_wildcard_extends;
+
+@motif.Scope
+public interface Scope {
+
+    B<? extends Integer> b();
+
+    @motif.Objects
+    abstract class Objects {
+        abstract A<Integer> a();
+
+        abstract B<Integer> b(A<? extends Integer> a);
+    }
+
+    @motif.Dependencies
+    interface Dependencies {}
+}

tests/src/main/java/testcases/E042_binds_invalid_wildcard_extends/Test.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E042_binds_invalid_wildcard_extends;
+
+import motif.models.errors.MotifError;
+import motif.models.errors.NotAssignableBindsMethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+public class Test {
+
+    public static MotifError error;
+
+    public static void run() {
+        assertThat(error).isInstanceOf(NotAssignableBindsMethod.class);
+    }
+}

tests/src/main/java/testcases/E043_binds_invalid_wildcard_super/A.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E043_binds_invalid_wildcard_super;
+
+public class A<T> implements B<T> {}

tests/src/main/java/testcases/E043_binds_invalid_wildcard_super/B.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E043_binds_invalid_wildcard_super;
+
+interface B<T> {}

tests/src/main/java/testcases/E043_binds_invalid_wildcard_super/Scope.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E043_binds_invalid_wildcard_super;
+
+@motif.Scope
+public interface Scope {
+
+    B<? extends Integer> b();
+
+    @motif.Objects
+    abstract class Objects {
+        abstract A<Integer> a();
+
+        abstract B<Integer> b(A<? super Integer> a);
+    }
+
+    @motif.Dependencies
+    interface Dependencies {}
+}

tests/src/main/java/testcases/E043_binds_invalid_wildcard_super/Test.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.E043_binds_invalid_wildcard_super;
+
+import motif.models.errors.MotifError;
+import motif.models.errors.NotAssignableBindsMethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+public class Test {
+
+    public static MotifError error;
+
+    public static void run() {
+        assertThat(error).isInstanceOf(NotAssignableBindsMethod.class);
+    }
+}

tests/src/main/java/testcases/T051_binds_interface/A.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T051_binds_interface;
+
+public class A implements B {}

tests/src/main/java/testcases/T051_binds_interface/B.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T051_binds_interface;
+
+interface B {}

tests/src/main/java/testcases/T051_binds_interface/Scope.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T051_binds_interface;
+
+@motif.Scope
+public interface Scope {
+
+    B b();
+
+    @motif.Objects
+    abstract class Objects {
+        abstract A a();
+
+        abstract B b(A a);
+    }
+
+    @motif.Dependencies
+    interface Dependencies {}
+}

tests/src/main/java/testcases/T051_binds_interface/Test.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T051_binds_interface;
+
+import static com.google.common.truth.Truth.assertThat;
+
+public class Test {
+
+    public static void run() {
+        Scope scope = new ScopeImpl();
+        assertThat(scope.b()).isInstanceOf(A.class);
+    }
+}

tests/src/main/java/testcases/T052_binds_interface_generic/A.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T052_binds_interface_generic;
+
+public class A<T> implements B<T> {}

tests/src/main/java/testcases/T052_binds_interface_generic/B.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T052_binds_interface_generic;
+
+interface B<T> {}

tests/src/main/java/testcases/T052_binds_interface_generic/Scope.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Uber Technologies, 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 testcases.T052_binds_interface_generic;
+
+@motif.Scope
+public interface Scope {
+
+    B<String> b();
+
+    @motif.Objects
+    abstract class Objects {
+        abstract A<String> a();
+
+        abstract B<String> b(A<String> a);
+    }
+
+    @motif.Dependencies
+    interface Dependencies {}
+}