Repository navigation
Restore DocumentUtil.toMap(ODocument, boolean) to fix the master build - #249
Merged
vharseko merged 1 commit intoOct 6, 2026
Merged
Conversation
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
added a commit
to vharseko/OpenIDM
that referenced
this pull request
Oct 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
masterdoes not compile since #245 was merged:Two merged PRs collided without a textual conflict:
topLevelparameter of the privateDocumentUtil.toMap(ODocument, boolean)overload as unused and folded it into the publictoMap(ODocument).version/_openidm_idare rewritten into_rev/_idon read #242) was branched before [#236] Remove five unused private-method parameters #239 landed and madetoMapreadtopLevel: only a top level document maps@ridto_id/_revand a projected@versionto_rev; embedded documents are converted as they are. Its CI passed on the older base, and the squash merge applied cleanly on top of [#236] Remove five unused private-method parameters #239.As a result every open PR fails
build-maven/build-docker, because CI builds the merge with the brokenmaster.Fix
Restore the private
toMap(ODocument doc, boolean topLevel)overload:toMap(ODocument)delegates to it withtrue;asSimpleBindingpassesfalsefor embedded documents.DocumentUtil.javais 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.