fix: <nGQL> fails to function properly when using ng.include across multiple lines.

CHANGELOG-CN.md

@@ -22,6 +22,7 @@ This source code is licensed under Apache 2.0 License.
 ## Bug修复
 
 - 修复执行报错时产生连接未回收的泄漏问题
+- 修复 ng.include 在多行的情况下，模板无法正常使用的问题
 
 # 2.0.1
 

CHANGELOG.md

@@ -45,6 +45,7 @@ This source code is licensed under Apache 2.0 License.
 ## Bugfix
 
 - Fixed connection leak issue when an error occurs during execution.
+- Fix the issue where the template fails to function properly when using `ng.include` across multiple lines.
 
 # 2.0.1
 

ngbatis-demo/src/main/java/ye/weicheng/ngbatis/demo/repository/NgqlIncludeDao.java

@@ -1,5 +1,7 @@
 package ye.weicheng.ngbatis.demo.repository;
 
+import java.util.List;
+import java.util.Map;
 import org.springframework.data.repository.query.Param;
 import ye.weicheng.ngbatis.demo.pojo.Person;
 
@@ -12,4 +14,6 @@ public interface NgqlIncludeDao {
   Integer testInclude(@Param("myInt") Integer myInt);
 
   Integer returnAge(@Param("person")Person person);
+
+  List<Map> selectByFilter(@Param("person") Person person);
 }

ngbatis-demo/src/main/resources/mapper/NgqlIncludeDao.xml

@@ -25,4 +25,18 @@
         RETURN @ng.include('include-test-value',{'myInt':age});
     </nGQL>
 
+
+  <nGQL id="filterStart">
+    MATCH (n: person)-[r]->(n2: person)
+    @if ( isNotEmpty( person.name ) ) {
+       WHERE id(n) == '${person.name}'
+    @}
+  </nGQL>
+
+  <select id="selectByFilter" resultType="java.util.Map">
+    @ng.include('filterStart');
+    RETURN n as startNode, r as `edge`, n2 as endNode
+    LIMIT 10
+  </select>
+
 </mapper>

ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/repository/NgqlIncludeTest.java

@@ -1,5 +1,8 @@
 package ye.weicheng.ngbatis.demo.repository;
 
+import com.alibaba.fastjson.JSON;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -26,5 +29,15 @@ public void test() {
     System.out.println("nGQL跨mapper引用测试:" + ngqlInclude4diffMapperDao.testInclude(1));
 
   }
+
+  @Test
+  public void testFilter() {
+    Person person = new Person();
+    List<Map> ngTriplet = ngqlIncludeDao.selectByFilter(person);
+    System.out.println(JSON.toJSONString(ngTriplet));
+    person.setName("赵小洋");
+    ngTriplet = ngqlIncludeDao.selectByFilter(person);
+    System.out.println(JSON.toJSONString(ngTriplet));
+  }
 
 }

src/main/java/org/nebula/contrib/ngbatis/io/MapperResourceLoader.java

@@ -197,7 +197,7 @@ protected MethodModel parseMethodModel(Node node) {
    * @return
    */
   protected NgqlModel parseNgqlModel(Element ngqlEl) {
-    return  new NgqlModel(ngqlEl.id(),ngqlEl.text());
+    return  new NgqlModel(ngqlEl.id(),ngqlEl.wholeText());
   }
 
   /**

src/main/java/org/nebula/contrib/ngbatis/models/data/NgTriplet.java

@@ -8,6 +8,8 @@ public class NgTriplet<I> {
   private Object edge;
   private Object endNode;
 
+  public NgTriplet() {}
+
   public NgTriplet(Object startNode, Object edge, Object endNode) {
     this.startNode = startNode;
     this.edge = edge;