Skip to content

Commit

Permalink
2.0.5:
Browse files Browse the repository at this point in the history
- escape separator: '/'
  • Loading branch information
biagio committed Jul 2, 2024
1 parent 5b7cccd commit 50194d7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ or if you prefer to manage a JSON:

### Other (only for Mode 1)
- Separator for array values: `,`; e.g. _?myField_in=test1,test2_ --> values: ["test1", "test2"]
- To escape separator: `\,`; e.g. _?myField_in=test1,test2\\,test3_ --> values: ["test1", "test2,test3"]
- To escape separator: `/,`; e.g. _?myField_in=test1,test2/,test3_ --> values: ["test1", "test2,test3"]


---
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group = 'app.tozzi'
version = '2.0.4'
version = '2.0.5'

java {
sourceCompatibility = '17'
Expand Down Expand Up @@ -57,7 +57,7 @@ publishing {
maven(MavenPublication) {
group = 'app.tozzi'
artifactId = 'jpa-search-helper'
version = "2.0.4"
version = "2.0.5"
from components.java
pom {
name = 'JPA Search Helper'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/app/tozzi/util/JPASearchUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class JPASearchUtils {

private static final String SEPARATOR = ",";
private static final String ESCAPE_SEPARATOR_CHAR = "\\";
private static final String ESCAPE_SEPARATOR_CHAR = "/";
private static final String IGNORE_CASE_OPTION_IDENTIFIER = "#i";
private static final String NEGATION_OPTION_IDENTIFIER = "#n";
private static final String TRIM_OPTION_IDENTIFIER = "#t";
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/app/tozzi/util/GenericUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ public class GenericUtilsTest {
@Test
public void containsSeparatorTest() {
assertTrue(GenericUtils.containsSeparator("test1,test2", ",", null));
assertTrue(GenericUtils.containsSeparator("test1,test2", ",", "\\"));
assertTrue(GenericUtils.containsSeparator("test1,test2\\,test3", ",", "\\"));
assertTrue(GenericUtils.containsSeparator("test1,test2", ",", "/"));
assertTrue(GenericUtils.containsSeparator("test1,test2/,test3", ",", "/"));
assertTrue(GenericUtils.containsSeparator("test1,test2|,test3", ",", "|"));
}

@Test
public void notContainsSeparatorTest() {
assertFalse(GenericUtils.containsSeparator("test1,test2", ";", null));
assertFalse(GenericUtils.containsSeparator("test1\\,test2", ",", "\\"));
assertFalse(GenericUtils.containsSeparator("test1/,test2", ",", "/"));
assertFalse(GenericUtils.containsSeparator("test1;,test2", ",", ";"));
}

Expand All @@ -47,7 +47,7 @@ public void splitTest() {
assertEquals("test1", splitted.getFirst());
assertEquals("test2", splitted.getLast());

splitted = GenericUtils.split("test1,test2\\,test3", ",", "\\");
splitted = GenericUtils.split("test1,test2/,test3", ",", "/");
assertNotNull(splitted);
assertFalse(splitted.isEmpty());
assertEquals(2, splitted.size());
Expand All @@ -67,7 +67,7 @@ public void splitTest() {
assertEquals(1, splitted.size());
assertEquals("test1,test2", splitted.getFirst());

splitted = GenericUtils.split("test1\\,test2", ",", "\\");
splitted = GenericUtils.split("test1/,test2", ",", "/");
assertNotNull(splitted);
assertFalse(splitted.isEmpty());
assertEquals(1, splitted.size());
Expand All @@ -87,7 +87,7 @@ public void splitTest() {
assertEquals("test2", splitted.get(1));
assertEquals("", splitted.getLast());

splitted = GenericUtils.split("test1\\,test2,test3,", ",", "\\");
splitted = GenericUtils.split("test1/,test2,test3,", ",", "/");
assertNotNull(splitted);
assertFalse(splitted.isEmpty());
assertEquals(3, splitted.size());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/app/tozzi/util/JPASearchUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static Map<String, String> generateRandomMap() {
Map<String, String> resultMap = new HashMap<>();
resultMap.put("id_eq", String.valueOf(generateRandomValue(String.class)));
resultMap.put("stringOne_contains", String.valueOf(generateRandomValue(String.class)));
resultMap.put("stringTwo_in", "test1,test2\\,test3");
resultMap.put("stringTwo_in", "test1,test2/,test3");
resultMap.put("stringThree_startsWith#i", String.valueOf(generateRandomValue(String.class)));
resultMap.put("stringFalse_eq#n", String.valueOf(generateRandomValue(String.class)));
resultMap.put("email_eq", String.valueOf(generateRandomValue(String.class)));
Expand Down

0 comments on commit 50194d7

Please sign in to comment.