Merge pull request #10369 from Maiklins/JAVA-3535-move-spring-rest-query-language

Java 3535 move spring rest query language

pom.xml

@@ -672,7 +672,6 @@
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
                 <module>spring-rest-http-2</module>
-                <module>spring-rest-query-language</module>
                 <module>spring-rest-shell</module>
                 <module>spring-rest-simple</module>
                 <module>spring-resttemplate</module>
@@ -1137,7 +1136,6 @@
 
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
-                <module>spring-rest-query-language</module>
                 <module>spring-rest-shell</module>
                 <module>spring-rest-simple</module>
                 <module>spring-resttemplate</module>

spring-web-modules/pom.xml

@@ -24,6 +24,7 @@
         <module>spring-mvc-webflow</module>
         <module>spring-rest-angular</module>
         <module>spring-rest-http</module>
+        <module>spring-rest-query-language</module>
         <module>spring-resttemplate-2</module>
         <module>spring-thymeleaf</module>
         <module>spring-thymeleaf-2</module>

spring-web-modules/spring-rest-query-language/pom.xml

@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-web-modules/spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/GenericSpecificationsBuilder.java

@@ -1,100 +1,100 @@
-package com.baeldung.persistence.dao;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.springframework.data.jpa.domain.Specification;
-
-import com.baeldung.web.util.SearchOperation;
-import com.baeldung.web.util.SpecSearchCriteria;
-
-public class GenericSpecificationsBuilder<U> {
-
-    private final List<SpecSearchCriteria> params;
-
-    public GenericSpecificationsBuilder() {
-        this.params = new ArrayList<>();
-    }
-
-    public final GenericSpecificationsBuilder<U> with(final String key, final String operation, final Object value, final String prefix, final String suffix) {
-        return with(null, key, operation, value, prefix, suffix);
-    }
-
-    public final GenericSpecificationsBuilder<U> with(final String precedenceIndicator, final String key, final String operation, final Object value, final String prefix, final String suffix) {
-        SearchOperation op = SearchOperation.getSimpleOperation(operation.charAt(0));
-        if (op != null) {
-            if (op == SearchOperation.EQUALITY) // the operation may be complex operation
-            {
-                final boolean startWithAsterisk = prefix != null && prefix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
-                final boolean endWithAsterisk = suffix != null && suffix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
-
-                if (startWithAsterisk && endWithAsterisk) {
-                    op = SearchOperation.CONTAINS;
-                } else if (startWithAsterisk) {
-                    op = SearchOperation.ENDS_WITH;
-                } else if (endWithAsterisk) {
-                    op = SearchOperation.STARTS_WITH;
-                }
-            }
-            params.add(new SpecSearchCriteria(precedenceIndicator, key, op, value));
-        }
-        return this;
-    }
-
-    public Specification<U> build(Function<SpecSearchCriteria, Specification<U>> converter) {
-
-        if (params.size() == 0) {
-            return null;
-        }
-
-        final List<Specification<U>> specs = params.stream()
-            .map(converter)
-            .collect(Collectors.toCollection(ArrayList::new));
-
-        Specification<U> result = specs.get(0);
-
-        for (int idx = 1; idx < specs.size(); idx++) {
-            result = params.get(idx)
-                .isOrPredicate()
-                    ? Specification.where(result)
-                        .or(specs.get(idx))
-                    : Specification.where(result)
-                        .and(specs.get(idx));
-        }
-        
-        return result;
-    }
-
-    public Specification<U> build(Deque<?> postFixedExprStack, Function<SpecSearchCriteria, Specification<U>> converter) {
-
-        Deque<Specification<U>> specStack = new LinkedList<>();
-
-        Collections.reverse((List<?>) postFixedExprStack);
-
-        while (!postFixedExprStack.isEmpty()) {
-            Object mayBeOperand = postFixedExprStack.pop();
-
-            if (!(mayBeOperand instanceof String)) {
-                specStack.push(converter.apply((SpecSearchCriteria) mayBeOperand));
-            } else {
-                Specification<U> operand1 = specStack.pop();
-                Specification<U> operand2 = specStack.pop();
-                if (mayBeOperand.equals(SearchOperation.AND_OPERATOR))
-                    specStack.push(Specification.where(operand1)
-                        .and(operand2));
-                else if (mayBeOperand.equals(SearchOperation.OR_OPERATOR))
-                    specStack.push(Specification.where(operand1)
-                        .or(operand2));
-            }
-
-        }
-        return specStack.pop();
-
-    }
-
-}
+package com.baeldung.persistence.dao;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.springframework.data.jpa.domain.Specification;
+
+import com.baeldung.web.util.SearchOperation;
+import com.baeldung.web.util.SpecSearchCriteria;
+
+public class GenericSpecificationsBuilder<U> {
+
+    private final List<SpecSearchCriteria> params;
+
+    public GenericSpecificationsBuilder() {
+        this.params = new ArrayList<>();
+    }
+
+    public final GenericSpecificationsBuilder<U> with(final String key, final String operation, final Object value, final String prefix, final String suffix) {
+        return with(null, key, operation, value, prefix, suffix);
+    }
+
+    public final GenericSpecificationsBuilder<U> with(final String precedenceIndicator, final String key, final String operation, final Object value, final String prefix, final String suffix) {
+        SearchOperation op = SearchOperation.getSimpleOperation(operation.charAt(0));
+        if (op != null) {
+            if (op == SearchOperation.EQUALITY) // the operation may be complex operation
+            {
+                final boolean startWithAsterisk = prefix != null && prefix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
+                final boolean endWithAsterisk = suffix != null && suffix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
+
+                if (startWithAsterisk && endWithAsterisk) {
+                    op = SearchOperation.CONTAINS;
+                } else if (startWithAsterisk) {
+                    op = SearchOperation.ENDS_WITH;
+                } else if (endWithAsterisk) {
+                    op = SearchOperation.STARTS_WITH;
+                }
+            }
+            params.add(new SpecSearchCriteria(precedenceIndicator, key, op, value));
+        }
+        return this;
+    }
+
+    public Specification<U> build(Function<SpecSearchCriteria, Specification<U>> converter) {
+
+        if (params.size() == 0) {
+            return null;
+        }
+
+        final List<Specification<U>> specs = params.stream()
+            .map(converter)
+            .collect(Collectors.toCollection(ArrayList::new));
+
+        Specification<U> result = specs.get(0);
+
+        for (int idx = 1; idx < specs.size(); idx++) {
+            result = params.get(idx)
+                .isOrPredicate()
+                    ? Specification.where(result)
+                        .or(specs.get(idx))
+                    : Specification.where(result)
+                        .and(specs.get(idx));
+        }
+        
+        return result;
+    }
+
+    public Specification<U> build(Deque<?> postFixedExprStack, Function<SpecSearchCriteria, Specification<U>> converter) {
+
+        Deque<Specification<U>> specStack = new LinkedList<>();
+
+        Collections.reverse((List<?>) postFixedExprStack);
+
+        while (!postFixedExprStack.isEmpty()) {
+            Object mayBeOperand = postFixedExprStack.pop();
+
+            if (!(mayBeOperand instanceof String)) {
+                specStack.push(converter.apply((SpecSearchCriteria) mayBeOperand));
+            } else {
+                Specification<U> operand1 = specStack.pop();
+                Specification<U> operand2 = specStack.pop();
+                if (mayBeOperand.equals(SearchOperation.AND_OPERATOR))
+                    specStack.push(Specification.where(operand1)
+                        .and(operand2));
+                else if (mayBeOperand.equals(SearchOperation.OR_OPERATOR))
+                    specStack.push(Specification.where(operand1)
+                        .or(operand2));
+            }
+
+        }
+        return specStack.pop();
+
+    }
+
+}

spring-web-modules/spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/UserSpecificationsBuilder.java

@@ -1,70 +1,70 @@
-package com.baeldung.persistence.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.jpa.domain.Specification;
-
-import com.baeldung.persistence.model.User;
-import com.baeldung.web.util.SearchOperation;
-import com.baeldung.web.util.SpecSearchCriteria;
-
-public final class UserSpecificationsBuilder {
-
-    private final List<SpecSearchCriteria> params;
-
-    public UserSpecificationsBuilder() {
-        params = new ArrayList<>();
-    }
-
-    // API
-
-    public final UserSpecificationsBuilder with(final String key, final String operation, final Object value, final String prefix, final String suffix) {
-        return with(null, key, operation, value, prefix, suffix);
-    }
-
-    public final UserSpecificationsBuilder with(final String orPredicate, final String key, final String operation, final Object value, final String prefix, final String suffix) {
-        SearchOperation op = SearchOperation.getSimpleOperation(operation.charAt(0));
-        if (op != null) {
-            if (op == SearchOperation.EQUALITY) { // the operation may be complex operation
-                final boolean startWithAsterisk = prefix != null && prefix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
-                final boolean endWithAsterisk = suffix != null && suffix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
-
-                if (startWithAsterisk && endWithAsterisk) {
-                    op = SearchOperation.CONTAINS;
-                } else if (startWithAsterisk) {
-                    op = SearchOperation.ENDS_WITH;
-                } else if (endWithAsterisk) {
-                    op = SearchOperation.STARTS_WITH;
-                }
-            }
-            params.add(new SpecSearchCriteria(orPredicate, key, op, value));
-        }
-        return this;
-    }
-
-    public Specification<User> build() {
-        if (params.size() == 0)
-            return null;
-
-        Specification<User> result = new UserSpecification(params.get(0));
-     
-        for (int i = 1; i < params.size(); i++) {
-            result = params.get(i).isOrPredicate()
-              ? Specification.where(result).or(new UserSpecification(params.get(i))) 
-              : Specification.where(result).and(new UserSpecification(params.get(i)));
-        }
-        
-        return result;
-    }
-
-    public final UserSpecificationsBuilder with(UserSpecification spec) {
-        params.add(spec.getCriteria());
-        return this;
-    }
-
-    public final UserSpecificationsBuilder with(SpecSearchCriteria criteria) {
-        params.add(criteria);
-        return this;
-    }
-}
+package com.baeldung.persistence.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.data.jpa.domain.Specification;
+
+import com.baeldung.persistence.model.User;
+import com.baeldung.web.util.SearchOperation;
+import com.baeldung.web.util.SpecSearchCriteria;
+
+public final class UserSpecificationsBuilder {
+
+    private final List<SpecSearchCriteria> params;
+
+    public UserSpecificationsBuilder() {
+        params = new ArrayList<>();
+    }
+
+    // API
+
+    public final UserSpecificationsBuilder with(final String key, final String operation, final Object value, final String prefix, final String suffix) {
+        return with(null, key, operation, value, prefix, suffix);
+    }
+
+    public final UserSpecificationsBuilder with(final String orPredicate, final String key, final String operation, final Object value, final String prefix, final String suffix) {
+        SearchOperation op = SearchOperation.getSimpleOperation(operation.charAt(0));
+        if (op != null) {
+            if (op == SearchOperation.EQUALITY) { // the operation may be complex operation
+                final boolean startWithAsterisk = prefix != null && prefix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
+                final boolean endWithAsterisk = suffix != null && suffix.contains(SearchOperation.ZERO_OR_MORE_REGEX);
+
+                if (startWithAsterisk && endWithAsterisk) {
+                    op = SearchOperation.CONTAINS;
+                } else if (startWithAsterisk) {
+                    op = SearchOperation.ENDS_WITH;
+                } else if (endWithAsterisk) {
+                    op = SearchOperation.STARTS_WITH;
+                }
+            }
+            params.add(new SpecSearchCriteria(orPredicate, key, op, value));
+        }
+        return this;
+    }
+
+    public Specification<User> build() {
+        if (params.size() == 0)
+            return null;
+
+        Specification<User> result = new UserSpecification(params.get(0));
+     
+        for (int i = 1; i < params.size(); i++) {
+            result = params.get(i).isOrPredicate()
+              ? Specification.where(result).or(new UserSpecification(params.get(i))) 
+              : Specification.where(result).and(new UserSpecification(params.get(i)));
+        }
+        
+        return result;
+    }
+
+    public final UserSpecificationsBuilder with(UserSpecification spec) {
+        params.add(spec.getCriteria());
+        return this;
+    }
+
+    public final UserSpecificationsBuilder with(SpecSearchCriteria criteria) {
+        params.add(criteria);
+        return this;
+    }
+}