lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

In and Out parameter changes

Browse Source 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
This commit is contained in:
asharani-murugesh
2016-02-13 21:33:27 +01:00
parent 629ac6c4de
commit 59fb97fea2
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/rsql/RSQLUtility.java
View File

@@ -470,27 +470,35 @@ public final class RSQLUtility {
} }
} }
private Predicate getInPredicate(final List<Object> transformedValues, final Path<Object> fieldPath) { private Predicate getInPredicate(final List<Object> transformedValues, final Path<Object> fieldPath) {
List<String> inParams =new ArrayList<>(); List<String> inParams = new ArrayList<>();
for(Object param :transformedValues){ for (Object param : transformedValues) {
if(param instanceof String){ if (param instanceof String) {
inParams.add(((String) param).toUpperCase()); inParams.add(((String) param).toUpperCase());
} }
} }
return cb.upper(pathOfString(fieldPath)).in(inParams); if (!inParams.isEmpty()) {
} return cb.upper(pathOfString(fieldPath)).in(inParams);
} else {
return fieldPath.in(transformedValues);
}
}
private Predicate getOutPredicate(final List<Object> transformedValues, final Path<Object> fieldPath) { private Predicate getOutPredicate(final List<Object> transformedValues, final Path<Object> fieldPath) {
List<String> outParams =new ArrayList<>(); List<String> outParams = new ArrayList<>();
for(Object param :transformedValues){ for (Object param : transformedValues) {
if(param instanceof String){ if (param instanceof String) {
outParams.add(((String) param).toUpperCase()); outParams.add(((String) param).toUpperCase());
} }
} }
return cb.not(cb.upper(pathOfString(fieldPath)).in(outParams)); if (!outParams.isEmpty()) {
} return cb.not(cb.upper(pathOfString(fieldPath)).in(outParams));
} else {
return cb.not(fieldPath.in(transformedValues));
}
}
private Path<Object> getMapValueFieldPath(final A enumField, final Path<Object> fieldPath) { private Path<Object> getMapValueFieldPath(final A enumField, final Path<Object> fieldPath) {
if (!enumField.isMap() || enumField.getValueFieldName() == null) { if (!enumField.isMap() || enumField.getValueFieldName() == null) {