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

Author: yuanxuegui

README.md

@@ -43,9 +43,31 @@ Conditions on frameworks which I choose for consideration:
 4. The framework must be mature enough for "enterprise level" use
 
 #### Subjective pros/cons of each framework 
+> Reference：[java-persistence-frameworks-comparison](https://github.com/bwajtr/java-persistence-frameworks-comparison)
+
 **Hibernate/JPA**
 * [Compare to JPA](http://ebean-orm.github.io/architecture/compare-jpa)
 
+**JDBC Template**
+* Pros
+    * Feels like you are very close to JDBC itself
+    * Implemented all of the scenarios without bigger issues - there were no hidden surprises
+    * Very easy batch operations
+    * Easy setup
+* Cons
+    * Methods in JDBCDataRepositoryImpl are not much readable - that's because you have to inline SQL in Java code. It would have been better if Java supported multiline strings.
+    * Debug logging could be better  
+
+**jOOQ**
+* Pros
+  * Very fluent, very easy to write new queries, code is very readable
+  * Once setup it's very easy to use, excellent for simple queries
+  * Awesome logger debug output
+* Cons
+  * Paid license for certain databases - it'll be difficult to persuade managers that it's worth it :)
+  * Not so much usable for big queries - it's better to use native SQL (see scenario 9.)
+  * Weird syntax of batch operations (in case that you do not use UpdatableRecord). But it's not a big deal... 
+
 **MyBatis**
 * Pros
   * Writing SQL statements in XML mapper file feels good - it's easy to work with parameters

README_zh.md

@@ -25,17 +25,18 @@
 * 支持MySQL、Oracle、SQL Server、H2、PostgreSQL等数据库
 
 #### 实现的场景 ####
-1. Fetch single entity based on primary key
-2. Fetch list of entities based on condition
-3. Save new single entity and return primary key
-4. Batch insert multiple entities of the same type and return generated keys
-5. Update single existing entity - update all fields of entity at once
-6. Fetch many-to-one relation (Company for Department)
-7. Fetch one-to-many relation (Departments for Company)
-8. Update entities one-to-many relation (Departments in Company) - add two items, update two items and delete one item - all at once
-9. Complex select - construct select where conditions based on some boolean conditions + throw in some JOINs
-10. Execute query using JDBC simple Statement (not PreparedStatement)
-11. Remove single entity based on primary key
+
+1. 基于主键获取单个实体
+2. 根据条件获取实体的列表
+3. 保存新的单个实体并返回主键
+4. 批量插入相同类型的多个实体并返回生成的主键列表
+5. 更新单个现有实体——同时更新所有的实体字段
+6. 获取多对一关系(部门的所属公司)
+7. 获取一对多关系(公司的部门)
+8. 更新实体一对多的关系(公司的部门)-增加两个项目，更新两个项目和删除一个项目-所有只需一句代码/一次操作
+9. 复杂的选择-构造选择的条件基于一些布尔条件+加入一些连接
+10. 使用JDBC简单语句(非PreparedStatement)执行查询
+11. 基于主键移除单个实体
 
 ## 为什么选择[Ebean ORM](https://ebean-orm.github.io)
 
@@ -49,10 +50,32 @@
 4. 足够成熟以应对企业级应用（Ebean和Hibernate同时期作品，资格老，而且持续更新以满足更高需求）
 
 #### 框架优缺点比较
+> 参考：[java-persistence-frameworks-comparison](https://github.com/bwajtr/java-persistence-frameworks-comparison)
+
 **Hibernate/JPA**
 * [Compare to JPA](http://ebean-orm.github.io/architecture/compare-jpa)
 * 反正比Hibernate/JPA好
 
+**JDBC Template**
+* 优点
+    * 感觉自己非常接近JDBC本身
+    * 实现了所有的场景而没有更大的问题-没有隐藏的惊喜
+    * 非常容易的批量操作
+    * 设置简单
+* 缺点
+    * 在Java代码中内联SQL使得实现仓储接口的可读性不强。如果Java支持多行字符串，那就更好了
+    * 调试日志可以更好 
+
+**jOOQ**
+* 优点
+  * 非常流畅，很容易编写新的查询，代码非常易读
+  * 一旦设置好，就很容易使用，非常适合简单的查询
+  * 很棒的日志记录器调试输出
+* 缺点
+  * 某些数据库的付费许可证——很难说服经理们相信它是值得的:)
+  * 对于大的查询来说没有那么多的实用性——最好使用原生SQL(参见场景9)
+  * 批量操作的怪异语法(如果您不使用UpdatableRecord)。但这没什么大不了的……
+
 **MyBatis**
 * 优点
   * 在XML映射文件里写SQL语句很爽
@@ -72,7 +95,7 @@
 
 ## 快速开始 ##
 
-建立maven项目，建议使用spring boot建立web项目
+建立maven项目，建议使用spring boot和[spring-data-ebean-spring-boot](https://github.com/hexagonframework/spring-data-ebean-spring-boot.git)建立web项目
 
 实例：[spring-boot-data-ebean-samples](https://github.com/hexagonframework/spring-boot-data-ebean-samples)
 
@@ -150,7 +173,7 @@ public interface UserRepository extends EbeanRepository<User, Long> {
     int deleteUserByEmailAddress(@Param("emailAddress") String emailAddress);
 
     /**
-     * 命名ORM查询 
+     * 命名ORM/SQL查询 
      */
     @Query(name = "withManagerById")
     List<User> findByLastnameNamedOql(@Param("lastname") String lastname);

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.hexagonframework.data</groupId>
     <artifactId>spring-data-ebean</artifactId>
-    <version>1.3.0.RELEASE</version>
+    <version>1.3.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Spring Data Ebean</name>

src/main/java/org/springframework/data/ebean/annotation/Modifying.java

@@ -16,7 +16,11 @@
 
 package org.springframework.data.ebean.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Indicates a method should be regarded as Update{@link io.ebean.UpdateQuery} or SqlUpdate {@link io.ebean.SqlUpdate}.

src/main/java/org/springframework/data/ebean/annotation/Procedure.java

@@ -16,10 +16,13 @@
 
 package org.springframework.data.ebean.annotation;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.springframework.data.annotation.QueryAnnotation;
 
-import java.lang.annotation.*;
-
 /**
  * Annotation to declare stored procedure mappings directly on repository methods.
  *

src/main/java/org/springframework/data/ebean/annotation/Query.java

@@ -16,10 +16,13 @@
 
 package org.springframework.data.ebean.annotation;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import org.springframework.data.annotation.QueryAnnotation;
 
-import java.lang.annotation.*;
-
 /**
  * Annotation to declare finder queries directly on repository methods.
  *

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

@@ -16,16 +16,15 @@
 
 package org.springframework.data.ebean.domain;
 
-import org.springframework.data.domain.AfterDomainEventPublication;
-import org.springframework.data.domain.DomainEvents;
-import org.springframework.util.Assert;
-
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import org.springframework.data.domain.AfterDomainEventPublication;
+import org.springframework.data.domain.DomainEvents;
+import org.springframework.util.Assert;
 
 /**
  * Abstract base class for aggregate root, aggregate extends {@link AbstractEntity} and add
@@ -35,37 +34,37 @@
  */
 @MappedSuperclass
 public abstract class AbstractAggregateRoot extends AbstractEntity {
-    @Transient
-    private transient final List<DomainEvent> domainEvents = new ArrayList<>();
+  @Transient
+  private transient final List<DomainEvent> domainEvents = new ArrayList<>();
 
-    /**
-     * Registers the given event object for publication on a call to a Spring Data repository's save methods.
-     *
-     * @param event must not be {@literal null}.
-     * @return the event that has been added.
-     */
-    protected <T extends DomainEvent> T registerEvent(T event) {
-        Assert.notNull(event, "Domain event must not be null!");
+  /**
+   * Registers the given event object for publication on a call to a Spring Data repository's save methods.
+   *
+   * @param event must not be {@literal null}.
+   * @return the event that has been added.
+   */
+  protected <T extends DomainEvent> T registerEvent(T event) {
+    Assert.notNull(event, "Domain event must not be null!");
 
-        this.domainEvents.add(event);
-        return event;
-    }
+    this.domainEvents.add(event);
+    return event;
+  }
 
-    /**
-     * Clears all domain events currently held. Usually invoked by the infrastructure in place in Spring Data
-     * repositories.
-     */
-    @AfterDomainEventPublication
-    protected void clearDomainEvents() {
-        this.domainEvents.clear();
-    }
+  /**
+   * Clears all domain events currently held. Usually invoked by the infrastructure in place in Spring Data
+   * repositories.
+   */
+  @AfterDomainEventPublication
+  protected void clearDomainEvents() {
+    this.domainEvents.clear();
+  }
 
-    /**
-     * All domain events currently captured by the aggregate.
-     */
-    @DomainEvents
-    protected Collection<DomainEvent> domainEvents() {
-        return Collections.unmodifiableList(domainEvents);
-    }
+  /**
+   * All domain events currently captured by the aggregate.
+   */
+  @DomainEvents
+  protected Collection<DomainEvent> domainEvents() {
+    return Collections.unmodifiableList(domainEvents);
+  }
 
 }