Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
5f3af4fa
Commit
5f3af4fa
authored
Jun 27, 2019
by
Viacheslav Pavlov
Browse files
Fixed ElasticQueryBuilder for range filters
parent
5b1ed5d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/component/elastic/ElasticQueryBuilder.java
View file @
5f3af4fa
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment