1.新增范围关系支持

2.升级junit与jackson的版本
ymm-tech · Jan 5, 2021 · 3f6dac5 · 3f6dac5
1 parent 5ac77d6
commit 3f6dac5
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 15 deletions.
diff --git a/ebatis-core/pom.xml b/ebatis-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ebatis-core</artifactId>

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/domain/DefaultRange.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/domain/DefaultRange.java
@@ -1,12 +1,14 @@
 package io.manbang.ebatis.core.domain;
 
 import io.manbang.ebatis.core.exception.ConditionNotSupportException;
+import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Objects;
 
 
 /**
@@ -20,6 +22,7 @@ class DefaultRange<T extends Comparable<T>> implements Range<T> {
     private IntervalType leftIntervalType;
     private IntervalType rightIntervalType;
     private String name;
+    private ShapeRelation relation;
 
     public DefaultRange(T min, T max) {
         this.min = min;
@@ -73,13 +76,41 @@ public Range<T> openRight() {
         return this;
     }
 
+    @Override
+    public Range<T> intersects() {
+        relation = ShapeRelation.INTERSECTS;
+        return this;
+    }
+
+    @Override
+    public Range<T> disjoint() {
+        relation = ShapeRelation.DISJOINT;
+        return this;
+    }
+
+    @Override
+    public Range<T> within() {
+        relation = ShapeRelation.WITHIN;
+        return this;
+    }
+
+    @Override
+    public Range<T> contains() {
+        relation = ShapeRelation.CONTAINS;
+        return this;
+    }
+
     @Override
     public QueryBuilder toBuilder() {
         Object left = getValue(min);
         Object right = getValue(max);
 
         RangeQueryBuilder builder = QueryBuilders.rangeQuery(name);
 
+        //设置范围关系
+        if (Objects.nonNull(relation)) {
+            builder.relation(relation.getRelationName());
+        }
         // 如果左界限为空，右界限肯定不是空值，因为上面已经判断了，左右界限同时为空的场景
         if (left == null) {
             rightIntervalType.right(builder, right);

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/domain/Range.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/domain/Range.java
@@ -100,6 +100,34 @@ static <T extends Comparable<T>> Range<T> ge(T min) {
      */
     Range<T> openRight();
 
+    /**
+     * 范围相交
+     *
+     * @return 自身
+     */
+    Range<T> intersects();
+
+    /**
+     * 范围不相交
+     *
+     * @return 自身
+     */
+    Range<T> disjoint();
+
+    /**
+     * 范围在内部
+     *
+     * @return 自身
+     */
+    Range<T> within();
+
+    /**
+     * 范围包含
+     *
+     * @return 自身
+     */
+    Range<T> contains();
+
     /**
      * 转换成ES的插叙构建器
      *

diff --git a/ebatis-sample/pom.xml b/ebatis-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.manbang</groupId>
             <artifactId>ebatis-spring</artifactId>
-            <version>6.5.1.1.RELEASE</version>
+            <version>6.5.1.2.RELEASE</version>
         </dependency>
 
         <dependency>

diff --git a/ebatis-spring-boot/ebatis-spring-boot-autoconfigure/pom.xml b/ebatis-spring-boot/ebatis-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis-spring-boot</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ebatis-spring-boot/ebatis-spring-boot-starter/pom.xml b/ebatis-spring-boot/ebatis-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis-spring-boot</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ebatis-spring-boot/pom.xml b/ebatis-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,17 +30,17 @@
             <dependency>
                 <groupId>io.manbang</groupId>
                 <artifactId>ebatis-spring</artifactId>
-                <version>6.5.1.1.RELEASE</version>
+                <version>6.5.1.2.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>io.manbang</groupId>
                 <artifactId>ebatis-core</artifactId>
-                <version>6.5.1.1.RELEASE</version>
+                <version>6.5.1.2.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>io.manbang</groupId>
                 <artifactId>ebatis-spring-boot-autoconfigure</artifactId>
-                <version>6.5.1.1.RELEASE</version>
+                <version>6.5.1.2.RELEASE</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/ebatis-spring/pom.xml b/ebatis-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ebatis-spring</artifactId>
@@ -14,7 +14,7 @@
         <dependency>
             <artifactId>ebatis-core</artifactId>
             <groupId>io.manbang</groupId>
-            <version>6.5.1.1.RELEASE</version>
+            <version>6.5.1.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/ebatis-web/pom.xml b/ebatis-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>6.5.1.1.RELEASE</version>
+        <version>6.5.1.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.manbang</groupId>
     <artifactId>ebatis</artifactId>
-    <version>6.5.1.1.RELEASE</version>
+    <version>6.5.1.2.RELEASE</version>
     <packaging>pom</packaging>
     <name>ebatis</name>
     <description>Elasticsearch ORM Framework</description>
@@ -29,7 +29,7 @@
         <commons-codec.version>1.11</commons-codec.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <junit.version>4.11</junit.version>
+        <junit.version>4.13.1</junit.version>
         <spring.version>4.3.16.RELEASE</spring.version>
         <spring-boot.version>1.5.12.RELEASE</spring-boot.version>
         <fastjson.version>1.2.61</fastjson.version>
@@ -43,7 +43,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.targe>${java.version}</maven.compiler.targe>
         <maven.compiler.parameters>true</maven.compiler.parameters>
-        <jackson.version>2.8.11</jackson.version>
+        <jackson.version>2.11.3</jackson.version>
         <commons-configuration2.version>2.6</commons-configuration2.version>
         <auto-service-annotations.version>1.0-rc5</auto-service-annotations.version>
         <auto-service.version>1.0-rc7</auto-service.version>