4545public class TransformExpressionKey implements Serializable {
4646 private static final long serialVersionUID = 1L ;
4747 @ Nullable private final String originalExpression ;
48- private final String expression ;
48+ private final String compiledExpression ;
4949 private final List <String > argumentNames ;
5050 private final List <Class <?>> argumentClasses ;
5151 private final Class <?> returnClass ;
5252 private final Map <String , String > columnNameMap ;
5353
5454 private TransformExpressionKey (
5555 @ Nullable String originalExpression ,
56- String expression ,
56+ String compiledExpression ,
5757 List <String > argumentNames ,
5858 List <Class <?>> argumentClasses ,
5959 Class <?> returnClass ,
6060 Map <String , String > columnNameMap ) {
6161 this .originalExpression = originalExpression ;
62- this .expression = expression ;
62+ this .compiledExpression = compiledExpression ;
6363 this .argumentNames = argumentNames ;
6464 this .argumentClasses = argumentClasses ;
6565 this .returnClass = returnClass ;
@@ -71,12 +71,12 @@ public String getOriginalExpression() {
7171 return originalExpression ;
7272 }
7373
74- public String getExpression () {
75- return expression ;
74+ public String getCompiledExpression () {
75+ return compiledExpression ;
7676 }
7777
7878 public String getFullExpression () {
79- return JaninoCompiler .loadSystemFunction (expression );
79+ return JaninoCompiler .loadSystemFunction (compiledExpression );
8080 }
8181
8282 public List <String > getArgumentNames () {
@@ -97,14 +97,14 @@ public Map<String, String> getColumnNameMap() {
9797
9898 public static TransformExpressionKey of (
9999 @ Nullable String originalExpression ,
100- String expression ,
100+ String compiledExpression ,
101101 List <String > argumentNames ,
102102 List <Class <?>> argumentClasses ,
103103 Class <?> returnClass ,
104104 Map <String , String > columnNameMap ) {
105105 return new TransformExpressionKey (
106106 originalExpression ,
107- expression ,
107+ compiledExpression ,
108108 argumentNames ,
109109 argumentClasses ,
110110 returnClass ,
@@ -121,7 +121,7 @@ public boolean equals(Object o) {
121121 }
122122 TransformExpressionKey that = (TransformExpressionKey ) o ;
123123 return Objects .equals (originalExpression , that .originalExpression )
124- && expression .equals (that .expression )
124+ && compiledExpression .equals (that .compiledExpression )
125125 && argumentNames .equals (that .argumentNames )
126126 && argumentClasses .equals (that .argumentClasses )
127127 && returnClass .equals (that .returnClass )
@@ -132,7 +132,7 @@ public boolean equals(Object o) {
132132 public int hashCode () {
133133 return Objects .hash (
134134 originalExpression ,
135- expression ,
135+ compiledExpression ,
136136 argumentNames ,
137137 argumentClasses ,
138138 returnClass ,
@@ -145,8 +145,8 @@ public String toString() {
145145 + "originalExpression='"
146146 + originalExpression
147147 + '\''
148- + ", expression ='"
149- + expression
148+ + ", compiledExpression ='"
149+ + compiledExpression
150150 + '\''
151151 + ", argumentNames="
152152 + argumentNames
0 commit comments