refactor spring rest query lang

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSpecificationsBuilder.java

@@ -45,26 +45,17 @@ public final class UserSpecificationsBuilder {
     }
 
     public Specification<User> build() {
-
         if (params.size() == 0)
             return null;
 
-        final List<Specification<User>> specs = params.stream()
+        Specification<User> result = new UserSpecification(params.get(0));
-                .map(UserSpecification::new)
+     
-                .collect(Collectors.toList());
-        
-        Specification<User> result = specs.get(0);
-
         for (int i = 1; i < params.size(); i++) {
-            result = params.get(i)
+            result = params.get(i).isOrPredicate()
-                .isOrPredicate()
+              ? Specifications.where(result).or(new UserSpecification(params.get(i))) 
-                    ? Specifications.where(result)
+              : Specifications.where(result).and(new UserSpecification(params.get(i)));
-                        .or(specs.get(i))
-                    : Specifications.where(result)
-                        .and(specs.get(i));
-
         }
-
+        
         return result;
     }
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java

@@ -31,16 +31,17 @@ public class GenericRsqlSpecBuilder<T> {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
         
-        Specifications<T> initialSpec = specs.stream().findFirst().get();
+        Specifications<T> result = specs.get(0);
-        
+        if (logicalNode.getOperator() == LogicalOperator.AND) {
-        Specifications<T> result = specs.stream().skip(1).reduce(initialSpec, (firstSpec, secondSpec) -> {
+           for (int i = 1; i < specs.size(); i++) {
-            if (logicalNode.getOperator() == LogicalOperator.AND) {
+               result = Specifications.where(result).and(specs.get(i));
-                return Specifications.where(firstSpec).and(secondSpec);
+           }
-            } else if (logicalNode.getOperator() == LogicalOperator.OR) {
+        }
-                return Specifications.where(firstSpec).or(secondSpec);    
+        else if (logicalNode.getOperator() == LogicalOperator.OR) {
-            }
+           for (int i = 1; i < specs.size(); i++) {
-            return firstSpec;
+               result = Specifications.where(result).or(specs.get(i));
-        });
+           }
+        }
         
         return result;
     }

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java

@@ -77,17 +77,13 @@ public class GenericRsqlSpecification<T> implements Specification<T> {
         final Class<? extends Object> type = root.get(property).getJavaType();
         
         final List<Object> args = arguments.stream().map(arg -> {
-            
-            Object obj;
             if (type.equals(Integer.class)) {
-                obj = Integer.parseInt(arg);
+               return Integer.parseInt(arg);
             } else if (type.equals(Long.class)) {
-                obj = Long.parseLong(arg);
+               return Long.parseLong(arg);
             } else {
-                obj = arg;
+                return arg;
-            }
+            }            
-            return obj;
-            
         }).collect(Collectors.toList());
 
         return args;