Author: angela
Date: Thu Aug 6 09:34:58 2015
New Revision: 1694428
URL: http://svn.apache.org/r1694428
Log:
minor improvement: add property annotation to param list in
Permissions.getPermissions(String,TreeLocation,boolean)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/package-info.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java?rev=1694428&r1=1694427&r2=1694428&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
Thu Aug 6 09:34:58 2015
@@ -362,7 +362,8 @@ public final class Permissions {
* @throws IllegalArgumentException If the string contains unknown actions
* or permission names.
*/
- public static long getPermissions(String jcrActions, TreeLocation location,
+ public static long getPermissions(@Nonnull String jcrActions,
+ @Nonnull TreeLocation location,
boolean isAccessControlContent) {
Set<String> actions = Sets.newHashSet(Text.explode(jcrActions, ',',
false));
long permissions = NO_PERMISSION;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/package-info.java?rev=1694428&r1=1694427&r2=1694428&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/package-info.java
Thu Aug 6 09:34:58 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("2.0")
+@Version("2.0.1")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.spi.security.authorization.permission;
