feat: version bump to 2.2.0

Author: biggates

eaphone-spring-data-query-commons/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.eaphonetech</groupId>
 		<artifactId>eaphone-spring-data-query-parent</artifactId>
-		<version>2.1.1</version>
+		<version>2.2.0</version>
 	</parent>
 
 	<artifactId>eaphone-spring-data-query-commons</artifactId>

eaphone-spring-data-query-jpa/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.eaphonetech</groupId>
 		<artifactId>eaphone-spring-data-query-parent</artifactId>
-		<version>2.1.1</version>
+		<version>2.2.0</version>
 	</parent>
 
 	<artifactId>eaphone-spring-data-query-jpa</artifactId>

eaphone-spring-data-query-jpa/src/main/java/com/eaphonetech/common/datatables/jpa/columns/AbstractColumnTypeDecorator.java

@@ -216,17 +216,23 @@ public void fillPredicates(List<Predicate> predicates, CriteriaBuilder crit, Exp
 				// TODO Need test here about regular expressions
 				// src:
 				// https://stackoverflow.com/questions/24995881/use-regular-expressions-in-jpa-criteriabuilder
-				predicates.add(//
-						crit.equal(//
-								crit.function("regexp", Integer.class, exp, crit.literal(filter.get_regex()))//
-								, 1));
+				Expression<String> patternLiteral = crit.literal(filter.get_regex());
+
+				// 尝试直接使用函数返回的布尔值作为谓词
+				try {
+					predicates.add( //
+							crit.isTrue( //
+									crit.function("regexp", Boolean.class, exp, patternLiteral)
+					//
+					));
+				} catch (IllegalArgumentException e) {
+					System.err.println("Failed to create regexp predicate with function: " + e.getMessage());
+				}
 			}
 			if (StringUtils.hasLength(filter.get_like())) {
-				// TODO Need test here about whether '%' should be added
 				predicates.add(crit.like(exp, filter.get_like()));
 			}
 			if (StringUtils.hasLength(filter.get_notlike())) {
-				// TODO Need test here about whether '%' should be added
 				predicates.add(crit.like(exp, filter.get_notlike()).not());
 			}
 			if (filter.get_empty() != null) {

eaphone-spring-data-query-mongodb/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.eaphonetech</groupId>
 		<artifactId>eaphone-spring-data-query-parent</artifactId>
-		<version>2.1.1</version>
+		<version>2.2.0</version>
 	</parent>
 
 	<artifactId>eaphone-spring-data-query-mongodb</artifactId>

eaphone-spring-data-query-samples/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.eaphonetech</groupId>
 		<artifactId>eaphone-spring-data-query-parent</artifactId>
-		<version>2.1.1</version>
+		<version>2.2.0</version>
 	</parent>
 
 	<artifactId>eaphone-spring-data-query-samples</artifactId>

eaphone-spring-data-query-samples/src/main/resources/static/js/index.js

@@ -144,12 +144,12 @@ $(document).ready(function() {
 			}]
 		}
 	}, {
-		summary: 'Like',
-		description: 'SQL like',
+		summary: 'Not Like',
+		description: 'SQL NOT like',
 		value: {
 			where: {
 				"orderNumber": {
-					"_like": "O100%"
+					"_notlike": "O100%"
 				}
 			}
 		}

pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.13</version>
+		<version>3.5.5</version>
 	</parent>
 
 	<groupId>com.eaphonetech</groupId>
 	<artifactId>eaphone-spring-data-query-parent</artifactId>
-	<version>2.1.1</version>
+	<version>2.2.0</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -18,10 +18,10 @@
 	</organization>
 
 	<scm>
-		<connection>scm:git:https://e.coding.net/biggates/java-projects/eaphone-spring-data-query.git</connection>
-		<developerConnection>scm:git:https://e.coding.net/biggates/java-projects/eaphone-spring-data-query.git</developerConnection>
-		<url>https://e.coding.net/biggates/java-projects/eaphone-spring-data-query.git</url>
-		<tag>2.1.1</tag>
+		<connection>scm:git:https://github.com/EaphoneTech/eaphone-spring-data-query.git</connection>
+		<developerConnection>scm:git:https://github.com/EaphoneTech/eaphone-spring-data-query.git</developerConnection>
+		<url>https://github.com/EaphoneTech/eaphone-spring-data-query</url>
+		<tag>2.2.0</tag>
 	</scm>
 
 	<properties>
@@ -61,7 +61,7 @@
 			<dependency>
 				<groupId>de.bwaldvogel</groupId>
 				<artifactId>mongo-java-server</artifactId>
-				<version>1.45.0</version>
+				<version>1.47.0</version>
 			</dependency>
 
 			<!-- h2 for fake mysql -->
@@ -94,7 +94,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.10.0</version>
+					<version>3.11.3</version>
 				</plugin>
 		        <plugin>
 		            <groupId>org.apache.maven.plugins</groupId>