From e94343c1b234ae29998133158362280df8789f7d Mon Sep 17 00:00:00 2001 From: bmg13 Date: Thu, 17 Oct 2024 15:33:07 +0100 Subject: [PATCH] Changes from PR. --- .../retirement/store/SqlAgreementsRetirementStoreExtension.java | 2 +- .../retirement/store/sql/SqlAgreementsRetirementStore.java | 2 +- settings.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java b/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java index 0d9d7f35d..c9c8aa822 100644 --- a/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java +++ b/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/SqlAgreementsRetirementStoreExtension.java @@ -40,7 +40,7 @@ public class SqlAgreementsRetirementStoreExtension implements ServiceExtension { private static final String NAME = "SQL Agreement Retirement Store."; @Setting(value = "Datasource name for the SQL AgreementsRetirement store") - private static final String DATASOURCE_SETTING_NAME = "edc.datasource.agreementretirement.name"; + private static final String DATASOURCE_SETTING_NAME = "tx.edc.sql.store.agreementretirement.datasource"; @Inject private DataSourceRegistry dataSourceRegistry; diff --git a/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/sql/SqlAgreementsRetirementStore.java b/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/sql/SqlAgreementsRetirementStore.java index c8e874507..dbb467108 100644 --- a/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/sql/SqlAgreementsRetirementStore.java +++ b/edc-extensions/agreements/retirement-evaluation-store-sql/src/main/java/org/eclipse/tractusx/edc/agreements/retirement/store/sql/SqlAgreementsRetirementStore.java @@ -117,7 +117,7 @@ private AgreementsRetirementEntry mapAgreementsRetirement(ResultSet resultSet) t return AgreementsRetirementEntry.Builder.newInstance() .withAgreementId(resultSet.getString(statements.getIdColumn())) .withReason(resultSet.getString(statements.getReasonColumn())) - .withAgreementRetirementDate(Long.parseLong(resultSet.getString(statements.getRetirementDateColumn()))) + .withAgreementRetirementDate(resultSet.getLong(statements.getRetirementDateColumn())) .build(); } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 78035b50e..1a378ea7e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,7 +56,7 @@ include(":edc-extensions:agreements") include(":edc-extensions:agreements:retirement-evaluation-core") include(":edc-extensions:agreements:retirement-evaluation-api") include(":edc-extensions:agreements:retirement-evaluation-spi") -include("edc-extensions:agreements:retirement-evaluation-store-sql") +include(":edc-extensions:agreements:retirement-evaluation-store-sql") // extensions - data plane include(":edc-extensions:dataplane:dataplane-proxy:edc-dataplane-proxy-consumer-api")