Skip to content

Commit

Permalink
Optimizing ItemPath comparison a bit.
Browse files Browse the repository at this point in the history
  • Loading branch information
mederly committed Jul 10, 2017
1 parent 19474ba commit f13727d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Expand Up @@ -54,7 +54,7 @@ public Map<String, String> getNamespaceMap() {
}

public ItemPath() {
segments = new ArrayList<>(0);
segments = new ArrayList<>();
}

public ItemPath(QName... qnames) {
Expand Down
Expand Up @@ -170,7 +170,7 @@ public <O extends ObjectType> void applySchemasAndSecurity(PrismObject<O> object
try {
securityConstraints = securityEnforcer.compileSecurityConstraints(object, null);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Security constrains for {}:\n{}", object, securityConstraints==null?"null":securityConstraints.debugDump());
LOGGER.trace("Security constraints for {}:\n{}", object, securityConstraints==null?"null":securityConstraints.debugDump());
}
if (securityConstraints == null) {
SecurityUtil.logSecurityDeny(object, "because no security constraints are defined (default deny)");
Expand Down Expand Up @@ -314,7 +314,7 @@ private <D extends ItemDefinition> void applySecurityConstraintsPhase(D itemDefi
AuthorizationDecisionType defaultAddDecision = securityConstraints.getActionDecision(ModelAuthorizationAction.ADD.getUrl(), phase);
AuthorizationDecisionType defaultModifyDecision = securityConstraints.getActionDecision(ModelAuthorizationAction.MODIFY.getUrl(), phase);
LOGGER.trace("applySecurityConstraints(itemDefs): def={}, phase={}, defaults R={}, A={}, M={}",
new Object[]{itemDefinition, phase, defaultReadDecision, defaultAddDecision, defaultModifyDecision});
itemDefinition, phase, defaultReadDecision, defaultAddDecision, defaultModifyDecision);
applySecurityConstraintsItemDef(itemDefinition, ItemPath.EMPTY_PATH, securityConstraints,
defaultReadDecision, defaultAddDecision, defaultModifyDecision, phase);

Expand Down
Expand Up @@ -22,10 +22,10 @@

public interface ObjectSecurityConstraints extends DebugDumpable {

public AuthorizationDecisionType getActionDecision(String actionUrl, AuthorizationPhaseType phase);
AuthorizationDecisionType getActionDecision(String actionUrl, AuthorizationPhaseType phase);

public AuthorizationDecisionType findItemDecision(ItemPath itemPath, String actionUrl, AuthorizationPhaseType phase);
AuthorizationDecisionType findItemDecision(ItemPath itemPath, String actionUrl, AuthorizationPhaseType phase);

public boolean hasNoItemDecisions();
boolean hasNoItemDecisions();

}

0 comments on commit f13727d

Please sign in to comment.