Adds review changes

Author: murtuza-ranapur

spring-boot/specification/src/main/java/io/reflectoring/specification/repository/CustomProductRepository.java

@@ -5,8 +5,6 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.criteria.*;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,41 +32,38 @@ public List<Product> getPremiumProducts(String name, List<Category> categories)
                         .and(isPremium()));
     }
 
-    public List<Product> getQueryResult(List<QueryInput> queryInputs){
-        if(queryInputs.size()>0) {
-            return productRepository.findAll(getSpecificationFromQuery(queryInputs));
+
+    public List<Product> getQueryResult(List<Filter> filters){
+        if(filters.size()>0) {
+            return productRepository.findAll(getSpecificationFromFilters(filters));
         }else {
             return productRepository.findAll();
         }
     }
 
-    private Specification<Product> getSpecificationFromQuery(List<QueryInput> queryInput) {
-        Specification<Product> specification = where(createSpecification(queryInput.remove(0)));
-        for (QueryInput input : queryInput) {
-            if(input.isOptional()){
-                specification = specification.or(createSpecification(input));
-            }else {
-                specification = specification.and(createSpecification(input));
-            }
+    private Specification<Product> getSpecificationFromFilters(List<Filter> filter) {
+        Specification<Product> specification = where(createSpecification(filter.remove(0)));
+        for (Filter input : filter) {
+            specification = specification.and(createSpecification(input));
         }
         return specification;
     }
 
-    private Specification<Product> createSpecification(QueryInput input) {
+    private Specification<Product> createSpecification(Filter input) {
         switch (input.getOperator()){
-            case EQ:
+            case EQUALS:
                 return (root, query, criteriaBuilder) ->
                         criteriaBuilder.equal(root.get(input.getField()),
                         castToRequiredType(root.get(input.getField()).getJavaType(), input.getValue()));
             case NOT_EQ:
                 return (root, query, criteriaBuilder) ->
                         criteriaBuilder.notEqual(root.get(input.getField()),
                         castToRequiredType(root.get(input.getField()).getJavaType(), input.getValue()));
-            case GT:
+            case GREATER_THAN:
                 return (root, query, criteriaBuilder) ->
                         criteriaBuilder.gt(root.get(input.getField()),
                         (Number) castToRequiredType(root.get(input.getField()).getJavaType(), input.getValue()));
-            case LT:
+            case LESS_THAN:
                 return (root, query, criteriaBuilder) ->
                         criteriaBuilder.lt(root.get(input.getField()),
                         (Number) castToRequiredType(root.get(input.getField()).getJavaType(), input.getValue()));

spring-boot/specification/src/main/java/io/reflectoring/specification/repository/QueryInput.java renamed to spring-boot/specification/src/main/java/io/reflectoring/specification/repository/Filter.java

@@ -9,10 +9,9 @@
 @Getter
 @Setter
 @Builder
-public class QueryInput {
+public class Filter {
     private String field;
     private QueryOperator operator;
     private String value;
     private List<String> values;//Used in case of IN operator
-    private boolean isOptional;
 }

spring-boot/specification/src/main/java/io/reflectoring/specification/repository/QueryOperator.java

@@ -1,9 +1,9 @@
 package io.reflectoring.specification.repository;
 
 public enum QueryOperator {
-    GT,
-    LT,
-    EQ,
+    GREATER_THAN,
+    LESS_THAN,
+    EQUALS,
     LIKE,
     NOT_EQ,
     IN

spring-boot/specification/src/test/java/io/reflectoring/specification/repository/CustomProductRepositoryTest.java

@@ -37,46 +37,43 @@ void testGetPremiumProducts() {
 
     @Test
     void testDynamicSpecification() {
-        QueryInput nameLike = QueryInput.builder()
+        Filter nameLike = Filter.builder()
                 .field("name")
                 .operator(QueryOperator.LIKE)
                 .value("jacket")
-                .isOptional(false)
                 .build();
-        QueryInput categories = QueryInput.builder()
+        Filter categories = Filter.builder()
                 .field("category")
                 .operator(QueryOperator.IN)
                 .values(List.of(Category.MEN_FASHION.name(), Category.WOMEN_FASHION.name()))
-                .isOptional(false)
                 .build();
-        List<QueryInput> queries = new ArrayList<>();
-        queries.add(nameLike);
-        queries.add(categories);
-        List<Product> products = productAdapter.getQueryResult(queries);
+        List<Filter> filters = new ArrayList<>();
+        filters.add(nameLike);
+        filters.add(categories);
+        List<Product> products = productAdapter.getQueryResult(filters);
         assertEquals(2, products.size());
 
-        QueryInput lowRange = QueryInput.builder()
+        Filter lowRange = Filter.builder()
                 .field("price")
-                .operator(QueryOperator.LT)
+                .operator(QueryOperator.LESS_THAN)
                 .value("1000")
-                .isOptional(false)
                 .build();
         categories.setValues(List.of(Category.MOBILE.name(), Category.TV_APPLIANCES.name()));
-        queries = new ArrayList<>();
-        queries.add(lowRange);
-        queries.add(categories);
+        filters = new ArrayList<>();
+        filters.add(lowRange);
+        filters.add(categories);
 
-        products = productAdapter.getQueryResult(queries);
+        products = productAdapter.getQueryResult(filters);
         assertEquals(2, products.size());
 
-        QueryInput priceEquals = QueryInput.builder()
+        Filter priceEquals = Filter.builder()
                 .field("price")
-                .operator(QueryOperator.EQ)
+                .operator(QueryOperator.EQUALS)
                 .value("1100")
                 .build();
-        queries = new ArrayList<>();
-        queries.add(priceEquals);
-        products = productAdapter.getQueryResult(queries);
+        filters = new ArrayList<>();
+        filters.add(priceEquals);
+        products = productAdapter.getQueryResult(filters);
         assertEquals(1, products.size());
     }
 }