Skip to content

Jq class clean up #485

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Jq class clean up #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 0 additions & 22 deletions impl/core/src/main/java/io/serverlessworkflow/impl/ContextAware.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion impl/core/src/main/java/io/serverlessworkflow/impl/TaskContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.HashMap;
import java.util.Map;

public class TaskContext<T extends TaskBase> implements ContextAware {
public class TaskContext<T extends TaskBase> {

private final JsonNode rawInput;
private final T task;
Expand Down
177 changes: 4 additions & 173 deletions impl/core/src/main/java/io/serverlessworkflow/impl/expressions/JQExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,141 +17,38 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import io.serverlessworkflow.impl.ContextAware;
import io.serverlessworkflow.impl.TaskContext;
import io.serverlessworkflow.impl.WorkflowContext;
import io.serverlessworkflow.impl.json.JsonUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
import net.thisptr.jackson.jq.Output;
import net.thisptr.jackson.jq.Scope;
import net.thisptr.jackson.jq.Version;
import net.thisptr.jackson.jq.exception.JsonQueryException;
import net.thisptr.jackson.jq.internal.javacc.ExpressionParser;
import net.thisptr.jackson.jq.internal.tree.FunctionCall;
import net.thisptr.jackson.jq.internal.tree.StringInterpolation;
import net.thisptr.jackson.jq.internal.tree.binaryop.BinaryOperatorExpression;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class JQExpression implements Expression {

private static final Logger logger = LoggerFactory.getLogger(JQExpression.class);
private final Map<Class<? extends net.thisptr.jackson.jq.Expression>, Collection<Field>>
declaredFieldsMap = new ConcurrentHashMap<>();
private final Map<Class<? extends net.thisptr.jackson.jq.Expression>, Collection<Field>>
allFieldsMap = new ConcurrentHashMap<>();

private final Supplier<Scope> scope;
private final String expr;

private net.thisptr.jackson.jq.Expression internalExpr;
private static Field rhsField;

static {
try {
rhsField = BinaryOperatorExpression.class.getDeclaredField("rhs");
rhsField.setAccessible(true);
} catch (ReflectiveOperationException e) {
logger.warn("Unexpected exception while resolving rhs field", e);
}
}

public JQExpression(Supplier<Scope> scope, String expr, Version version)
throws JsonQueryException {
this.expr = expr;
this.scope = scope;
this.internalExpr = compile(version);
checkFunctionCall(internalExpr);
}

private net.thisptr.jackson.jq.Expression compile(Version version) throws JsonQueryException {
net.thisptr.jackson.jq.Expression expression;
try {
expression = ExpressionParser.compile(expr, version);
} catch (JsonQueryException ex) {
expression = handleStringInterpolation(version).orElseThrow(() -> ex);
}
checkFunctionCall(expression);
return expression;
}

private Optional<net.thisptr.jackson.jq.Expression> handleStringInterpolation(Version version) {
if (!expr.startsWith("\"")) {
try {
net.thisptr.jackson.jq.Expression expression =
ExpressionParser.compile("\"" + expr + "\"", version);
if (expression instanceof StringInterpolation) {
return Optional.of(expression);
}
} catch (JsonQueryException ex) {
// ignoring it
}
}
return Optional.empty();
return ExpressionParser.compile(expr, version);
}

private interface TypedOutput<T> extends Output {
T getResult();
}

@SuppressWarnings("unchecked")
private <T> TypedOutput<T> output(Class<T> returnClass) {
TypedOutput<T> out;
if (String.class.isAssignableFrom(returnClass)) {
out = (TypedOutput<T>) new StringOutput();
} else if (Collection.class.isAssignableFrom(returnClass)) {
out = (TypedOutput<T>) new CollectionOutput();
} else {
out = (TypedOutput<T>) new JsonNodeOutput();
}
return out;
}

private static class StringOutput implements TypedOutput<String> {
StringBuilder sb = new StringBuilder();

@Override
public void emit(JsonNode out) throws JsonQueryException {
if (sb.length() > 0) {
sb.append(' ');
}
if (!out.isNull() && out.asText() != null) {
sb.append(out.asText());
}
}

@Override
public String getResult() {
return sb.toString();
}
}

private static class CollectionOutput implements TypedOutput<Collection<Object>> {
Collection<Object> result = new ArrayList<>();

@SuppressWarnings("unchecked")
@Override
public void emit(JsonNode out) throws JsonQueryException {
Object obj = JsonUtils.toJavaValue(out);
if (obj instanceof Collection) result.addAll((Collection<Object>) obj);
else {
result.add(obj);
}
}

@Override
public Collection<Object> getResult() {
return result;
}
}

private static class JsonNodeOutput implements TypedOutput<JsonNode> {

private JsonNode result;
Expand Down Expand Up @@ -179,7 +76,7 @@ public JsonNode getResult() {

@Override
public JsonNode eval(WorkflowContext workflow, TaskContext<?> task, JsonNode node) {
TypedOutput<JsonNode> output = output(JsonNode.class);
TypedOutput<JsonNode> output = new JsonNodeOutput();
try {
internalExpr.apply(createScope(workflow, task), node, output);
return output.getResult();
Expand All @@ -190,74 +87,8 @@ public JsonNode eval(WorkflowContext workflow, TaskContext<?> task, JsonNode nod
}

private Scope createScope(WorkflowContext workflow, TaskContext<?> task) {
return createScope(scope.get(), task);
}

private Scope createScope(Scope parentScope, ContextAware context) {
Scope childScope = Scope.newChildScope(parentScope);
context.variables().forEach((k, v) -> childScope.setValue(k, JsonUtils.fromValue(v)));
Scope childScope = Scope.newChildScope(scope.get());
task.variables().forEach((k, v) -> childScope.setValue(k, JsonUtils.fromValue(v)));
return childScope;
}

private void checkFunctionCall(net.thisptr.jackson.jq.Expression toCheck)
throws JsonQueryException {
if (toCheck instanceof FunctionCall) {
toCheck.apply(scope.get(), JsonUtils.mapper().createObjectNode(), out -> {});
} else if (toCheck instanceof BinaryOperatorExpression) {
if (rhsField != null) {
try {
checkFunctionCall((net.thisptr.jackson.jq.Expression) rhsField.get(toCheck));
} catch (ReflectiveOperationException e) {
logger.warn(
"Ignoring unexpected error {} while accesing field {} for class{} and expression {}",
e.getMessage(),
rhsField.getName(),
toCheck.getClass(),
expr);
}
}
} else if (toCheck != null) {
for (Field f : getAllExprFields(toCheck))
try {
checkFunctionCall((net.thisptr.jackson.jq.Expression) f.get(toCheck));
} catch (ReflectiveOperationException e) {
logger.warn(
"Ignoring unexpected error {} while accesing field {} for class{} and expression {}",
e.getMessage(),
f.getName(),
toCheck.getClass(),
expr);
}
}
}

private Collection<Field> getAllExprFields(net.thisptr.jackson.jq.Expression toCheck) {
return allFieldsMap.computeIfAbsent(toCheck.getClass(), this::getAllExprFields);
}

private Collection<Field> getAllExprFields(
Class<? extends net.thisptr.jackson.jq.Expression> clazz) {
Collection<Field> fields = new HashSet<>();
Class<?> currentClass = clazz;
do {
fields.addAll(
declaredFieldsMap.computeIfAbsent(
currentClass.asSubclass(net.thisptr.jackson.jq.Expression.class),
this::getDeclaredExprFields));
currentClass = currentClass.getSuperclass();
} while (net.thisptr.jackson.jq.Expression.class.isAssignableFrom(currentClass));
return fields;
}

private Collection<Field> getDeclaredExprFields(
Class<? extends net.thisptr.jackson.jq.Expression> clazz) {
Collection<Field> fields = new HashSet<>();
for (Field f : clazz.getDeclaredFields()) {
if (net.thisptr.jackson.jq.Expression.class.isAssignableFrom(f.getType())) {
f.setAccessible(true);
fields.add(f);
}
}
return fields;
}
}
6 changes: 3 additions & 3 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</dependencies>
</dependencyManagement>
<modules>
<module>http</module>
<module>core</module>
<module>bom</module>
<module>http</module>
<module>core</module>
<module>bom</module>
</modules>
</project>