Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use long literals (closes #248) 

This patch replaces int literals that were cast to longs (e.g.,
"(long) 1)" with long literals (e.g., "1L"), making the code cleaner
and easier to maintain.
This commit is contained in:
Allon Mureinik 2017-03-04 05:55:03 +02:00 committed by pascalschumacher
parent 4670a941be
commit 6597c19652
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java
View File

@ -1158,53 +1158,53 @@ public class ArrayUtilsRemoveMultipleTest {
public void testRemoveElementLongArray() { public void testRemoveElementLongArray() {
long[] array; long[] array;
array = ArrayUtils.removeElements((long[]) null, (long) 1); array = ArrayUtils.removeElements((long[]) null, 1L);
assertNull(array); assertNull(array);
array = ArrayUtils.removeElements(ArrayUtils.EMPTY_LONG_ARRAY, (long) 1); array = ArrayUtils.removeElements(ArrayUtils.EMPTY_LONG_ARRAY, 1L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1 }, (long) 1); array = ArrayUtils.removeElements(new long[] { 1 }, 1L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2 }, (long) 1); array = ArrayUtils.removeElements(new long[] { 1, 2 }, 1L);
assertTrue(Arrays.equals(new long[] { 2 }, array)); assertTrue(Arrays.equals(new long[] { 2 }, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1); array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, 1L);
assertTrue(Arrays.equals(new long[] { 2, 1 }, array)); assertTrue(Arrays.equals(new long[] { 2, 1 }, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements((long[]) null, (long) 1, (long) 1); array = ArrayUtils.removeElements((long[]) null, 1L, 1L);
assertNull(array); assertNull(array);
array = ArrayUtils.removeElements(ArrayUtils.EMPTY_LONG_ARRAY, (long) 1, (long) 1); array = ArrayUtils.removeElements(ArrayUtils.EMPTY_LONG_ARRAY, 1L, 1L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1 }, (long) 1, (long) 1); array = ArrayUtils.removeElements(new long[] { 1 }, 1L, 1L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2 }, (long) 1, (long) 2); array = ArrayUtils.removeElements(new long[] { 1, 2 }, 1L, 2L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2 }, (long) 1, (long) 1); array = ArrayUtils.removeElements(new long[] { 1, 2 }, 1L, 1L);
assertTrue(Arrays.equals(new long[] { 2 }, array)); assertTrue(Arrays.equals(new long[] { 2 }, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1, (long) 1); array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, 1L, 1L);
assertTrue(Arrays.equals(new long[] { 2 }, array)); assertTrue(Arrays.equals(new long[] { 2 }, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1, (long) 2); array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, 1L, 2L);
assertTrue(Arrays.equals(new long[] { 1 }, array)); assertTrue(Arrays.equals(new long[] { 1 }, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1, (long) 1, (long) 1, (long) 1); array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, 1L, 1L, 1L, 1L);
assertTrue(Arrays.equals(new long[] { 2 }, array)); assertTrue(Arrays.equals(new long[] { 2 }, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
} }

10
src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
View File

@ -447,18 +447,18 @@ public class ArrayUtilsRemoveTest {
@SuppressWarnings("cast") @SuppressWarnings("cast")
public void testRemoveElementLongArray() { public void testRemoveElementLongArray() {
long[] array; long[] array;
array = ArrayUtils.removeElement((long[]) null, (long) 1); array = ArrayUtils.removeElement((long[]) null, 1L);
assertNull(array); assertNull(array);
array = ArrayUtils.removeElement(ArrayUtils.EMPTY_LONG_ARRAY, (long) 1); array = ArrayUtils.removeElement(ArrayUtils.EMPTY_LONG_ARRAY, 1L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElement(new long[] {1}, (long) 1); array = ArrayUtils.removeElement(new long[] {1}, 1L);
assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElement(new long[] {1, 2}, (long) 1); array = ArrayUtils.removeElement(new long[] {1, 2}, 1L);
assertTrue(Arrays.equals(new long[] {2}, array)); assertTrue(Arrays.equals(new long[] {2}, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
array = ArrayUtils.removeElement(new long[] {1, 2, 1}, (long) 1); array = ArrayUtils.removeElement(new long[] {1, 2, 1}, 1L);
assertTrue(Arrays.equals(new long[] {2, 1}, array)); assertTrue(Arrays.equals(new long[] {2, 1}, array));
assertEquals(Long.TYPE, array.getClass().getComponentType()); assertEquals(Long.TYPE, array.getClass().getComponentType());
} }

2
src/test/java/org/apache/commons/lang3/RangeTest.java
View File

@ -54,7 +54,7 @@ public class RangeTest {
byteRange3 = Range.between((byte) 0, (byte) 10); byteRange3 = Range.between((byte) 0, (byte) 10);
intRange = Range.between(10, 20); intRange = Range.between(10, 20);
longRange = Range.between((long) 10, (long) 20); longRange = Range.between(10L, 20L);
floatRange = Range.between((float) 10, (float) 20); floatRange = Range.between((float) 10, (float) 20);
doubleRange = Range.between((double) 10, (double) 20); doubleRange = Range.between((double) 10, (double) 20);
} }

40
src/test/java/org/apache/commons/lang3/mutable/MutableLongTest.java
View File

@ -144,7 +144,7 @@ public class MutableLongTest {
@Test @Test
public void testIncrementAndGet() { public void testIncrementAndGet() {
final MutableLong mutNum = new MutableLong((long) 1); final MutableLong mutNum = new MutableLong(1L);
final long result = mutNum.incrementAndGet(); final long result = mutNum.incrementAndGet();
assertEquals(2, result); assertEquals(2, result);
@ -154,7 +154,7 @@ public class MutableLongTest {
@Test @Test
public void testGetAndIncrement() { public void testGetAndIncrement() {
final MutableLong mutNum = new MutableLong((long) 1); final MutableLong mutNum = new MutableLong(1L);
final long result = mutNum.getAndIncrement(); final long result = mutNum.getAndIncrement();
assertEquals(1, result); assertEquals(1, result);
@ -173,7 +173,7 @@ public class MutableLongTest {
@Test @Test
public void testDecrementAndGet() { public void testDecrementAndGet() {
final MutableLong mutNum = new MutableLong((long) 1); final MutableLong mutNum = new MutableLong(1L);
final long result = mutNum.decrementAndGet(); final long result = mutNum.decrementAndGet();
assertEquals(0, result); assertEquals(0, result);
@ -183,7 +183,7 @@ public class MutableLongTest {
@Test @Test
public void testGetAndDecrement() { public void testGetAndDecrement() {
final MutableLong mutNum = new MutableLong((long) 1); final MutableLong mutNum = new MutableLong(1L);
final long result = mutNum.getAndDecrement(); final long result = mutNum.getAndDecrement();
assertEquals(1, result); assertEquals(1, result);
@ -211,38 +211,38 @@ public class MutableLongTest {
@Test @Test
public void testGetAndAddValuePrimitive() { public void testGetAndAddValuePrimitive() {
final MutableLong mutableLong = new MutableLong((long)0); final MutableLong mutableLong = new MutableLong(0L);
final long result = mutableLong.getAndAdd((long) 1); final long result = mutableLong.getAndAdd(1L);
assertEquals((long) 0, result); assertEquals(0L, result);
assertEquals((long) 1, mutableLong.longValue()); assertEquals(1L, mutableLong.longValue());
} }
@Test @Test
public void testGetAndAddValueObject() { public void testGetAndAddValueObject() {
final MutableLong mutableLong = new MutableLong((long)0); final MutableLong mutableLong = new MutableLong(0L);
final long result = mutableLong.getAndAdd(Long.valueOf((long) 1)); final long result = mutableLong.getAndAdd(Long.valueOf(1L));
assertEquals((long) 0, result); assertEquals(0L, result);
assertEquals((long) 1, mutableLong.longValue()); assertEquals(1L, mutableLong.longValue());
} }
@Test @Test
public void testAddAndGetValuePrimitive() { public void testAddAndGetValuePrimitive() {
final MutableLong mutableLong = new MutableLong((long)0); final MutableLong mutableLong = new MutableLong(0L);
final long result = mutableLong.addAndGet((long) 1); final long result = mutableLong.addAndGet(1L);
assertEquals((long) 1, result); assertEquals(1L, result);
assertEquals((long) 1, mutableLong.longValue()); assertEquals(1L, mutableLong.longValue());
} }
@Test @Test
public void testAddAndGetValueObject() { public void testAddAndGetValueObject() {
final MutableLong mutableLong = new MutableLong((long)0); final MutableLong mutableLong = new MutableLong(0L);
final long result = mutableLong.addAndGet(Long.valueOf((long) 1)); final long result = mutableLong.addAndGet(Long.valueOf(1L));
assertEquals((long) 1, result); assertEquals(1L, result);
assertEquals((long) 1, mutableLong.longValue()); assertEquals(1L, mutableLong.longValue());
} }
@Test @Test