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

Jump to bottom

Feature/420 add contractagreements #474

Merged
merged 6 commits into from
Mar 7, 2024
Merged

Feature/420 add contractagreements #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffcc247
feat(impl):[#471] remove redundant datasets
ds-ext-kmassalski Mar 5, 2024
f2ff82e
Merge pull request #801 from catenax-ng/feat/471-remove-redundand-dat…
ds-ext-kmassalski Mar 5, 2024
ee9e174
Merge branch 'main' into feature/420-add-contractagreements
ds-lcapellino Mar 6, 2024
3cdb514
Merge pull request #803 from eclipse-tractusx/main
ds-jhartmann Mar 6, 2024
11e81dd
Merge branch 'main' into feature/420-add-contractagreements
ds-lcapellino Mar 6, 2024
ab66790
feature: 420 fix filterExpression; refactor
ds-lcapellino Mar 6, 2024
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
9 changes: 4 additions & 5 deletions ...ava/org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
********************************************************************************/
package org.eclipse.tractusx.irs.edc.client.contract.service;

import java.util.Arrays;
import java.util.List;

import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -48,7 +47,7 @@
public class EdcContractAgreementService {

public static final String EDC_REQUEST_SUFFIX = "/request";
public static final String EDC_CONTRACT_AGREEMENT_ID = "https://w3id.org/edc/v0.0.1/ns/id";
public static final String EDC_CONTRACT_AGREEMENT_ID = "id";
private final EdcConfiguration config;
private final RestTemplate edcRestTemplate;

Expand All @@ -58,7 +57,7 @@ public EdcContractAgreementService(final EdcConfiguration config,
this.edcRestTemplate = edcRestTemplate;
}

public List<EdcContractAgreementsResponse> getContractAgreements(final String... contractAgreementIds)
public List<EdcContractAgreementsResponse> getContractAgreements(final List<String> contractAgreementIds)
throws ContractAgreementException {

final EdcContractAgreementRequest edcContractAgreementRequest = buildContractAgreementRequest(
Expand Down Expand Up @@ -89,9 +88,9 @@ public EdcContractAgreementNegotiationResponse getContractAgreementNegotiation(f
return contractNegotiationResponseEntity.getBody();
}

private EdcContractAgreementRequest buildContractAgreementRequest(final String... contractAgreementIds) {
private EdcContractAgreementRequest buildContractAgreementRequest(final List<String> contractAgreementIds) {

final List<EdcContractAgreementFilterExpression> list = Arrays.stream(contractAgreementIds)
final List<EdcContractAgreementFilterExpression> list = contractAgreementIds.stream()
.map(s -> new EdcContractAgreementFilterExpression(
EDC_CONTRACT_AGREEMENT_ID, "=", s))
.toList();
Expand Down
4 changes: 2 additions & 2 deletions ...org/eclipse/tractusx/irs/edc/client/contract/service/EdcContractAgreementServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void setUp() {
@Test
void shouldReturnContractAgreements() throws ContractAgreementException {
//GIVEN
String[] contractAgreementIds = { "contractAgreementId" };
List<String> contractAgreementIds = List.of("contractAgreementId");

final EdcContractAgreementsResponse[] edcContractAgreementsResponse = new EdcContractAgreementsResponse[1];
edcContractAgreementsResponse[0] = EdcContractAgreementsResponse.builder().contractAgreementId("id")
Expand All @@ -93,7 +93,7 @@ void shouldReturnContractAgreements() throws ContractAgreementException {
@Test
void shouldThrowContractAgreementExceptionWhenResponseBodyIsEmtpy() {
//GIVEN
String[] contractAgreementIds = { "contractAgreementId" };
List<String> contractAgreementIds = List.of("contractAgreementId");

when(restTemplate.exchange(anyString(), any(), any(), eq(EdcContractAgreementsResponse[].class))).thenReturn(
ResponseEntity.ok(new EdcContractAgreementsResponse[0]));
Expand Down
Loading
Loading