Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/main/java/cz/jirutka/rsql/parser/NodesFactoryAccess.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles.Lookup;
import java.lang.invoke.MethodType;
import java.lang.reflect.Method;
import java.util.List;
import java.util.logging.Logger;
Expand All @@ -45,19 +46,25 @@ final class NodesFactoryAccess {
static {
Lookup lookup = MethodHandles.lookup();

LOGICAL_NODE_MH = methodHandle(lookup, "logicalNodeTrusted", LogicalOperator.class, List.class);
COMP_NODE_MH = methodHandle(lookup, "comparisonNodeTrusted", String.class, String.class, List.class);
LOGICAL_NODE_MH = methodHandle(lookup, "logicalNodeTrusted", LogicalNode.class, LogicalOperator.class,
List.class);
COMP_NODE_MH = methodHandle(lookup, "comparisonNodeTrusted", ComparisonNode.class, String.class, String.class,
List.class);
}

private NodesFactoryAccess() {
}

private static MethodHandle methodHandle(Lookup lookup, String name, Class<?>... parameterTypes) {
private static MethodHandle methodHandle(Lookup lookup, String name, Class<?> returnType,
Class<?>... parameterTypes) {
try {
Method m = NodesFactory.class.getDeclaredMethod(name, parameterTypes);
m.setAccessible(true);

return lookup.unreflect(m);
MethodType exact = MethodType.methodType(returnType, parameterTypes)
.insertParameterTypes(0, NodesFactory.class);

return lookup.unreflect(m).asType(exact);
} catch (Throwable e) {
logger().log(WARNING, "Unable to initialize MethodHandle for {0}", new Object[]{name, e});
}
Expand All @@ -70,7 +77,7 @@ static LogicalNode create(NodesFactory factory, LogicalOperator operator, List<N
return factory.createLogicalNode(operator, children);
} else {
try {
return (LogicalNode) LOGICAL_NODE_MH.invoke(factory, operator, children);
return (LogicalNode) LOGICAL_NODE_MH.invokeExact(factory, operator, children);
} catch (RuntimeException e) {
throw e;
} catch (Throwable e) {
Expand All @@ -87,7 +94,7 @@ static ComparisonNode create(NodesFactory factory, String operatorToken, String
return factory.createComparisonNode(operatorToken, selector, arguments);
} else {
try {
return (ComparisonNode) COMP_NODE_MH.invoke(factory, operatorToken, selector, arguments);
return (ComparisonNode) COMP_NODE_MH.invokeExact(factory, operatorToken, selector, arguments);
} catch (RuntimeException | UnknownOperatorException e) {
throw e;
} catch (Throwable e) {
Expand Down
Loading