WW-5340 Preliminary refactor of OgnlUtil #746

kusalk · 2023-08-31T07:28:49Z

WW-5340

I've refactored this class to improve both readability and maintainability.

My primary goal was to consolidate calls to ognl.Ognl, specifically the following functions:

#getValue: 5 calls to 1
#setValue: 2 calls to 1
#parseExpression: 4 calls to 1

Functionally, there are only 2 changes:

Removed redundant tree validation from OgnlUtil#setValue
Cache expressions prior to tree validation (i.e. even if validation fails)

…ue,parseExpression

core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java

@@ -592,58 +582,55 @@
    }

    public Object getValue(final String name, final Map<String, Object> context, final Object root) throws OgnlException {
-        return compileAndExecute(name, context, tree -> Ognl.getValue(tree, context, root));
+        return getValue(name, context, root, null);


core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java

        }
+        Ognl.setValue(tree, context, root, value);


core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java

+        for (TreeValidator validator : treeValidators) {
+            validator.validate(tree, checkContext);
+        }
+        return (T) Ognl.getValue(tree, context, root, resultType);
