Skip to content

Restore DocumentUtil.toMap(ODocument, boolean) to fix the master build #249

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
vharseko merged 1 commit into from
Oct 6, 2026
Merged

Restore DocumentUtil.toMap(ODocument, boolean) to fix the master build #249

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
15 changes: 13 additions & 2 deletions ...dm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/DocumentUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ public static ResourceResponse toResource(ODocument doc) {
return result;
}

/**
* Convert to JSON object structures (akin to simple binding),
* composed of the basic Java types: {@link Map}, {@link List}, {@link String}, {@link Number}, {@link Boolean}.
* @param doc the OrientDB document to convert
* @return the doc converted into maps, lists, java types; or null if the doc was null
*/
public static Map<String, Object> toMap(ODocument doc) {
return toMap(doc, true);
}

/**
* Convert to JSON object structures (akin to simple binding),
* composed of the basic Java types: {@link Map}, {@link List}, {@link String}, {@link Number}, {@link Boolean}.
Expand All @@ -98,9 +108,10 @@ public static ResourceResponse toResource(ODocument doc) {
* Embedded documents are converted as they are.
*
* @param doc the OrientDB document to convert
* @param topLevel if the passed in document represents a top level orientdb class, or false if it is an embedded document
* @return the doc converted into maps, lists, java types; or null if the doc was null
*/
public static Map<String, Object> toMap(ODocument doc) {
private static Map<String, Object> toMap(ODocument doc, boolean topLevel) {
Map<String, Object> result = null;
if (doc != null) {
boolean projection = topLevel && !doc.getIdentity().isPersistent();
Expand Down Expand Up @@ -148,7 +159,7 @@ public static Map<String, Object> toMap(ODocument doc) {
private static Object asSimpleBinding(Object objToClean) {
if (objToClean instanceof ODocument) {
logger.trace("Converting embedded ODocument {} to map ", objToClean);
return DocumentUtil.toMap((ODocument) objToClean);
return DocumentUtil.toMap((ODocument) objToClean, false);
} else if (objToClean instanceof List) {
logger.trace("Checking embedded list {} ", objToClean);
return toSimpleModel((List) objToClean);
Expand Down
Loading