Skip to content

Commit 096ed9b

Browse files
authored
feat: Clean up the 0.8.X deprecated instances (eclipse-tractusx#2690)
* feat: Clean up the 0.8.X deprecated instances * feat: Clean up the 0.8.X deprecated instances * feat: add deleted test
1 parent b06aace commit 096ed9b

13 files changed

Lines changed: 21 additions & 543 deletions

File tree

docs/migration/2026_06-Version_0.12.x_0.13.x.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,24 @@ The Federate Catalog feature has not been proven to be usable, that's why it wil
1717
`edc_federated_catalog` will be done automatically by migration script. If you need to keep the data, please make sure
1818
that `tx.edc.postgresql.migration.federatedcatalog.enabled` is set to `false` before the migration.
1919

20+
## 2. Deprecated instances
21+
The API `/business-partner-groups` has been removed, please use `/v3/business-partner-groups` instead.
22+
Also the API `/v2/edrs` has been removed, please use `/v3/edrs` instead.
23+
Additionally, several configuration parameters deprecated since version 0.8.x have also been removed.
24+
Please use the updated configuration parameters instead.
2025

26+
[SqlBusinessPartnerGroupStoreExtension](../../edc-extensions/bpn-validation/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java):
27+
28+
| Old value | New value | New environment variable |
29+
|---------------------------|--------------------------------|--------------------------------|
30+
| `edc.datasource.bpn.name` | `edc.sql.store.bpn.datasource` | `EDC_SQL_STORE_BPN_DATASOURCE` |
31+
32+
33+
[SqlEdrLockExtension](../../edc-extensions/edr/edr-index-lock-sql/src/main/java/org/eclipse/tractusx/edc/edr/index/sql/lock/SqlEdrLockExtension.java):
34+
35+
| Old value | New value | New environment variable |
36+
|---------------------------|--------------------------------|--------------------------------|
37+
| `edc.datasource.edr.name` | `edc.sql.store.edr.datasource` | `EDC_SQL_STORE_EDR_DATASOURCE` |
38+
39+
40+
[2026_06-Version_0.12.x_0.13.x.md](2026_06-Version_0.12.x_0.13.x.md)

edc-extensions/bpn-validation/bpn-validation-api/src/main/java/org/eclipse/tractusx/edc/api/bpn/BusinessPartnerGroupApiExtension.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
3030
import org.eclipse.edc.web.spi.WebService;
3131
import org.eclipse.edc.web.spi.configuration.ApiContext;
32-
import org.eclipse.tractusx.edc.api.bpn.v1.BusinessPartnerGroupApiV1Controller;
3332
import org.eclipse.tractusx.edc.api.bpn.v3.BusinessPartnerGroupApiV3Controller;
3433
import org.eclipse.tractusx.edc.validation.businesspartner.spi.observe.BusinessPartnerObservableImpl;
3534
import org.eclipse.tractusx.edc.validation.businesspartner.spi.store.BusinessPartnerStore;
@@ -59,13 +58,6 @@ public void initialize(ServiceExtensionContext context) {
5958
var businessPartnerObservable = new BusinessPartnerObservableImpl();
6059
businessPartnerObservable.registerListener(new BusinessPartnerEventListener(clock, eventRouter));
6160

62-
webService.registerResource(ApiContext.MANAGEMENT, new BusinessPartnerGroupApiV1Controller(
63-
businessPartnerStore, businessPartnerObservable, context.getMonitor()
64-
));
65-
webService.registerDynamicResource(ApiContext.MANAGEMENT, BusinessPartnerGroupApiV1Controller.class,
66-
new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, "MANAGEMENT_API"));
67-
68-
6961
webService.registerResource(ApiContext.MANAGEMENT, new BusinessPartnerGroupApiV3Controller(
7062
businessPartnerStore, businessPartnerObservable
7163
));

edc-extensions/bpn-validation/bpn-validation-api/src/main/java/org/eclipse/tractusx/edc/api/bpn/v1/BusinessPartnerGroupApiV1.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

edc-extensions/bpn-validation/bpn-validation-api/src/main/java/org/eclipse/tractusx/edc/api/bpn/v1/BusinessPartnerGroupApiV1Controller.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

edc-extensions/bpn-validation/bpn-validation-api/src/test/java/org/eclipse/tractusx/edc/api/bpn/v1/BusinessPartnerGroupApiV1ControllerTest.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

edc-extensions/bpn-validation/business-partner-store-sql/src/main/java/org/eclipse/tractusx/edc/validation/businesspartner/store/SqlBusinessPartnerGroupStoreExtension.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
@Extension("Registers an SQL implementation for the BusinessPartnerGroupStore")
3838
public class SqlBusinessPartnerGroupStoreExtension implements ServiceExtension {
3939

40-
private static final String DEFAULT_DATASOURCE_NAME = "bpn";
41-
@Deprecated(since = "0.8.0")
42-
@Setting(value = "Datasource name for the SQL BusinessPartnerGroup store", defaultValue = DEFAULT_DATASOURCE_NAME)
43-
private static final String DATASOURCE_SETTING_NAME = "edc.datasource.bpn.name";
4440
@Setting(value = "The datasource to be used", defaultValue = DataSourceRegistry.DEFAULT_DATASOURCE)
4541
public static final String DATASOURCE_NAME = "edc.sql.store.bpn.datasource";
4642

edc-extensions/edr/edr-api-v2/src/main/java/org/eclipse/tractusx/edc/api/edr/EdrCacheApiExtension.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.eclipse.edc.web.spi.WebService;
3636
import org.eclipse.edc.web.spi.configuration.ApiContext;
3737
import org.eclipse.tractusx.edc.api.edr.transform.JsonObjectFromEndpointDataReferenceEntryTransformer;
38-
import org.eclipse.tractusx.edc.api.edr.v2.EdrCacheApiV2Controller;
3938
import org.eclipse.tractusx.edc.api.edr.v3.EdrCacheApiV3Controller;
4039
import org.eclipse.tractusx.edc.edr.spi.service.EdrService;
4140

@@ -71,9 +70,6 @@ public class EdrCacheApiExtension implements ServiceExtension {
7170
public void initialize(ServiceExtensionContext context) {
7271
var mgmtApiTransformerRegistry = transformerRegistry.forContext("management-api");
7372
mgmtApiTransformerRegistry.register(new JsonObjectFromEndpointDataReferenceEntryTransformer(Json.createBuilderFactory(Map.of())));
74-
webService.registerResource(MANAGEMENT, new EdrCacheApiV2Controller(edrStore, mgmtApiTransformerRegistry, validatorRegistry, monitor, edrService, contractNegotiationService, singleParticipantContextSupplier));
75-
webService.registerDynamicResource(ApiContext.MANAGEMENT, EdrCacheApiV2Controller.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, "MANAGEMENT_API"));
76-
7773
webService.registerResource(MANAGEMENT, new EdrCacheApiV3Controller(edrStore, mgmtApiTransformerRegistry, validatorRegistry, monitor, edrService, contractNegotiationService, singleParticipantContextSupplier));
7874
webService.registerDynamicResource(ApiContext.MANAGEMENT, EdrCacheApiV3Controller.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, "MANAGEMENT_API"));
7975
}

0 commit comments

Comments
 (0)