Skip to content

chore(jans-cedarling): Upgrade UniFFI from 0.29.0 to 0.32.0 #14804

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
olehbozhok merged 12 commits into from
Aug 28, 2026
Merged

chore(jans-cedarling): Upgrade UniFFI from 0.29.0 to 0.32.0 #14804

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
664922a
feat(jans-cedarling): upgrade UniFFI to version 0.32.0
haileyesus2433 Aug 19, 2026
cbd3396
refactor(jans-cedarling): JsonValue as a record and update UniFFI
haileyesus2433 Aug 19, 2026
1b91509
chore(jans-cedarling): update JsonValue instantiation in tests
haileyesus2433 Aug 19, 2026
192e916
refactor(jans-cedarling): CedarlingAdapter to use JsonValue type
haileyesus2433 Aug 19, 2026
250e52f
chore(jans-cedarling): update BatchItem context usage to JsonValue in
haileyesus2433 Aug 19, 2026
70fd77d
Merge branch 'main' into jans-cedarling-14556
haileyesus2433 Aug 19, 2026
3bef32c
chore(jans-cedarling): update cargo.lock
haileyesus2433 Aug 19, 2026
e7889fd
chore(jans-cedarling): pass direct ByteBuffer to Cedarling load method
haileyesus2433 Aug 19, 2026
e6f85dc
chore(jans-cedarling): update Kotlin example to use ByteBuffer for
haileyesus2433 Aug 19, 2026
88ed747
chore(jans-cedarling): update JsonValue documentation for FFI clarity
haileyesus2433 Aug 19, 2026
74b47ff
Merge branch 'main' into jans-cedarling-14556
haileyesus2433 Aug 21, 2026
addc76a
fix(jans-cedarling): fix whitespace and formatting in cedarling_uniffi
olehbozhok Aug 28, 2026
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
116 changes: 62 additions & 54 deletions jans-cedarling/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions ...ings/cedarling-java/src/main/java/io/jans/cedarling/binding/wrapper/CedarlingAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public MultiIssuerAuthorizeResult authorizeMultiIssuer(
throw new IllegalArgumentException("resource must not be null");
}
EntityData resourceObj = EntityData.Companion.fromJson(resource.toString());
String contextStr = context != null ? context.toString() : "{}";
return cedarling.authorizeMultiIssuer(tokens, action, resourceObj, contextStr);
JsonValue contextJson = context != null ? new JsonValue(context.toString()) : null;
return cedarling.authorizeMultiIssuer(tokens, action, resourceObj, contextJson);
}

// ── authorize_unsigned ──────────────────────────────────────────────
Expand Down Expand Up @@ -159,7 +159,7 @@ public AuthorizeResult authorizeUnsignedEntity(
}
EntityData resourceObj = EntityData.Companion.fromJson(resource.toString());
String contextStr = context != null ? context.toString() : "{}";
return cedarling.authorizeUnsigned(principal, action, resourceObj, contextStr);
return cedarling.authorizeUnsigned(principal, action, resourceObj, new JsonValue(contextStr));
}

// ── authorize_unsigned_batch ────────────────────────────────────────
Expand Down Expand Up @@ -264,8 +264,8 @@ public BatchItem batchItemFromJson(
throw new IllegalArgumentException("resource must not be null");
}
EntityData resourceObj = EntityData.Companion.fromJson(resource.toString());
String contextStr = context != null ? context.toString() : null;
return new BatchItem(resourceObj, action, contextStr);
JsonValue contextJson = context != null ? new JsonValue(context.toString()) : null;
return new BatchItem(resourceObj, action, contextJson);
}

/**
Expand Down Expand Up @@ -362,7 +362,7 @@ public void pushDataCtx(String key, JSONObject value, Long ttlSecs) throws DataE
if (value == null) {
throw new DataException.SerializationException("value cannot be null");
}
cedarling.pushDataCtx(key, value.toString(), ttlSecs);
cedarling.pushDataCtx(key, new JsonValue(value.toString()), ttlSecs);
}

/**
Expand All @@ -382,7 +382,7 @@ public void pushDataCtx(String key, String value, Long ttlSecs) throws DataExcep
if (value == null) {
throw new DataException.SerializationException("value cannot be null");
}
cedarling.pushDataCtx(key, value, ttlSecs);
cedarling.pushDataCtx(key, new JsonValue(value), ttlSecs);
}

/**
Expand Down Expand Up @@ -416,12 +416,12 @@ public void pushDataCtx(String key, String value) throws DataException {
* @throws DataException If the operation fails
*/
public Object getDataCtx(String key) throws DataException {
String result = cedarling.getDataCtx(key);
JsonValue result = cedarling.getDataCtx(key);
if (result == null) {
return null;
}
try {
org.json.JSONTokener tokener = new org.json.JSONTokener(result);
org.json.JSONTokener tokener = new org.json.JSONTokener(result.getValue());
Object value = tokener.nextValue();
if (value == org.json.JSONObject.NULL) {
return null;
Expand Down
4 changes: 3 additions & 1 deletion ...rling-java/src/test/java/io/jans/cedarling/binding/wrapper/MultiIssuerBatchAuthzTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import uniffi.cedarling_uniffi.AuthorizeException;
import uniffi.cedarling_uniffi.BatchAuthorizeMultiIssuerResponse;
import uniffi.cedarling_uniffi.BatchItem;
import uniffi.cedarling_uniffi.JsonValue;
import uniffi.cedarling_uniffi.BatchItemError;
import uniffi.cedarling_uniffi.BatchItemMultiIssuerOutcome;
import uniffi.cedarling_uniffi.EntityData;
Expand Down Expand Up @@ -201,7 +202,8 @@ public void batchMixedDecisionsPreserveOrder() throws Exception {
BatchItem badItem = new BatchItem(
EntityData.Companion.fromJson(resource.toString()),
"this is not a valid uid",
new JSONObject().toString());
new JsonValue("{}")
);
List<BatchItem> items = new ArrayList<>();
items.add(sameItem());
items.add(badItem);
Expand Down
Loading