chore: Remove deprecated endpoint (#441)

Co-authored-by: Jan Ridderbusch <[email protected]>
sovity · Feb 29, 2024 · cacd6fc · cacd6fc
1 parent 0740d05
commit cacd6fc
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,13 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 #### Major
 
+- Authority Portal API: Removed deprecated data offer count endpoint
+
 #### Minor
 
 #### Patch
 
 ### Deployment Migration Notes
 
-_No special deployment migration steps required_
+- Authority Portal API: The deprecated data offer count endpoint was removed:  ~~``authority-portal-api/data-offer-counts``~~.
+  Alternatively the connector metadata endpoint should be used: `authority-portal-api/connectors`.
 
 #### Compatible Versions
 

diff --git a/...server-api/api/src/main/java/de/sovity/edc/ext/brokerserver/api/BrokerServerResource.java b/...server-api/api/src/main/java/de/sovity/edc/ext/brokerserver/api/BrokerServerResource.java
@@ -23,7 +23,6 @@
 import de.sovity.edc.ext.brokerserver.api.model.ConnectorDetailPageResult;
 import de.sovity.edc.ext.brokerserver.api.model.ConnectorPageQuery;
 import de.sovity.edc.ext.brokerserver.api.model.ConnectorPageResult;
-import de.sovity.edc.ext.brokerserver.api.model.DataOfferCountResult;
 import de.sovity.edc.ext.brokerserver.api.model.DataOfferDetailPageQuery;
 import de.sovity.edc.ext.brokerserver.api.model.DataOfferDetailPageResult;
 import io.swagger.v3.oas.annotations.Operation;
@@ -90,15 +89,6 @@ public interface BrokerServerResource {
     @Operation(description = "Provide Connector metadata by provided Connector Endpoints")
     List<AuthorityPortalConnectorInfo> getConnectorMetadata(List<String> endpoints, @QueryParam("adminApiKey") String adminApiKey);
 
-    @POST
-    @Deprecated
-    @Path("authority-portal-api/data-offer-counts")
-    @Consumes(MediaType.APPLICATION_JSON)
-    @Produces(MediaType.APPLICATION_JSON)
-    @Operation(description = "Query the amount of public Data Offers by provided Connector URLs." +
-        "This endpoint has been replaced by the Authority Portal Connector Metadata endpoint and will be removed in the near future.")
-    DataOfferCountResult dataOfferCount(List<String> endpoints);
-
     @POST
     @Path("authority-portal-api/organization-metadata")
     @Consumes(MediaType.APPLICATION_JSON)

diff --git a/...-api/api/src/main/java/de/sovity/edc/ext/brokerserver/api/model/DataOfferCountResult.java b/...-api/api/src/main/java/de/sovity/edc/ext/brokerserver/api/model/DataOfferCountResult.java
diff --git a/.../broker-server/src/main/java/de/sovity/edc/ext/brokerserver/BrokerServerResourceImpl.java b/.../broker-server/src/main/java/de/sovity/edc/ext/brokerserver/BrokerServerResourceImpl.java
@@ -24,7 +24,6 @@
 import de.sovity.edc.ext.brokerserver.api.model.ConnectorDetailPageResult;
 import de.sovity.edc.ext.brokerserver.api.model.ConnectorPageQuery;
 import de.sovity.edc.ext.brokerserver.api.model.ConnectorPageResult;
-import de.sovity.edc.ext.brokerserver.api.model.DataOfferCountResult;
 import de.sovity.edc.ext.brokerserver.api.model.DataOfferDetailPageQuery;
 import de.sovity.edc.ext.brokerserver.api.model.DataOfferDetailPageResult;
 import de.sovity.edc.ext.brokerserver.db.DslContextFactory;
@@ -96,11 +95,6 @@ public List<AuthorityPortalConnectorInfo> getConnectorMetadata(List<String> endp
         return dslContextFactory.transactionResult(dsl -> authorityPortalConnectorMetadataApiService.getMetadataByEndpoints(dsl, endpoints));
     }
 
-    @Override
-    public DataOfferCountResult dataOfferCount(List<String> endpoints) {
-        return dslContextFactory.transactionResult(dsl -> authorityPortalConnectorMetadataApiService.countByEndpoints(dsl, endpoints));
-    }
-
     @Override
     public void setOrganizationMetadata(AuthorityPortalOrganizationMetadataRequest organizationMetadataRequest, String adminApiKey) {
         adminApiKeyValidator.validateAdminApiKey(adminApiKey);

diff --git a/.../sovity/edc/ext/brokerserver/services/api/AuthorityPortalConnectorMetadataApiService.java b/.../sovity/edc/ext/brokerserver/services/api/AuthorityPortalConnectorMetadataApiService.java
@@ -15,17 +15,10 @@
 package de.sovity.edc.ext.brokerserver.services.api;
 
 import de.sovity.edc.ext.brokerserver.api.model.AuthorityPortalConnectorInfo;
-import de.sovity.edc.ext.brokerserver.api.model.DataOfferCountResult;
-import de.sovity.edc.ext.brokerserver.dao.utils.PostgresqlUtils;
-import de.sovity.edc.ext.brokerserver.db.jooq.Tables;
 import lombok.RequiredArgsConstructor;
 import org.jooq.DSLContext;
-import org.jooq.impl.DSL;
 
 import java.util.List;
-import java.util.function.Function;
-
-import static java.util.stream.Collectors.toMap;
 
 @RequiredArgsConstructor
 public class AuthorityPortalConnectorMetadataApiService {
@@ -44,15 +37,4 @@ public List<AuthorityPortalConnectorInfo> getMetadataByEndpoints(DSLContext dsl,
             ))
             .toList();
     }
-
-    public DataOfferCountResult countByEndpoints(DSLContext dsl, List<String> endpoints) {
-        var connectorMetadata = getMetadataByEndpoints(dsl, endpoints);
-
-        var numDataOffers = connectorMetadata.stream().distinct().collect(toMap(
-            AuthorityPortalConnectorInfo::getConnectorEndpoint,
-            AuthorityPortalConnectorInfo::getDataOfferCount
-        ));
-
-        return new DataOfferCountResult(numDataOffers);
-    }
 }
diff --git a/.../de/sovity/edc/ext/brokerserver/services/api/AuthorityPortalConnectorMetadataApiTest.java b/.../de/sovity/edc/ext/brokerserver/services/api/AuthorityPortalConnectorMetadataApiTest.java
@@ -100,44 +100,6 @@ void testConnectorMetadataByEndpoints() {
         });
     }
 
-    @Test
-    void testCountByEndpoints() {
-        TEST_DATABASE.testTransaction(dsl -> {
-            // arrange
-            var now = OffsetDateTime.now().withNano(0);
-
-            createConnector(dsl, now, 1);
-            createDataOffer(dsl, now, 1, 1);
-            createDataOffer(dsl, now, 1, 2);
-
-            createConnector(dsl, now, 2);
-            createDataOffer(dsl, now, 2, 1);
-
-            createConnector(dsl, now, 3);
-            createDataOffer(dsl, now, 3, 1);
-
-            createConnector(dsl, now, 4);
-
-            // act
-            var actual = brokerServerClient().brokerServerApi().dataOfferCount(
-                Arrays.asList(
-                    getEndpoint(1),
-                    getEndpoint(1), // having this twice should not crash the query
-                    getEndpoint(2),
-                    getEndpoint(4),
-                    getEndpoint(5) // having this not existing should not crash the query
-            ));
-
-            // assert
-            var dataOfferCountMap = actual.getDataOfferCount();
-            assertThat(dataOfferCountMap).isEqualTo(Map.of(
-                getEndpoint(1), 2,
-                getEndpoint(2), 1,
-                getEndpoint(4), 0
-            ));
-        });
-    }
-
     private AuthorityPortalConnectorInfo forConnector(List<AuthorityPortalConnectorInfo> actual, int iConnector) {
         return actual.stream()
             .filter(connectorMetadata ->