Skip to content

fix: rightOperand serialization for list types #5934

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

Merged
ndr-brt merged 1 commit into from
Aug 4, 2026
Merged

fix: rightOperand serialization for list types #5934

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
26 changes: 21 additions & 5 deletions ...lipse/edc/connector/controlplane/transform/odrl/from/JsonObjectFromPolicyTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Collection;
import java.util.Optional;

import static jakarta.json.stream.JsonCollectors.toJsonArray;
Expand Down Expand Up @@ -99,10 +100,10 @@ public JsonObjectFromPolicyTransformer(JsonBuilderFactory jsonFactory, Participa
/**
* Walks the policy object model, transforming it to a JsonObject.
*/
private static class Visitor implements Policy.Visitor<JsonObject>, Rule.Visitor<JsonObject>, Constraint.Visitor<JsonObject>, Expression.Visitor<JsonObject> {
private static class Visitor implements Policy.Visitor<JsonObject>, Rule.Visitor<JsonObject>, Constraint.Visitor<JsonObject>, Expression.Visitor<JsonArray> {
private final JsonBuilderFactory jsonFactory;
private final ParticipantIdMapper participantIdMapper;
private TransformerConfig config;
private final TransformerConfig config;


Visitor(JsonBuilderFactory jsonFactory, ParticipantIdMapper participantIdMapper, TransformerConfig config) {
Expand Down Expand Up @@ -140,12 +141,27 @@ public JsonObject visitAtomicConstraint(AtomicConstraint atomicConstraint) {
}

@Override
public JsonObject visitLiteralExpression(LiteralExpression expression) {
return jsonFactory.createObjectBuilder()
.add(VALUE, Json.createValue(expression.getValue().toString()))
public JsonArray visitLiteralExpression(LiteralExpression expression) {
if (expression.getValue() instanceof Collection<?> collection) {
return collection.stream()
.map(this::toJsonValue)
.map(value -> jsonFactory.createObjectBuilder().add(VALUE, value).build())
.collect(toJsonArray());
}

return jsonFactory.createArrayBuilder()
.add(jsonFactory.createObjectBuilder().add(VALUE, toJsonValue(expression.getValue())))
.build();
}

private JsonValue toJsonValue(Object value) {
if (value instanceof Number number) {
return Json.createValue(number);
}

return Json.createValue(value.toString());
}

@Override
public JsonObject visitPolicy(Policy policy) {
var builder = jsonFactory.createObjectBuilder()
Expand Down
71 changes: 67 additions & 4 deletions ...e/edc/connector/controlplane/transform/odrl/from/JsonObjectFromPolicyTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
import static org.assertj.core.api.InstanceOfAssertFactories.list;
import static org.assertj.core.api.InstanceOfAssertFactories.type;
import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID;
import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
Expand Down Expand Up @@ -191,7 +192,7 @@ void transform_actionWithAllAttributes_returnJsonObject() {
.isEqualTo(((LiteralExpression) constraint.getLeftExpression()).getValue());
assertThat(constraintJson.getJsonArray(ODRL_OPERATOR_ATTRIBUTE).getJsonObject(0).getString(ID))
.isEqualTo(constraint.getOperator().getOdrlRepresentation());
assertThat(constraintJson.getJsonObject(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonString(VALUE).getString())
assertThat(constraintJson.getJsonArray(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonObject(0).getJsonString(VALUE).getString())
.isEqualTo(((LiteralExpression) constraint.getRightExpression()).getValue());

verify(context, never()).reportProblem(anyString());
Expand Down Expand Up @@ -231,7 +232,7 @@ void transform_permissionWithConstraintAndDuty_returnJsonObject() {
.isEqualTo(((LiteralExpression) constraint.getLeftExpression()).getValue());
assertThat(constraintJson.getJsonArray(ODRL_OPERATOR_ATTRIBUTE).getJsonObject(0).getString(ID))
.isEqualTo(constraint.getOperator().getOdrlRepresentation());
assertThat(constraintJson.getJsonObject(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonString(VALUE).getString())
assertThat(constraintJson.getJsonArray(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonObject(0).getJsonString(VALUE).getString())
.isEqualTo(((LiteralExpression) constraint.getRightExpression()).getValue());

var dutyJson = permissionJson.getJsonArray(ODRL_DUTY_ATTRIBUTE).get(0).asJsonObject();
Expand Down Expand Up @@ -263,7 +264,7 @@ void transform_prohibitionWithConstraint_returnJsonObject() {
.isEqualTo(((LiteralExpression) constraint.getLeftExpression()).getValue());
assertThat(constraintJson.getJsonArray(ODRL_OPERATOR_ATTRIBUTE).getJsonObject(0).getString(ID))
.isEqualTo(constraint.getOperator().getOdrlRepresentation());
assertThat(constraintJson.getJsonObject(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonString(VALUE).getString())
assertThat(constraintJson.getJsonArray(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonObject(0).getJsonString(VALUE).getString())
.isEqualTo(((LiteralExpression) constraint.getRightExpression()).getValue());

assertThat(prohibitionJson.getJsonArray(ODRL_REMEDY_ATTRIBUTE)).hasSize(1).first()
Expand Down Expand Up @@ -299,7 +300,7 @@ void transform_dutyWithConstraintAndConsequence_returnJsonObject() {
.isEqualTo(((LiteralExpression) constraint.getLeftExpression()).getValue());
assertThat(constraintJson.getJsonArray(ODRL_OPERATOR_ATTRIBUTE).getJsonObject(0).getString(ID))
.isEqualTo(constraint.getOperator().getOdrlRepresentation());
assertThat(constraintJson.getJsonObject(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonString(VALUE).getString())
assertThat(constraintJson.getJsonArray(ODRL_RIGHT_OPERAND_ATTRIBUTE).getJsonObject(0).getJsonString(VALUE).getString())
.isEqualTo(((LiteralExpression) constraint.getRightExpression()).getValue());

var consequencesJson = dutyJson.getJsonArray(ODRL_CONSEQUENCE_ATTRIBUTE);
Expand Down Expand Up @@ -427,6 +428,68 @@ void shouldMapPolicyTypeToOdrlType(PolicyType type, String expectedType) {
assertThat(result.getString(TYPE)).isEqualTo(expectedType);
}

@Test
void shouldTransformRightOperandCollectionStrings() {
var constraint = AtomicConstraint.Builder.newInstance()
.leftExpression(new LiteralExpression("left"))
.operator(Operator.EQ)
.rightExpression(new LiteralExpression(List.of("right1", "right2")))
.build();
var policy = Policy.Builder.newInstance()
.permission(Permission.Builder.newInstance()
.action(Action.Builder.newInstance().type("use").constraint(constraint).build())
.build())
.build();

var result = transformer.transform(policy, context);

assertThat(result)
.extracting(it -> it.get(ODRL_PERMISSION_ATTRIBUTE))
.extracting(it -> it.asJsonArray())
.asInstanceOf(list(JsonObject.class))
.first()
.extracting(it -> it.getJsonObject(ODRL_ACTION_ATTRIBUTE))
.extracting(it -> it.getJsonObject(ODRL_REFINEMENT_ATTRIBUTE))
.extracting(it -> it.getJsonArray(ODRL_RIGHT_OPERAND_ATTRIBUTE))
.asInstanceOf(list(JsonObject.class))
.hasSize(2)
.extracting(it -> it.getString(VALUE))
.containsExactly("right1", "right2");

verify(context, never()).reportProblem(anyString());
}

@Test
void shouldTransformRightOperandCollectionInts() {
var constraint = AtomicConstraint.Builder.newInstance()
.leftExpression(new LiteralExpression("left"))
.operator(Operator.EQ)
.rightExpression(new LiteralExpression(List.of(3, 5)))
.build();
var policy = Policy.Builder.newInstance()
.permission(Permission.Builder.newInstance()
.action(Action.Builder.newInstance().type("use").constraint(constraint).build())
.build())
.build();

var result = transformer.transform(policy, context);

assertThat(result)
.extracting(it -> it.get(ODRL_PERMISSION_ATTRIBUTE))
.extracting(JsonValue::asJsonArray)
.asInstanceOf(list(JsonObject.class))
.first()
.extracting(it -> it.getJsonObject(ODRL_ACTION_ATTRIBUTE))
.extracting(it -> it.getJsonObject(ODRL_REFINEMENT_ATTRIBUTE))
.extracting(it -> it.getJsonArray(ODRL_RIGHT_OPERAND_ATTRIBUTE))
.asInstanceOf(list(JsonObject.class))
.hasSize(2)
.extracting(it -> it.getInt(VALUE))
.containsExactly(3, 5);

verify(context, never()).reportProblem(anyString());
}

private Action getAction() {
return Action.Builder.newInstance().type("use").build();
}
Expand Down
43 changes: 43 additions & 0 deletions ...est/java/org/eclipse/edc/test/e2e/managementapi/v5/PolicyDefinitionApiV5EndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import static org.eclipse.edc.test.e2e.managementapi.v5.TestFunction.participantContext;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.matchesRegex;
import static org.hamcrest.Matchers.notNullValue;
Expand Down Expand Up @@ -120,6 +121,48 @@ void create(ManagementEndToEndV5TestContext context) {
.body("policy.obligation[0].action", is("use"));
}

@Test
void create_rightOperandAsList(ManagementEndToEndV5TestContext context) {
var policy = createObjectBuilder()
.add(TYPE, "Set")
.add("permission", createArrayBuilder()
.add(createObjectBuilder()
.add("action", "use")
.add("constraint", createArrayBuilder().add(createObjectBuilder()
.add("leftOperand", "inForceDate")
.add("operator", "isPartOf")
.add("rightOperand", createArrayBuilder().add("value").add("another")))
.build()))
.build())
.build();

var requestBody = createObjectBuilder()
.add(CONTEXT, jsonLdContext())
.add(TYPE, "PolicyDefinition")
.add("policy", policy)
.build();

var id = context.baseRequest(participantTokenJwt)
.body(requestBody.toString())
.contentType(JSON)
.post("/v5beta/participants/" + PARTICIPANT_CONTEXT_ID + "/policydefinitions")
.then()
.log().ifValidationFails()
.contentType(JSON)
.statusCode(200)
.extract().jsonPath().getString(ID);

context.baseRequest(participantTokenJwt)
.get("/v5beta/participants/" + PARTICIPANT_CONTEXT_ID + "/policydefinitions/" + id)
.then()
.log().ifValidationFails()
.statusCode(200)
.contentType(JSON)
.body(ID, is(id))
.body(CONTEXT, contains(jsonLdContextArray()))
.body("policy.permission[0].constraint[0].rightOperand", hasSize(2));
}

@Test
void create_WithPrivateProperties(ManagementEndToEndV5TestContext context, PolicyDefinitionStore store) {
var requestBody = createObjectBuilder()
Expand Down
Loading