diff --git a/data-protocols/dsp/dsp-http-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationExtension.java b/data-protocols/dsp/dsp-http-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationExtension.java index 95a4d3c32cf..3d1dcf2cab9 100644 --- a/data-protocols/dsp/dsp-http-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationExtension.java +++ b/data-protocols/dsp/dsp-http-api-configuration/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationExtension.java @@ -86,9 +86,8 @@ public class DspApiConfigurationExtension implements ServiceExtension { public static final WebServiceSettings SETTINGS = WebServiceSettings.Builder.newInstance() .apiConfigKey(PROTOCOL_CONFIG_KEY) .contextAlias(ApiContext.PROTOCOL) - .defaultPath("/api/v1/dsp") + .defaultPath("/api/dsp") .defaultPort(8282) - .name("Protocol API") .build(); @Setting(description = "Configures endpoint for reaching the Protocol API in the form \"\"", key = "edc.dsp.callback.address", required = false) private String callbackAddress; diff --git a/extensions/common/api/control-api-configuration/src/main/java/org/eclipse/edc/connector/api/control/configuration/ControlApiConfigurationExtension.java b/extensions/common/api/control-api-configuration/src/main/java/org/eclipse/edc/connector/api/control/configuration/ControlApiConfigurationExtension.java index 6f4f1e3949b..d8cb29803d9 100644 --- a/extensions/common/api/control-api-configuration/src/main/java/org/eclipse/edc/connector/api/control/configuration/ControlApiConfigurationExtension.java +++ b/extensions/common/api/control-api-configuration/src/main/java/org/eclipse/edc/connector/api/control/configuration/ControlApiConfigurationExtension.java @@ -68,16 +68,13 @@ public class ControlApiConfigurationExtension implements ServiceExtension { @Setting(description = "Configures endpoint for reaching the Control API. If it's missing it defaults to the hostname configuration.", key = "edc.control.endpoint", required = false) private String controlEndpoint; public static final String CONTROL_SCOPE = "CONTROL_API"; - private static final String WEB_SERVICE_NAME = "Control API"; @SettingContext("Control API context setting key") private static final String CONTROL_CONFIG_KEY = "web.http." + ApiContext.CONTROL; public static final WebServiceSettings SETTINGS = WebServiceSettings.Builder.newInstance() .apiConfigKey(CONTROL_CONFIG_KEY) .contextAlias(ApiContext.CONTROL) - .defaultPath("/api/v1/control") + .defaultPath("/api/control") .defaultPort(9191) - .useDefaultContext(true) - .name(WEB_SERVICE_NAME) .build(); private static final String API_VERSION_JSON_FILE = "control-api-version.json"; diff --git a/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java b/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java index 542304b8fc0..b86aad8e2cb 100644 --- a/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java +++ b/extensions/common/api/management-api-configuration/src/main/java/org/eclipse/edc/connector/api/management/configuration/ManagementApiConfigurationExtension.java @@ -81,7 +81,6 @@ public class ManagementApiConfigurationExtension implements ServiceExtension { public static final String API_VERSION_JSON_FILE = "management-api-version.json"; public static final String NAME = "Management API configuration"; - public static final String WEB_SERVICE_NAME = "Management API"; public static final String MANAGEMENT_SCOPE = "MANAGEMENT_API"; @SettingContext("Management API context setting key") @@ -89,10 +88,8 @@ public class ManagementApiConfigurationExtension implements ServiceExtension { public static final WebServiceSettings SETTINGS = WebServiceSettings.Builder.newInstance() .apiConfigKey(MANAGEMENT_CONFIG_KEY) .contextAlias(ApiContext.MANAGEMENT) - .defaultPath("/api/v1/management") + .defaultPath("/api/management") .defaultPort(8181) - .useDefaultContext(true) - .name(WEB_SERVICE_NAME) .build(); private static final boolean DEFAULT_MANAGEMENT_API_ENABLE_CONTEXT = false; @Setting(description = "Configures endpoint for reaching the Management API, in the format \"\"", key = "edc.management.endpoint", required = false) diff --git a/extensions/common/api/version-api/src/main/java/org/eclipse/edc/connector/api/management/version/VersionApiExtension.java b/extensions/common/api/version-api/src/main/java/org/eclipse/edc/connector/api/management/version/VersionApiExtension.java index 7d4ff86c723..bb8999e4ed3 100644 --- a/extensions/common/api/version-api/src/main/java/org/eclipse/edc/connector/api/management/version/VersionApiExtension.java +++ b/extensions/common/api/version-api/src/main/java/org/eclipse/edc/connector/api/management/version/VersionApiExtension.java @@ -38,7 +38,6 @@ public class VersionApiExtension implements ServiceExtension { public static final String NAME = "Management API: Version Information"; - private static final String WEB_SERVICE_NAME = "Version Information API"; @SettingContext("Version API context setting key") private static final String VERSION_CONFIG_KEY = "web.http." + ApiContext.VERSION; @@ -48,15 +47,11 @@ public class VersionApiExtension implements ServiceExtension { .contextAlias(ApiContext.VERSION) .defaultPath("/.well-known/api") .defaultPort(7171) - .useDefaultContext(false) - .name(WEB_SERVICE_NAME) .build(); private static final String API_VERSION_JSON_FILE = "version-api-version.json"; @Inject private WebService webService; - - @Inject private TypeManager typeManager; @Inject diff --git a/extensions/common/http/jetty-core/src/main/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImpl.java b/extensions/common/http/jetty-core/src/main/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImpl.java index ebb8d43348d..2cffa255379 100644 --- a/extensions/common/http/jetty-core/src/main/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImpl.java +++ b/extensions/common/http/jetty-core/src/main/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImpl.java @@ -43,15 +43,13 @@ public WebServiceConfiguration configure(Config config, WebServer webServer, Web port = config.getInteger("port", port); path = config.getString("path", path); } else { - monitor.warning(format("Settings for [%s] and/or [%s] were not provided. Using default" + - " value(s) instead.", apiConfig + ".path", apiConfig + ".path")); + monitor.warning("Settings for [%s] and/or [%s] were not provided. Using default value(s) instead." + .formatted(apiConfig + ".path", apiConfig + ".path")); - if (!settings.useDefaultContext()) { - webServer.addPortMapping(contextAlias, port, path); - } + webServer.addPortMapping(contextAlias, port, path); } - monitor.debug(format("%s will be available under port=%s, path=%s", settings.getName(), port, path)); + monitor.debug(format("%s API will be available under port=%s, path=%s", contextAlias, port, path)); return WebServiceConfiguration.Builder.newInstance() .path(path) diff --git a/extensions/common/http/jetty-core/src/test/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImplTest.java b/extensions/common/http/jetty-core/src/test/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImplTest.java index 7e827c3d842..0eb07619990 100644 --- a/extensions/common/http/jetty-core/src/test/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImplTest.java +++ b/extensions/common/http/jetty-core/src/test/java/org/eclipse/edc/web/jetty/WebServiceConfigurerImplTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; public class WebServiceConfigurerImplTest { @@ -48,8 +47,6 @@ void verifyConfigure_whenDefaultConfig() { .contextAlias(ALIAS) .defaultPath(PATH) .defaultPort(PORT) - .useDefaultContext(false) - .name("TEST") .build(); var actualConfig = configurator.configure(config, server, settings); @@ -59,31 +56,6 @@ void verifyConfigure_whenDefaultConfig() { assertThat(actualConfig.getPort()).isEqualTo(PORT); assertThat(actualConfig.getPath()).isEqualTo(PATH); - - } - - @Test - void verifyConfigure_whenDefaultAlias() { - - var config = ConfigFactory.fromMap(new HashMap<>()); - var defValue = "default"; - when(server.getDefaultContextName()).thenReturn(defValue); - - var settings = WebServiceSettings.Builder.newInstance() - .apiConfigKey(CONFIG) - .contextAlias(ALIAS) - .defaultPath(PATH) - .defaultPort(PORT) - .useDefaultContext(true) - .name("TEST") - .build(); - - var actualConfig = configurator.configure(config, server, settings); - - verifyNoInteractions(server); - assertThat(actualConfig.getPort()).isEqualTo(PORT); - assertThat(actualConfig.getPath()).isEqualTo(PATH); - } @Test @@ -102,8 +74,6 @@ void verifyConfigure_whenExternalConfig() { .contextAlias(ALIAS) .defaultPath(PATH) .defaultPort(PORT) - .useDefaultContext(false) - .name("TEST") .build(); var actualConfig = configurator.configure(config, server, settings); diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-accounts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/accounts/StsAccountsApiConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-accounts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/accounts/StsAccountsApiConfigurationExtension.java index 017149254d0..8a381c96481 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-accounts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/accounts/StsAccountsApiConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-accounts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/accounts/StsAccountsApiConfigurationExtension.java @@ -36,7 +36,6 @@ public class StsAccountsApiConfigurationExtension implements ServiceExtension { public static final String NAME = "Secure Token Service Accounts API configuration"; - private static final String WEB_SERVICE_NAME = "STS Accounts API"; private static final int DEFAULT_STS_API_PORT = 9393; private static final String DEFAULT_STS_API_CONTEXT_PATH = "/api/sts"; @@ -48,8 +47,6 @@ public class StsAccountsApiConfigurationExtension implements ServiceExtension { .contextAlias(ApiContext.STS_ACCOUNTS) .defaultPath(DEFAULT_STS_API_CONTEXT_PATH) .defaultPort(DEFAULT_STS_API_PORT) - .useDefaultContext(false) - .name(WEB_SERVICE_NAME) .build(); private static final String API_VERSION_JSON_FILE = "sts-accounts-api-version.json"; diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java index 3872164a97f..de05ed94238 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-api/src/main/java/org/eclipse/edc/api/iam/identitytrust/sts/StsApiConfigurationExtension.java @@ -36,9 +36,8 @@ public class StsApiConfigurationExtension implements ServiceExtension { public static final String NAME = "Secure Token Service API configuration"; - private static final String WEB_SERVICE_NAME = "STS API"; private static final int DEFAULT_STS_API_PORT = 9292; - private static final String DEFAULT_STS_API_CONTEXT_PATH = "/api/v1/sts"; + private static final String DEFAULT_STS_API_CONTEXT_PATH = "/api/sts"; @SettingContext("Sts API context setting key") private static final String STS_CONFIG_KEY = "web.http." + ApiContext.STS; @@ -48,8 +47,6 @@ public class StsApiConfigurationExtension implements ServiceExtension { .contextAlias(ApiContext.STS) .defaultPath(DEFAULT_STS_API_CONTEXT_PATH) .defaultPort(DEFAULT_STS_API_PORT) - .useDefaultContext(false) - .name(WEB_SERVICE_NAME) .build(); private static final String API_VERSION_JSON_FILE = "sts-api-version.json"; diff --git a/extensions/data-plane/data-plane-public-api-v2/src/main/java/org/eclipse/edc/connector/dataplane/api/DataPlanePublicApiV2Extension.java b/extensions/data-plane/data-plane-public-api-v2/src/main/java/org/eclipse/edc/connector/dataplane/api/DataPlanePublicApiV2Extension.java index 0b392be5c3e..9e83e3f76a5 100644 --- a/extensions/data-plane/data-plane-public-api-v2/src/main/java/org/eclipse/edc/connector/dataplane/api/DataPlanePublicApiV2Extension.java +++ b/extensions/data-plane/data-plane-public-api-v2/src/main/java/org/eclipse/edc/connector/dataplane/api/DataPlanePublicApiV2Extension.java @@ -44,7 +44,7 @@ public class DataPlanePublicApiV2Extension implements ServiceExtension { public static final String NAME = "Data Plane Public API"; private static final int DEFAULT_PUBLIC_PORT = 8185; - private static final String PUBLIC_CONTEXT_PATH = "/api/v2/public"; + private static final String PUBLIC_CONTEXT_PATH = "/api/public"; @SettingContext("Public API context setting key") private static final String PUBLIC_CONFIG_KEY = "web.http." + ApiContext.PUBLIC; @@ -64,7 +64,6 @@ public class DataPlanePublicApiV2Extension implements ServiceExtension { .contextAlias(ApiContext.PUBLIC) .defaultPath(PUBLIC_CONTEXT_PATH) .defaultPort(DEFAULT_PUBLIC_PORT) - .name(NAME) .build(); @Inject diff --git a/spi/common/web-spi/src/main/java/org/eclipse/edc/web/spi/configuration/WebServiceSettings.java b/spi/common/web-spi/src/main/java/org/eclipse/edc/web/spi/configuration/WebServiceSettings.java index 4cd2ef1685d..2d00d9acf15 100644 --- a/spi/common/web-spi/src/main/java/org/eclipse/edc/web/spi/configuration/WebServiceSettings.java +++ b/spi/common/web-spi/src/main/java/org/eclipse/edc/web/spi/configuration/WebServiceSettings.java @@ -18,12 +18,10 @@ public class WebServiceSettings { - private boolean useDefaultContext = false; private String apiConfigKey; private Integer defaultPort; private String defaultPath; private String contextAlias; - private String name; private WebServiceSettings() { @@ -46,7 +44,6 @@ public Integer getDefaultPort() { /** * The default path if the config {@link WebServiceSettings#apiConfigKey()} is not found in {@link org.eclipse.edc.spi.system.ServiceExtensionContext#getConfig} */ - public String getDefaultPath() { return defaultPath; } @@ -54,30 +51,13 @@ public String getDefaultPath() { /** * The name of the API context */ - public String getContextAlias() { return contextAlias; } - /** - * Returns true if the default context should be taken into consideration if there's not one context-specific - * configured - */ - public boolean useDefaultContext() { - return useDefaultContext; - } - - /** - * The name of the API settings. It's intended only for displaying the name of the Web Extension that - * will be configured by {@link WebServiceConfigurer}. - */ - public String getName() { - return name; - } - @Override public int hashCode() { - return Objects.hash(useDefaultContext, apiConfigKey, defaultPort, defaultPath, contextAlias, name); + return Objects.hash(apiConfigKey, defaultPort, defaultPath, contextAlias); } @Override @@ -88,10 +68,10 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - WebServiceSettings that = (WebServiceSettings) o; - return useDefaultContext == that.useDefaultContext && apiConfigKey.equals(that.apiConfigKey) && + var that = (WebServiceSettings) o; + return apiConfigKey.equals(that.apiConfigKey) && defaultPort.equals(that.defaultPort) && defaultPath.equals(that.defaultPath) && - Objects.equals(contextAlias, that.contextAlias) && name.equals(that.name); + Objects.equals(contextAlias, that.contextAlias); } public static class Builder { @@ -121,26 +101,15 @@ public Builder apiConfigKey(String apiConfigKey) { return this; } - public Builder name(String name) { - settings.name = name; - return this; - } - public Builder defaultPort(int defaultPort) { settings.defaultPort = defaultPort; return this; } - public Builder useDefaultContext(boolean useDefaultContext) { - settings.useDefaultContext = useDefaultContext; - return this; - } - public WebServiceSettings build() { Objects.requireNonNull(settings.apiConfigKey); Objects.requireNonNull(settings.defaultPath); Objects.requireNonNull(settings.defaultPort); - Objects.requireNonNull(settings.name); return settings; } diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ManagementEndToEndExtension.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ManagementEndToEndExtension.java index fb6ef9e2cac..edc81ddb1ba 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ManagementEndToEndExtension.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/ManagementEndToEndExtension.java @@ -80,7 +80,6 @@ private static ManagementEndToEndTestContext context(Map config) put("web.http.port", String.valueOf(getFreePort())); put("web.http.protocol.path", "/protocol"); put("web.http.protocol.port", String.valueOf(protocolPort)); - put("web.http.control.port", String.valueOf(getFreePort())); put("edc.dsp.callback.address", "http://localhost:" + protocolPort + "/protocol"); put("web.http.management.path", "/management"); put("web.http.management.port", String.valueOf(managementPort));