author | attila |
Thu, 30 Jan 2014 20:13:27 +0100 | |
changeset 22669 | 75563515567f |
parent 21691 | 8e284e9a6144 |
child 24719 | f726e9d67629 |
permissions | -rw-r--r-- |
16147 | 1 |
/* |
16151 | 2 |
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
16147 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package jdk.nashorn.internal.runtime.linker; |
|
27 |
||
22669 | 28 |
import static jdk.nashorn.internal.lookup.Lookup.MH; |
16147 | 29 |
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; |
30 |
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; |
|
31 |
||
32 |
import java.lang.invoke.MethodHandle; |
|
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
33 |
import java.lang.invoke.MethodType; |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
34 |
import java.lang.reflect.Method; |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
35 |
import java.lang.reflect.Modifier; |
22669 | 36 |
import java.util.HashMap; |
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
37 |
import java.util.Map; |
16234
86cb162cec6c
8008085: Integrate Dynalink source code into Nashorn codebase
attila
parents:
16188
diff
changeset
|
38 |
import jdk.internal.dynalink.CallSiteDescriptor; |
16246
f60e04200be3
8008387: Improve code coverage tests for JSObjectLinker and NashornBottomLinker
sundar
parents:
16234
diff
changeset
|
39 |
import jdk.internal.dynalink.beans.BeansLinker; |
16234
86cb162cec6c
8008085: Integrate Dynalink source code into Nashorn codebase
attila
parents:
16188
diff
changeset
|
40 |
import jdk.internal.dynalink.linker.GuardedInvocation; |
22669 | 41 |
import jdk.internal.dynalink.linker.GuardedTypeConversion; |
16234
86cb162cec6c
8008085: Integrate Dynalink source code into Nashorn codebase
attila
parents:
16188
diff
changeset
|
42 |
import jdk.internal.dynalink.linker.GuardingDynamicLinker; |
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
43 |
import jdk.internal.dynalink.linker.GuardingTypeConverterFactory; |
16234
86cb162cec6c
8008085: Integrate Dynalink source code into Nashorn codebase
attila
parents:
16188
diff
changeset
|
44 |
import jdk.internal.dynalink.linker.LinkRequest; |
86cb162cec6c
8008085: Integrate Dynalink source code into Nashorn codebase
attila
parents:
16188
diff
changeset
|
45 |
import jdk.internal.dynalink.linker.LinkerServices; |
86cb162cec6c
8008085: Integrate Dynalink source code into Nashorn codebase
attila
parents:
16188
diff
changeset
|
46 |
import jdk.internal.dynalink.support.Guards; |
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
47 |
import jdk.nashorn.internal.runtime.Context; |
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
48 |
import jdk.nashorn.internal.runtime.JSType; |
16147 | 49 |
import jdk.nashorn.internal.runtime.ScriptRuntime; |
50 |
||
51 |
/** |
|
52 |
* Nashorn bottom linker; used as a last-resort catch-all linker for all linking requests that fall through all other |
|
53 |
* linkers (see how {@link Bootstrap} class configures the dynamic linker in its static initializer). It will throw |
|
54 |
* appropriate ECMAScript errors for attempts to invoke operations on {@code null}, link no-op property getters and |
|
55 |
* setters for Java objects that couldn't be linked by any other linker, and throw appropriate ECMAScript errors for |
|
56 |
* attempts to invoke arbitrary Java objects as functions or constructors. |
|
57 |
*/ |
|
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
58 |
final class NashornBottomLinker implements GuardingDynamicLinker, GuardingTypeConverterFactory { |
16147 | 59 |
|
60 |
@Override |
|
61 |
public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices) |
|
62 |
throws Exception { |
|
63 |
final Object self = linkRequest.getReceiver(); |
|
64 |
||
65 |
if (self == null) { |
|
66 |
return linkNull(linkRequest); |
|
67 |
} |
|
68 |
||
69 |
// None of the objects that can be linked by NashornLinker should ever reach here. Basically, anything below |
|
70 |
// this point is a generic Java bean. Therefore, reaching here with a ScriptObject is a Nashorn bug. |
|
71 |
assert isExpectedObject(self) : "Couldn't link " + linkRequest.getCallSiteDescriptor() + " for " + self.getClass().getName(); |
|
72 |
||
73 |
return linkBean(linkRequest, linkerServices); |
|
74 |
} |
|
75 |
||
76 |
private static final MethodHandle EMPTY_PROP_GETTER = |
|
77 |
MH.dropArguments(MH.constant(Object.class, UNDEFINED), 0, Object.class); |
|
78 |
private static final MethodHandle EMPTY_ELEM_GETTER = |
|
79 |
MH.dropArguments(EMPTY_PROP_GETTER, 0, Object.class); |
|
80 |
private static final MethodHandle EMPTY_PROP_SETTER = |
|
81 |
MH.asType(EMPTY_ELEM_GETTER, EMPTY_ELEM_GETTER.type().changeReturnType(void.class)); |
|
82 |
private static final MethodHandle EMPTY_ELEM_SETTER = |
|
83 |
MH.dropArguments(EMPTY_PROP_SETTER, 0, Object.class); |
|
84 |
||
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
85 |
private static GuardedInvocation linkBean(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception { |
16147 | 86 |
final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor)linkRequest.getCallSiteDescriptor(); |
87 |
final Object self = linkRequest.getReceiver(); |
|
88 |
final String operator = desc.getFirstOperator(); |
|
89 |
switch (operator) { |
|
90 |
case "new": |
|
16246
f60e04200be3
8008387: Improve code coverage tests for JSObjectLinker and NashornBottomLinker
sundar
parents:
16234
diff
changeset
|
91 |
if(BeansLinker.isDynamicMethod(self)) { |
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
92 |
throw typeError("method.not.constructor", ScriptRuntime.safeToString(self)); |
16147 | 93 |
} |
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
94 |
throw typeError("not.a.function", ScriptRuntime.safeToString(self)); |
16147 | 95 |
case "call": |
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
96 |
// Support dyn:call on any object that supports some @FunctionalInterface |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
97 |
// annotated interface. This way Java method, constructor references or |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
98 |
// implementations of java.util.function.* interfaces can be called as though |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
99 |
// those are script functions. |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
100 |
final Method m = getFunctionalInterfaceMethod(self.getClass()); |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
101 |
if (m != null) { |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
102 |
final MethodType callType = desc.getMethodType(); |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
103 |
// 'callee' and 'thiz' passed from script + actual arguments |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
104 |
if (callType.parameterCount() != m.getParameterCount() + 2) { |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
105 |
throw typeError("no.method.matches.args", ScriptRuntime.safeToString(self)); |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
106 |
} |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
107 |
return new GuardedInvocation( |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
108 |
// drop 'thiz' passed from the script. |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
109 |
MH.dropArguments(desc.getLookup().unreflect(m), 1, callType.parameterType(1)), |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
110 |
Guards.getInstanceOfGuard(m.getDeclaringClass())).asType(callType); |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
111 |
} |
16246
f60e04200be3
8008387: Improve code coverage tests for JSObjectLinker and NashornBottomLinker
sundar
parents:
16234
diff
changeset
|
112 |
if(BeansLinker.isDynamicMethod(self)) { |
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
113 |
throw typeError("no.method.matches.args", ScriptRuntime.safeToString(self)); |
16147 | 114 |
} |
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
115 |
throw typeError("not.a.function", ScriptRuntime.safeToString(self)); |
16147 | 116 |
case "callMethod": |
117 |
case "getMethod": |
|
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
118 |
throw typeError("no.such.function", getArgument(linkRequest), ScriptRuntime.safeToString(self)); |
16147 | 119 |
case "getProp": |
120 |
case "getElem": |
|
121 |
if (desc.getOperand() != null) { |
|
122 |
return getInvocation(EMPTY_PROP_GETTER, self, linkerServices, desc); |
|
123 |
} |
|
124 |
return getInvocation(EMPTY_ELEM_GETTER, self, linkerServices, desc); |
|
125 |
case "setProp": |
|
126 |
case "setElem": |
|
127 |
if (desc.getOperand() != null) { |
|
128 |
return getInvocation(EMPTY_PROP_SETTER, self, linkerServices, desc); |
|
129 |
} |
|
130 |
return getInvocation(EMPTY_ELEM_SETTER, self, linkerServices, desc); |
|
131 |
default: |
|
132 |
break; |
|
133 |
} |
|
134 |
throw new AssertionError("unknown call type " + desc); |
|
135 |
} |
|
136 |
||
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
137 |
@Override |
22669 | 138 |
public GuardedTypeConversion convertToType(final Class<?> sourceType, final Class<?> targetType) throws Exception { |
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
139 |
final GuardedInvocation gi = convertToTypeNoCast(sourceType, targetType); |
22669 | 140 |
return gi == null ? null : new GuardedTypeConversion(gi.asType(MH.type(targetType, sourceType)), true); |
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
141 |
} |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
142 |
|
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
143 |
/** |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
144 |
* Main part of the implementation of {@link GuardingTypeConverterFactory#convertToType(Class, Class)} that doesn't |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
145 |
* care about adapting the method signature; that's done by the invoking method. Returns conversion from Object to String/number/boolean (JS primitive types). |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
146 |
* @param sourceType the source type |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
147 |
* @param targetType the target type |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
148 |
* @return a guarded invocation that converts from the source type to the target type. |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
149 |
* @throws Exception if something goes wrong |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
150 |
*/ |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
151 |
private static GuardedInvocation convertToTypeNoCast(final Class<?> sourceType, final Class<?> targetType) throws Exception { |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
152 |
final MethodHandle mh = CONVERTERS.get(targetType); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
153 |
if (mh != null) { |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
154 |
return new GuardedInvocation(mh, null); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
155 |
} |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
156 |
|
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
157 |
return null; |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
158 |
} |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
159 |
|
16147 | 160 |
private static GuardedInvocation getInvocation(final MethodHandle handle, final Object self, final LinkerServices linkerServices, final CallSiteDescriptor desc) { |
161 |
return Bootstrap.asType(new GuardedInvocation(handle, Guards.getClassGuard(self.getClass())), linkerServices, desc); |
|
162 |
} |
|
163 |
||
164 |
// Used solely in an assertion to figure out if the object we get here is something we in fact expect. Objects |
|
165 |
// linked by NashornLinker should never reach here. |
|
166 |
private static boolean isExpectedObject(final Object obj) { |
|
167 |
return !(NashornLinker.canLinkTypeStatic(obj.getClass())); |
|
168 |
} |
|
169 |
||
170 |
private static GuardedInvocation linkNull(final LinkRequest linkRequest) { |
|
171 |
final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor)linkRequest.getCallSiteDescriptor(); |
|
172 |
final String operator = desc.getFirstOperator(); |
|
173 |
switch (operator) { |
|
174 |
case "new": |
|
175 |
case "call": |
|
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
176 |
throw typeError("not.a.function", "null"); |
16147 | 177 |
case "callMethod": |
178 |
case "getMethod": |
|
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
179 |
throw typeError("no.such.function", getArgument(linkRequest), "null"); |
16147 | 180 |
case "getProp": |
181 |
case "getElem": |
|
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
182 |
throw typeError("cant.get.property", getArgument(linkRequest), "null"); |
16147 | 183 |
case "setProp": |
184 |
case "setElem": |
|
16256
f2d9a0c49914
8007002: Replace implicit exception throwing methods with explicit throws - simplify control flow and remove useless code
lagergren
parents:
16246
diff
changeset
|
185 |
throw typeError("cant.set.property", getArgument(linkRequest), "null"); |
16147 | 186 |
default: |
187 |
break; |
|
188 |
} |
|
189 |
throw new AssertionError("unknown call type " + desc); |
|
190 |
} |
|
191 |
||
21691
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
192 |
private static final Map<Class<?>, MethodHandle> CONVERTERS = new HashMap<>(); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
193 |
static { |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
194 |
CONVERTERS.put(boolean.class, JSType.TO_BOOLEAN.methodHandle()); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
195 |
CONVERTERS.put(double.class, JSType.TO_NUMBER.methodHandle()); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
196 |
CONVERTERS.put(int.class, JSType.TO_INTEGER.methodHandle()); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
197 |
CONVERTERS.put(long.class, JSType.TO_LONG.methodHandle()); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
198 |
CONVERTERS.put(String.class, JSType.TO_STRING.methodHandle()); |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
199 |
} |
8e284e9a6144
8027828: ClassCastException when converting return value of a Java method to boolean
sundar
parents:
19097
diff
changeset
|
200 |
|
16147 | 201 |
private static String getArgument(final LinkRequest linkRequest) { |
202 |
final CallSiteDescriptor desc = linkRequest.getCallSiteDescriptor(); |
|
203 |
if (desc.getNameTokenCount() > 2) { |
|
204 |
return desc.getNameToken(2); |
|
205 |
} |
|
206 |
return ScriptRuntime.safeToString(linkRequest.getArguments()[1]); |
|
207 |
} |
|
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
208 |
|
19097
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
209 |
// cache of @FunctionalInterface method of implementor classes |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
210 |
private static final ClassValue<Method> FUNCTIONAL_IFACE_METHOD = new ClassValue<Method>() { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
211 |
@Override |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
212 |
protected Method computeValue(final Class<?> type) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
213 |
return findFunctionalInterfaceMethod(type); |
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
214 |
} |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
215 |
|
19097
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
216 |
private Method findFunctionalInterfaceMethod(final Class<?> clazz) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
217 |
if (clazz == null) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
218 |
return null; |
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
219 |
} |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
220 |
|
19097
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
221 |
for (Class<?> iface : clazz.getInterfaces()) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
222 |
// check accessiblity up-front |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
223 |
if (! Context.isAccessibleClass(iface)) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
224 |
continue; |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
225 |
} |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
226 |
|
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
227 |
// check for @FunctionalInterface |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
228 |
if (iface.isAnnotationPresent(FunctionalInterface.class)) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
229 |
// return the first abstract method |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
230 |
for (final Method m : iface.getMethods()) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
231 |
if (Modifier.isAbstract(m.getModifiers())) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
232 |
return m; |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
233 |
} |
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
234 |
} |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
235 |
} |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
236 |
} |
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
237 |
|
19097
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
238 |
// did not find here, try super class |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
239 |
return findFunctionalInterfaceMethod(clazz.getSuperclass()); |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
240 |
} |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
241 |
}; |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
242 |
|
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
243 |
// Returns @FunctionalInterface annotated interface's single abstract |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
244 |
// method. If not found, returns null. |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
245 |
static Method getFunctionalInterfaceMethod(final Class<?> clazz) { |
f544a2ea40ef
8021262: Make nashorn access checks consistent with underlying dynalink
sundar
parents:
19088
diff
changeset
|
246 |
return FUNCTIONAL_IFACE_METHOD.get(clazz); |
19088
153f268bfa72
8021122: Not all callables are handled for toString and other function valued properties
sundar
parents:
16277
diff
changeset
|
247 |
} |
16147 | 248 |
} |