Author: angela
Date: Wed Aug 14 12:49:57 2019
New Revision: 1865112
URL: http://svn.apache.org/viewvc?rev=1865112&view=rev
Log:
OAK-8541 : AbstractRestrictionProvider.createRestriction : Include restriction
name in error message
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java?rev=1865112&r1=1865111&r2=1865112&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
Wed Aug 14 12:49:57 2019
@@ -67,7 +67,7 @@ public abstract class AbstractRestrictio
Type<?> requiredType = definition.getRequiredType();
int tag = requiredType.tag();
if (tag != PropertyType.UNDEFINED && tag != value.getType()) {
- throw new AccessControlException("Unsupported restriction:
Expected value of type " + requiredType);
+ throw new AccessControlException("Unsupported restriction:
Expected value of type " + requiredType + " for " + oakName);
}
PropertyState propertyState;
if (requiredType.isArray()) {
@@ -85,7 +85,7 @@ public abstract class AbstractRestrictio
Type<?> requiredType = definition.getRequiredType();
for (Value v : values) {
if (requiredType.tag() != PropertyType.UNDEFINED &&
requiredType.tag() != v.getType()) {
- throw new AccessControlException("Unsupported restriction:
Expected value of type " + requiredType);
+ throw new AccessControlException("Unsupported restriction:
Expected value of type " + requiredType + " for " + oakName);
}
}
@@ -94,7 +94,7 @@ public abstract class AbstractRestrictio
propertyState = PropertyStates.createProperty(oakName,
Arrays.asList(values), requiredType.tag());
} else {
if (values.length != 1) {
- throw new AccessControlException("Unsupported restriction:
Expected single value.");
+ throw new AccessControlException("Unsupported restriction:
Expected single value for " + oakName);
}
propertyState = PropertyStates.createProperty(oakName, values[0]);
}
@@ -151,7 +151,7 @@ public abstract class AbstractRestrictio
}
Type<?> type = entry.getValue().getType();
if (type != def.getRequiredType()) {
- throw new AccessControlException("Invalid restriction type
'" + type + "'. Expected " + def.getRequiredType());
+ throw new AccessControlException("Invalid restriction type
'" + type + "' for " + restrName + ". Expected " + def.getRequiredType());
}
}
for (RestrictionDefinition def : supported.values()) {
