[feat] Update to spring boot 2.0.0 (#73)

Author: iamareebjamal

.travis.yml

@@ -2,12 +2,13 @@ sudo: false
 language: java
 jdk:
   - oraclejdk8
-  - openjdk7
 services:
   - mysql
   - pgsql
 matrix:
   include:
+  - jdk: oraclejdk8
+    env: DB=h2
   - jdk: oraclejdk8
     env: DB=mysql
   - jdk: oraclejdk8

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.github.darrachequesne</groupId>
 	<artifactId>spring-data-jpa-datatables</artifactId>
-	<version>4.3</version>
+	<version>5.0.0-SNAPSHOT</version>
 
 	<name>Spring Data JPA for DataTables</name>
 	<description>Spring Data JPA extension to work with the great jQuery plug-in DataTables (http://datatables.net/)</description>
@@ -53,7 +53,7 @@
 		<version.plugin.maven-gpg-plugin>1.6</version.plugin.maven-gpg-plugin>
 
 		<!-- Source encoding -->
-		<java.version>1.6</java.version>
+		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<source.encoding>UTF-8</source.encoding>
@@ -62,9 +62,9 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>io.spring.platform</groupId>
-				<artifactId>platform-bom</artifactId>
-				<version>Brussels-RELEASE</version>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>2.0.0.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -83,63 +83,21 @@
 			<artifactId>spring-data-jpa</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 
-		<!-- Hibernate -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
 		</dependency>
+
+		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>javax.el-api</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>com.querydsl</groupId>

src/main/java/org/springframework/data/jpa/datatables/AbstractPredicateBuilder.java

@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.datatables.mapping.Column;
 import org.springframework.data.jpa.datatables.mapping.DataTablesInput;
 import org.springframework.data.jpa.datatables.mapping.Search;
+import org.springframework.lang.NonNull;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
@@ -19,9 +20,9 @@ abstract class AbstractPredicateBuilder<T> {
         this.input = input;
         this.hasGlobalFilter = input.getSearch() != null && StringUtils.hasText(input.getSearch().getValue());
         if (this.hasGlobalFilter) {
-            tree = new Node<Filter>(null, new GlobalFilter(input.getSearch().getValue()));
+            tree = new Node<>(null, new GlobalFilter(input.getSearch().getValue()));
         } else {
-            tree = new Node<Filter>(null);
+            tree = new Node<>(null);
         }
         initTree(input);
     }
@@ -38,7 +39,7 @@ private void addChild(Node<Filter> parent, int index, String[] names, Search sea
         boolean isLast = index + 1 == names.length;
         if (isLast) {
             boolean hasColumnFilter = search != null && StringUtils.hasText(search.getValue());
-            parent.addChild(new Node<Filter>(names[index], hasColumnFilter ? new ColumnFilter(search.getValue()) : null));
+            parent.addChild(new Node<>(names[index], hasColumnFilter ? new ColumnFilter(search.getValue()) : null));
         } else {
             Node<Filter> child = parent.getOrCreateChild(names[index]);
             addChild(child, index + 1, names, search);
@@ -51,7 +52,7 @@ private void addChild(Node<Filter> parent, int index, String[] names, Search sea
      * @return a {@link Pageable}, must not be {@literal null}.
      */
     public Pageable createPageable() {
-        List<Sort.Order> orders = new ArrayList<Sort.Order>();
+        List<Sort.Order> orders = new ArrayList<>();
         for (org.springframework.data.jpa.datatables.mapping.Order order : input.getOrder()) {
             Column column = input.getColumns().get(order.getColumn());
             if (column.getOrderable()) {
@@ -60,7 +61,7 @@ public Pageable createPageable() {
                 orders.add(new Sort.Order(sortDirection, sortColumn));
             }
         }
-        Sort sort = orders.isEmpty() ? null : new Sort(orders);
+        Sort sort = orders.isEmpty() ? Sort.unsorted() : Sort.by(orders);
 
         if (input.getLength() == -1) {
             input.setStart(0);
@@ -83,7 +84,7 @@ private class DataTablesPageRequest implements Pageable {
         }
 
         @Override
-        public int getOffset() {
+        public long getOffset() {
             return offset;
         }
 
@@ -93,21 +94,25 @@ public int getPageSize() {
         }
 
         @Override
+        @NonNull
         public Sort getSort() {
             return sort;
         }
 
         @Override
+        @NonNull
         public Pageable next() {
             throw new UnsupportedOperationException();
         }
 
         @Override
+        @NonNull
         public Pageable previousOrFirst() {
             throw new UnsupportedOperationException();
         }
 
         @Override
+        @NonNull
         public Pageable first() {
             throw new UnsupportedOperationException();
         }

src/main/java/org/springframework/data/jpa/datatables/ColumnFilter.java

@@ -22,15 +22,16 @@
  * </ul>
  */
 class ColumnFilter extends GlobalFilter {
-    private Set<String> values = new HashSet<String>();
-    private Set<Boolean> booleanValues = new HashSet<Boolean>();
+    private final Set<String> values;
+    private final Set<Boolean> booleanValues;
     private boolean addNullCase;
     private boolean isBooleanComparison;
 
     ColumnFilter(String filterValue) {
         super(filterValue);
 
         isBooleanComparison = true;
+        Set<String> values = new HashSet<>();
         for (String value : filterValue.split("\\+")) {
             if ("NULL".equals(value)) {
                 addNullCase = true;
@@ -39,14 +40,15 @@ class ColumnFilter extends GlobalFilter {
                 values.add(nullOrTrimmedValue(value));
             }
         }
-        values = unmodifiableSet(values);
+        this.values = unmodifiableSet(values);
 
+        Set<Boolean> booleanValues = new HashSet<>();
         if (isBooleanComparison) {
             for (String value : values) {
                 booleanValues.add(Boolean.valueOf(value));
             }
-            booleanValues = unmodifiableSet(booleanValues);
         }
+        this.booleanValues = unmodifiableSet(booleanValues);
     }
 
     private boolean isBoolean(String filterValue) {

src/main/java/org/springframework/data/jpa/datatables/Node.java

@@ -6,7 +6,7 @@
 class Node<T> {
     private final String name;
     private final T data;
-    private List<Node<T>> children = new ArrayList<Node<T>>();
+    private List<Node<T>> children = new ArrayList<>();
 
     Node(String name, T data) {
         this.name = name;
@@ -28,7 +28,7 @@ Node<T> getOrCreateChild(String name) {
                 return child;
             }
         }
-        Node<T> child = new Node<T>(name);
+        Node<T> child = new Node<>(name);
         children.add(child);
         return child;
     }

src/main/java/org/springframework/data/jpa/datatables/PredicateBuilder.java

@@ -8,10 +8,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class PredicateBuilder<T> extends AbstractPredicateBuilder<Predicate> {
+public class PredicateBuilder extends AbstractPredicateBuilder<Predicate> {
     private final PathBuilder<?> entity;
-    private List<Predicate> columnPredicates = new ArrayList<Predicate>();
-    private List<Predicate> globalPredicates = new ArrayList<Predicate>();
+    private List<Predicate> columnPredicates = new ArrayList<>();
+    private List<Predicate> globalPredicates = new ArrayList<>();
 
     public PredicateBuilder(PathBuilder<?> entity, DataTablesInput input) {
         super(input);

src/main/java/org/springframework/data/jpa/datatables/SpecificationBuilder.java

@@ -1,30 +1,30 @@
 package org.springframework.data.jpa.datatables;
 
-import org.hibernate.jpa.criteria.path.AbstractPathImpl;
+import org.hibernate.query.criteria.internal.path.AbstractPathImpl;
 import org.springframework.data.jpa.datatables.mapping.DataTablesInput;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.lang.NonNull;
 
 import javax.persistence.criteria.*;
 import java.util.ArrayList;
 import java.util.List;
 
-
 public class SpecificationBuilder<T> extends AbstractPredicateBuilder<Specification<T>> {
     public SpecificationBuilder(DataTablesInput input) {
         super(input);
     }
 
     @Override
     public Specification<T> build() {
-        return new DataTablesSpecification<T>();
+        return new DataTablesSpecification<>();
     }
 
     private class DataTablesSpecification<S> implements Specification<S> {
-        private List<Predicate> columnPredicates = new ArrayList<Predicate>();
-        private List<Predicate> globalPredicates = new ArrayList<Predicate>();
+        private List<Predicate> columnPredicates = new ArrayList<>();
+        private List<Predicate> globalPredicates = new ArrayList<>();
 
         @Override
-        public Predicate toPredicate(Root<S> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
+        public Predicate toPredicate(@NonNull Root<S> root, @NonNull CriteriaQuery<?> query, @NonNull CriteriaBuilder criteriaBuilder) {
             initPredicatesRecursively(tree, root, root, criteriaBuilder);
 
             boolean isCountQuery = query.getResultType() == Long.class;
@@ -65,7 +65,7 @@ private void initPredicatesRecursively(Node<Filter> node, From<S, S> from, Fetch
         }
 
         private Predicate createFinalPredicate(CriteriaBuilder criteriaBuilder) {
-            List<Predicate> allPredicates = new ArrayList<Predicate>(columnPredicates);
+            List<Predicate> allPredicates = new ArrayList<>(columnPredicates);
 
             if (!globalPredicates.isEmpty()) {
                 allPredicates.add(criteriaBuilder.or(globalPredicates.toArray(new Predicate[0])));

src/main/java/org/springframework/data/jpa/datatables/mapping/Column.java

@@ -1,13 +1,12 @@
 package org.springframework.data.jpa.datatables.mapping;
 
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.NotBlank;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/org/springframework/data/jpa/datatables/mapping/DataTablesInput.java

@@ -1,17 +1,15 @@
 package org.springframework.data.jpa.datatables.mapping;
 
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import lombok.Data;
-
 @Data
 public class DataTablesInput {
 
@@ -53,20 +51,20 @@ public class DataTablesInput {
    * Order parameter
    */
   @NotEmpty
-  private List<Order> order = new ArrayList<Order>();
+  private List<Order> order = new ArrayList<>();
 
   /**
    * Per-column search parameter
    */
   @NotEmpty
-  private List<Column> columns = new ArrayList<Column>();
+  private List<Column> columns = new ArrayList<>();
 
   /**
    * 
    * @return a {@link Map} of {@link Column} indexed by name
    */
   public Map<String, Column> getColumnsAsMap() {
-    Map<String, Column> map = new HashMap<String, Column>();
+    Map<String, Column> map = new HashMap<>();
     for (Column column : columns) {
       map.put(column.getData(), column);
     }

src/main/java/org/springframework/data/jpa/datatables/mapping/DataTablesOutput.java

@@ -1,12 +1,11 @@
 package org.springframework.data.jpa.datatables.mapping;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonView;
-
 import lombok.Data;
 
+import java.util.Collections;
+import java.util.List;
+
 @Data
 public class DataTablesOutput<T> {