8016281: The SAM method should be passed to the metafactory as a MethodType not a MethodHandle
8020010: Move lambda bridge creation from metafactory and VM to compiler
Summary: langtools/javac component of the bridge support and MethodType vs. MethodHandle changes.
Reviewed-by: jjg, vromero, briangoetz, forax
Contributed-by: robert.field@oracle.com
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 8003280
* @summary Add lambda tests
* Test bridge methods for certain SAM conversions
* @compile LambdaTest6.java
* @run main LambdaTest6
*/
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Set;
public class LambdaTest6<T> {
interface H {Object m();}
interface K<U> {void m(U element);}
interface L extends K<String> {} //generic substitution
interface M {void m(String s);}
interface KM extends K<String>, M{} //generic substitution
interface N extends H {String m();} //covariant return
private static void assertTrue(boolean b) {
if(!b)
throw new AssertionError();
}
private Set<String> setOfStringObject() {
Set<String> s = new HashSet<>();
s.add("java.lang.String");
s.add("java.lang.Object");
return s;
}
private void test1()
{
L la = s -> { };
la.m("hi");
Class<? extends L> c1 = la.getClass();
Method[] methods = c1.getDeclaredMethods();
Set<String> types = setOfStringObject();
for(Method m : methods) {
assertTrue(m.getName().equals("m"));
Class[] parameterTypes = m.getParameterTypes();
assertTrue(parameterTypes.length == 1);
assertTrue(types.remove(parameterTypes[0].getName()));
}
assertTrue(types.isEmpty() || (types.size() == 1 && types.contains("java.lang.String")));
}
private void test2()
{
KM km = s -> { };
//km.m("hi");
Class<? extends KM> c2 = km.getClass();
Method[] methods = c2.getDeclaredMethods();
Set<String> types = setOfStringObject();
for(Method m : methods) {
assertTrue(m.getName().equals("m"));
Class[] parameterTypes = m.getParameterTypes();
assertTrue(parameterTypes.length == 1);
assertTrue(types.remove(parameterTypes[0].getName()));
}
assertTrue(types.isEmpty());
}
private void test3()
{
N na = ()-> "hi";
assertTrue( na.m().equals("hi") );
assertTrue( ((H)na).m().equals("hi") );
Class<? extends N> c3 = na.getClass();
Method[] methods = c3.getDeclaredMethods();
Set<String> types = setOfStringObject();
for(Method m : methods) {
assertTrue(m.getName().equals("m"));
Class returnType = m.getReturnType();
assertTrue(types.remove(returnType.getName()));
}
assertTrue(types.size() == 1); //there's a bridge
}
public static void main(String[] args) {
LambdaTest6 test = new LambdaTest6();
test.test1();
test.test2();
test.test3();
}
}