Revision 55539
Added by Claudio Atzori almost 5 years ago
DatasourceSpecs.java | ||
---|---|---|
24 | 24 |
public static final String WILDCARD = "%"; |
25 | 25 |
|
26 | 26 |
public static Specification<DatasourceDbEntry> dsSpec(final RequestSort requestSortBy, final RequestSortOrder order, final RequestFilter requestFilter) { |
27 |
log.debug(String.format("RequestFilter:'%s', RequestSort:'%s', RequestSortOrder:'%s'", requestFilter, requestSortBy, order)); |
|
27 | 28 |
return (ds, query, cb) -> { |
28 | 29 |
final Predicate p = cb.conjunction(); |
29 | 30 |
if (requestFilter != null) { |
... | ... | |
71 | 72 |
} |
72 | 73 |
|
73 | 74 |
public static Specification<DatasourceApiDbEntry> apiSpec(final RequestFilter requestFilter) { |
75 |
log.debug(String.format("RequestFilter:'%s'", requestFilter)); |
|
74 | 76 |
return (api, query, cb) -> { |
75 | 77 |
final Predicate p = cb.conjunction(); |
76 | 78 |
if (requestFilter != null) { |
... | ... | |
114 | 116 |
private static Object getValue(final Entry<FilterName, Object> e) { |
115 | 117 |
if (e.getValue() instanceof String) { |
116 | 118 |
final String s = ((String) e.getValue()); |
117 |
Boolean b = BooleanUtils.toBooleanObject(s); |
|
118 |
if (b != null) { |
|
119 |
return b; |
|
119 |
|
|
120 |
if (!e.getKey().equals(FilterName.country)) { |
|
121 |
Boolean b = BooleanUtils.toBooleanObject(s); |
|
122 |
if (b != null) { |
|
123 |
return b; |
|
124 |
} |
|
120 | 125 |
} |
121 | 126 |
return e.getKey().equals(FilterName.id) ? s : StringUtils.lowerCase(s); |
122 | 127 |
} |
Also available in: Unified diff
avoid to interpret NO as boolean