Merge pull request eugenp#5666 from eugenp/BAEL-10234-v2

fix boot 2 upgrade, rename package

Author: lor6

spring-rest-angular/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.contextPath=/
+server.servlet.contextPath=/
 spring.h2.console.enabled=true
 logging.level.org.hibernate.SQL=info
 spring.jpa.hibernate.ddl-auto=none

spring-rest-full/src/main/resources/application.properties

@@ -1,3 +1,3 @@
 server.port=8082
-server.servlet.context-path=/spring-rest-full
+server.context-path=/spring-rest-full
 endpoints.metrics.enabled=true

spring-rest-query-language/pom.xml

@@ -1,7 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>spring-rest-query-language</artifactId>
     <version>0.1-SNAPSHOT</version>
     <name>spring-rest-query-language</name>
@@ -357,7 +356,7 @@
         <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.7.0</cargo-maven2-plugin.version>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
     </properties>
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/GenericSpecificationsBuilder.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/GenericSpecificationsBuilder.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -8,10 +8,10 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.baeldung.web.util.SearchOperation;
-import org.baeldung.web.util.SpecSearchCriteria;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
+
+import com.baeldung.web.util.SearchOperation;
+import com.baeldung.web.util.SpecSearchCriteria;
 
 public class GenericSpecificationsBuilder<U> {
 
@@ -61,11 +61,12 @@ public Specification<U> build(Function<SpecSearchCriteria, Specification<U>> con
         for (int idx = 1; idx < specs.size(); idx++) {
             result = params.get(idx)
                 .isOrPredicate()
-                    ? Specifications.where(result)
+                    ? Specification.where(result)
                         .or(specs.get(idx))
-                    : Specifications.where(result)
+                    : Specification.where(result)
                         .and(specs.get(idx));
         }
+        
         return result;
     }
 
@@ -84,10 +85,10 @@ public Specification<U> build(Deque<?> postFixedExprStack, Function<SpecSearchCr
                 Specification<U> operand1 = specStack.pop();
                 Specification<U> operand2 = specStack.pop();
                 if (mayBeOperand.equals(SearchOperation.AND_OPERATOR))
-                    specStack.push(Specifications.where(operand1)
+                    specStack.push(Specification.where(operand1)
                         .and(operand2));
                 else if (mayBeOperand.equals(SearchOperation.OR_OPERATOR))
-                    specStack.push(Specifications.where(operand1)
+                    specStack.push(Specification.where(operand1)
                         .or(operand2));
             }
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/IUserDAO.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/IUserDAO.java

@@ -1,9 +1,9 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.util.List;
 
-import org.baeldung.persistence.model.User;
-import org.baeldung.web.util.SearchCriteria;
+import com.baeldung.persistence.model.User;
+import com.baeldung.web.util.SearchCriteria;
 
 public interface IUserDAO {
     List<User> searchUser(List<SearchCriteria> params);

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/MyUserPredicate.java

@@ -1,8 +1,7 @@
-package org.baeldung.persistence.dao;
-
-import org.baeldung.persistence.model.MyUser;
-import org.baeldung.web.util.SearchCriteria;
+package com.baeldung.persistence.dao;
 
+import com.baeldung.persistence.model.MyUser;
+import com.baeldung.web.util.SearchCriteria;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.NumberPath;
 import com.querydsl.core.types.dsl.PathBuilder;

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/MyUserPredicatesBuilder.java

@@ -1,12 +1,11 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import org.baeldung.web.util.SearchCriteria;
-
+import com.baeldung.web.util.SearchCriteria;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/MyUserRepository.java

@@ -1,13 +1,13 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.MyUser;
-import org.baeldung.persistence.model.QMyUser;
+import com.baeldung.persistence.model.QMyUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer;
 import org.springframework.data.querydsl.binding.QuerydslBindings;
 import org.springframework.data.querydsl.binding.SingleValueBinding;
 
+import com.baeldung.persistence.model.MyUser;
 import com.querydsl.core.types.dsl.StringExpression;
 import com.querydsl.core.types.dsl.StringPath;
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserDAO.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/UserDAO.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.util.List;
 
@@ -9,10 +9,11 @@
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.persistence.model.User;
-import org.baeldung.web.util.SearchCriteria;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.persistence.model.User;
+import com.baeldung.web.util.SearchCriteria;
+
 @Repository
 public class UserDAO implements IUserDAO {
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserRepository.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/UserRepository.java

@@ -1,9 +1,10 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import com.baeldung.persistence.model.User;
+
 public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificationExecutor<User> {
 
 }

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSearchQueryCriteriaConsumer.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/UserSearchQueryCriteriaConsumer.java

@@ -1,12 +1,12 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.util.function.Consumer;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.baeldung.web.util.SearchCriteria;
+import com.baeldung.web.util.SearchCriteria;
 
 public class UserSearchQueryCriteriaConsumer implements Consumer<SearchCriteria>{
 

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSpecification.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/UserSpecification.java

@@ -1,9 +1,10 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
-import org.baeldung.persistence.model.User;
-import org.baeldung.web.util.SpecSearchCriteria;
 import org.springframework.data.jpa.domain.Specification;
 
+import com.baeldung.persistence.model.User;
+import com.baeldung.web.util.SpecSearchCriteria;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;

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

@@ -1,14 +1,13 @@
-package org.baeldung.persistence.dao;
+package com.baeldung.persistence.dao;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import org.baeldung.persistence.model.User;
-import org.baeldung.web.util.SearchOperation;
-import org.baeldung.web.util.SpecSearchCriteria;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
+
+import com.baeldung.persistence.model.User;
+import com.baeldung.web.util.SearchOperation;
+import com.baeldung.web.util.SpecSearchCriteria;
 
 public final class UserSpecificationsBuilder {
 
@@ -52,8 +51,8 @@ public Specification<User> build() {
 
         for (int i = 1; i < params.size(); i++) {
             result = params.get(i).isOrPredicate()
-              ? Specifications.where(result).or(new UserSpecification(params.get(i))) 
-              : Specifications.where(result).and(new UserSpecification(params.get(i)));
+              ? Specification.where(result).or(new UserSpecification(params.get(i))) 
+              : Specification.where(result).and(new UserSpecification(params.get(i)));
         }
 
         return result;

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao.rsql;
+package com.baeldung.persistence.dao.rsql;
 
 import org.springframework.data.jpa.domain.Specification;
 

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

@@ -1,10 +1,10 @@
-package org.baeldung.persistence.dao.rsql;
+package com.baeldung.persistence.dao.rsql;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import org.springframework.data.jpa.domain.Specifications;
+import org.springframework.data.jpa.domain.Specification;
 
 import cz.jirutka.rsql.parser.ast.ComparisonNode;
 import cz.jirutka.rsql.parser.ast.LogicalNode;
@@ -13,7 +13,7 @@
 
 public class GenericRsqlSpecBuilder<T> {
 
-    public Specifications<T> createSpecification(final Node node) {
+    public Specification<T> createSpecification(final Node node) {
         if (node instanceof LogicalNode) {
             return createSpecification((LogicalNode) node);
         }
@@ -23,31 +23,31 @@ public Specifications<T> createSpecification(final Node node) {
         return null;
     }
 
-    public Specifications<T> createSpecification(final LogicalNode logicalNode) {
+    public Specification<T> createSpecification(final LogicalNode logicalNode) {
 
-        List<Specifications<T>> specs = logicalNode.getChildren()
+        List<Specification<T>> specs = logicalNode.getChildren()
                 .stream()
                 .map(node -> createSpecification(node))
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
-        Specifications<T> result = specs.get(0);
+        Specification<T> result = specs.get(0);
         if (logicalNode.getOperator() == LogicalOperator.AND) {
            for (int i = 1; i < specs.size(); i++) {
-               result = Specifications.where(result).and(specs.get(i));
+               result = Specification.where(result).and(specs.get(i));
            }
         }
         else if (logicalNode.getOperator() == LogicalOperator.OR) {
            for (int i = 1; i < specs.size(); i++) {
-               result = Specifications.where(result).or(specs.get(i));
+               result = Specification.where(result).or(specs.get(i));
            }
         }
 
         return result;
     }
 
-    public Specifications<T> createSpecification(final ComparisonNode comparisonNode) {
-        return Specifications.where(new GenericRsqlSpecification<T>(comparisonNode.getSelector(), comparisonNode.getOperator(), comparisonNode.getArguments()));
+    public Specification<T> createSpecification(final ComparisonNode comparisonNode) {
+        return Specification.where(new GenericRsqlSpecification<T>(comparisonNode.getSelector(), comparisonNode.getOperator(), comparisonNode.getArguments()));
     }
 
 }

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

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao.rsql;
+package com.baeldung.persistence.dao.rsql;
 
 import java.util.List;
 import java.util.stream.Collectors;

spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/dao/rsql/RsqlSearchOperation.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.dao.rsql;
+package com.baeldung.persistence.dao.rsql;
 
 import cz.jirutka.rsql.parser.ast.ComparisonOperator;
 import cz.jirutka.rsql.parser.ast.RSQLOperators;

spring-rest-query-language/src/main/java/org/baeldung/persistence/model/MyUser.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/model/MyUser.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/model/User.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User_.java renamed to spring-rest-query-language/src/main/java/com/baeldung/persistence/model/User_.java

@@ -1,4 +1,4 @@
-package org.baeldung.persistence.model;
+package com.baeldung.persistence.model;
 
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;

spring-rest-query-language/src/main/java/org/baeldung/spring/Application.java renamed to spring-rest-query-language/src/main/java/com/baeldung/spring/Application.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -19,7 +19,7 @@
  */
 @EnableScheduling
 @EnableAutoConfiguration
-@ComponentScan("org.baeldung")
+@ComponentScan("com.baeldung")
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
 

spring-rest-query-language/src/main/java/org/baeldung/spring/PersistenceConfig.java renamed to spring-rest-query-language/src/main/java/com/baeldung/spring/PersistenceConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import java.util.Properties;
 
@@ -24,9 +24,9 @@
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@ComponentScan({ "com.baeldung.persistence" })
 // @ImportResource("classpath*:springDataPersistenceConfig.xml")
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
+@EnableJpaRepositories(basePackages = "com.baeldung.persistence.dao")
 public class PersistenceConfig {
 
     @Autowired
@@ -40,7 +40,7 @@ public PersistenceConfig() {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         // vendorAdapter.set

spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java renamed to spring-rest-query-language/src/main/java/com/baeldung/spring/WebConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package com.baeldung.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -10,14 +10,10 @@
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
-@ComponentScan("org.baeldung.web")
+@ComponentScan("com.baeldung.web")
 @EnableWebMvc
 public class WebConfig implements WebMvcConfigurer {
 
-    public WebConfig() {
-        super();
-    }
-
     @Bean
     public ViewResolver viewResolver() {
         final InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();

spring-rest-query-language/src/main/java/org/baeldung/web/controller/HomeController.java renamed to spring-rest-query-language/src/main/java/com/baeldung/web/controller/HomeController.java

@@ -1,4 +1,4 @@
-package org.baeldung.web.controller;
+package com.baeldung.web.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;