You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2020/05/26 14:42:54 UTC
svn commit: r1878125 - in /jackrabbit/oak/trunk/oak-security-spi/src:
main/java/org/apache/jackrabbit/oak/spi/security/
test/java/org/apache/jackrabbit/oak/plugins/tree/
test/java/org/apache/jackrabbit/oak/spi/security/
test/java/org/apache/jackrabbit/...
Author: angela
Date: Tue May 26 14:42:54 2020
New Revision: 1878125
URL: http://svn.apache.org/viewvc?rev=1878125&view=rev
Log:
OAK-9079 : Remove unnecessary (un)boxing in oak-security-spi (patch provided by Lars Grefer)
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1878125&r1=1878124&r2=1878125&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java Tue May 26 14:42:54 2020
@@ -273,7 +273,7 @@ public abstract class CompositeConfigura
if (ranking == null) {
return NO_RANKING;
} else {
- return ranking.intValue();
+ return ranking;
}
}
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java?rev=1878125&r1=1878124&r2=1878125&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java Tue May 26 14:42:54 2020
@@ -483,7 +483,7 @@ public final class ConfigurationParamete
number += decimal;
}
String unit = m.group(3);
- double value = Double.valueOf(number);
+ double value = Double.parseDouble(number);
if ("s".equals(unit)) {
value *= 1000.0;
} else if ("m".equals(unit)) {
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java?rev=1878125&r1=1878124&r2=1878125&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java Tue May 26 14:42:54 2020
@@ -35,7 +35,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
import java.util.List;
-import java.util.UUID;
import static org.apache.jackrabbit.JcrConstants.JCR_AUTOCREATED;
import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTPRIMARYTYPE;
@@ -582,7 +581,7 @@ public class TreeUtilTest extends Abstra
@Test
public void testAutoCreatePropertyFromDefaultValues() {
- PropertyState defaultSingleValue = PropertyStates.createProperty(JCR_DEFAULTVALUES, ImmutableList.of(Long.valueOf(34)), Type.LONGS);
+ PropertyState defaultSingleValue = PropertyStates.createProperty(JCR_DEFAULTVALUES, ImmutableList.of(34L), Type.LONGS);
when(propDef.getProperty(JCR_DEFAULTVALUES)).thenReturn(defaultSingleValue);
when(propDef.getProperty(JCR_MULTIPLE)).thenReturn(PropertyStates.createProperty(JCR_MULTIPLE, false));
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java?rev=1878125&r1=1878124&r2=1878125&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java Tue May 26 14:42:54 2020
@@ -404,7 +404,7 @@ public class ConfigurationParametersTest
@Test
public void testConversionToLong() {
- ConfigurationParameters params = ConfigurationParameters.of("l1", 1, "l2", Long.valueOf(2));
+ ConfigurationParameters params = ConfigurationParameters.of("l1", 1, "l2", 2L);
assertEquals(1, params.getConfigValue("l1", null, Long.class).longValue());
assertEquals(1, params.getConfigValue("l1", null, long.class).longValue());
assertEquals(2, params.getConfigValue("l2", null, Long.class).longValue());
@@ -419,11 +419,11 @@ public class ConfigurationParametersTest
@Test
public void testConversionToFloat() {
- ConfigurationParameters params = ConfigurationParameters.of("f1", 1.1, "f2", new Float(2.2));
- assertEquals(1.1, params.getConfigValue("f1", null, Float.class).floatValue(), 0.01);
- assertEquals(1.1, params.getConfigValue("f1", null, float.class).floatValue(), 0.01);
- assertEquals(2.2, params.getConfigValue("f2", null, Float.class).floatValue(), 0.01);
- assertEquals(2.2, params.getConfigValue("f2", null, float.class).floatValue(), 0.01);
+ ConfigurationParameters params = ConfigurationParameters.of("f1", 1.1, "f2", 2.2f);
+ assertEquals(1.1, params.getConfigValue("f1", null, Float.class), 0.01);
+ assertEquals(1.1, params.getConfigValue("f1", null, float.class), 0.01);
+ assertEquals(2.2, params.getConfigValue("f2", null, Float.class), 0.01);
+ assertEquals(2.2, params.getConfigValue("f2", null, float.class), 0.01);
}
@Test(expected = IllegalArgumentException.class)
@@ -434,11 +434,11 @@ public class ConfigurationParametersTest
@Test
public void testConversionToDouble() {
- ConfigurationParameters params = ConfigurationParameters.of("d1", 1.1, "d2", new Double(2.2));
- assertEquals(1.1, params.getConfigValue("d1", null, Double.class).doubleValue(), 0.01);
- assertEquals(1.1, params.getConfigValue("d1", null, double.class).doubleValue(), 0.01);
- assertEquals(2.2, params.getConfigValue("d2", null, Double.class).doubleValue(), 0.01);
- assertEquals(2.2, params.getConfigValue("d2", null, double.class).doubleValue(), 0.01);
+ ConfigurationParameters params = ConfigurationParameters.of("d1", 1.1, "d2", 2.2);
+ assertEquals(1.1, params.getConfigValue("d1", null, Double.class), 0.01);
+ assertEquals(1.1, params.getConfigValue("d1", null, double.class), 0.01);
+ assertEquals(2.2, params.getConfigValue("d2", null, Double.class), 0.01);
+ assertEquals(2.2, params.getConfigValue("d2", null, double.class), 0.01);
}
@Test(expected = IllegalArgumentException.class)
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java?rev=1878125&r1=1878124&r2=1878125&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/JcrAllUtilTest.java Tue May 26 14:42:54 2020
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.when;
public class JcrAllUtilTest implements PrivilegeConstants {
- private static final Long ALL = Long.valueOf(Long.MAX_VALUE);
+ private static final Long ALL = Long.MAX_VALUE;
private static final PropertyState ALL_PROPERTY = PropertyStates.createProperty(REP_BITS, Longs.asList(Long.MAX_VALUE), Type.LONGS);
private final PrivilegeBits ALL_BITS = PrivilegeBits.getInstance(ALL_PROPERTY);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java?rev=1878125&r1=1878124&r2=1878125&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java Tue May 26 14:42:54 2020
@@ -49,7 +49,7 @@ public class PrivilegeBitsProviderTest i
private static final String KNOWN_PRIV_NAME = "prefix:known";
- private final PropertyState ps = PropertyStates.createProperty(REP_BITS, Long.valueOf(5000), Type.LONG);
+ private final PropertyState ps = PropertyStates.createProperty(REP_BITS, 5000L, Type.LONG);
private final PrivilegeBits bits = PrivilegeBits.getInstance(ps);
private Tree privTree;
@@ -283,7 +283,7 @@ public class PrivilegeBitsProviderTest i
when(anotherPriv.getName()).thenReturn("name2");
when(anotherPriv.hasProperty(REP_AGGREGATES)).thenReturn(true);
when(anotherPriv.getProperty(REP_AGGREGATES)).thenReturn(PropertyStates.createProperty(REP_AGGREGATES, ImmutableList.of(KNOWN_PRIV_NAME), Type.NAMES));
- PropertyState bits2 = PropertyStates.createProperty(REP_BITS, Long.valueOf(7500));
+ PropertyState bits2 = PropertyStates.createProperty(REP_BITS, 7500L);
when(anotherPriv.getProperty(REP_BITS)).thenReturn(bits2);
when(privTree.getChildren()).thenReturn(ImmutableSet.of(pTree, anotherPriv));