RM-6836 formatting change

(cherry picked from commit 05c70ede63)
This commit is contained in:
Ross Gale
2019-05-08 11:06:08 +03:00
committed by cagache
parent b65400746e
commit b799e5600b

View File

@@ -258,28 +258,28 @@ public class RMEntryVoter extends RMSecurityCommon
} }
else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM_CAP)) else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM_CAP))
{ {
switch(checkCapability(invocation, params, cad)) switch (checkCapability(invocation, params, cad))
{ {
case AccessDecisionVoter.ACCESS_DENIED: case AccessDecisionVoter.ACCESS_DENIED:
{ {
return AccessDecisionVoter.ACCESS_DENIED; return AccessDecisionVoter.ACCESS_DENIED;
} }
case AccessDecisionVoter.ACCESS_ABSTAIN: case AccessDecisionVoter.ACCESS_ABSTAIN:
{ {
if(logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
if(logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException()); logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException());
} }
else else
{ {
logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod()); logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod());
} }
} }
// abstain denies // abstain denies
return AccessDecisionVoter.ACCESS_DENIED; return AccessDecisionVoter.ACCESS_DENIED;
} }
case AccessDecisionVoter.ACCESS_GRANTED: case AccessDecisionVoter.ACCESS_GRANTED:
{ {
break; break;
@@ -292,31 +292,31 @@ public class RMEntryVoter extends RMSecurityCommon
} }
else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM)) else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM))
{ {
switch(checkPolicy(invocation, params, cad)) switch (checkPolicy(invocation, params, cad))
{ {
case AccessDecisionVoter.ACCESS_DENIED: case AccessDecisionVoter.ACCESS_DENIED:
{ {
// log message // log message
RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied."); RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied.");
return AccessDecisionVoter.ACCESS_DENIED; return AccessDecisionVoter.ACCESS_DENIED;
} }
case AccessDecisionVoter.ACCESS_ABSTAIN: case AccessDecisionVoter.ACCESS_ABSTAIN:
{ {
if(logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
if(logger.isTraceEnabled()) if (logger.isTraceEnabled())
{ {
logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException()); logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException());
} }
else else
{ {
logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod()); logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod());
} }
} }
// abstain denies // abstain denies
return AccessDecisionVoter.ACCESS_DENIED; return AccessDecisionVoter.ACCESS_DENIED;
} }
case AccessDecisionVoter.ACCESS_GRANTED: case AccessDecisionVoter.ACCESS_GRANTED:
{ {
break; break;