Author: angela
Date: Tue Jun 16 13:41:24 2015
New Revision: 1685834
URL: http://svn.apache.org/r1685834
Log:
OAK-2996 : Improvement wrt property states of type Type.LONG and Type.LONGS
Added:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/LongUtils.java
Modified:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
Added:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/LongUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/LongUtils.java?rev=1685834&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/LongUtils.java
(added)
+++
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/LongUtils.java
Tue Jun 16 13:41:24 2015
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.commons;
+
+import java.util.Date;
+
+public final class LongUtils {
+
+ private LongUtils() {}
+
+ /**
+ * Sums {@code a} and {@code b} and verifies that it doesn't overflow in
+ * signed long arithmetic, in which case {@link Long#MAX_VALUE} will be
+ * returned instead of the result.
+ *
+ * Note: this method is a variant of {@link
com.google.common.math.LongMath#checkedAdd(long, long)}
+ * that returns {@link Long#MAX_VALUE} instead of throwing {@code
ArithmeticException}.
+ *
+ * @see com.google.common.math.LongMath#checkedAdd(long, long)
+ */
+ public static long safeAdd(long a, long b) {
+ long result = a + b;
+ if ((a ^ b) < 0 | (a ^ result) >= 0) {
+ return result;
+ } else {
+ return Long.MAX_VALUE;
+ }
+ }
+
+ /**
+ * Calculate an expiration time based on {@code new Date().getTime()} and
+ * the specified {@code expiration} in number of milliseconds.
+ *
+ * @param expiration The expiration in milliseconds.
+ * @return The expiration time.
+ */
+ public static long calculateExpirationTime(long expiration) {
+ return LongUtils.safeAdd(expiration, new Date().getTime());
+ }
+}
Modified:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java?rev=1685834&r1=1685833&r2=1685834&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/package-info.java
Tue Jun 16 13:41:24 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.2.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.commons;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java?rev=1685834&r1=1685833&r2=1685834&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
Tue Jun 16 13:41:24 2015
@@ -30,6 +30,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.commons.iterator.AbstractLazyIterator;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.LongUtils;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import
org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
@@ -95,7 +96,7 @@ class PermissionEntryProviderImpl implem
if (Long.MAX_VALUE == n) {
cnt = Long.MAX_VALUE;
} else {
- cnt = safeAdd(cnt, n);
+ cnt = LongUtils.safeAdd(cnt, n);
}
}
}
@@ -161,25 +162,6 @@ class PermissionEntryProviderImpl implem
return ret;
}
- /**
- * Sums {@code a} and {@code b} and verifies that it doesn't overflow in
- * signed long arithmetic, in which case {@link Long#MAX_VALUE} will be
- * returned instead of the result.
- *
- * Note: this method is a variant of {@link
com.google.common.math.LongMath#checkedAdd(long, long)}
- * that returns {@link Long#MAX_VALUE} instead of throwing {@code
ArithmeticException}.
- *
- * @see com.google.common.math.LongMath#checkedAdd(long, long)
- */
- private static long safeAdd(long a, long b) {
- long result = a + b;
- if ((a ^ b) < 0 | (a ^ result) >= 0) {
- return result;
- } else {
- return Long.MAX_VALUE;
- }
- }
-
private final class EntryIterator extends
AbstractLazyIterator<PermissionEntry> {
private final EntryPredicate predicate;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java?rev=1685834&r1=1685833&r2=1685834&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
Tue Jun 16 13:41:24 2015
@@ -238,6 +238,10 @@ public class NodeUtil {
}
}
+ public void setLong(@Nonnull String name, long value) {
+ tree.setProperty(name, value);
+ }
+
public void setValues(String name, Value[] values) {
try {
tree.setProperty(PropertyStates.createProperty(name,
Arrays.asList(values)));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java?rev=1685834&r1=1685833&r2=1685834&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/package-info.java
Tue Jun 16 13:41:24 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.2.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.util;
