Skip to content

JCRVLT-814 remove redundant calculations #381

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JCRVLT-814 remove redundant calculations #381

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
12 changes: 8 additions & 4 deletions vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ public void endDocViewNode(@NotNull String nodePath, @NotNull DocViewNode2 docVi
}
} else {
NodeIterator iter = node.getNodes();
EffectiveNodeType entParent = null; // initialize once when required
while (iter.hasNext()) {
numChildren++;
Node child = iter.nextNode();
Expand All @@ -467,15 +468,18 @@ && isIncluded(child, child.getDepth() - rootDepth)) {
} else {
if (wspFilter.getImportMode(path) == ImportMode.REPLACE) {
boolean shouldRemoveChild = true;
NodeDefinition childDefinition = child.getDefinition();
// check if child is not protected
if (child.getDefinition().isProtected()) {
if (childDefinition.isProtected()) {
log.warn("Refuse to delete protected child node: {}", path);
shouldRemoveChild = false;
// check if child is mandatory (and not residual, https://s.apache.org/jcr-2.0-spec/2.0/3_Repository_Model.html#3.7.2.4%20Mandatory)
} else if (child.getDefinition().isMandatory() && !child.getDefinition().getName().equals("*")) {
} else if (childDefinition.isMandatory() && !childDefinition.getName().equals("*")) {
// get relevant child node definition from parent's effective node type
EffectiveNodeType ent = EffectiveNodeType.ofNode(child.getParent());
Optional<NodeDefinition> childNodeDefinition = ent.getApplicableChildNodeDefinition(child.getName(), child.getPrimaryNodeType());
if (entParent == null) {
entParent = EffectiveNodeType.ofNode(node);
}
Optional<NodeDefinition> childNodeDefinition = entParent.getApplicableChildNodeDefinition(child.getName(), child.getPrimaryNodeType());
if (!childNodeDefinition.isPresent()) {
// this should never happen as then child.getDefinition().isMandatory() would have returned false in the first place...
throw new IllegalStateException("Could not find applicable child node definition for mandatory child node " + child.getPath());
Expand Down