update spring data to 1.2.6 & ebean 11.6.1

Author: yuanxuegui

README.md

@@ -53,7 +53,7 @@ If using maven to compile, package, run，should add:
         <configuration>
           <tiles>
             <tile>org.avaje.tile:java-compile:1.1</tile>
-            <tile>io.ebean.tile:enhancement:2.4</tile>
+            <tile>io.ebean.tile:enhancement:5.1</tile>
           </tiles>
         </configuration>
       </plugin>

README_zh.md

@@ -57,7 +57,7 @@
         <configuration>
           <tiles>
             <tile>org.avaje.tile:java-compile:1.1</tile>
-            <tile>io.ebean.tile:enhancement:2.4</tile>
+            <tile>io.ebean.tile:enhancement:5.1</tile>
           </tiles>
         </configuration>
       </plugin>

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.9.3.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
 
     <groupId>io.github.hexagonframework.data</groupId>
@@ -47,12 +47,10 @@
     <properties>
         <bundlor.enabled>false</bundlor.enabled>
         <bundlor.failOnWarnings>false</bundlor.failOnWarnings>
-        <springdata.commons>1.13.3.RELEASE</springdata.commons>
-        <jpa>2.0.0</jpa>
+        <springdata.commons>2.0.2.RELEASE</springdata.commons>
         <ebean.version>11.6.1</ebean.version>
         <ebean-spring-txn.version>10.1.1</ebean-spring-txn.version>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-        <guava.verion>20.0</guava.verion>
     </properties>
 
     <profiles>
@@ -159,19 +157,6 @@
             <version>${ebean-spring-txn.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.verion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime}</version>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>

src/main/java/org/springframework/data/ebean/domain/AbstractAuditableEntity.java

@@ -19,8 +19,9 @@
 import io.ebean.annotation.UpdatedTimestamp;
 import io.ebean.annotation.WhoCreated;
 import io.ebean.annotation.WhoModified;
+import java.time.LocalDateTime;
+import java.util.Optional;
 import javax.persistence.MappedSuperclass;
-import org.joda.time.DateTime;
 import org.springframework.data.domain.Auditable;
 
 /**
@@ -30,91 +31,59 @@
  */
 @MappedSuperclass
 public abstract class AbstractAuditableEntity extends AbstractEntity
-        implements Auditable<String, Long> {
+    implements Auditable<String, Long, LocalDateTime> {
 
     private static final long serialVersionUID = 141481953116476081L;
 
     @WhoCreated
     String createdBy;
 
     @CreatedTimestamp
-    DateTime createdDate;
+    LocalDateTime createdDate;
 
     @WhoModified
     String lastModifiedBy;
 
     @UpdatedTimestamp
-    DateTime lastModifiedDate;
+    LocalDateTime lastModifiedDate;
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#getCreatedBy()
-     */
     @Override
-    public String getCreatedBy() {
-        return createdBy;
+    public Optional<String> getCreatedBy() {
+        return Optional.ofNullable(createdBy);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#setCreatedBy(java.lang.Object)
-     */
     @Override
     public void setCreatedBy(String createdBy) {
         this.createdBy = createdBy;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#getCreatedDate()
-     */
     @Override
-    public DateTime getCreatedDate() {
-        return createdDate;
+    public Optional<LocalDateTime> getCreatedDate() {
+        return Optional.ofNullable(createdDate);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#setCreatedDate(org.joda.time.DateTime)
-     */
     @Override
-    public void setCreatedDate(DateTime createdDate) {
+    public void setCreatedDate(LocalDateTime createdDate) {
         this.createdDate = createdDate;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#getLastModifiedBy()
-     */
     @Override
-    public String getLastModifiedBy() {
-        return lastModifiedBy;
+    public Optional<String> getLastModifiedBy() {
+        return Optional.ofNullable(lastModifiedBy);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#setLastModifiedBy(java.lang.Object)
-     */
     @Override
     public void setLastModifiedBy(String lastModifiedBy) {
         this.lastModifiedBy = lastModifiedBy;
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#getLastModifiedDate()
-     */
     @Override
-    public DateTime getLastModifiedDate() {
-        return lastModifiedDate;
+    public Optional<LocalDateTime> getLastModifiedDate() {
+        return Optional.ofNullable(lastModifiedDate);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Auditable#setLastModifiedDate(org.joda.time.DateTime)
-     */
     @Override
-    public void setLastModifiedDate(DateTime lastModifiedDate) {
+    public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
         this.lastModifiedDate = lastModifiedDate;
     }
 }

src/main/java/org/springframework/data/ebean/domain/AbstractEntity.java

@@ -48,10 +48,9 @@ public int hashCode() {
         hashCode += null == getId() ? 0 : getId().hashCode() * 31;
 
         return hashCode;
-    }    /*
-     * (non-Javadoc)
-     * @see org.springframework.data.domain.Persistable#getId()
-     */
+    }
+
+  @Override
     public Long getId() {
         return id;
     }
@@ -65,19 +64,12 @@ public void setId(final Long id) {
         this.id = id;
     }
 
-    /**
-     * @see org.springframework.data.domain.Persistable#isNew()
-     */
     @Transient
+    @Override
     public boolean isNew() {
         return null == getId();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
     @Override
     public boolean equals(Object obj) {
 

src/main/java/org/springframework/data/ebean/domain/DomainEvent.java

@@ -1,12 +1,17 @@
-package org.springframework.data.ebean.domain;
-
-import java.util.Date;
-
-/**
- * DomainEvent interface.
- *
- * @author Xuegui Yuan
- */
-public interface DomainEvent {
-    Date occurredOn();
+package org.springframework.data.ebean.domain;
+
+import java.util.Date;
+
+/**
+ * DomainEvent interface.
+ *
+ * @author Xuegui Yuan
+ */
+public interface DomainEvent {
+  /**
+   * Occurred date.
+   *
+   * @return Occurred date
+   */
+  Date occurredOn();
 }

src/main/java/org/springframework/data/ebean/eventbus/guava/AbstractGuavaDomainEventPublisher.java

@@ -154,7 +154,7 @@ public static <T> Query<T> queryWithPage(ExpressionList<T> expressionList, Pagea
     Assert.notNull(expressionList, "expressionList must not null");
     Assert.notNull(pageable, "pageable must not null");
     return expressionList.setMaxRows(pageable.getPageSize())
-        .setFirstRow(pageable.getOffset())
+        .setFirstRow((int) pageable.getOffset())
         .setOrder(Converters.convertToEbeanOrderBy(pageable.getSort()));
   }