From 4ce15f350da184a830a21f29cccc008f99208688 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 21 Feb 2024 09:29:33 +0100
Subject: [PATCH] Remove unnecessary dependency :data-plane-instance-store-sql
 and the associated service

---
 CHANGELOG.md                                  |  1 +
 extensions/postgres-flyway/build.gradle.kts   |  1 -
 ...neInstanceStatementsProviderExtension.java | 34 -------------------
 ...rg.eclipse.edc.spi.system.ServiceExtension |  1 -
 4 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 extensions/postgres-flyway/src/main/java/de/sovity/edc/extension/postgresql/DataPlaneInstanceStatementsProviderExtension.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f382d4a2f..3ce48d909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 #### Patch Changes
 - DspCatalogService: Contract Offer IDs are now stable
+- Removed the DataPlaneInstanceStatementsProviderExtension as it is not necessary here and causes crashes.
 
 ### Deployment Migration Notes
 
diff --git a/extensions/postgres-flyway/build.gradle.kts b/extensions/postgres-flyway/build.gradle.kts
index d2d94b3f7..203782838 100644
--- a/extensions/postgres-flyway/build.gradle.kts
+++ b/extensions/postgres-flyway/build.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
 
     // Adds Database-Related EDC-Extensions (EDC-SQL-Stores, JDBC-Driver, Pool and Transactions)
     implementation("${edcGroup}:control-plane-sql:${edcVersion}")
-    implementation("${edcGroup}:data-plane-instance-store-sql:${edcVersion}")
     implementation("${tractusGroup}:sql-pool:${tractusVersion}")
     implementation("${edcGroup}:transaction-local:${edcVersion}")
 
diff --git a/extensions/postgres-flyway/src/main/java/de/sovity/edc/extension/postgresql/DataPlaneInstanceStatementsProviderExtension.java b/extensions/postgres-flyway/src/main/java/de/sovity/edc/extension/postgresql/DataPlaneInstanceStatementsProviderExtension.java
deleted file mode 100644
index bb5b71ec1..000000000
--- a/extensions/postgres-flyway/src/main/java/de/sovity/edc/extension/postgresql/DataPlaneInstanceStatementsProviderExtension.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2023 sovity GmbH
- *
- *  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:
- *       sovity GmbH - initial implementation
- *
- */
-
-package de.sovity.edc.extension.postgresql;
-
-import org.eclipse.edc.connector.dataplane.selector.store.sql.schema.DataPlaneInstanceStatements;
-import org.eclipse.edc.connector.dataplane.selector.store.sql.schema.postgres.PostgresDataPlaneInstanceStatements;
-import org.eclipse.edc.runtime.metamodel.annotation.Provider;
-import org.eclipse.edc.spi.system.ServiceExtension;
-
-public class DataPlaneInstanceStatementsProviderExtension implements ServiceExtension {
-
-
-    @Override
-    public String name() {
-        return "DataPlaneInstance Statements Provider";
-    }
-
-    @Provider
-    public DataPlaneInstanceStatements dataPlaneInstanceStatements() {
-        return new PostgresDataPlaneInstanceStatements();
-    }
-}
\ No newline at end of file
diff --git a/extensions/postgres-flyway/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/postgres-flyway/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
index 2662cff7e..b25d94ffc 100644
--- a/extensions/postgres-flyway/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
+++ b/extensions/postgres-flyway/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension
@@ -1,2 +1 @@
 de.sovity.edc.extension.postgresql.PostgresFlywayExtension
-de.sovity.edc.extension.postgresql.DataPlaneInstanceStatementsProviderExtension