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

Author: yuanxuegui

README.md

@@ -345,6 +345,22 @@ public class UserRepositoryIntegrationTests {
     }
 }
 ```
+QueryObject `UserQuery`
+```java
+@Data
+@IncludeFields("emailAddress")
+public class UserQuery {
+    @ExprParam(expr = ExprType.CONTAINS)
+    private String emailAddress;
+
+    @ExprParam(name = "age", expr = ExprType.GE)
+    private int ageStart;
+
+    @ExprParam(name = "age", expr = ExprType.LE)
+    private int ageEnd;
+}
+```
+
 `EbeanQueryChannelServiceIntegrationTests.java`
 ```java
 package org.springframework.data.ebean.querychannel;
@@ -444,6 +460,31 @@ public class EbeanQueryChannelServiceIntegrationTests {
         assertEquals("QueryChannel", userDTO.getFirstName());
         assertEquals("[email protected]", userDTO.getEmailAddress());
     }
+    
+    @Test
+    public void query_queryObject() {
+        UserQuery userQuery = new UserQuery();
+        userQuery.setEmailAddress("[email protected]");
+        userQuery.setAgeStart(1);
+        userQuery.setAgeEnd(30);
+        UserDTO user = queryChannel.createQuery(User.class, userQuery)
+                .asDto(UserDTO.class)
+                .setRelaxedMode()
+                .findOne();
+        assertEquals("[email protected]", user.getEmailAddress());
+    }
+    
+    @Test
+    public void applyQueryObject() {
+        UserQuery userQuery = new UserQuery();
+        userQuery.setEmailAddress("[email protected]");
+        userQuery.setAgeStart(1);
+        userQuery.setAgeEnd(30);
+        UserInfo userInfo = EbeanQueryChannelService.applyWhere(queryChannel.createNamedQuery(UserInfo.class,
+                "userInfo").where(), userQuery).findOne();
+        assertEquals("QueryChannel", userInfo.getFirstName());
+        assertEquals("[email protected]", userInfo.getEmailAddress());
+    }
 
 }
 ```

README_zh.md

@@ -309,6 +309,22 @@ public class UserRepositoryIntegrationTests {
     }
 }
 ```
+查询对象 `UserQuery`
+```java
+@Data
+@IncludeFields("emailAddress")
+public class UserQuery {
+    @ExprParam(expr = ExprType.CONTAINS)
+    private String emailAddress;
+
+    @ExprParam(name = "age", expr = ExprType.GE)
+    private int ageStart;
+
+    @ExprParam(name = "age", expr = ExprType.LE)
+    private int ageEnd;
+}
+```
+```
 `EbeanQueryChannelServiceIntegrationTests.java`
 ```java
 package org.springframework.data.ebean.querychannel;
@@ -408,6 +424,31 @@ public class EbeanQueryChannelServiceIntegrationTests {
         assertEquals("QueryChannel", userDTO.getFirstName());
         assertEquals("[email protected]", userDTO.getEmailAddress());
     }
+    
+    @Test
+    public void query_queryObject() {
+        UserQuery userQuery = new UserQuery();
+        userQuery.setEmailAddress("[email protected]");
+        userQuery.setAgeStart(1);
+        userQuery.setAgeEnd(30);
+        UserDTO user = queryChannel.createQuery(User.class, userQuery)
+                .asDto(UserDTO.class)
+                .setRelaxedMode()
+                .findOne();
+        assertEquals("[email protected]", user.getEmailAddress());
+    }
+    
+    @Test
+    public void applyQueryObject() {
+        UserQuery userQuery = new UserQuery();
+        userQuery.setEmailAddress("[email protected]");
+        userQuery.setAgeStart(1);
+        userQuery.setAgeEnd(30);
+        UserInfo userInfo = EbeanQueryChannelService.applyWhere(queryChannel.createNamedQuery(UserInfo.class,
+                "userInfo").where(), userQuery).findOne();
+        assertEquals("QueryChannel", userInfo.getFirstName());
+        assertEquals("[email protected]", userInfo.getEmailAddress());
+    }
 
 }
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.hexagonframework.data</groupId>
     <artifactId>spring-data-ebean</artifactId>
-    <version>1.3.4.RELEASE</version>
+    <version>1.4.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Spring Data Ebean</name>
@@ -40,6 +40,9 @@
     </scm>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+        <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>
@@ -70,7 +73,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <source>1.8</source>
+                            <source>${java.version}</source>
                         </configuration>
                         <executions>
                             <execution>
@@ -207,12 +210,12 @@
             <plugin>
                 <groupId>io.repaint.maven</groupId>
                 <artifactId>tiles-maven-plugin</artifactId>
-                <version>2.8</version>
+                <version>2.10</version>
                 <extensions>true</extensions>
                 <configuration>
                     <tiles>
                         <tile>org.avaje.tile:java-compile:1.1</tile>
-                        <tile>io.ebean.tile:enhancement:5.1</tile>
+                        <tile>io.ebean.tile:enhancement:5.5</tile>
                     </tiles>
                 </configuration>
             </plugin>

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

@@ -0,0 +1,42 @@
+package org.springframework.data.ebean.annotation;
+
+import org.springframework.data.ebean.querychannel.ExprType;
+
+import java.lang.annotation.*;
+
+/**
+ * Expr param.
+ *
+ * @author XueguiYuan
+ * @version 1.0 (created time: 2018/4/29).
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Documented
+public @interface ExprParam {
+
+    /**
+     * Query param name.
+     */
+    String name() default "";
+
+    /**
+     * Query param name.
+     */
+    String value() default "";
+
+    /**
+     * Expr.
+     */
+    ExprType expr() default ExprType.DEFAULT;
+
+    /**
+     * Case insensitive.
+     */
+    boolean ignoreCase() default true;
+
+    /**
+     * If true, do nothing when field value is null, else and expr isNull.
+     */
+    boolean escapeNull() default true;
+}

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

@@ -0,0 +1,21 @@
+package org.springframework.data.ebean.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Define the fetch path string for query select and fetch.
+ *
+ * @author XueguiYuan
+ * @version 1.0 (created time: 2018/4/29).
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface IncludeFields {
+    /**
+     * Query fetch path string.
+     */
+    String value();
+}

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

@@ -16,19 +16,15 @@
 
 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 java.lang.annotation.*;
 
 /**
- * Indicates a method should be regarded as Update{@link io.ebean.UpdateQuery} or SqlUpdate {@link io.ebean.SqlUpdate}.
+ * Indicates a method should be regarded as Update{@link io.ebean.UpdateQuery} or SqlUpdate{@link io.ebean.SqlUpdate}.
  *
  * @author Xuegui Yuan
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target( {ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
 @Documented
 public @interface Modifying {
 }

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

@@ -16,44 +16,34 @@
 
 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.
  *
  * @author Xuegui Yuan
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target( {ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
 @QueryAnnotation
 @Documented
 public @interface Query {
 
-  /**
-   * Defines the Ebean query to be executed when the annotated method is called.
-   */
-  String value() default "";
-
-  /**
-   * Configures whether the given query is a SqlQuery. Defaults to {@literal false}.
-   */
-  boolean nativeQuery() default false;
+    /**
+     * Defines the Ebean query to be executed when the annotated method is called.
+     */
+    String value() default "";
 
-  /**
-   * The named query to be used. If not defined, a {@link javax.persistence.NamedQuery} with name of
-   * {@code $ domainClass}.${queryMethodName}} will be used.
-   */
-  String name() default "";
+    /**
+     * Configures whether the given query is a SqlQuery. Defaults to {@literal false}.
+     */
+    boolean nativeQuery() default false;
 
-  /**
-   * Parse the string to return a FetchPath,
-   * format like (a,b,c(d,e),f(g)) where "c" is a path containing "d" and "e" and "f" is a
-   * path containing "g" and the root path contains "a","b","c" and "f".
-   */
-  String fetchPath() default "";
+    /**
+     * The named query to be used. If not defined, a {@link javax.persistence.NamedQuery} with name of
+     * {@code $ domainClass}.${queryMethodName}} will be used.
+     */
+    String name() default "";
 }