refactor: remove ConnectorVersionProvider

CHANGELOG.md

@@ -29,6 +29,7 @@ in the detailed section referring to by linking pull requests or issues.
 * Deprecated `InlineDataFlowController` (replaced by the Data Plane) (#1464)
 * Unused classes and interfaces at `ids.spi.policy` (#1471)
 * Remove modules `:extensions:transfer-functions:transfer-functions-spi` and `:extensions:transfer-functions:transfer-functions-core` (#1482)
+* Remove `ConnectorVersionProvider`, provide version as static string (#1470)
 
 #### Fixed
 

data-protocols/ids/ids-api-multipart-endpoint-v1/src/test/java/org/eclipse/dataspaceconnector/ids/api/multipart/MultipartControllerIntegrationTest.java

@@ -98,7 +98,7 @@ void testRequestConnectorSelfDescriptionWithoutId() throws Exception {
 
         jsonPayload.inPath("$.@type").isString().isEqualTo("ids:BaseConnector");
         jsonPayload.inPath("$.@id").isString().matches("urn:connector:" + CONNECTOR_ID);
-        jsonPayload.inPath("$.ids:version").isString().isEqualTo("0.0.1");
+        jsonPayload.inPath("$.ids:version").isString().isEqualTo("0.0.1-SNAPSHOT");
         jsonPayload.inPath("$.ids:resourceCatalog").isPresent().isArray().hasSizeGreaterThanOrEqualTo(1);
         jsonPayload.inPath("$.ids:resourceCatalog[0].@type").isString().isEqualTo("ids:ResourceCatalog");
         jsonPayload.inPath("$.ids:resourceCatalog[0].@id").isString().isEqualTo("urn:catalog:" + CATALOG_ID);
@@ -157,7 +157,7 @@ void testRequestConnectorSelfDescriptionWithId() throws Exception {
 
         jsonPayload.inPath("$.@type").isString().isEqualTo("ids:BaseConnector");
         jsonPayload.inPath("$.@id").isString().matches("urn:connector:" + CONNECTOR_ID);
-        jsonPayload.inPath("$.ids:version").isString().isEqualTo("0.0.1");
+        jsonPayload.inPath("$.ids:version").isString().isEqualTo("0.0.1-SNAPSHOT");
         jsonPayload.inPath("$.ids:resourceCatalog").isPresent().isArray().hasSizeGreaterThanOrEqualTo(1);
         jsonPayload.inPath("$.ids:resourceCatalog[0].@type").isString().isEqualTo("ids:ResourceCatalog");
         jsonPayload.inPath("$.ids:resourceCatalog[0].@id").isString().isEqualTo("urn:catalog:" + CATALOG_ID);

data-protocols/ids/ids-core/src/main/java/org/eclipse/dataspaceconnector/ids/core/IdsCoreServiceExtension.java

@@ -21,15 +21,13 @@
 import org.eclipse.dataspaceconnector.ids.core.service.ConnectorServiceImpl;
 import org.eclipse.dataspaceconnector.ids.core.service.ConnectorServiceSettings;
 import org.eclipse.dataspaceconnector.ids.core.transform.IdsTransformerRegistryImpl;
-import org.eclipse.dataspaceconnector.ids.core.version.ConnectorVersionProviderImpl;
 import org.eclipse.dataspaceconnector.ids.spi.IdsId;
 import org.eclipse.dataspaceconnector.ids.spi.IdsIdParser;
 import org.eclipse.dataspaceconnector.ids.spi.IdsType;
 import org.eclipse.dataspaceconnector.ids.spi.descriptor.IdsDescriptorService;
 import org.eclipse.dataspaceconnector.ids.spi.service.CatalogService;
 import org.eclipse.dataspaceconnector.ids.spi.service.ConnectorService;
 import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
-import org.eclipse.dataspaceconnector.ids.spi.version.ConnectorVersionProvider;
 import org.eclipse.dataspaceconnector.spi.EdcException;
 import org.eclipse.dataspaceconnector.spi.EdcSetting;
 import org.eclipse.dataspaceconnector.spi.contract.offer.ContractOfferService;
@@ -46,7 +44,7 @@
 /**
  * Implements the IDS Controller REST API.
  */
-@Provides({ ConnectorVersionProvider.class, CatalogService.class, ConnectorService.class, IdsDescriptorService.class,
+@Provides({ CatalogService.class, ConnectorService.class, IdsDescriptorService.class,
         CatalogService.class, ConnectorService.class, IdsTransformerRegistry.class, ObjectMapperFactory.class })
 public class IdsCoreServiceExtension implements ServiceExtension {
 
@@ -98,20 +96,18 @@ public void initialize(ServiceExtensionContext serviceExtensionContext) {
         IdsTransformerRegistry transformerRegistry = createTransformerRegistry();
         serviceExtensionContext.registerService(IdsTransformerRegistry.class, transformerRegistry);
 
-        ConnectorVersionProvider connectorVersionProvider = createConnectorVersionProvider();
-        serviceExtensionContext.registerService(ConnectorVersionProvider.class, connectorVersionProvider);
-
         CatalogService dataCatalogService = createDataCatalogService(dataCatalogId, contractOfferService);
 
         serviceExtensionContext.registerService(CatalogService.class, dataCatalogService);
 
-        ConnectorService connectorService = createConnectorService(connectorServiceSettings, connectorVersionProvider, dataCatalogService);
+        ConnectorService connectorService = createConnectorService(connectorServiceSettings,
+                dataCatalogService);
         serviceExtensionContext.registerService(ConnectorService.class, connectorService);
-        
+
         //TODO remove once IDS serializer is integrated (#236)
         var objectMapperFactory = new ObjectMapperFactory();
         serviceExtensionContext.registerService(ObjectMapperFactory.class, objectMapperFactory);
-        
+
         registerOther(serviceExtensionContext);
     }
 
@@ -136,19 +132,8 @@ private CatalogService createDataCatalogService(
 
     private ConnectorService createConnectorService(
             ConnectorServiceSettings connectorServiceSettings,
-            ConnectorVersionProvider connectorVersionProvider,
             CatalogService dataCatalogService) {
-
-        return new ConnectorServiceImpl(
-                monitor,
-                connectorServiceSettings,
-                connectorVersionProvider,
-                dataCatalogService
-        );
-    }
-
-    private ConnectorVersionProvider createConnectorVersionProvider() {
-        return new ConnectorVersionProviderImpl();
+        return new ConnectorServiceImpl(monitor, connectorServiceSettings, dataCatalogService);
     }
 
     private String resolveCatalogId(ServiceExtensionContext serviceExtensionContext) {

data-protocols/ids/ids-core/src/main/java/org/eclipse/dataspaceconnector/ids/core/service/ConnectorServiceImpl.java

@@ -18,7 +18,6 @@
 import org.eclipse.dataspaceconnector.ids.spi.service.CatalogService;
 import org.eclipse.dataspaceconnector.ids.spi.service.ConnectorService;
 import org.eclipse.dataspaceconnector.ids.spi.types.Connector;
-import org.eclipse.dataspaceconnector.ids.spi.version.ConnectorVersionProvider;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
@@ -28,19 +27,18 @@
 import java.util.Objects;
 
 public class ConnectorServiceImpl implements ConnectorService {
+    private static final String SYSTEM_VERSION = "0.0.1-SNAPSHOT"; // TODO update before/during build
+
     private final Monitor monitor;
     private final ConnectorServiceSettings connectorServiceSettings;
-    private final ConnectorVersionProvider connectorVersionProvider;
     private final CatalogService dataCatalogService;
 
     public ConnectorServiceImpl(
             @NotNull Monitor monitor,
             @NotNull ConnectorServiceSettings connectorServiceSettings,
-            @NotNull ConnectorVersionProvider connectorVersionProvider,
             @NotNull CatalogService dataCatalogService) {
         this.monitor = Objects.requireNonNull(monitor);
         this.connectorServiceSettings = Objects.requireNonNull(connectorServiceSettings);
-        this.connectorVersionProvider = Objects.requireNonNull(connectorVersionProvider);
         this.dataCatalogService = Objects.requireNonNull(dataCatalogService);
     }
 
@@ -56,7 +54,7 @@ public Connector getConnector(@NotNull ClaimToken claimToken) {
                 .id(connectorServiceSettings.getId())
                 .title(connectorServiceSettings.getTitle())
                 .description(connectorServiceSettings.getDescription())
-                .connectorVersion(connectorVersionProvider.getVersion())
+                .connectorVersion(SYSTEM_VERSION)
                 .securityProfile(connectorServiceSettings.getSecurityProfile())
                 .dataCatalogs(Collections.singletonList(catalog))
                 .endpoint(connectorServiceSettings.getEndpoint())

data-protocols/ids/ids-core/src/test/java/org/eclipse/dataspaceconnector/ids/core/service/ConnectorServiceImplTest.java

@@ -17,7 +17,6 @@
 
 import org.eclipse.dataspaceconnector.ids.spi.service.CatalogService;
 import org.eclipse.dataspaceconnector.ids.spi.types.SecurityProfile;
-import org.eclipse.dataspaceconnector.ids.spi.version.ConnectorVersionProvider;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
@@ -40,16 +39,15 @@ class ConnectorServiceImplTest {
     private static final URI CONNECTOR_ENDPOINT = URI.create("https://example.com/connector/endpoint");
     private static final URI CONNECTOR_MAINTAINER = URI.create("https://example.com/connector/maintainer");
     private static final URI CONNECTOR_CURATOR = URI.create("https://example.com/connector/curator");
-    private static final String CONNECTOR_VERSION = "connectorVersion";
+    private static final String CONNECTOR_VERSION = "0.0.1-SNAPSHOT";
     private final ConnectorServiceSettings connectorServiceSettings = mock(ConnectorServiceSettings.class);
-    private final ConnectorVersionProvider connectorVersionProvider = mock(ConnectorVersionProvider.class);
     private final CatalogService dataCatalogService = mock(CatalogService.class);
 
     private ConnectorServiceImpl connectorService;
 
     @BeforeEach
     void setUp() {
-        connectorService = new ConnectorServiceImpl(mock(Monitor.class), connectorServiceSettings, connectorVersionProvider, dataCatalogService);
+        connectorService = new ConnectorServiceImpl(mock(Monitor.class), connectorServiceSettings, dataCatalogService);
     }
 
     @Test
@@ -62,7 +60,6 @@ void getConnector() {
         when(connectorServiceSettings.getEndpoint()).thenReturn(CONNECTOR_ENDPOINT);
         when(connectorServiceSettings.getMaintainer()).thenReturn(CONNECTOR_MAINTAINER);
         when(connectorServiceSettings.getCurator()).thenReturn(CONNECTOR_CURATOR);
-        when(connectorVersionProvider.getVersion()).thenReturn(CONNECTOR_VERSION);
         var claimToken = ClaimToken.Builder.newInstance().build();
 
         var result = connectorService.getConnector(claimToken);
@@ -84,7 +81,6 @@ void getConnector() {
         verify(connectorServiceSettings).getEndpoint();
         verify(connectorServiceSettings).getMaintainer();
         verify(connectorServiceSettings).getCurator();
-        verify(connectorVersionProvider).getVersion();
     }
 
-}
+}