Fixed ElasticQueryBuilder for range filters

src/main/java/org/genesys2/server/component/elastic/ElasticQueryBuilder.java

@@ -5,7 +5,9 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
@@ -39,6 +41,8 @@ public class ElasticQueryBuilder implements Visitor<Void, Void> {
 
     private final List<QueryBuilder> mustClauses = new ArrayList<>();
     private final List<QueryBuilder> mustNotClauses = new ArrayList<>();
+
+	private final Map<String, RangeQueryBuilder> ranges = new HashMap<>();
 	
 	private final ElasticQueryBuilder self = this;
 
@@ -180,7 +184,15 @@ public class ElasticQueryBuilder implements Visitor<Void, Void> {
 
 	private void handleRange(Operator operator, Path<?> path, Expression<?> val1, Expression<?> val2) {
 		PathMetadata pmd = path.getMetadata();
-		RangeQueryBuilder rq = rangeQuery(customizedPath(pmd.getParent().toString() + "." + pmd.getName()));
+		RangeQueryBuilder rq;
+
+		if (ranges.get(path.toString()) != null) {
+			rq = ranges.get(path.toString());
+		} else {
+			rq = rangeQuery(customizedPath(pmd.getParent().toString() + "." + pmd.getName()));
+			ranges.put(path.toString(), rq);
+		}
+
 		if (operator == Ops.LOE) {
 			rq.lte(toValue(val1));
 		} else if (operator == Ops.LT) {