Merge remote-tracking branch 'remotes/origin/dev'

Author: yuanxuegui

pom.xml

@@ -47,7 +47,7 @@
     <properties>
         <bundlor.enabled>false</bundlor.enabled>
         <bundlor.failOnWarnings>false</bundlor.failOnWarnings>
-        <springdata.commons>2.0.4.RELEASE</springdata.commons>
+        <springdata.commons>1.13.10.RELEASE</springdata.commons>
         <ebean.version>11.10.6</ebean.version>
         <ebean-spring-txn.version>11.10.3</ebean-spring-txn.version>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -189,6 +189,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.9.7</version>
+        </dependency>
 
 
     </dependencies>

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

@@ -20,15 +20,14 @@
 import io.ebean.annotation.UpdatedTimestamp;
 import io.ebean.annotation.WhoCreated;
 import io.ebean.annotation.WhoModified;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import org.joda.time.DateTime;
 import org.springframework.data.domain.Auditable;
 import org.springframework.data.domain.Persistable;
 import org.springframework.util.ClassUtils;
 
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
-import java.time.LocalDateTime;
-import java.util.Optional;
 
 /**
  * Abstract base class for entities.
@@ -37,7 +36,7 @@
  * @author Xuegui Yuan
  */
 @MappedSuperclass
-public abstract class AbstractEntity implements Persistable<Long>, Auditable<String, Long, LocalDateTime> {
+public abstract class AbstractEntity implements Persistable<Long>, Auditable<String, Long> {
 
     private static final long serialVersionUID = -5554308939380869754L;
 
@@ -48,19 +47,29 @@ public abstract class AbstractEntity implements Persistable<Long>, Auditable<Str
     String createdBy;
 
     @CreatedTimestamp
-    LocalDateTime createdDate;
+    DateTime createdDate;
 
     @WhoModified
     String lastModifiedBy;
 
     @UpdatedTimestamp
-    LocalDateTime lastModifiedDate;
+    DateTime lastModifiedDate;
+
+    @Override
+    public String getCreatedBy() {
+        return createdBy;
+    }
 
     @Override
     public Long getId() {
         return id;
     }
 
+    @Override
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
     /**
      * Sets the id of the entity.
      *
@@ -70,35 +79,25 @@ public void setId(final Long id) {
         this.id = id;
     }
 
-    @Transient
     @Override
-    public boolean isNew() {
-        return null == getId();
-    }
-
-    @Override
-    public Optional<String> getCreatedBy() {
-        return Optional.ofNullable(createdBy);
-    }
-
-    @Override
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
+    public DateTime getCreatedDate() {
+        return createdDate;
     }
 
+    @Transient
     @Override
-    public Optional<LocalDateTime> getCreatedDate() {
-        return Optional.ofNullable(createdDate);
+    public boolean isNew() {
+        return null == getId();
     }
 
     @Override
-    public void setCreatedDate(LocalDateTime createdDate) {
+    public void setCreatedDate(DateTime createdDate) {
         this.createdDate = createdDate;
     }
 
     @Override
-    public Optional<String> getLastModifiedBy() {
-        return Optional.ofNullable(lastModifiedBy);
+    public String getLastModifiedBy() {
+        return lastModifiedBy;
     }
 
     @Override
@@ -107,21 +106,15 @@ public void setLastModifiedBy(String lastModifiedBy) {
     }
 
     @Override
-    public Optional<LocalDateTime> getLastModifiedDate() {
-        return Optional.ofNullable(lastModifiedDate);
+    public DateTime getLastModifiedDate() {
+        return lastModifiedDate;
     }
 
     @Override
-    public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
+    public void setLastModifiedDate(DateTime lastModifiedDate) {
         this.lastModifiedDate = lastModifiedDate;
     }
 
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#hashCode()
-     */
     @Override
     public int hashCode() {
         int hashCode = 17;

src/main/java/org/springframework/data/ebean/repository/EbeanRepository.java

@@ -19,14 +19,17 @@
 import io.ebean.EbeanServer;
 import io.ebean.SqlUpdate;
 import io.ebean.UpdateQuery;
-import org.springframework.data.domain.*;
+import java.io.Serializable;
+import java.util.List;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Persistable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * Ebean specific extension of {@link org.springframework.data.repository.Repository}.
  *
@@ -106,7 +109,6 @@ public interface EbeanRepository<T extends Persistable, ID extends Serializable>
    * @param ids Id list
    * @return List
    */
-  @Override
   List<T> findAllById(Iterable<ID> ids);
 
   /**

src/main/java/org/springframework/data/ebean/repository/config/EbeanRepositoryConfigExtension.java

@@ -16,19 +16,18 @@
 
 package org.springframework.data.ebean.repository.config;
 
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.data.ebean.repository.EbeanRepository;
-import org.springframework.data.ebean.repository.support.EbeanRepositoryFactoryBean;
-import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
-
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.ebean.repository.EbeanRepository;
+import org.springframework.data.ebean.repository.support.EbeanRepositoryFactoryBean;
+import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
 
 /**
  * Ebean specific configuration extension parsing custom attributes from the XML namespace and
@@ -47,8 +46,12 @@ public class EbeanRepositoryConfigExtension extends RepositoryConfigurationExten
    * (non-Javadoc)
    * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryBeanClassName()
    */
+//  public String getRepositoryFactoryBeanClassName() {
+//    return EbeanRepositoryFactoryBean.class.getName();
+//  }
+
   @Override
-  public String getRepositoryFactoryBeanClassName() {
+  public String getRepositoryFactoryClassName() {
     return EbeanRepositoryFactoryBean.class.getName();
   }
 

src/main/java/org/springframework/data/ebean/repository/query/EbeanQueryCreator.java

@@ -20,6 +20,9 @@
 import io.ebean.Expression;
 import io.ebean.ExpressionList;
 import io.ebean.Query;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.repository.query.ReturnedType;
@@ -28,10 +31,6 @@
 import org.springframework.data.repository.query.parser.PartTree;
 import org.springframework.util.Assert;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * EbeanQueryWrapper creator to create a {@link io.ebean.Expression} from a {@link PartTree}.
  *
@@ -199,10 +198,10 @@ public Expression build() {
           ParameterMetadataProvider.ParameterMetadata<Object> pmNot = provider.next(part);
           return pmNot.isIsNullParameter() ? Expr.isNull(property.toDotPath())
               : Expr.ne(property.toDotPath(), pmNot.getParameterValue());
-        case IS_EMPTY:
-          return Expr.isEmpty(property.toDotPath());
-        case IS_NOT_EMPTY:
-          return Expr.isNotEmpty(property.toDotPath());
+//        case IS_EMPTY:
+//          return Expr.isEmpty(property.toDotPath());
+//        case IS_NOT_EMPTY:
+//          return Expr.isNotEmpty(property.toDotPath());
         default:
           throw new IllegalArgumentException("Unsupported keyword " + type);
       }