Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DPF: add TransferRequestDto id #1188

Merged
merged 1 commit into from
Apr 25, 2022
Merged

DPF: add TransferRequestDto id #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 0 additions & 127 deletions ...ava/org/eclipse/dataspaceconnector/api/datamanagement/asset/model/TransferRequestDto.java
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions ...lipse/dataspaceconnector/api/datamanagement/transferprocess/model/TransferRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
public class TransferRequestDto {

private String connectorAddress;
private String id;
private String contractId;
private DataAddress dataDestination;
private boolean managedResources = true;
Expand All @@ -40,6 +41,10 @@ public String getConnectorAddress() {
return connectorAddress;
}

public String getId() {
return id;
}

public String getContractId() {
return contractId;
}
Expand Down Expand Up @@ -90,6 +95,11 @@ public Builder connectorAddress(String connectorAddress) {
return this;
}

public Builder id(String id) {
request.id = id;
return this;
}

public Builder contractId(String contractId) {
request.contractId = contractId;
return this;
Expand Down
6 changes: 6 additions & 0 deletions .../datamanagement/transferprocess/transform/TransferRequestDtoToDataRequestTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.jetbrains.annotations.Nullable;

import java.util.Objects;
import java.util.UUID;

public class TransferRequestDtoToDataRequestTransformer implements DtoTransformer<TransferRequestDto, DataRequest> {

Expand All @@ -41,7 +42,12 @@ public Class<DataRequest> getOutputType() {
if (object == null) {
return null;
}

// Generate a DataRequest ID if none is provided (used for idempotency)
String id = Objects.requireNonNullElseGet(object.getId(), () -> UUID.randomUUID().toString());

return DataRequest.Builder.newInstance()
.id(id)
.assetId(object.getAssetId())
.connectorId(object.getConnectorId())
.dataDestination(object.getDataDestination())
Expand Down
22 changes: 18 additions & 4 deletions ...amanagement/transferprocess/transform/TransferRequestDtoToDataRequestTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*
* Contributors:
* Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - Initial implementation
* Microsoft Corporation - support for id field
*
*/

Expand All @@ -20,6 +21,7 @@
import org.eclipse.dataspaceconnector.spi.transformer.TransformerContext;
import org.eclipse.dataspaceconnector.spi.types.domain.DataAddress;
import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataRequest;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;

import java.util.Map;
Expand All @@ -45,8 +47,11 @@ void getOutputType() {
@Test
void transform() {
var context = mock(TransformerContext.class);
var transferReq = transferRequestDto();
var transferReq = transferRequestDto()
.id(faker.lorem().word())
.build();
var dataRequest = transformer.transform(transferReq, context);
assertThat(dataRequest.getId()).isEqualTo(transferReq.getId());
assertThat(dataRequest.getAssetId()).isEqualTo(transferReq.getAssetId());
assertThat(dataRequest.getConnectorAddress()).isEqualTo(transferReq.getConnectorAddress());
assertThat(dataRequest.getConnectorId()).isEqualTo(transferReq.getConnectorId());
Expand All @@ -59,16 +64,25 @@ void transform() {
assertThat(dataRequest.isManagedResources()).isEqualTo(transferReq.isManagedResources());
}

private TransferRequestDto transferRequestDto() {
@Test
void transform_whenIdIsNull_generatesId() {
var context = mock(TransformerContext.class);
var transferReq = transferRequestDto().build();
var dataRequest = transformer.transform(transferReq, context);
assertThat(transferReq.getId()).isBlank();
assertThat(dataRequest.getId()).isNotBlank();
}

@NotNull
private TransferRequestDto.Builder transferRequestDto() {
return TransferRequestDto.Builder.newInstance()
.connectorAddress(faker.internet().url())
.assetId(faker.lorem().word())
.contractId(faker.lorem().word())
.protocol(faker.lorem().word())
.dataDestination(DataAddress.Builder.newInstance().type(faker.lorem().word()).build())
.connectorId(faker.lorem().word())
.properties(Map.of(faker.lorem().word(), faker.lorem().word()))
.build();
.properties(Map.of(faker.lorem().word(), faker.lorem().word()));
}

}