feat: add UPPER and LOWER query predicate criteria options

Author: igdianov

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaSchemaBuilder.java

@@ -521,6 +521,18 @@ private GraphQLInputType getWhereAttributeType(Attribute<?,?> attribute) {
                         .type(getAttributeInputType(attribute))
                         .build()
                     )
+                    .field(GraphQLInputObjectField.newInputObjectField()
+                        .name(Criteria.UPPER.name())
+                        .description("Uppercase sensitive match criteria")
+                        .type(getAttributeInputType(attribute))
+                        .build()
+                    )
+                    .field(GraphQLInputObjectField.newInputObjectField()
+                        .name(Criteria.LOWER.name())
+                         .description("Lowercase sensitive match criteria")
+                        .type(getAttributeInputType(attribute))
+                        .build()
+                    )
                     .field(GraphQLInputObjectField.newInputObjectField()
                         .name(Criteria.STARTS.name())
                         .description("Starts with criteria")

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/JpaPredicateBuilder.java

@@ -28,7 +28,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
@@ -73,24 +74,42 @@
  *
  */
 class JpaPredicateBuilder {
+    
+    public static final Map<Class<?>, Class<?>> WRAPPERS_TO_PRIMITIVES = new HashMap<Class<?>, Class<?>>();
+    public static final Map<Class<?>, Class<?>> PRIMITIVES_TO_WRAPPERS = new HashMap<Class<?>, Class<?>>();
+
+    static {
+        PRIMITIVES_TO_WRAPPERS.put(boolean.class, Boolean.class);
+        PRIMITIVES_TO_WRAPPERS.put(byte.class, Byte.class);
+        PRIMITIVES_TO_WRAPPERS.put(char.class, Character.class);
+        PRIMITIVES_TO_WRAPPERS.put(double.class, Double.class);
+        PRIMITIVES_TO_WRAPPERS.put(float.class, Float.class);
+        PRIMITIVES_TO_WRAPPERS.put(int.class, Integer.class);
+        PRIMITIVES_TO_WRAPPERS.put(long.class, Long.class);
+        PRIMITIVES_TO_WRAPPERS.put(short.class, Short.class);
+        PRIMITIVES_TO_WRAPPERS.put(void.class, Void.class);
+
+        WRAPPERS_TO_PRIMITIVES.put(Boolean.class, boolean.class);
+        WRAPPERS_TO_PRIMITIVES.put(Byte.class, byte.class);
+        WRAPPERS_TO_PRIMITIVES.put(Character.class, char.class);
+        WRAPPERS_TO_PRIMITIVES.put(Double.class, double.class);
+        WRAPPERS_TO_PRIMITIVES.put(Float.class, float.class);
+        WRAPPERS_TO_PRIMITIVES.put(Integer.class, int.class);
+        WRAPPERS_TO_PRIMITIVES.put(Long.class, long.class);
+        WRAPPERS_TO_PRIMITIVES.put(Short.class, short.class);
+        WRAPPERS_TO_PRIMITIVES.put(Void.class, void.class);
+    }
+    
 
     private final CriteriaBuilder cb;
 
-    private final EnumSet<Logical> globalOptions;
-
     /**
-     * Field name can be prepended with (comma separated list of local options)
-     * if field is prepended with (), even without options, any global options
-     * avoided and defaults are used.Defaults: for numbers and booleas -
-     * equality; for strings case insensitive beginning matches; for dates
-     * greater or equal;
-     *
-     * @param cb
-     * @param globalOptions
+     * Create JpaPredicateBuilder instance with CriteriaBuilder
+     * 
+     * @param cb criteria builder instance
      */
-    public JpaPredicateBuilder(CriteriaBuilder cb, EnumSet<Logical> globalOptions) {
+    public JpaPredicateBuilder(CriteriaBuilder cb) {
         this.cb = cb;
-        this.globalOptions = globalOptions;
     }
 
     protected Predicate addOrNull(Path<?> root, Predicate p) {
@@ -109,48 +128,43 @@ protected Predicate getStringPredicate(Path<String> root, PredicateFilter filter
         Predicate arrayValuePredicate = mayBeArrayValuePredicate(root, filter);
 
         if(arrayValuePredicate == null) {
+            // CASE sensitive by default
             String compareValue = filter.getValue().toString();
             Expression<String> fieldValue = root;
 
-            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 = root;
-            }
-            else if (filter.getCriterias().contains(PredicateFilter.Criteria.LOWER)) {
+            if (filter.getCriterias().contains(PredicateFilter.Criteria.LOWER)) {
                 fieldValue = cb.lower(root);
-                compareValue = compareValue.toLowerCase();
             }
             else if (filter.getCriterias().contains(PredicateFilter.Criteria.UPPER)) {
                 fieldValue = cb.upper(root);
-                compareValue = compareValue.toUpperCase();
             }
-
-            if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {
+            
+            if (filter.getCriterias().contains(PredicateFilter.Criteria.IN)) {
+                return cb.in(fieldValue).value(compareValue);
+            } 
+            else if (filter.getCriterias().contains(PredicateFilter.Criteria.NIN)) {
+                return cb.not(fieldValue.in(compareValue));
+            }
+            else if (filter.getCriterias().contains(PredicateFilter.Criteria.EQ)) {
                 return cb.equal(fieldValue, compareValue);
             } 
             else if (filter.getCriterias().contains(PredicateFilter.Criteria.NE)) {
                 return cb.notEqual(fieldValue, compareValue);
             }
-            else if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {
+            
+            if (filter.getCriterias().contains(PredicateFilter.Criteria.LIKE)) {
                 compareValue = "%" + compareValue + "%";
             }
             else if (filter.getCriterias().contains(PredicateFilter.Criteria.ENDS)) {
                 compareValue = "%" + compareValue;
             }
-            else if (filter.getCriterias().contains(PredicateFilter.Criteria.EXACT)) {
-                // do nothing
+            else if (filter.getCriterias().contains(PredicateFilter.Criteria.STARTS)){
+                compareValue = compareValue + "%";
             }
-            // STARTS or empty (default)
             else {
-                compareValue = compareValue + "%";
+                // do nothing
             }
+            
             return cb.like(fieldValue, compareValue);
         }
 
@@ -668,7 +682,7 @@ private Predicate getTypedPredicate(From<?,?> from, Path<?> field, PredicateFilt
         PredicateFilter predicateFilter = new PredicateFilter(filter.getField(), value, criterias);
 
         if (type.isPrimitive())
-            type = JpaQueryBuilder.PRIMITIVES_TO_WRAPPERS.get(type);
+            type = PRIMITIVES_TO_WRAPPERS.get(type);
         if (type.equals(String.class)) {
             return getStringPredicate((Path<String>)field, filter);
         }