chore: enhance code

sovity · Jun 11, 2024 · 7c38a58 · 7c38a58
1 parent ed762fc
commit 7c38a58
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...mmon-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapper.java b/...mmon-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapper.java
@@ -9,6 +9,7 @@
 import de.sovity.edc.ext.wrapper.api.common.model.PolicyElement;
 import de.sovity.edc.ext.wrapper.api.common.model.UiPolicyCreateRequest;
 import de.sovity.edc.utils.JsonUtils;
+import de.sovity.edc.utils.jsonld.vocab.Prop;
 import jakarta.json.JsonObject;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.edc.policy.model.Action;
@@ -78,11 +79,9 @@ public Policy buildPolicy(UiPolicyCreateRequest policyCreateDto) {
                 .build();
     }
 
-    public Policy buildGenericPolicy(List<PolicyElement> constraintElements) {
+    public Policy buildMultiplicityPolicy(List<PolicyElement> constraintElements) {
         var constraints = buildConstraints(constraintElements);
-
-        var action = Action.Builder.newInstance().type(PolicyValidator.ALLOWED_ACTION).build();
-
+        var action = Action.Builder.newInstance().type(Prop.Odrl.USE).build();
         var permission = Permission.Builder.newInstance()
                 .action(action)
                 .constraints(constraints)
@@ -101,11 +100,11 @@ private List<Constraint> buildConstraints(List<PolicyElement> constraintElements
                 .toList();
     }
 
-    private Constraint buildConstraint(PolicyElement uiPolicyConstraintElement) {
-        var constraintElements = uiPolicyConstraintElement.getConstraintElements();
-        return switch (uiPolicyConstraintElement.getConstraintType()) {
+    private Constraint buildConstraint(PolicyElement policyElement) {
+        var constraintElements = policyElement.getConstraintElements();
+        return switch (policyElement.getConstraintType()) {
             case ATOMIC ->
-                    atomicConstraintMapper.buildAtomicConstraint(uiPolicyConstraintElement.getAtomicConstraint());
+                    atomicConstraintMapper.buildAtomicConstraint(policyElement.getAtomicConstraint());
             case AND -> AndConstraint.Builder.newInstance()
                     .constraints(buildConstraints(constraintElements))
                     .build();

diff --git a/...-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java b/...-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java
@@ -111,7 +111,7 @@ void buildGenericPolicy(String constraintTypeString) {
         when(atomicConstraintMapper
                 .buildAtomicConstraint(eq(incomingConstraint)))
                 .thenReturn(mockAtomicConstraint);
-        var policy = policyMapper.buildGenericPolicy(List.of(baseConstraintElement));
+        var policy = policyMapper.buildMultiplicityPolicy(List.of(baseConstraintElement));
 
         // assert
         assertThat(policy.getType()).isEqualTo(PolicyType.SET);

diff --git a/...c/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/policy/PolicyDefinitionApiService.java b/...c/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/policy/PolicyDefinitionApiService.java
@@ -84,7 +84,7 @@ public IdResponseDto createGenericPolicyDefinition(GenericPolicyCreateRequest ge
     }
 
     private PolicyDefinition buildPolicyDefinition(GenericPolicyCreateRequest genericPolicyCreateRequest) {
-        var policy = policyMapper.buildGenericPolicy(genericPolicyCreateRequest.getConstraintElements());
+        var policy = policyMapper.buildMultiplicityPolicy(genericPolicyCreateRequest.getConstraintElements());
         return PolicyDefinition.Builder.newInstance()
                 .id(genericPolicyCreateRequest.getPolicyDefinitionId())
                 .policy(policy)