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

sync with upstream #937

Merged
merged 6 commits into from
May 15, 2024
Merged

sync with upstream #937

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
9f84e62
feat(decentral-client-library):974-tracex extend datamodel of EdcPoli…
ds-mwesener May 14, 2024
660e2d4
feat(decentral-client-library):974-tracex extend datamodel of EdcPoli…
ds-mwesener May 15, 2024
2581068
feat(decentral-client-library): Fix test
ds-jhartmann May 15, 2024
2fe5d55
feat(decentral-client-library): Fix test
ds-jhartmann May 15, 2024
7baf5ec
chore(dependencies): Update registry client lib to 2.0.3
ds-jhartmann May 15, 2024
f39c60f
Merge pull request #642 from catenax-ng/chore/947-trace-x-extension-o…
ds-jhartmann May 15, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ _**For better traceability add the corresponding GitHub issue number in each cha
### Changed

- Improved policy store API input validation. #528

- Extended datamodel of EdcPolicyPermissionConstraint to include andConstraints
- Marked createAccessPolicy requests with deprecation mark.


## Added
Expand Down
10 changes: 5 additions & 5 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,12 @@ maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved
maven/mavencentral/org.eclipse.tractusx.edc/edr-api/0.6.0, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.edc/edr-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/2.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/2.0.3, Apache-2.0, approved, automotive.tractusx
maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
Expand Down
3 changes: 3 additions & 0 deletions .../java/org/eclipse/tractusx/irs/edc/client/policy/model/EdcPolicyPermissionConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ public class EdcPolicyPermissionConstraint {
@JsonProperty("odrl:or")
private List<EdcPolicyPermissionConstraintExpression> orExpressions;

@JsonProperty("odrl:and")
private List<EdcPolicyPermissionConstraintExpression> andExpressions;

}
43 changes: 20 additions & 23 deletions ...n/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import static org.eclipse.tractusx.irs.edc.client.configuration.JsonLdConfiguration.NAMESPACE_ODRL;

import java.util.Collections;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -64,12 +65,14 @@ public class EdcPolicyDefinitionService {
private final EdcConfiguration config;
private final RestTemplate restTemplate;

@Deprecated(since = "5.1.1")
public String createAccessPolicy(final String policyName) throws CreateEdcPolicyDefinitionException {
final String accessPolicyId = UUID.randomUUID().toString();

return createAccessPolicy(policyName, accessPolicyId);
}

@Deprecated(since = "5.1.1")
public String createAccessPolicy(final String policyName, final String policyId)
throws CreateEdcPolicyDefinitionException {
final EdcCreatePolicyDefinitionRequest request = createPolicyDefinition(policyName, policyId);
Expand Down Expand Up @@ -124,29 +127,23 @@ public boolean policyDefinitionExists(final String policyName) throws GetEdcPoli

public EdcCreatePolicyDefinitionRequest createPolicyDefinition(final String policyName,
final String accessPolicyId) {
final EdcPolicyPermissionConstraintExpression constraint = EdcPolicyPermissionConstraintExpression.builder()
.leftOperand(
"PURPOSE")
.rightOperand(
policyName)
.operator(
new EdcOperator(
OPERATOR_PREFIX
+ "eq"))
.type(CONSTRAINT)
.build();

final EdcPolicyPermissionConstraint edcPolicyPermissionConstraint = EdcPolicyPermissionConstraint.builder()
.orExpressions(
List.of(constraint))
.type(ATOMIC_CONSTRAINT)
.build();

final EdcPolicyPermission odrlPermissions = EdcPolicyPermission.builder()
.action(USE_ACTION)
.edcPolicyPermissionConstraints(
edcPolicyPermissionConstraint)
.build();
final var constraint = EdcPolicyPermissionConstraintExpression.builder()
.leftOperand("PURPOSE")
.rightOperand(policyName)
.operator(new EdcOperator(OPERATOR_PREFIX + "eq"))
.type(CONSTRAINT)
.build();

final var edcPolicyPermissionConstraint = EdcPolicyPermissionConstraint.builder()
.andExpressions(List.of(constraint))
.orExpressions(Collections.emptyList())
.type(ATOMIC_CONSTRAINT)
.build();

final var odrlPermissions = EdcPolicyPermission.builder()
.action(USE_ACTION)
.edcPolicyPermissionConstraints(edcPolicyPermissionConstraint)
.build();

final EdcPolicy edcPolicy = EdcPolicy.builder()
.odrlPermissions(List.of(odrlPermissions))
Expand Down
3 changes: 2 additions & 1 deletion ...va/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONExc
"odrl:action": "USE",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:or": [
"odrl:or": [],
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "PURPOSE",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</sonar.coverage.jacoco.xmlReportPaths>

<!-- IRS Registry Client Library -->
<irs-registry-client.version>2.0.2-SNAPSHOT</irs-registry-client.version>
<irs-registry-client.version>2.0.3</irs-registry-client.version>

<!-- Dependencies -->
<springboot.version>3.1.11</springboot.version>
Expand Down
Loading