feat(assetindex): Refactor the dynamic assembly of queries (#1496)

CHANGELOG.md

@@ -24,6 +24,7 @@ in the detailed section referring to by linking pull requests or issues.
 #### Changed
 
 * Provided default no-op `TransactionContext` (#1461)
+* Refactored query capabilites for `Asset` (#1459)
 
 #### Removed
 

system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/dataspaceconnector/test/e2e/postgresql/PostgresqlLocalInstance.java → common/util/src/testFixtures/java/org/eclipse/dataspaceconnector/common/util/postgres/PostgresqlLocalInstance.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2022 Microsoft Corporation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -8,11 +8,11 @@
  *  SPDX-License-Identifier: Apache-2.0
  *
  *  Contributors:
- *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Microsoft Corporation - initial API and implementation
  *
  */
 
-package org.eclipse.dataspaceconnector.test.e2e.postgresql;
+package org.eclipse.dataspaceconnector.common.util.postgres;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;

extensions/sql/asset-index-sql/README.md

@@ -13,18 +13,18 @@ Please apply this [schema](docs/schema.sql) to your SQL database.
 ```plantuml
 @startuml
 entity edc_asset {
-  * asset_id: string <<PK>>
+  * asset_id_fk: string <<PK>>
   --
 }
 
 entity edc_asset_dataaddress {
-  * asset_id: string <<PK>>
+  * asset_id_fk: string <<PK>>
   * properties: string <<json>>
   --
 }
 
 entity edc_asset_property {
-  * asset_id: string <<PK>>
+  * asset_id_fk: string <<PK>>
   * property_name: string
   * property_value: string
   * property_type: string

extensions/sql/asset-index-sql/build.gradle.kts

@@ -19,6 +19,7 @@ plugins {
 
 val h2Version: String by project
 val assertj: String by project
+val postgresVersion: String by project
 
 dependencies {
     api(project(":spi:core-spi"))
@@ -33,6 +34,7 @@ dependencies {
     testImplementation("com.h2database:h2:${h2Version}")
     testImplementation("org.assertj:assertj-core:${assertj}")
     testImplementation(testFixtures(project(":common:util")))
+    testImplementation("org.postgresql:postgresql:${postgresVersion}")
 }
 
 publishing {

extensions/sql/asset-index-sql/docs/er.puml

@@ -1,17 +1,17 @@
 @startuml
 entity edc_asset {
-  * asset_id: string <<PK>>
+  * id: string <<PK>>
   --
 }
 
 entity edc_asset_dataaddress {
-  * asset_id: string <<PK>>
+  * asset_id_fk: string <<PK>>
   * properties: string <<json>>
   --
 }
 
 entity edc_asset_property {
-  * asset_id: string <<PK>>
+  * asset_id_fk: string <<PK>>
   * property_name: string
   * property_value: string
   * property_type: string

extensions/sql/asset-index-sql/docs/schema.sql

@@ -14,29 +14,32 @@
 -- THIS SCHEMA HAS BEEN WRITTEN AND TESTED ONLY FOR POSTGRES
 
 -- table: edc_asset
-CREATE TABLE IF NOT EXISTS edc_asset (
+CREATE TABLE IF NOT EXISTS edc_asset
+(
     asset_id VARCHAR NOT NULL,
     PRIMARY KEY (asset_id)
-    );
+);
 
 -- table: edc_asset_dataaddress
-CREATE TABLE IF NOT EXISTS edc_asset_dataaddress (
-    asset_id VARCHAR NOT NULL,
-    properties VARCHAR NOT NULL,
-    PRIMARY KEY (asset_id),
-    FOREIGN KEY (asset_id) REFERENCES edc_asset (asset_id) ON DELETE CASCADE
-    );
-COMMENT ON COLUMN edc_asset_dataaddress.properties is 'DataAddress properties serialized as JSON';
+CREATE TABLE IF NOT EXISTS edc_asset_dataaddress
+(
+    asset_id_fk VARCHAR NOT NULL,
+    properties  JSON    NOT NULL,
+    PRIMARY KEY (asset_id_fk),
+    FOREIGN KEY (asset_id_fk) REFERENCES edc_asset (asset_id) ON DELETE CASCADE
+);
+COMMENT ON COLUMN edc_asset_dataaddress.properties IS 'DataAddress properties serialized as JSON';
 
 -- table: edc_asset_property
-CREATE TABLE IF NOT EXISTS edc_asset_property (
-    asset_id VARCHAR NOT NULL,
-    property_name VARCHAR NOT NULL,
+CREATE TABLE IF NOT EXISTS edc_asset_property
+(
+    asset_id_fk    VARCHAR NOT NULL,
+    property_name  VARCHAR NOT NULL,
     property_value VARCHAR NOT NULL,
-    property_type VARCHAR NOT NULL,
-    PRIMARY KEY (asset_id, property_name),
-    FOREIGN KEY (asset_id) REFERENCES edc_asset (asset_id) ON DELETE CASCADE
-    );
+    property_type  VARCHAR NOT NULL,
+    PRIMARY KEY (asset_id_fk, property_name),
+    FOREIGN KEY (asset_id_fk) REFERENCES edc_asset (asset_id) ON DELETE CASCADE
+);
 
 COMMENT ON COLUMN edc_asset_property.property_name IS
     'Asset property key';
@@ -46,4 +49,4 @@ COMMENT ON COLUMN edc_asset_property.property_type IS
     'Asset property class name';
 
 CREATE INDEX IF NOT EXISTS idx_edc_asset_property_value
-    ON edc_asset_property(property_name, property_value);
+    ON edc_asset_property (property_name, property_value);