Skip to content

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

Merged
vharseko merged 1 commit into
OpenIdentityPlatform:masterfrom
vharseko:hotfix-orientdb-toplevel
Oct 6, 2026
Merged

vharseko merged 1 commit into
OpenIdentityPlatform:masterfrom
vharseko:hotfix-orientdb-toplevel

Conversation

@vharseko

@vharseko vharseko commented Oct 6, 2026

Copy link
Copy Markdown
Member

Problem

master does not compile since #245 was merged:

openidm-repo-orientdb/.../DocumentUtil.java:[106,33] error: cannot find symbol
  symbol:   variable topLevel
openidm-repo-orientdb/.../DocumentUtil.java:[111,20] error: cannot find symbol
  symbol:   variable topLevel

Two merged PRs collided without a textual conflict:

As a result every open PR fails build-maven / build-docker, because CI builds the merge with the broken master.

Fix

Restore the private toMap(ODocument doc, boolean topLevel) overload:

  • the public toMap(ODocument) delegates to it with true;
  • asSimpleBinding passes false for embedded documents.

DocumentUtil.java is now byte-for-byte identical to the version from the #245 head (831df0fc0), which was reviewed and tested.

Testing

mvn -pl openidm-repo-orientdb verify: BUILD SUCCESS, 38 tests, 0 failures, 0 errors.

After this is merged, CI of the open PRs (#226, #227, #238, #244, #247, #248) needs a re-run.

OpenIdentityPlatform#239 removed the topLevel parameter of the private DocumentUtil.toMap
overload as unused and folded the overload into toMap(ODocument). OpenIdentityPlatform#245,
branched before OpenIdentityPlatform#239 landed, made toMap read topLevel: only a top level
document maps @Rid to _id/_rev and a projected @Version to _rev, while
embedded documents are converted as they are. Each change merged cleanly
on its own, but together master no longer compiles:

  DocumentUtil.java:[106,33] error: cannot find symbol: variable topLevel

Restore the private toMap(ODocument, boolean topLevel) overload, with
the public toMap(ODocument) delegating to it with true and
asSimpleBinding passing false for embedded documents. The file is now
identical to the version OpenIdentityPlatform#245 was reviewed and tested with.
@vharseko
vharseko requested a review from maximthomas October 6, 2026 08:01
@vharseko vharseko added bug Something isn't working java Pull requests that update Java code repo Storage / repository layer (OrientDB, JDBC, HSQLDB) labels Oct 6, 2026
@vharseko
vharseko merged commit cc9d8ae into OpenIdentityPlatform:master Oct 6, 2026
31 checks passed
@vharseko
vharseko deleted the hotfix-orientdb-toplevel branch October 6, 2026 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working java Pull requests that update Java code repo Storage / repository layer (OrientDB, JDBC, HSQLDB)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant