lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix RSQL G2 visitor and referenes (e.g. assignedds) with multiple conditions (2) (#2406)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-05-16 15:11:25 +03:00
committed by GitHub
parent 86fca64e51
commit c0e89fbbee
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java
View File

@@ -298,8 +298,13 @@ public class JpaQueryRsqlVisitorG2<A extends Enum<A> & RsqlQueryField, T>
if (!attribute.isCollection()) { if (!attribute.isCollection()) {
// it is a SingularAttribute and not join if it is of basic or entity persistence type // it is a SingularAttribute and not join if it is of basic or entity persistence type
final Type.PersistenceType persistenceType = ((SingularAttribute<?, ?>) attribute).getType().getPersistenceType(); final Type.PersistenceType persistenceType = ((SingularAttribute<?, ?>) attribute).getType().getPersistenceType();
if (persistenceType.equals(Type.PersistenceType.BASIC) || persistenceType.equals(Type.PersistenceType.ENTITY)) { if (persistenceType == Type.PersistenceType.BASIC) {
return root.get(fieldNameSplit); return root.get(fieldNameSplit);
} else if (persistenceType == Type.PersistenceType.ENTITY) {
return root.getJoins().stream()
.filter(join -> join.getAttribute().equals(attribute))
.findFirst()
.orElseGet(() -> root.join(fieldNameSplit, JoinType.LEFT));
} }
} // if a collection - it is a join } // if a collection - it is a join
if (inOr && root == this.root) { // try to reuse join of the same "or" level and no subquery if (inOr && root == this.root) { // try to reuse join of the same "or" level and no subquery

11
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java
View File

@@ -39,14 +39,15 @@ import org.springframework.test.context.ContextConfiguration;
@SuppressWarnings("java:S2699") // java:S2699 - manual test, don't actually does assertions @SuppressWarnings("java:S2699") // java:S2699 - manual test, don't actually does assertions
class RSQLToSQLTest { class RSQLToSQLTest {
private static final boolean FULL = Boolean.getBoolean("full");
private RSQLToSQL rsqlToSQL; private RSQLToSQL rsqlToSQL;
@Test @Test
void print() { void print() {
print(JpaTarget.class, TargetFields.class, "tag==tag1 and tag==tag2"); print(JpaTarget.class, TargetFields.class, "tag==tag1 and tag==tag2");
print(JpaTarget.class, TargetFields.class, "tag==tag1 or tag==tag2 or tag==tag3"); print(JpaTarget.class, TargetFields.class, "tag==tag1 or tag==tag2 or tag==tag3");
print(JpaTarget.class, TargetFields.class, "targettype.key==type1 and metadata.key1==target1-value1"); print(JpaTarget.class, TargetFields.class, "targettype.key==type1 and metadata.key1==target1-value1");
print(JpaTarget.class, TargetFields.class, "targettype.key==type1 or metadata.key1==target1-value1");
print(JpaTarget.class, TargetFields.class, "(tag!=TAG1 or tag !=TAG2)"); print(JpaTarget.class, TargetFields.class, "(tag!=TAG1 or tag !=TAG2)");
} }
@@ -105,9 +106,9 @@ class RSQLToSQLTest {
private <T, A extends Enum<A> & RsqlQueryField> void print(final Class<T> domainClass, final Class<A> fieldsClass, final String rsql) { private <T, A extends Enum<A> & RsqlQueryField> void print(final Class<T> domainClass, final Class<A> fieldsClass, final String rsql) {
System.out.println(rsql); System.out.println(rsql);
System.out.println("\tlegacy:\n" + System.out.println("\tlegacy:\n" +
"\t\t" + rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, true)); "\t\t" + useStar(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, true)));
System.out.println("\tG2:\n" + System.out.println("\tG2:\n" +
"\t\t" + rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false)); "\t\t" + useStar(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false)));
} }
private <T, A extends Enum<A> & RsqlQueryField> void printFrom(final Class<T> domainClass, final Class<A> fieldsClass, final String rsql) { private <T, A extends Enum<A> & RsqlQueryField> void printFrom(final Class<T> domainClass, final Class<A> fieldsClass, final String rsql) {
@@ -117,4 +118,8 @@ class RSQLToSQLTest {
System.out.println("\tG2:\n" + System.out.println("\tG2:\n" +
"\t\t" + from(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false))); "\t\t" + from(rsqlToSQL.toSQL(domainClass, fieldsClass, rsql, false)));
} }
private static String useStar(final String sql) {
return FULL ? sql : sql.replaceAll("^SELECT [^(]* FROM", "SELECT * FROM");
}
} }