Skip to content

Commit 058285f

Browse files
juliapampusjuliapampus
committed
chore: apply feedback from review
1 parent 91c9757 commit 058285f

File tree

45 files changed

+269
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+269
-284
lines changed

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/IdsMultipartDispatcherServiceExtension.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.MultipartContractRejectionSender;
2525
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.MultipartDescriptionRequestSender;
2626
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.MultipartEndpointDataReferenceRequestSender;
27-
import org.eclipse.dataspaceconnector.ids.spi.IdsIdParser;
28-
import org.eclipse.dataspaceconnector.ids.spi.IdsType;
2927
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
3028
import org.eclipse.dataspaceconnector.ids.spi.types.IdsId;
3129
import org.eclipse.dataspaceconnector.ids.spi.types.IdsType;
@@ -97,13 +95,15 @@ private String resolveConnectorId(@NotNull ServiceExtensionContext context) {
9795
Objects.requireNonNull(context);
9896

9997
var value = context.getSetting(EDC_IDS_ID, DEFAULT_EDC_IDS_ID);
100-
try {
101-
// Hint: use stringified uri to keep uri path and query
102-
var idsId = IdsId.from(value);
98+
99+
// Hint: use stringified uri to keep uri path and query
100+
var result = IdsId.from(value);
101+
if (result.succeeded()) {
102+
var idsId = result.getContent();
103103
if (idsId != null && idsId.getType() == IdsType.CONNECTOR) {
104104
return idsId.getValue();
105105
}
106-
} catch (IllegalArgumentException e) {
106+
} else {
107107
var message = "IDS Settings: Expected valid URN for setting '%s', but was %s'. Expected format: 'urn:connector:[id]'";
108108
throw new EdcException(String.format(message, EDC_IDS_ID, DEFAULT_EDC_IDS_ID));
109109
}

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/IdsMultipartRemoteMessageDispatcher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class IdsMultipartRemoteMessageDispatcher extends IdsRemoteMessageDispatc
2424

2525
@Override
2626
public String protocol() {
27-
return MessageProtocol.IDS_MULTIPART.getValue();
27+
return MessageProtocol.IDS_MULTIPART;
2828
}
2929

3030
}

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartArtifactRequestSender.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2525
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
2626
import org.eclipse.dataspaceconnector.ids.core.util.CalendarUtil;
27-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
27+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
2828
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
2929
import org.eclipse.dataspaceconnector.ids.spi.types.IdsId;
3030
import org.eclipse.dataspaceconnector.ids.spi.types.IdsType;
@@ -42,7 +42,7 @@
4242
import java.util.UUID;
4343

4444
import static org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.util.ResponseUtil.parseMultipartStringResponse;
45-
import static org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues.IDS_WEBHOOK_ADDRESS_PROPERTY;
45+
import static org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants.IDS_WEBHOOK_ADDRESS_PROPERTY;
4646

4747
/**
4848
* IdsMultipartSender implementation for data requests. Sends IDS ArtifactRequestMessages and
@@ -96,7 +96,7 @@ protected Message buildMessageHeader(DataRequest request, DynamicAttributeToken
9696

9797
var artifactRequestId = request.getId() != null ? request.getId() : UUID.randomUUID().toString();
9898
var message = new ArtifactRequestMessageBuilder(URI.create(artifactRequestId))
99-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
99+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
100100
._issued_(CalendarUtil.gregorianNow())
101101
._securityToken_(token)
102102
._issuerConnector_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartCatalogDescriptionRequestSender.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2929
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
3030
import org.eclipse.dataspaceconnector.ids.core.util.CalendarUtil;
31-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
31+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
3232
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
3333
import org.eclipse.dataspaceconnector.spi.EdcException;
3434
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
@@ -84,7 +84,7 @@ protected String retrieveRemoteConnectorAddress(CatalogRequest request) {
8484
@Override
8585
protected Message buildMessageHeader(CatalogRequest request, DynamicAttributeToken token) {
8686
var message = new DescriptionRequestMessageBuilder()
87-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
87+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
8888
._issued_(CalendarUtil.gregorianNow())
8989
._securityToken_(token)
9090
._issuerConnector_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartContractAgreementSender.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2525
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
2626
import org.eclipse.dataspaceconnector.ids.core.util.CalendarUtil;
27-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
27+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
2828
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
2929
import org.eclipse.dataspaceconnector.ids.spi.types.IdsId;
3030
import org.eclipse.dataspaceconnector.ids.spi.types.IdsType;
@@ -39,7 +39,7 @@
3939
import java.util.List;
4040

4141
import static org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.util.ResponseUtil.parseMultipartStringResponse;
42-
import static org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues.IDS_WEBHOOK_ADDRESS_PROPERTY;
42+
import static org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants.IDS_WEBHOOK_ADDRESS_PROPERTY;
4343

4444
/**
4545
* IdsMultipartSender implementation for contract agreements. Sends IDS ContractAgreementMessages and
@@ -87,7 +87,7 @@ protected Message buildMessageHeader(ContractAgreementRequest request, DynamicAt
8787
.build();
8888

8989
var message = new ContractAgreementMessageBuilder(idsId.toUri())
90-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
90+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
9191
._issued_(CalendarUtil.gregorianNow())
9292
._securityToken_(token)
9393
._issuerConnector_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartContractOfferSender.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2727
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
2828
import org.eclipse.dataspaceconnector.ids.core.util.CalendarUtil;
29-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
29+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
3030
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
3131
import org.eclipse.dataspaceconnector.spi.EdcException;
3232
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
@@ -41,7 +41,7 @@
4141
import java.util.Objects;
4242

4343
import static org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.util.ResponseUtil.parseMultipartStringResponse;
44-
import static org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues.IDS_WEBHOOK_ADDRESS_PROPERTY;
44+
import static org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants.IDS_WEBHOOK_ADDRESS_PROPERTY;
4545

4646
/**
4747
* IdsMultipartSender implementation for contract requests. Sends IDS ContractRequestMessages and
@@ -84,7 +84,7 @@ protected String retrieveRemoteConnectorAddress(ContractOfferRequest request) {
8484
protected Message buildMessageHeader(ContractOfferRequest request, DynamicAttributeToken token) {
8585
if (request.getType() == ContractOfferRequest.Type.INITIAL) {
8686
var message = new ContractRequestMessageBuilder()
87-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
87+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
8888
._issued_(CalendarUtil.gregorianNow())
8989
._securityToken_(token)
9090
._issuerConnector_(getConnectorId())
@@ -97,7 +97,7 @@ protected Message buildMessageHeader(ContractOfferRequest request, DynamicAttrib
9797
return message;
9898
} else {
9999
var message = new ContractOfferMessageBuilder()
100-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
100+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
101101
._issued_(CalendarUtil.gregorianNow())
102102
._securityToken_(token)
103103
._issuerConnector_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartContractRejectionSender.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2525
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
2626
import org.eclipse.dataspaceconnector.ids.core.util.CalendarUtil;
27-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
27+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
2828
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
2929
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
3030
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
@@ -72,7 +72,7 @@ protected String retrieveRemoteConnectorAddress(ContractRejection rejection) {
7272
@Override
7373
protected Message buildMessageHeader(ContractRejection rejection, DynamicAttributeToken token) throws Exception {
7474
return new ContractRejectionMessageBuilder()
75-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
75+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
7676
._issued_(CalendarUtil.gregorianNow())
7777
._securityToken_(token)
7878
._issuerConnector_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartDescriptionRequestSender.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
3232
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
3333
import org.eclipse.dataspaceconnector.ids.core.util.CalendarUtil;
34-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
34+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
3535
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
3636
import org.eclipse.dataspaceconnector.spi.EdcException;
3737
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
@@ -78,7 +78,7 @@ protected String retrieveRemoteConnectorAddress(MetadataRequest request) {
7878
@Override
7979
protected Message buildMessageHeader(MetadataRequest request, DynamicAttributeToken token) {
8080
return new DescriptionRequestMessageBuilder()
81-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
81+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
8282
._issued_(CalendarUtil.gregorianNow())
8383
._securityToken_(token)
8484
._issuerConnector_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartEndpointDataReferenceRequestSender.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import okhttp3.OkHttpClient;
2424
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2525
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.MultipartResponse;
26-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
26+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
2727
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
2828
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
2929
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
@@ -71,7 +71,7 @@ protected String retrieveRemoteConnectorAddress(EndpointDataReferenceMessage req
7171
@Override
7272
protected Message buildMessageHeader(EndpointDataReferenceMessage request, DynamicAttributeToken token) {
7373
return new ParticipantUpdateMessageBuilder()
74-
._modelVersion_(DefaultValues.INFORMATION_MODEL_VERSION)
74+
._modelVersion_(IdsConstants.INFORMATION_MODEL_VERSION)
7575
._securityToken_(token)
7676
._issuerConnector_(getConnectorId())
7777
._senderAgent_(getConnectorId())

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/test/java/org/eclipse/dataspaceconnector/ids/api/multipart/client/MultipartDispatcherIntegrationTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void testSendDescriptionRequestMessage() throws Exception {
9494
var request = MetadataRequest.Builder.newInstance()
9595
.connectorId(CONNECTOR_ID)
9696
.connectorAddress(getUrl())
97-
.protocol(MessageProtocol.IDS_MULTIPART.getValue())
97+
.protocol(MessageProtocol.IDS_MULTIPART)
9898
.build();
9999

100100
var result = multipartDispatcher.send(BaseConnector.class, request, () -> null).get();
@@ -120,7 +120,7 @@ void testSendArtifactRequestMessage() {
120120
var request = DataRequest.Builder.newInstance()
121121
.connectorId(CONNECTOR_ID)
122122
.connectorAddress(getUrl())
123-
.protocol(MessageProtocol.IDS_MULTIPART.getValue())
123+
.protocol(MessageProtocol.IDS_MULTIPART)
124124
.contractId("1")
125125
.assetId(asset.getId())
126126
.dataDestination(DataAddress.Builder.newInstance().type("test-type").build())
@@ -139,7 +139,7 @@ void testSendContractOfferMessage() {
139139
.type(ContractOfferRequest.Type.COUNTER_OFFER)
140140
.connectorId(CONNECTOR_ID)
141141
.connectorAddress(getUrl())
142-
.protocol(MessageProtocol.IDS_MULTIPART.getValue())
142+
.protocol(MessageProtocol.IDS_MULTIPART)
143143
.contractOffer(contractOffer)
144144
.correlationId("1")
145145
.build();
@@ -162,7 +162,7 @@ void testSendContractRequestMessage() {
162162
.type(ContractOfferRequest.Type.INITIAL)
163163
.connectorId(CONNECTOR_ID)
164164
.connectorAddress(getUrl())
165-
.protocol(MessageProtocol.IDS_MULTIPART.getValue())
165+
.protocol(MessageProtocol.IDS_MULTIPART)
166166
.contractOffer(contractOffer)
167167
.correlationId("1")
168168
.build();
@@ -186,7 +186,7 @@ void testSendContractAgreementMessage() {
186186
var request = ContractAgreementRequest.Builder.newInstance()
187187
.connectorId(CONNECTOR_ID)
188188
.connectorAddress(getUrl())
189-
.protocol(MessageProtocol.IDS_MULTIPART.getValue())
189+
.protocol(MessageProtocol.IDS_MULTIPART)
190190
.contractAgreement(contractAgreement)
191191
.correlationId("1")
192192
.policy(Policy.Builder.newInstance().build())
@@ -202,7 +202,7 @@ void testSendContractRejectionMessage() {
202202
var rejection = ContractRejection.Builder.newInstance()
203203
.connectorId(CONNECTOR_ID)
204204
.connectorAddress(getUrl())
205-
.protocol(MessageProtocol.IDS_MULTIPART.getValue())
205+
.protocol(MessageProtocol.IDS_MULTIPART)
206206
.rejectionReason("Modified policy in contract offer.")
207207
.correlationId(UUID.randomUUID().toString())
208208
.build();

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/test/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartArtifactRequestSenderTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
import de.fraunhofer.iais.eis.DynamicAttributeTokenBuilder;
2121
import okhttp3.OkHttpClient;
2222
import org.eclipse.dataspaceconnector.ids.core.serialization.IdsTypeManagerUtil;
23-
import org.eclipse.dataspaceconnector.ids.spi.IdsId;
24-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
23+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
2524
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
2625
import org.eclipse.dataspaceconnector.ids.spi.types.IdsId;
2726
import org.eclipse.dataspaceconnector.ids.spi.types.IdsType;
@@ -39,7 +38,7 @@
3938
import java.util.UUID;
4039

4140
import static org.assertj.core.api.Assertions.assertThat;
42-
import static org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues.IDS_WEBHOOK_ADDRESS_PROPERTY;
41+
import static org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants.IDS_WEBHOOK_ADDRESS_PROPERTY;
4342
import static org.mockito.Mockito.mock;
4443

4544
class MultipartArtifactRequestSenderTest {
@@ -73,7 +72,7 @@ void buildMessageHeaderOkTest() {
7372

7473
assertThat(message).isInstanceOf(ArtifactRequestMessage.class);
7574
assertThat(message.getId()).hasToString(request.getId());
76-
assertThat(message.getModelVersion()).isEqualTo(DefaultValues.INFORMATION_MODEL_VERSION);
75+
assertThat(message.getModelVersion()).isEqualTo(IdsConstants.INFORMATION_MODEL_VERSION);
7776
assertThat(message.getSecurityToken()).isEqualTo(token);
7877
assertThat(message.getIssuerConnector()).isEqualTo(sender.getConnectorId());
7978
assertThat(message.getSenderAgent()).isEqualTo(sender.getConnectorId());

‎data-protocols/ids/ids-api-multipart-dispatcher-v1/src/test/java/org/eclipse/dataspaceconnector/ids/api/multipart/dispatcher/sender/MultipartEndpointDataReferenceRequestSenderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import okhttp3.OkHttpClient;
2626
import org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.response.IdsMultipartParts;
2727
import org.eclipse.dataspaceconnector.ids.core.serialization.IdsTypeManagerUtil;
28-
import org.eclipse.dataspaceconnector.ids.spi.domain.DefaultValues;
28+
import org.eclipse.dataspaceconnector.ids.spi.domain.IdsConstants;
2929
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
3030
import org.eclipse.dataspaceconnector.spi.iam.IdentityService;
3131
import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
@@ -75,7 +75,7 @@ void buildMessageHeader() {
7575

7676
assertThat(header).isInstanceOf(ParticipantUpdateMessage.class);
7777
var participantUpdateMessage = (ParticipantUpdateMessage) header;
78-
assertThat(participantUpdateMessage.getModelVersion()).isEqualTo(DefaultValues.INFORMATION_MODEL_VERSION);
78+
assertThat(participantUpdateMessage.getModelVersion()).isEqualTo(IdsConstants.INFORMATION_MODEL_VERSION);
7979
assertThat(participantUpdateMessage.getSecurityToken()).isEqualTo(datToken);
8080
assertThat(participantUpdateMessage.getIssuerConnector()).isEqualTo(sender.getConnectorId());
8181
assertThat(participantUpdateMessage.getSenderAgent()).isEqualTo(sender.getConnectorId());

‎data-protocols/ids/ids-api-multipart-endpoint-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/IdsMultipartApiServiceExtension.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import org.eclipse.dataspaceconnector.ids.api.multipart.handler.DescriptionRequestHandler;
2828
import org.eclipse.dataspaceconnector.ids.api.multipart.handler.EndpointDataReferenceHandler;
2929
import org.eclipse.dataspaceconnector.ids.api.multipart.handler.Handler;
30-
import org.eclipse.dataspaceconnector.ids.spi.IdsIdParser;
31-
import org.eclipse.dataspaceconnector.ids.spi.IdsType;
3230
import org.eclipse.dataspaceconnector.ids.spi.service.CatalogService;
3331
import org.eclipse.dataspaceconnector.ids.spi.service.ConnectorService;
3432
import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
@@ -147,13 +145,15 @@ private void registerControllers(ServiceExtensionContext context) {
147145

148146
private String resolveConnectorId(@NotNull ServiceExtensionContext context) {
149147
var value = context.getSetting(EDC_IDS_ID, DEFAULT_EDC_IDS_ID);
150-
try {
151-
// Hint: use stringified uri to keep uri path and query
152-
var idsId = IdsId.from(value);
148+
149+
// Hint: use stringified uri to keep uri path and query
150+
var result = IdsId.from(value);
151+
if (result.succeeded()) {
152+
var idsId = result.getContent();
153153
if (idsId != null && idsId.getType() == IdsType.CONNECTOR) {
154154
return idsId.getValue();
155155
}
156-
} catch (IllegalArgumentException e) {
156+
} else {
157157
var message = "IDS Settings: Expected valid URN for setting '%s', but was %s'. Expected format: 'urn:connector:[id]'";
158158
throw new EdcException(String.format(message, EDC_IDS_ID, DEFAULT_EDC_IDS_ID));
159159
}

0 commit comments

Comments
 (0)