[Minor] Changed SearchBuilder to AND not OR query
This commit is contained in:
parent
e644b43e2c
commit
2eaca7d7d8
|
@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
|
||||||
* <li>format <code>param:<bagId>:<paramId>:<value></code> adds search expression for given
|
* <li>format <code>param:<bagId>:<paramId>:<value></code> adds search expression for given
|
||||||
* bag/param</li>
|
* bag/param</li>
|
||||||
* <li>otherwise search expression for id and name are added</li>
|
* <li>otherwise search expression for id and name are added</li>
|
||||||
* <li>all added search expressions are ORed</li>
|
* <li>all added search expressions are ANDed</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
*/
|
*/
|
||||||
public class SearchBuilder {
|
public class SearchBuilder {
|
||||||
|
@ -87,18 +87,18 @@ public class SearchBuilder {
|
||||||
if (!part.startsWith("param:")) {
|
if (!part.startsWith("param:")) {
|
||||||
|
|
||||||
if (se == null)
|
if (se == null)
|
||||||
se = (SearchExpression<T>) id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part)));
|
se = (SearchExpression<T>) id(containsIgnoreCase(part)).and(name(containsIgnoreCase(part)));
|
||||||
else
|
else
|
||||||
se = se.or(id(containsIgnoreCase(part))).or(name(containsIgnoreCase(part)));
|
se = se.and(id(containsIgnoreCase(part))).and(name(containsIgnoreCase(part)));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
String[] paramParts = part.split(":");
|
String[] paramParts = part.split(":");
|
||||||
if (paramParts.length != 4) {
|
if (paramParts.length != 4) {
|
||||||
|
|
||||||
if (se == null)
|
if (se == null)
|
||||||
se = (SearchExpression<T>) id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part)));
|
se = (SearchExpression<T>) id(containsIgnoreCase(part)).and(name(containsIgnoreCase(part)));
|
||||||
else
|
else
|
||||||
se = se.or(id(containsIgnoreCase(part))).or(name(containsIgnoreCase(part)));
|
se = se.and(id(containsIgnoreCase(part))).and(name(containsIgnoreCase(part)));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ public class SearchBuilder {
|
||||||
if (se == null)
|
if (se == null)
|
||||||
se = param(bagId, paramId, containsIgnoreCase(value));
|
se = param(bagId, paramId, containsIgnoreCase(value));
|
||||||
else
|
else
|
||||||
se = se.or(param(bagId, paramId, containsIgnoreCase(value)));
|
se = se.and(param(bagId, paramId, containsIgnoreCase(value)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue