Skip to content

Fix: 'NE' is generating 'LIKE' statement instead of notEqual for Strings #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2018
Merged

Fix: 'NE' is generating 'LIKE' statement instead of notEqual for Strings #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 33 additions & 38 deletions ...src/main/java/com/introproventures/graphql/jpa/query/schema/impl/JpaPredicateBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,35 @@ protected Predicate addOrNull(Path<?> root, Predicate p) {
* @param filter
* @return
*/
protected Predicate getStringPredicate(Path<?> root, PredicateFilter filter) {
protected Predicate getStringPredicate(Path<String> root, PredicateFilter filter) {
Expression<String> fieldValue;

// list or arrays only for in and not in
Predicate arrayValuePredicate = mayBeArrayValuePredicate(root, filter);

if(arrayValuePredicate == null) {
String compareValue = filter.getValue().toString();

if (filter.getCriterias().contains(PredicateFilter.Criteria.IN)) {
CriteriaBuilder.In<Object> in = cb.in(root);
return in.value(compareValue);
}
if (filter.getCriterias().contains(PredicateFilter.Criteria.NIN)) {
return cb.not(root.in(compareValue));
}

if (filter.getCriterias().contains(PredicateFilter.Criteria.CASE)) {
fieldValue = (Path<String>) root;
fieldValue = root;
}
else {
fieldValue = cb.lower((Path<String>) root);
fieldValue = cb.lower(root);
compareValue = compareValue.toLowerCase();
}

if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
return cb.notEqual(fieldValue, compareValue);
}

if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {
compareValue = "%" + compareValue + "%";
}
Expand All @@ -125,7 +130,7 @@ else if (filter.getCriterias().contains(PredicateFilter.Criteria.EXACT)) {
}
return cb.like(fieldValue, compareValue);
}

return arrayValuePredicate;
}

Expand All @@ -148,8 +153,8 @@ protected Predicate getBooleanPredicate(Path<?> root, PredicateFilter filter) {
protected Predicate getIntegerPredicate(Path<? extends Number> root, PredicateFilter filter) {

// list or arrays only for in and not in
Predicate arrayValuePredicate = mayBeArrayValuePredicate(root, filter);
Predicate arrayValuePredicate = mayBeArrayValuePredicate(root, filter);

if (arrayValuePredicate == null && filter.getValue() != null && filter.getValue() instanceof Number) {
if (filter.getCriterias().contains(PredicateFilter.Criteria.IN)) {
CriteriaBuilder.In<Object> in = cb.in(root);
Expand All @@ -171,9 +176,9 @@ protected Predicate getIntegerPredicate(Path<? extends Number> root, PredicateFi
return cb.ge(root, (Number) filter.getValue());
}
if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
return cb.notEqual(root, (Number) filter.getValue());
return cb.notEqual(root, filter.getValue());
}
return cb.equal(root, (Number) filter.getValue());
return cb.equal(root, filter.getValue());
}
return arrayValuePredicate;
}
Expand All @@ -193,7 +198,7 @@ protected Predicate mayBeArrayValuePredicate(Path<?> path, PredicateFilter filte
return cb.not(path.in((Object[]) filter.getValue()));
}
} else if ((filter.getValue() instanceof Collection)) {
if (!filter.getCriterias().contains(PredicateFilter.Criteria.NE)
if (!filter.getCriterias().contains(PredicateFilter.Criteria.NE)
&& !filter.getCriterias().contains(PredicateFilter.Criteria.NIN)) {
CriteriaBuilder.In<Object> in = cb.in(path);
for(Object n : (Collection<?>) filter.getValue()) {
Expand All @@ -205,11 +210,11 @@ protected Predicate mayBeArrayValuePredicate(Path<?> path, PredicateFilter filte
return cb.not(path.in((Collection<?>) filter.getValue()));
}
}

return null;

}

protected Predicate getFloatingPointPredicate(Path<? extends Number> root, PredicateFilter filter) {
if (filter.getValue() != null && filter.getValue() instanceof Number) {
if (filter.getCriterias().contains(PredicateFilter.Criteria.LT)) {
Expand All @@ -222,10 +227,10 @@ protected Predicate getFloatingPointPredicate(Path<? extends Number> root, Predi
return cb.ge(root, (Number) filter.getValue());
}
if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {
return cb.equal(root, (Number) filter.getValue());
return cb.equal(root, filter.getValue());
}
if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
return cb.notEqual(root, (Number) filter.getValue());
return cb.notEqual(root, filter.getValue());
}
// LE or default
return cb.le(root, (Number) filter.getValue());
Expand All @@ -246,22 +251,23 @@ protected Predicate getDatePredicate(Path<? extends Date> root, PredicateFilter
return cb.greaterThanOrEqualTo(root, (Date) filter.getValue());
}
if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {
return cb.equal(root, (Date) filter.getValue());
return cb.equal(root, filter.getValue());
}
if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
return cb.notEqual(root, (Date) filter.getValue());
return cb.notEqual(root, filter.getValue());
}
// LE or default
return cb.lessThanOrEqualTo(root, (Date) filter.getValue());
}
return null;
}

@SuppressWarnings("unchecked")
private Predicate getTypedPredicate(From<?,?> from, Path<?> field, PredicateFilter filter) {
Class<?> type = field.getJavaType();
Object value = filter.getValue();
Set<Criteria> criterias = filter.getCriterias();

if(value == null) {
return cb.disjunction();
}
Expand All @@ -270,25 +276,14 @@ private Predicate getTypedPredicate(From<?,?> from, Path<?> field, PredicateFilt
return (boolean) value ? cb.isNull(field) : cb.isNotNull(field);
} else if (criterias.contains(Criteria.NOT_NULL)) {
return (boolean) value ? cb.isNotNull(field) : cb.isNull(field) ;
}

// // Unwrap arrays and lists of 1 into single value
// if(value.getClass().isArray() && ((Object [])value).length == 1) {
// value = ((Object [])value)[0];
// type = value.getClass();
// }
//
// if(value instanceof List && ((List)value).size() == 1) {
// value = ((List)value).get(0);
// type = value.getClass();
// }

}

PredicateFilter predicateFilter = new PredicateFilter(filter.getField(), value, criterias);

if (type.isPrimitive())
type = JpaQueryBuilder.PRIMITIVES_TO_WRAPPERS.get(type);
if (type.equals(String.class)) {
return getStringPredicate(field, filter);
return getStringPredicate((Path<String>)field, filter);
}
else if (type.equals(Long.class)
|| type.equals(BigInteger.class)
Expand All @@ -307,12 +302,12 @@ else if (type.equals(java.util.Date.class)) {
}
else if (type.equals(Boolean.class)) {
return getBooleanPredicate(field, predicateFilter);
}
}
else if(Collection.class.isAssignableFrom(type)) {
if(field.getModel() == null)
return from.join(filter.getField()).in(value);
return from.join(filter.getField()).in(value);
}

throw new IllegalArgumentException("Unsupported field type " + type + " for field " + predicateFilter.getField());
}

Expand Down
Loading