build: fix tests (#277)

eclipse-edc · Dec 19, 2024 · 9fd8788 · 9fd8788
1 parent 09efe65
commit 9fd8788
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/...log-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java b/...log-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApiExtension.java
@@ -17,8 +17,11 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import org.eclipse.edc.catalog.spi.QueryService;
 import org.eclipse.edc.jsonld.spi.JsonLd;
+import org.eclipse.edc.runtime.metamodel.annotation.Configuration;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.runtime.metamodel.annotation.Settings;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
@@ -31,6 +34,8 @@
 import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
 import org.eclipse.edc.web.jersey.providers.jsonld.ObjectMapperProvider;
 import org.eclipse.edc.web.spi.WebService;
+import org.eclipse.edc.web.spi.configuration.PortMapping;
+import org.eclipse.edc.web.spi.configuration.PortMappingRegistry;
 
 import java.io.IOException;
 import java.util.stream.Stream;
@@ -53,28 +58,28 @@
 public class FederatedCatalogApiExtension implements ServiceExtension {
 
     public static final String NAME = "Cache Query API Extension";
-    public static final String CATALOG_QUERY_SCOPE = "CATALOG_QUERY_API";
-
+    static final String CATALOG_QUERY_SCOPE = "CATALOG_QUERY_API";
     private static final String API_VERSION_JSON_FILE = "catalog-version.json";
 
+    @Configuration
+    private CatalogApiConfiguration apiConfiguration;
+
     @Inject
     private WebService webService;
-
     @Inject
     private QueryService queryService;
-
     @Inject(required = false)
     private HealthCheckService healthCheckService;
     @Inject
     private JsonLd jsonLd;
     @Inject
     private TypeManager typeManager;
-
     @Inject
     private TypeTransformerRegistry transformerRegistry;
-
     @Inject
     private ApiVersionService apiVersionService;
+    @Inject
+    private PortMappingRegistry portMappingRegistry;
 
     @Override
     public String name() {
@@ -83,6 +88,7 @@ public String name() {
 
     @Override
     public void initialize(ServiceExtensionContext context) {
+        portMappingRegistry.register(new PortMapping(CATALOG_QUERY, apiConfiguration.port(), apiConfiguration.path()));
 
         jsonLd.registerNamespace(VOCAB, EDC_NAMESPACE, CATALOG_QUERY_SCOPE);
         jsonLd.registerNamespace(EDC_PREFIX, EDC_NAMESPACE, CATALOG_QUERY_SCOPE);
@@ -119,4 +125,14 @@ private void registerVersionInfo(ClassLoader resourceClassLoader) {
             throw new EdcException(e);
         }
     }
+
+    @Settings
+    record CatalogApiConfiguration(
+            @Setting(key = "web.http." + CATALOG_QUERY + ".port", description = "Port for " + CATALOG_QUERY + " api context", defaultValue = 17171 + "")
+            int port,
+            @Setting(key = "web.http." + CATALOG_QUERY + ".path", description = "Path for " + CATALOG_QUERY + " api context", defaultValue = "/api/catalog")
+            String path
+    ) {
+
+    }
 }
diff --git a/...ts/component-tests/src/test/java/org/eclipse/edc/catalog/CatalogRuntimeComponentTest.java b/...ts/component-tests/src/test/java/org/eclipse/edc/catalog/CatalogRuntimeComponentTest.java
@@ -75,10 +75,12 @@
 
 @ComponentTest
 public class CatalogRuntimeComponentTest {
+
     public static final String TEST_CATALOG_ID = "test-catalog-id";
     private static final Duration TEST_TIMEOUT = ofSeconds(10);
     private static final ObjectMapper OBJECT_MAPPER = createObjectMapper();
     private static final JsonLd JSON_LD_SERVICE = new TitaniumJsonLd(mock());
+
     @RegisterExtension
     protected static RuntimeExtension runtimePerClassExtension = new RuntimePerMethodExtension(new EmbeddedRuntime("catalog", Map.of(
             // make sure only one crawl-run is performed