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

Feat/Register DTR at EDC #247

Merged
merged 5 commits into from
Feb 12, 2024
Merged

Feat/Register DTR at EDC #247

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40d91f8
feat: initial commit
eschrewe Feb 7, 2024
5424b35
feat: added dtr registration
eschrewe Feb 8, 2024
9000072
fix: removed latest-tag from dtr containers
eschrewe Feb 8, 2024
ab73db7
chore: merge main
eschrewe Feb 8, 2024
8a7bc20
fix: review fixes
eschrewe Feb 12, 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
179 changes: 116 additions & 63 deletions ...n/java/org/eclipse/tractusx/puris/backend/common/edc/logic/service/EdcAdapterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private Response sendPostRequest(JsonNode requestBody, List<String> pathSegments
for (var pathSegment : pathSegments) {
urlBuilder.addPathSegment(pathSegment);
}
RequestBody body = RequestBody.create(MediaType.parse("application/json"), requestBody.toString());
RequestBody body = RequestBody.create(requestBody.toString(), MediaType.parse("application/json"));

var request = new Request.Builder()
.post(body)
Expand All @@ -103,6 +103,20 @@ private Response sendPostRequest(JsonNode requestBody, List<String> pathSegments
return CLIENT.newCall(request).execute();
}

private Response sendDtrPostRequest(JsonNode requestBody, List<String> pathSegments) throws IOException {
HttpUrl.Builder urlBuilder = HttpUrl.parse(variablesService.getDtrUrl() + "/api/v3.0").newBuilder();
for (var pathSegment : pathSegments) {
urlBuilder.addPathSegment(pathSegment);
}
RequestBody body = RequestBody.create(MediaType.parse("application/json"), requestBody.toString());
eschrewe marked this conversation as resolved.
Show resolved Hide resolved
var request = new Request.Builder()
.post(body)
.url(urlBuilder.build())
.header("Content-Type", "application/json")
.build();
return CLIENT.newCall(request).execute();
}

/**
* Call this method at startup to register the necessary request and
* response apis. In case you are using the framework agreement feature,
Expand All @@ -117,11 +131,14 @@ public boolean registerAssetsInitially() {
log.info("Registration of item-stock response api successful " + (result = registerApiAsset(DT_ApiMethodEnum.RESPONSE)));
if (!result) return false;
log.info("Registration of item-stock status-request api successful " + (result = registerApiAsset(DT_ApiMethodEnum.STATUS_REQUEST)));
if (!result) return false;
if (variablesService.isUseFrameworkPolicy()) {
log.info("Registration of framework agreement policy successful " + (result = createFrameWorkPolicy()));
} else {
log.info("Skipping registration of framework agreement policy");
}
if (!result) return false;
eschrewe marked this conversation as resolved.
Show resolved Hide resolved
log.info("Registration of DTR Asset successful " + (result = registerDtrAsset()));
return result;
}

Expand All @@ -135,6 +152,7 @@ public boolean registerAssetsInitially() {
*/
public boolean createPolicyAndContractDefForPartner(Partner partner) {
boolean result = createPolicyDefinitionForPartner(partner);
result &= createDtrContractDefinitionForPartner(partner);
result &= createContractDefinitionForPartner(partner, DT_ApiMethodEnum.REQUEST);
result &= createContractDefinitionForPartner(partner, DT_ApiMethodEnum.STATUS_REQUEST);
return result & createContractDefinitionForPartner(partner, DT_ApiMethodEnum.RESPONSE);
Expand All @@ -152,20 +170,37 @@ public boolean createPolicyAndContractDefForPartner(Partner partner) {
*/
private boolean createContractDefinitionForPartner(Partner partner, DT_ApiMethodEnum apiMethod) {
var body = edcRequestBodyBuilder.buildContractDefinitionWithBpnRestrictedPolicy(partner, apiMethod);
try {
var response = sendPostRequest(body, List.of("v2", "contractdefinitions"));
boolean result = response.isSuccessful();
if (!result) {
try (var response = sendPostRequest(body, List.of("v2", "contractdefinitions"))) {
if (!response.isSuccessful()) {
log.warn("Contract definition registration failed for partner " + partner.getBpnl() + " and "
+ apiMethod + "\n" + response.body().string());
+ apiMethod);
if (response.body() != null) {
log.warn("Response: \n" + response.body().string());
}
return false;
}
response.body().close();
return result;
return true;
} catch (Exception e) {
log.error("Contract definition registration failed for partner " + partner.getBpnl() + " and " + apiMethod);
return false;
}
}

private boolean createDtrContractDefinitionForPartner(Partner partner) {
var body = edcRequestBodyBuilder.buildDtrContractDefinitionForPartner(partner);
try (var response = sendPostRequest(body, List.of("v2", "contractdefinitions"))) {
if (!response.isSuccessful()) {
log.warn("Contract definition registration failed for partner " + partner.getBpnl() + " and DTR");
return false;
}
return true;
} catch (Exception e) {
log.error("Contract definition registration failed for partner " + partner.getBpnl() + " and DTR", e);
return false;
}
}


/**
* Registers a policy definition that allows only the given partner's
* BPNL.
Expand All @@ -175,14 +210,15 @@ private boolean createContractDefinitionForPartner(Partner partner, DT_ApiMethod
*/
private boolean createPolicyDefinitionForPartner(Partner partner) {
var body = edcRequestBodyBuilder.buildBpnRestrictedPolicy(partner);
try {
var response = sendPostRequest(body, List.of("v2", "policydefinitions"));
boolean result = response.isSuccessful();
if (!result) {
log.warn("Policy Registration failed \n" + response.body().string());
try (var response = sendPostRequest(body, List.of("v2", "policydefinitions"))) {
if (!response.isSuccessful()) {
log.warn("Policy Registration failed");
if (response.body() != null) {
log.warn("Response: \n" + response.body().string());
}
return false;
}
response.body().close();
return result;
return true;
} catch (Exception e) {
log.error("Failed to register policy definition for partner " + partner.getBpnl(), e);
return false;
Expand All @@ -196,20 +232,38 @@ private boolean createPolicyDefinitionForPartner(Partner partner) {
*/
private boolean createFrameWorkPolicy() {
var body = edcRequestBodyBuilder.buildFrameworkAgreementPolicy();
try {
var response = sendPostRequest(body, List.of("v2", "policydefinitions"));
boolean result = response.isSuccessful();
if (!result) {
log.warn("Framework Policy Registration failed \n" + response.body().string());
try (var response = sendPostRequest(body, List.of("v2", "policydefinitions"))) {
if (!response.isSuccessful()) {
log.warn("Framework Policy Registration failed");
if (response.body() != null) {
log.warn("Response: \n" + response.body().string());
}
return false;
}
response.body().close();
return result;
return true;
} catch (Exception e) {
log.error("Failed to register Framework Policy", e);
return false;
}
}


private boolean registerDtrAsset() {
var body = edcRequestBodyBuilder.buildDtrRegistrationBody();
try (var response = sendPostRequest(body, List.of("v3", "assets"))) {
eschrewe marked this conversation as resolved.
Show resolved Hide resolved
if (!response.isSuccessful()) {
log.warn("Asset registration failed for DTR");
if (response.body() != null) {
log.warn("Response: \n" + response.body().string());
}
}
return true;
} catch (Exception e) {
log.error("Failed to register DTR Asset", e);
return false;
}
}

/**
* Util method to register an API asset to your control plane.
*
Expand All @@ -218,14 +272,15 @@ private boolean createFrameWorkPolicy() {
*/
private boolean registerApiAsset(DT_ApiMethodEnum apiMethod) {
var body = edcRequestBodyBuilder.buildCreateItemStockAssetBody(apiMethod);
try {
var response = sendPostRequest(body, List.of("v3", "assets"));
boolean result = response.isSuccessful();
if (!result) {
log.warn("Asset registration failed \n" + response.body().string());
try (var response = sendPostRequest(body, List.of("v3", "assets"))) {
if (!response.isSuccessful()) {
log.warn("Asset registration failed");
if (response.body() != null) {
log.warn("Response: \n" + response.body().string());
}
return false;
}
response.body().close();
return result;
return true;
} catch (Exception e) {
log.error("Failed to register api asset " + apiMethod.CX_TAXO, e);
return false;
Expand All @@ -241,10 +296,11 @@ private boolean registerApiAsset(DT_ApiMethodEnum apiMethod) {
* @throws IOException If the connection to the partners control plane fails
*/
public JsonNode getCatalog(String dspUrl) throws IOException {
var response = sendPostRequest(edcRequestBodyBuilder.buildBasicCatalogRequestBody(dspUrl, null), List.of("v2", "catalog", "request"));
String stringData = response.body().string();
response.body().close();
return objectMapper.readTree(stringData);
try (var response = sendPostRequest(edcRequestBodyBuilder.buildBasicCatalogRequestBody(dspUrl, null), List.of("v2", "catalog", "request"))) {
String stringData = response.body().string();
return objectMapper.readTree(stringData);
}

}

/**
Expand All @@ -258,10 +314,10 @@ public JsonNode getCatalog(String dspUrl) throws IOException {
*/
private JsonNode initiateNegotiation(Partner partner, JsonNode catalogItem) throws IOException {
var requestBody = edcRequestBodyBuilder.buildAssetNegotiationBody(partner, catalogItem);
var response = sendPostRequest(requestBody, List.of("v2", "contractnegotiations"));
String responseString = response.body().string();
response.body().close();
return objectMapper.readTree(responseString);
try (var response = sendPostRequest(requestBody, List.of("v2", "contractnegotiations"))) {
String responseString = response.body().string();
return objectMapper.readTree(responseString);
}
}

/**
Expand All @@ -274,10 +330,10 @@ private JsonNode initiateNegotiation(Partner partner, JsonNode catalogItem) thro
* @throws IOException If the connection to your control plane fails
*/
public JsonNode getNegotiationState(String negotiationId) throws IOException {
var response = sendGetRequest(List.of("v2", "contractnegotiations", negotiationId));
String stringData = response.body().string();
response.body().close();
return objectMapper.readTree(stringData);
try (var response = sendGetRequest(List.of("v2", "contractnegotiations", negotiationId))) {
String stringData = response.body().string();
return objectMapper.readTree(stringData);
}
}

/**
Expand All @@ -289,10 +345,9 @@ public JsonNode getNegotiationState(String negotiationId) throws IOException {
*/
public String getAllNegotiations() throws IOException {
var requestBody = edcRequestBodyBuilder.buildNegotiationsRequestBody();
var response = sendPostRequest(requestBody, List.of("v2", "contractnegotiations", "request"));
String stringData = response.body().string();
response.body().close();
return stringData;
try (var response = sendPostRequest(requestBody, List.of("v2", "contractnegotiations", "request"))) {
return response.body().string();
}
}

/**
Expand All @@ -307,10 +362,10 @@ public String getAllNegotiations() throws IOException {
*/
public JsonNode initiateProxyPullTransfer(Partner partner, String contractId, String assetId) throws IOException {
var body = edcRequestBodyBuilder.buildProxyPullRequestBody(partner, contractId, assetId);
var response = sendPostRequest(body, List.of("v2", "transferprocesses"));
String data = response.body().string();
response.body().close();
return objectMapper.readTree(data);
try (var response = sendPostRequest(body, List.of("v2", "transferprocesses"))) {
String data = response.body().string();
return objectMapper.readTree(data);
}
}

/**
Expand All @@ -323,10 +378,10 @@ public JsonNode initiateProxyPullTransfer(Partner partner, String contractId, St
* @throws IOException If the connection to your control plane fails
*/
public JsonNode getTransferState(String transferId) throws IOException {
var response = sendGetRequest(List.of("v2", "transferprocesses", transferId));
String data = response.body().string();
response.body().close();
return objectMapper.readTree(data);
try (var response = sendGetRequest(List.of("v2", "transferprocesses", transferId))) {
String data = response.body().string();
return objectMapper.readTree(data);
}
}

/**
Expand All @@ -338,10 +393,10 @@ public JsonNode getTransferState(String transferId) throws IOException {
*/
public String getAllTransfers() throws IOException {
var requestBody = edcRequestBodyBuilder.buildTransfersRequestBody();
var response = sendPostRequest(requestBody, List.of("v2", "transferprocesses", "request"));
String data = response.body().string();
response.body().close();
return data;
try (var response = sendPostRequest(requestBody, List.of("v2", "transferprocesses", "request"))) {
String data = response.body().string();
return data;
}
}

/**
Expand All @@ -353,13 +408,11 @@ public String getAllTransfers() throws IOException {
* @throws IOException If the connection to your control plane fails
*/
public String getContractAgreement(String contractAgreementId) throws IOException {
var response = sendGetRequest(List.of("v2", "contractagreements", contractAgreementId));
String data = response.body().string();
response.body().close();
return data;
try (var response = sendGetRequest(List.of("v2", "contractagreements", contractAgreementId))) {
return response.body().string();
}
}


/**
* Util method for sending a post request the given endpoint
* in order to initiate a proxy pull request.
Expand Down Expand Up @@ -506,7 +559,7 @@ private boolean testFrameworkAgreementConstraint(JsonNode catalogEntry) {
return false;
}
var permissionObject = policyObject.get("odrl:permission");
if(permissionObject == null) {
if (permissionObject == null) {
return false;
}
var constraintObject = permissionObject.get("odrl:constraint");
Expand Down
Loading
Loading