Skip to content

Commit a3ab6ee

Browse files
author
Amir Tocker
committed
Avoid normalizing negative numbers.
1 parent a7fa6e7 commit a3ab6ee

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

cloudinary-core/src/main/java/com/cloudinary/transformation/BaseExpression.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,19 @@ public static String normalize(Object expresion) {
8787
}
8888

8989
/**
90-
* @return a regex pattern for operators and predefined vars
90+
* @return a regex pattern for operators and predefined vars as /((operators)(?=[ _])|variables)/
9191
*/
9292
private static String getpattern() {
9393
String pattern;
9494
final ArrayList<String> operators = new ArrayList<String>(OPERATORS.keySet());
9595
Collections.sort(operators, Collections.<String>reverseOrder());
96-
StringBuffer sb = new StringBuffer();
96+
StringBuffer sb = new StringBuffer("((");
9797
for(String op: operators) {
98-
sb.append("|").append(Pattern.quote(op));
98+
sb.append(Pattern.quote(op)).append("|");
9999
}
100-
pattern = "(" + StringUtils.join(PREDEFINED_VARS.keySet(), "|") + sb.toString() + ")";
100+
sb.deleteCharAt(sb.length() - 1);
101+
sb.append(")(?=[ _])|").append(StringUtils.join(PREDEFINED_VARS.keySet(), "|")).append(")");
102+
pattern = sb.toString();
101103
return pattern;
102104
}
103105

0 commit comments

Comments
 (0)