Merge branch 'dev', Release 2.0.0

yuanxuegui · yuanxuegui · commit 09709b378fd2 · 2018-11-06T15:52:23.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.hexagonframework.data</groupId>
     <artifactId>spring-data-ebean</artifactId>
-    <version>1.4.1.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Spring Data Ebean</name>
@@ -45,9 +45,9 @@
         <ebean-maven-plugin.args>debug=0</ebean-maven-plugin.args>
         <bundlor.enabled>false</bundlor.enabled>
         <bundlor.failOnWarnings>false</bundlor.failOnWarnings>
-        <spring>5.0.4.RELEASE</spring>
-        <springdata.commons>2.0.5.RELEASE</springdata.commons>
-        <ebean.version>11.15.5</ebean.version>
+        <spring>5.1.2.RELEASE</spring>
+        <springdata.commons>2.1.2.RELEASE</springdata.commons>
+        <ebean.version>11.21.1</ebean.version>
         <ebean-spring-txn.version>11.10.4</ebean-spring-txn.version>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
     </properties>
@@ -155,6 +155,7 @@
             <groupId>io.ebean</groupId>
             <artifactId>ebean</artifactId>
             <version>${ebean.version}</version>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/org/springframework/data/ebean/repository/EbeanRepository.java b/src/main/java/org/springframework/data/ebean/repository/EbeanRepository.java
@@ -19,12 +19,14 @@
 import io.ebean.EbeanServer;
 import io.ebean.SqlUpdate;
 import io.ebean.UpdateQuery;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+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;
 import java.util.Optional;
 
@@ -34,7 +36,7 @@
  * @author Xuegui Yuan
  */
 @NoRepositoryBean
-public interface EbeanRepository<T extends Persistable, ID extends Serializable> extends PagingAndSortingRepository<T, ID>, QueryByExampleExecutor<T> {
+public interface EbeanRepository<T, ID> extends PagingAndSortingRepository<T, ID>, QueryByExampleExecutor<T> {
 
     /**
      * Return the current EbeanServer.
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/AbstractStringBasedEbeanQuery.java b/src/main/java/org/springframework/data/ebean/repository/query/AbstractStringBasedEbeanQuery.java
@@ -30,7 +30,7 @@
 abstract class AbstractStringBasedEbeanQuery extends AbstractEbeanQuery {
 
     private final StringQuery query;
-    private final EvaluationContextProvider evaluationContextProvider;
+    private final QueryMethodEvaluationContextProvider evaluationContextProvider;
     private final SpelExpressionParser parser;
 
     /**
@@ -44,7 +44,7 @@ abstract class AbstractStringBasedEbeanQuery extends AbstractEbeanQuery {
      * @param parser                    must not be {@literal null}.
      */
     public AbstractStringBasedEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer, String queryString,
-                                         EvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
+                                         QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
 
         super(method, ebeanServer);
 
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/EbeanQueryFactory.java b/src/main/java/org/springframework/data/ebean/repository/query/EbeanQueryFactory.java
@@ -20,8 +20,8 @@
 import io.ebean.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.repository.query.EvaluationContextProvider;
 import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
@@ -51,7 +51,7 @@ enum EbeanQueryFactory {
      * @return the {@link RepositoryQuery} derived from the annotation or {@code null} if no annotation found.
      */
     AbstractEbeanQuery fromQueryAnnotation(EbeanQueryMethod method, EbeanServer ebeanServer,
-                                           EvaluationContextProvider evaluationContextProvider) {
+                                           QueryMethodEvaluationContextProvider evaluationContextProvider) {
 
         LOG.debug("Looking up query for method {}", method.getName());
         return fromMethodWithQueryString(method, ebeanServer, method.getAnnotatedQuery(), evaluationContextProvider);
@@ -67,7 +67,7 @@ AbstractEbeanQuery fromQueryAnnotation(EbeanQueryMethod method, EbeanServer ebea
      * @return
      */
     AbstractEbeanQuery fromMethodWithQueryString(EbeanQueryMethod method, EbeanServer ebeanServer, String queryString,
-                                                 EvaluationContextProvider evaluationContextProvider) {
+                                                 QueryMethodEvaluationContextProvider evaluationContextProvider) {
 
         if (queryString == null) {
             return null;
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/EbeanQueryLookupStrategy.java b/src/main/java/org/springframework/data/ebean/repository/query/EbeanQueryLookupStrategy.java
@@ -21,9 +21,9 @@
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.query.EvaluationContextProvider;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.util.Assert;
 
@@ -51,7 +51,7 @@ private EbeanQueryLookupStrategy() {
      * @return
      */
     public static QueryLookupStrategy create(EbeanServer ebeanServer, Key key,
-                                             EvaluationContextProvider evaluationContextProvider) {
+                                             QueryMethodEvaluationContextProvider evaluationContextProvider) {
 
         Assert.notNull(ebeanServer, "EbeanServer must not be null!");
         Assert.notNull(evaluationContextProvider, "EvaluationContextProvider must not be null!");
@@ -181,7 +181,7 @@ protected RepositoryQuery resolveQuery(EbeanQueryMethod method, EbeanServer ebea
      */
     private static class DeclaredQueryLookupStrategy extends AbstractQueryLookupStrategy {
 
-        private final EvaluationContextProvider evaluationContextProvider;
+        private final QueryMethodEvaluationContextProvider evaluationContextProvider;
 
         /**
          * Creates a new {@link DeclaredQueryLookupStrategy}.
@@ -190,7 +190,7 @@ private static class DeclaredQueryLookupStrategy extends AbstractQueryLookupStra
          * @param evaluationContextProvider
          */
         public DeclaredQueryLookupStrategy(EbeanServer ebeanServer,
-                                           EvaluationContextProvider evaluationContextProvider) {
+                                           QueryMethodEvaluationContextProvider evaluationContextProvider) {
             super(ebeanServer);
             this.evaluationContextProvider = evaluationContextProvider;
         }
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/NativeEbeanQuery.java b/src/main/java/org/springframework/data/ebean/repository/query/NativeEbeanQuery.java
@@ -39,7 +39,7 @@ final class NativeEbeanQuery extends AbstractStringBasedEbeanQuery {
      * @param evaluationContextProvider
      */
     public NativeEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer, String queryString,
-                            EvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
+                            QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
 
         super(method, ebeanServer, queryString, evaluationContextProvider, parser);
 
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/NativeEbeanUpdate.java b/src/main/java/org/springframework/data/ebean/repository/query/NativeEbeanUpdate.java
@@ -18,9 +18,9 @@
 
 import io.ebean.EbeanServer;
 import org.springframework.data.ebean.annotation.Query;
-import org.springframework.data.repository.query.EvaluationContextProvider;
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
@@ -42,7 +42,7 @@ final class NativeEbeanUpdate extends AbstractStringBasedEbeanQuery {
      * @param evaluationContextProvider
      */
     public NativeEbeanUpdate(EbeanQueryMethod method, EbeanServer ebeanServer, String queryString,
-                             EvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
+                             QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
 
         super(method, ebeanServer, queryString, evaluationContextProvider, parser);
 
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/OrmEbeanQuery.java b/src/main/java/org/springframework/data/ebean/repository/query/OrmEbeanQuery.java
@@ -18,7 +18,7 @@
 
 import io.ebean.EbeanServer;
 import org.springframework.data.ebean.annotation.Query;
-import org.springframework.data.repository.query.EvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
@@ -39,7 +39,7 @@ final class OrmEbeanQuery extends AbstractStringBasedEbeanQuery {
      * @param evaluationContextProvider must not be {@literal null}
      * @param parser                    must not be {@literal null}
      */
-    public OrmEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer, EvaluationContextProvider evaluationContextProvider,
+    public OrmEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer, QueryMethodEvaluationContextProvider evaluationContextProvider,
                          SpelExpressionParser parser) {
         this(method, ebeanServer, method.getAnnotatedQuery(), evaluationContextProvider, parser);
     }
@@ -54,7 +54,7 @@ public OrmEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer, Evaluatio
      * @param parser                    must not be {@literal null}
      */
     public OrmEbeanQuery(EbeanQueryMethod method, EbeanServer ebeanServer, String queryString,
-                         EvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
+                         QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
         super(method, ebeanServer, queryString, evaluationContextProvider, parser);
     }
 }
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/OrmEbeanUpdate.java b/src/main/java/org/springframework/data/ebean/repository/query/OrmEbeanUpdate.java
@@ -17,7 +17,7 @@
 package org.springframework.data.ebean.repository.query;
 
 import io.ebean.EbeanServer;
-import org.springframework.data.repository.query.EvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
@@ -38,7 +38,7 @@ final class OrmEbeanUpdate extends AbstractStringBasedEbeanQuery {
      * @param evaluationContextProvider must not be {@literal null}
      * @param parser                    must not be {@literal null}
      */
-    public OrmEbeanUpdate(EbeanQueryMethod method, EbeanServer ebeanServer, EvaluationContextProvider evaluationContextProvider,
+    public OrmEbeanUpdate(EbeanQueryMethod method, EbeanServer ebeanServer, QueryMethodEvaluationContextProvider evaluationContextProvider,
                           SpelExpressionParser parser) {
         this(method, ebeanServer, method.getAnnotatedQuery(), evaluationContextProvider, parser);
     }
@@ -53,7 +53,7 @@ public OrmEbeanUpdate(EbeanQueryMethod method, EbeanServer ebeanServer, Evaluati
      * @param parser                    must not be {@literal null}
      */
     public OrmEbeanUpdate(EbeanQueryMethod method, EbeanServer ebeanServer, String queryString,
-                          EvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
+                          QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
         super(method, ebeanServer, queryString, evaluationContextProvider, parser);
     }
 
diff --git a/src/main/java/org/springframework/data/ebean/repository/query/SpelExpressionStringQueryParameterBinder.java b/src/main/java/org/springframework/data/ebean/repository/query/SpelExpressionStringQueryParameterBinder.java
@@ -17,8 +17,8 @@
 package org.springframework.data.ebean.repository.query;
 
 import org.springframework.data.repository.query.DefaultParameters;
-import org.springframework.data.repository.query.EvaluationContextProvider;
 import org.springframework.data.repository.query.Parameter;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -35,7 +35,7 @@
 class SpelExpressionStringQueryParameterBinder extends StringQueryParameterBinder {
 
     private final StringQuery query;
-    private final EvaluationContextProvider evaluationContextProvider;
+    private final QueryMethodEvaluationContextProvider evaluationContextProvider;
     private final SpelExpressionParser parser;
 
     /**
@@ -48,7 +48,7 @@ class SpelExpressionStringQueryParameterBinder extends StringQueryParameterBinde
      * @param parser                    must not be {@literal null}
      */
     public SpelExpressionStringQueryParameterBinder(DefaultParameters parameters, Object[] values, StringQuery query,
-                                                    EvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
+                                                    QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
 
         super(parameters, values, query);
         Assert.notNull(evaluationContextProvider, "EvaluationContextProvider must not be null!");
diff --git a/src/main/java/org/springframework/data/ebean/repository/support/EbeanEntityInformation.java b/src/main/java/org/springframework/data/ebean/repository/support/EbeanEntityInformation.java
@@ -0,0 +1,52 @@
+package org.springframework.data.ebean.repository.support;
+
+import io.ebean.EbeanServer;
+import lombok.NonNull;
+import org.springframework.core.ResolvableType;
+import org.springframework.data.repository.core.EntityInformation;
+
+/**
+ * Extension of {@link EntityInformation} to capture information about ebean entity.
+ */
+public class EbeanEntityInformation<T, ID> implements EntityInformation<T, ID> {
+
+    private final EbeanServer ebeanServer;
+
+    private final @NonNull
+    Class<T> domainClass;
+
+    private Class<ID> idClass;
+
+    public EbeanEntityInformation(EbeanServer ebeanServer, Class<T> domainClass) {
+        this.ebeanServer = ebeanServer;
+        this.domainClass = domainClass;
+
+        Class<?> idClass = ResolvableType.forClass(domainClass).resolveGeneric(0);
+
+        if (idClass == null) {
+            throw new IllegalArgumentException(String.format("Could not resolve identifier type for %s!", domainClass));
+        }
+
+        this.idClass = (Class<ID>) idClass;
+    }
+
+    @Override
+    public boolean isNew(T entity) {
+        return ebeanServer.getBeanState(entity).isNew();
+    }
+
+    @Override
+    public ID getId(T entity) {
+        return (ID) ebeanServer.getBeanId(entity);
+    }
+
+    @Override
+    public Class<ID> getIdType() {
+        return this.idClass;
+    }
+
+    @Override
+    public Class<T> getJavaType() {
+        return this.domainClass;
+    }
+}
diff --git a/src/main/java/org/springframework/data/ebean/repository/support/EbeanRepositoryFactory.java b/src/main/java/org/springframework/data/ebean/repository/support/EbeanRepositoryFactory.java
@@ -23,10 +23,9 @@
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.PersistableEntityInformation;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.query.EvaluationContextProvider;
 import org.springframework.data.repository.query.QueryLookupStrategy;
+import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;
@@ -63,7 +62,8 @@ public void setBeanClassLoader(ClassLoader classLoader) {
     @SuppressWarnings("unchecked")
     @Override
     public <T, ID> EntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-        return new PersistableEntityInformation(domainClass);
+
+        return new EbeanEntityInformation(this.ebeanServer, domainClass);
     }
 
     /*
@@ -104,7 +104,7 @@ protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
      */
     @Override
     protected Optional<QueryLookupStrategy> getQueryLookupStrategy(QueryLookupStrategy.Key key,
-                                                                   EvaluationContextProvider evaluationContextProvider) {
+                                                                   QueryMethodEvaluationContextProvider evaluationContextProvider) {
         return Optional.ofNullable(EbeanQueryLookupStrategy.create(ebeanServer, key, evaluationContextProvider));
     }
 
diff --git a/src/main/java/org/springframework/data/ebean/repository/support/EbeanRepositoryFactoryBean.java b/src/main/java/org/springframework/data/ebean/repository/support/EbeanRepositoryFactoryBean.java
@@ -24,7 +24,6 @@
 import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;
 import org.springframework.util.Assert;
 
-import java.io.Serializable;
 
 /**
  * Special adapter for Springs {@link org.springframework.beans.factory.FactoryBean} interface to allow easy setup of
@@ -33,7 +32,7 @@
  * @param <T> the type of the repository
  * @author Xuegui Yuan
  */
-public class EbeanRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
+public class EbeanRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
         extends TransactionalRepositoryFactoryBeanSupport<T, S, ID> {
 
     @Autowired
diff --git a/src/main/java/org/springframework/data/ebean/repository/support/SimpleEbeanRepository.java b/src/main/java/org/springframework/data/ebean/repository/support/SimpleEbeanRepository.java
@@ -18,7 +18,10 @@
 
 import io.ebean.*;
 import io.ebean.text.PathProperties;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.ebean.repository.EbeanRepository;
 import org.springframework.data.ebean.util.Converters;
 import org.springframework.data.ebean.util.ExampleExpressionBuilder;
@@ -27,7 +30,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
@@ -42,7 +44,7 @@
  */
 @Repository
 @Transactional(rollbackFor = Exception.class)
-public class SimpleEbeanRepository<T extends Persistable, ID extends Serializable> implements EbeanRepository<T, ID> {
+public class SimpleEbeanRepository<T, ID> implements EbeanRepository<T, ID> {
 
     private static final String ID_MUST_NOT_BE_NULL = "The given id must not be null!";
     private static final String PROP_MUST_NOT_BE_NULL = "The given property must not be null!";
