rishabhdaim commented on code in PR #2232:
URL: https://github.com/apache/jackrabbit-oak/pull/2232#discussion_r2046657049
##########
oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java:
##########
@@ -46,7 +46,6 @@
* /foo | null | matches /foo and all descendants of /foo
* /foo | "" | matches /foo only (no descendants, not
even properties)
* </pre>
Review Comment:
shouldn't this be removed as well.
##########
oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java:
##########
@@ -42,14 +42,14 @@
*<p>
* The conflict handler deals with the following conflicts:
* <ul>
- * <li>{@code addExistingProperty} : {@code Resolution.MERGED}.</li>
+ * <li>{@code addExistingProperty} : {@code Resolution.MERGED}.
* <li>{@code changeDeletedProperty}: {@code Resolution.THEIRS}, removing
the members property takes precedence.
* <li>{@code changeChangedProperty}: {@code Resolution.MERGED}, merge of
the 2 members sets into a single one
* <li>{@code deleteChangedProperty}: {@code Resolution.OURS} removing the
members property takes precedence.
- * <li>{@code deleteDeletedProperty}: {@code Resolution.MERGED}.</li>
- * <li>{@code changeDeletedNode} : {@code Resolution.THEIRS}, removal
takes precedence.</li>
- * <li>{@code deleteChangedNode} : {@code Resolution.OURS}, removal
takes precedence.</li>
- * <li>{@code deleteDeletedNode} : {@code Resolution.MERGED}.</li>
+ * <li>{@code deleteDeletedProperty}: {@code Resolution.MERGED}.
+ * <li>{@code changeDeletedNode} : {@code Resolution.THEIRS}, removal
takes precedence.
+ * <li>{@code deleteChangedNode} : {@code Resolution.OURS}, removal
takes precedence.
+ * <li>{@code deleteDeletedNode} : {@code Resolution.MERGED}.
* </ul>
Review Comment:
same as here.
##########
oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java:
##########
@@ -78,7 +76,6 @@
* *cat/* | all siblings and descendants of foo that have an
intermediate segment ending with 'cat'
* /*cat/* | all descendants of /foo that have an intermediate
segment ending with 'cat'
* </pre>
Review Comment:
same as above.
##########
oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java:
##########
@@ -59,7 +58,6 @@
* cat | '/foocat' and all it's descendants
* cat/ | all descendants of '/foocat'
* </pre>
Review Comment:
shouldn't this be removed as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
