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

Author: yuanxuegui

README.md

@@ -348,7 +348,7 @@ public class UserRepositoryIntegrationTests {
 QueryObject `UserQuery`
 ```java
 @Data
-@IncludeFields("emailAddress")
+@IncludeFields("emailAddress,fullName(lastName,firstName),age")
 public class UserQuery {
     @ExprParam(expr = ExprType.CONTAINS)
     private String emailAddress;

README_zh.md

@@ -312,7 +312,7 @@ public class UserRepositoryIntegrationTests {
 查询对象 `UserQuery`
 ```java
 @Data
-@IncludeFields("emailAddress")
+@IncludeFields("emailAddress,fullName(lastName,firstName),age")
 public class UserQuery {
     @ExprParam(expr = ExprType.CONTAINS)
     private String emailAddress;

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.hexagonframework.data</groupId>
     <artifactId>spring-data-ebean</artifactId>
-    <version>1.4.0.RELEASE</version>
+    <version>1.4.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Spring Data Ebean</name>
@@ -47,7 +47,7 @@
         <bundlor.failOnWarnings>false</bundlor.failOnWarnings>
         <spring>5.0.4.RELEASE</spring>
         <springdata.commons>2.0.5.RELEASE</springdata.commons>
-        <ebean.version>11.15.4</ebean.version>
+        <ebean.version>11.15.5</ebean.version>
         <ebean-spring-txn.version>11.10.4</ebean-spring-txn.version>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
     </properties>
@@ -60,6 +60,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <phase>package</phase>
@@ -72,6 +73,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.0.0</version>
                         <configuration>
                             <source>${java.version}</source>
                         </configuration>
@@ -87,6 +89,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -222,14 +225,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>wagon-maven-plugin</artifactId>
+                <version>2.0.0</version>
             </plugin>
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
+                <version>1.5.6</version>
             </plugin>
         </plugins>
     </build>

src/main/java/org/springframework/data/ebean/querychannel/EbeanQueryChannelService.java

@@ -20,6 +20,7 @@
 import io.ebean.text.PathProperties;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.ebean.annotation.ExprParam;
+import org.springframework.data.ebean.annotation.IncludeFields;
 import org.springframework.data.ebean.util.Converters;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -356,6 +357,17 @@ private static <T> Query<T> query(EbeanServer ebeanServer, Class<T> entityType,
         Query<T> query = ebeanServer.find(entityType);
         if (StringUtils.hasText(fetchPath)) {
             query.apply(PathProperties.parse(fetchPath));
+        } else {
+            // queryObject IncludePath
+            if (queryObject != null) {
+                if (queryObject.getClass().isAnnotationPresent(IncludeFields.class)) {
+                    IncludeFields includeFields = queryObject.getClass().getAnnotation(IncludeFields.class);
+                    String ifs = includeFields.value();
+                    if (StringUtils.hasText(ifs)) {
+                        query.apply(PathProperties.parse(ifs));
+                    }
+                }
+            }
         }
 
         ExpressionList<T> expressionList = query.where();

src/test/java/org/springframework/data/ebean/querychannel/EbeanQueryChannelServiceIntegrationTest.java

@@ -111,11 +111,16 @@ public void query_queryObject() {
     userQuery.setEmailAddress("testquerychannel@163.com");
     userQuery.setAgeStart(1);
     userQuery.setAgeEnd(30);
-    UserDTO user = queryChannel.createQuery(User.class, userQuery)
+
+    User user = queryChannel.createQuery(User.class, userQuery)
+            .findOne();
+    assertEquals("testquerychannel@163.com", user.getEmailAddress());
+
+    UserDTO userDTO = queryChannel.createQuery(User.class, userQuery)
             .asDto(UserDTO.class)
             .setRelaxedMode()
             .findOne();
-    assertEquals("testquerychannel@163.com", user.getEmailAddress());
+    assertEquals("testquerychannel@163.com", userDTO.getEmailAddress());
   }
 
   @Test

src/test/java/org/springframework/data/ebean/querychannel/UserDTO.java

@@ -1,6 +1,5 @@
 package org.springframework.data.ebean.querychannel;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,9 +9,9 @@
  */
 @Getter
 @Setter
-@AllArgsConstructor
 public class UserDTO {
-  private String firstName;
   private String lastName;
+  private String firstName;
   private String emailAddress;
+  private int age;
 }

src/test/java/org/springframework/data/ebean/querychannel/UserQuery.java

@@ -9,7 +9,7 @@
  * @version 1.0 (created time: 2018/4/29).
  */
 @Data
-@IncludeFields("emailAddress")
+@IncludeFields("emailAddress,fullName(lastName,firstName),age")
 public class UserQuery {
     @ExprParam(expr = ExprType.CONTAINS)
     private String emailAddress;