zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化ArrayUtil的空判断

Browse Source
This commit is contained in:
Looly
2023-03-10 22:06:41 +08:00
parent ee57e381b0
commit 4cc18740a3
3 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
View File

@@ -553,16 +553,16 @@ public class ArrayUtil extends PrimitiveArrayUtil {
}
int length = 0;
for (T[] array : arrays) {
if (null != array) {
for (final T[] array : arrays) {
if (isNotEmpty(array)) {
length += array.length;
}
}
T[] result = newArray(arrays.getClass().getComponentType().getComponentType(), length);
final T[] result = newArray(arrays.getClass().getComponentType().getComponentType(), length);
length = 0;
for (T[] array : arrays) {
if (null != array) {
for (final T[] array : arrays) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}

64
hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java
View File

@@ -220,7 +220,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (byte[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -228,7 +228,7 @@ public class PrimitiveArrayUtil {
final byte[] result = new byte[length];
length = 0;
for (byte[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -252,7 +252,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (int[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -260,7 +260,7 @@ public class PrimitiveArrayUtil {
final int[] result = new int[length];
length = 0;
for (int[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -284,7 +284,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (long[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -292,7 +292,7 @@ public class PrimitiveArrayUtil {
final long[] result = new long[length];
length = 0;
for (long[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -316,7 +316,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (double[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -324,7 +324,7 @@ public class PrimitiveArrayUtil {
final double[] result = new double[length];
length = 0;
for (double[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -348,7 +348,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (float[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -356,7 +356,7 @@ public class PrimitiveArrayUtil {
final float[] result = new float[length];
length = 0;
for (float[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -380,7 +380,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (char[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -388,7 +388,7 @@ public class PrimitiveArrayUtil {
final char[] result = new char[length];
length = 0;
for (char[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -412,7 +412,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (boolean[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -420,7 +420,7 @@ public class PrimitiveArrayUtil {
final boolean[] result = new boolean[length];
length = 0;
for (boolean[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -444,7 +444,7 @@ public class PrimitiveArrayUtil {
// 计算总长度
int length = 0;
for (short[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
length += array.length;
}
}
@@ -452,7 +452,7 @@ public class PrimitiveArrayUtil {
final short[] result = new short[length];
length = 0;
for (short[] array : arrays) {
if (null != array) {
if (isNotEmpty(array)) {
System.arraycopy(array, 0, result, length, array.length);
length += array.length;
}
@@ -559,7 +559,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(long[] array, long value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -578,7 +578,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(long[] array, long value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -609,7 +609,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(int[] array, int value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -628,7 +628,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(int[] array, int value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -659,7 +659,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(short[] array, short value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -678,7 +678,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(short[] array, short value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -709,7 +709,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(char[] array, char value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -728,7 +728,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(char[] array, char value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -759,7 +759,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(byte[] array, byte value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -778,7 +778,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(byte[] array, byte value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;
@@ -809,7 +809,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(double[] array, double value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -828,7 +828,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(double[] array, double value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -859,7 +859,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(float[] array, float value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -878,7 +878,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(float[] array, float value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (NumberUtil.equals(value, array[i])) {
return i;
@@ -909,7 +909,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int indexOf(boolean[] array, boolean value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = 0; i < array.length; i++) {
if (value == array[i]) {
return i;
@@ -928,7 +928,7 @@ public class PrimitiveArrayUtil {
* @since 3.0.7
*/
public static int lastIndexOf(boolean[] array, boolean value) {
if (null != array) {
if (isNotEmpty(array)) {
for (int i = array.length - 1; i >= 0; i--) {
if (value == array[i]) {
return i;