feat: SQL store for cel expression (#67)

Author: wolf4ood

extensions/cel/cel-spi/src/testFixtures/java/org/eclipse/edc/virtualized/policy/cel/CelExpressionStoreTestBase.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.edc.virtualized.policy.cel;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.edc.spi.query.Criterion;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.virtualized.policy.cel.model.CelExpression;
@@ -36,7 +35,7 @@ void create() {
         var result = getStore().create(expr);
         assertThat(result).isSucceeded();
         var expressions = getStore().query(QuerySpec.max());
-        Assertions.assertThat(expressions).usingRecursiveFieldByFieldElementComparator().containsExactly(expr);
+        assertThat(expressions).usingRecursiveFieldByFieldElementComparator().containsExactly(expr);
     }
 
     @Test
@@ -58,11 +57,26 @@ void query_noQuerySpec() {
         resources.forEach(getStore()::create);
 
         var res = getStore().query(QuerySpec.none());
-        Assertions.assertThat(res)
+        assertThat(res)
                 .usingRecursiveFieldByFieldElementComparator()
                 .containsExactlyInAnyOrder(resources.toArray(new CelExpression[0]));
     }
 
+    @Test
+    void query_leftOperand() {
+        var resources = range(0, 5)
+                .mapToObj(i -> celExpression("id" + i, "leftOperand" + i))
+                .toList();
+
+        resources.forEach(getStore()::create);
+
+        var res = getStore().query(QuerySpec.Builder.newInstance().filter(Criterion.criterion("leftOperand", "=", "leftOperand3")).build());
+        assertThat(res).hasSize(1)
+                .first().satisfies(celExpression -> {
+                    assertThat(celExpression).usingRecursiveComparison().isEqualTo(resources.get(3));
+                });
+    }
+
     @Test
     void query_whenNotFound() {
         var resources = range(0, 5)
@@ -74,7 +88,7 @@ void query_whenNotFound() {
         var query = QuerySpec.Builder.newInstance().filter(Criterion.criterion("id", "=", "non-existing-id"))
                 .build();
         var res = getStore().query(query);
-        Assertions.assertThat(res).isEmpty();
+        assertThat(res).isEmpty();
     }
 
     @Test
@@ -90,7 +104,7 @@ void query_byInvalidField_shouldReturnEmptyList() {
                 .filter(new Criterion("invalidField", "=", "test-value"))
                 .build();
         var res = getStore().query(query);
-        Assertions.assertThat(res).isNotNull().isEmpty();
+        assertThat(res).isNotNull().isEmpty();
     }
 
     @Test
@@ -132,6 +146,10 @@ void delete_whenNotExists() {
     }
 
     private CelExpression celExpression(String id) {
-        return new CelExpression(id, "leftOperand", "expression", "description");
+        return celExpression(id, "leftOperand");
+    }
+
+    private CelExpression celExpression(String id, String leftOperand) {
+        return new CelExpression(id, leftOperand, "expression", "description");
     }
 }

extensions/cel/cel-store-sql/build.gradle.kts

@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2025 Metaform Systems, Inc.
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Metaform Systems, Inc. - initial API and implementation
+ *
+ */
+
+plugins {
+    `java-library`
+}
+
+dependencies {
+    api(project(":extensions:cel:cel-spi"))
+    implementation(libs.edc.spi.transaction.datasource)
+    implementation(libs.edc.lib.sql)
+    implementation(libs.edc.core.sql.bootstrapper)
+
+    testImplementation(libs.edc.junit)
+    testImplementation(testFixtures(libs.edc.fixtures.sql))
+    testImplementation(testFixtures(project(":extensions:cel:cel-spi")))
+
+    testImplementation(libs.postgres)
+}

extensions/cel/cel-store-sql/src/main/java/org/eclipse/edc/virtual/connector/store/sql/cel/BaseSqlDialectStatementsConfig.java

@@ -0,0 +1,72 @@
+/*
+ *  Copyright (c) 2025 Metaform Systems, Inc.
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Metaform Systems, Inc. - initial API and implementation
+ *
+ */
+
+package org.eclipse.edc.virtual.connector.store.sql.cel;
+
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.sql.translation.PostgresqlOperatorTranslator;
+import org.eclipse.edc.sql.translation.SqlQueryStatement;
+import org.eclipse.edc.virtual.connector.store.sql.cel.schema.postgres.CelExpressionMapping;
+
+import static java.lang.String.format;
+
+public class BaseSqlDialectStatementsConfig implements CelExpressionStoreStatements {
+
+    @Override
+    public String getInsertTemplate() {
+        return executeStatement()
+                .column(getIdColumn())
+                .column(getLeftOperandColumn())
+                .column(getExpressionColumn())
+                .column(getDescriptionColumn())
+                .jsonColumn(getScopesColumn())
+                .column(getCreateTimestampColumn())
+                .column(getLastModifiedTimestampColumn())
+                .insertInto(getCelExpressionTable());
+    }
+
+    @Override
+    public String getUpdateTemplate() {
+        return executeStatement()
+                .column(getLeftOperandColumn())
+                .column(getExpressionColumn())
+                .column(getDescriptionColumn())
+                .jsonColumn(getScopesColumn())
+                .column(getCreateTimestampColumn())
+                .column(getLastModifiedTimestampColumn())
+                .update(getCelExpressionTable(), getIdColumn());
+    }
+
+    @Override
+    public String getFindByIdTemplate() {
+        return format("SELECT * FROM %s WHERE %s = ?", getCelExpressionTable(), getIdColumn());
+
+    }
+
+    @Override
+    public String getDeleteByIdTemplate() {
+        return executeStatement().delete(getCelExpressionTable(), getIdColumn());
+    }
+
+    @Override
+    public SqlQueryStatement createQuery(QuerySpec querySpec) {
+        var select = getSelectStatement();
+        return new SqlQueryStatement(select, querySpec, new CelExpressionMapping(this), new PostgresqlOperatorTranslator());
+    }
+
+    @Override
+    public String getSelectStatement() {
+        return format("SELECT * FROM %s", getCelExpressionTable());
+    }
+}

extensions/cel/cel-store-sql/src/main/java/org/eclipse/edc/virtual/connector/store/sql/cel/CelExpressionStoreStatements.java

@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2025 Metaform Systems, Inc.
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Metaform Systems, Inc. - initial API and implementation
+ *
+ */
+
+package org.eclipse.edc.virtual.connector.store.sql.cel;
+
+import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.sql.statement.SqlStatements;
+import org.eclipse.edc.sql.translation.SqlQueryStatement;
+import org.eclipse.edc.virtualized.policy.cel.model.CelExpression;
+
+/**
+ * Defines SQL-statements and column names for use with a SQL-based {@link CelExpression}
+ */
+public interface CelExpressionStoreStatements extends SqlStatements {
+
+    default String getCelExpressionTable() {
+        return "edc_cel_expression";
+    }
+
+    default String getIdColumn() {
+        return "id";
+    }
+
+    default String getCreateTimestampColumn() {
+        return "created_date";
+    }
+
+    default String getLastModifiedTimestampColumn() {
+        return "last_modified_date";
+    }
+
+    default String getScopesColumn() {
+        return "scopes";
+    }
+
+    default String getLeftOperandColumn() {
+        return "left_operand";
+    }
+
+    default String getExpressionColumn() {
+        return "expression";
+    }
+
+    default String getDescriptionColumn() {
+        return "description";
+    }
+
+    String getInsertTemplate();
+
+    String getUpdateTemplate();
+
+    String getDeleteByIdTemplate();
+
+    String getFindByIdTemplate();
+
+    SqlQueryStatement createQuery(QuerySpec query);
+
+    String getSelectStatement();
+}