Skip to content

Commit becbcff

Browse files
garydgregorygarydgregory
committed
Use a single return in indexesOf() methods
1 parent a4cf528 commit becbcff

1 file changed

Lines changed: 80 additions & 92 deletions

File tree

‎src/main/java/org/apache/commons/lang3/ArrayUtils.java‎

Lines changed: 80 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,16 +1923,15 @@ public static BitSet indexesOf(final boolean[] array, final boolean valueToFind)
19231923
*/
19241924
public static BitSet indexesOf(final boolean[] array, final boolean valueToFind, int startIndex) {
19251925
final BitSet bitSet = new BitSet();
1926-
if (array == null) {
1927-
return bitSet;
1928-
}
1929-
while (startIndex < array.length) {
1930-
startIndex = indexOf(array, valueToFind, startIndex);
1931-
if (startIndex == INDEX_NOT_FOUND) {
1932-
break;
1926+
if (array != null) {
1927+
while (startIndex < array.length) {
1928+
startIndex = indexOf(array, valueToFind, startIndex);
1929+
if (startIndex == INDEX_NOT_FOUND) {
1930+
break;
1931+
}
1932+
bitSet.set(startIndex);
1933+
++startIndex;
19331934
}
1934-
bitSet.set(startIndex);
1935-
++startIndex;
19361935
}
19371936
return bitSet;
19381937
}
@@ -1970,18 +1969,16 @@ public static BitSet indexesOf(final byte[] array, final byte valueToFind) {
19701969
*/
19711970
public static BitSet indexesOf(final byte[] array, final byte valueToFind, int startIndex) {
19721971
final BitSet bitSet = new BitSet();
1973-
if (array == null) {
1974-
return bitSet;
1975-
}
1976-
while (startIndex < array.length) {
1977-
startIndex = indexOf(array, valueToFind, startIndex);
1978-
if (startIndex == INDEX_NOT_FOUND) {
1979-
break;
1972+
if (array != null) {
1973+
while (startIndex < array.length) {
1974+
startIndex = indexOf(array, valueToFind, startIndex);
1975+
if (startIndex == INDEX_NOT_FOUND) {
1976+
break;
1977+
}
1978+
bitSet.set(startIndex);
1979+
++startIndex;
19801980
}
1981-
bitSet.set(startIndex);
1982-
++startIndex;
19831981
}
1984-
19851982
return bitSet;
19861983
}
19871984

@@ -2017,16 +2014,15 @@ public static BitSet indexesOf(final char[] array, final char valueToFind) {
20172014
*/
20182015
public static BitSet indexesOf(final char[] array, final char valueToFind, int startIndex) {
20192016
final BitSet bitSet = new BitSet();
2020-
if (array == null) {
2021-
return bitSet;
2022-
}
2023-
while (startIndex < array.length) {
2024-
startIndex = indexOf(array, valueToFind, startIndex);
2025-
if (startIndex == INDEX_NOT_FOUND) {
2026-
break;
2017+
if (array != null) {
2018+
while (startIndex < array.length) {
2019+
startIndex = indexOf(array, valueToFind, startIndex);
2020+
if (startIndex == INDEX_NOT_FOUND) {
2021+
break;
2022+
}
2023+
bitSet.set(startIndex);
2024+
++startIndex;
20272025
}
2028-
bitSet.set(startIndex);
2029-
++startIndex;
20302026
}
20312027
return bitSet;
20322028
}
@@ -2084,16 +2080,15 @@ public static BitSet indexesOf(final double[] array, final double valueToFind, f
20842080
*/
20852081
public static BitSet indexesOf(final double[] array, final double valueToFind, int startIndex) {
20862082
final BitSet bitSet = new BitSet();
2087-
if (array == null) {
2088-
return bitSet;
2089-
}
2090-
while (startIndex < array.length) {
2091-
startIndex = indexOf(array, valueToFind, startIndex);
2092-
if (startIndex == INDEX_NOT_FOUND) {
2093-
break;
2083+
if (array != null) {
2084+
while (startIndex < array.length) {
2085+
startIndex = indexOf(array, valueToFind, startIndex);
2086+
if (startIndex == INDEX_NOT_FOUND) {
2087+
break;
2088+
}
2089+
bitSet.set(startIndex);
2090+
++startIndex;
20942091
}
2095-
bitSet.set(startIndex);
2096-
++startIndex;
20972092
}
20982093
return bitSet;
20992094
}
@@ -2121,16 +2116,15 @@ public static BitSet indexesOf(final double[] array, final double valueToFind, i
21212116
*/
21222117
public static BitSet indexesOf(final double[] array, final double valueToFind, int startIndex, final double tolerance) {
21232118
final BitSet bitSet = new BitSet();
2124-
if (array == null) {
2125-
return bitSet;
2126-
}
2127-
while (startIndex < array.length) {
2128-
startIndex = indexOf(array, valueToFind, startIndex, tolerance);
2129-
if (startIndex == INDEX_NOT_FOUND) {
2130-
break;
2119+
if (array != null) {
2120+
while (startIndex < array.length) {
2121+
startIndex = indexOf(array, valueToFind, startIndex, tolerance);
2122+
if (startIndex == INDEX_NOT_FOUND) {
2123+
break;
2124+
}
2125+
bitSet.set(startIndex);
2126+
++startIndex;
21312127
}
2132-
bitSet.set(startIndex);
2133-
++startIndex;
21342128
}
21352129
return bitSet;
21362130
}
@@ -2167,16 +2161,15 @@ public static BitSet indexesOf(final float[] array, final float valueToFind) {
21672161
*/
21682162
public static BitSet indexesOf(final float[] array, final float valueToFind, int startIndex) {
21692163
final BitSet bitSet = new BitSet();
2170-
if (array == null) {
2171-
return bitSet;
2172-
}
2173-
while (startIndex < array.length) {
2174-
startIndex = indexOf(array, valueToFind, startIndex);
2175-
if (startIndex == INDEX_NOT_FOUND) {
2176-
break;
2164+
if (array != null) {
2165+
while (startIndex < array.length) {
2166+
startIndex = indexOf(array, valueToFind, startIndex);
2167+
if (startIndex == INDEX_NOT_FOUND) {
2168+
break;
2169+
}
2170+
bitSet.set(startIndex);
2171+
++startIndex;
21772172
}
2178-
bitSet.set(startIndex);
2179-
++startIndex;
21802173
}
21812174
return bitSet;
21822175
}
@@ -2213,17 +2206,15 @@ public static BitSet indexesOf(final int[] array, final int valueToFind) {
22132206
*/
22142207
public static BitSet indexesOf(final int[] array, final int valueToFind, int startIndex) {
22152208
final BitSet bitSet = new BitSet();
2216-
if (array == null) {
2217-
return bitSet;
2218-
}
2219-
while (startIndex < array.length) {
2220-
startIndex = indexOf(array, valueToFind, startIndex);
2221-
2222-
if (startIndex == INDEX_NOT_FOUND) {
2223-
break;
2209+
if (array != null) {
2210+
while (startIndex < array.length) {
2211+
startIndex = indexOf(array, valueToFind, startIndex);
2212+
if (startIndex == INDEX_NOT_FOUND) {
2213+
break;
2214+
}
2215+
bitSet.set(startIndex);
2216+
++startIndex;
22242217
}
2225-
bitSet.set(startIndex);
2226-
++startIndex;
22272218
}
22282219
return bitSet;
22292220
}
@@ -2260,16 +2251,15 @@ public static BitSet indexesOf(final long[] array, final long valueToFind) {
22602251
*/
22612252
public static BitSet indexesOf(final long[] array, final long valueToFind, int startIndex) {
22622253
final BitSet bitSet = new BitSet();
2263-
if (array == null) {
2264-
return bitSet;
2265-
}
2266-
while (startIndex < array.length) {
2267-
startIndex = indexOf(array, valueToFind, startIndex);
2268-
if (startIndex == INDEX_NOT_FOUND) {
2269-
break;
2254+
if (array != null) {
2255+
while (startIndex < array.length) {
2256+
startIndex = indexOf(array, valueToFind, startIndex);
2257+
if (startIndex == INDEX_NOT_FOUND) {
2258+
break;
2259+
}
2260+
bitSet.set(startIndex);
2261+
++startIndex;
22702262
}
2271-
bitSet.set(startIndex);
2272-
++startIndex;
22732263
}
22742264
return bitSet;
22752265
}
@@ -2306,16 +2296,15 @@ public static BitSet indexesOf(final Object[] array, final Object objectToFind)
23062296
*/
23072297
public static BitSet indexesOf(final Object[] array, final Object objectToFind, int startIndex) {
23082298
final BitSet bitSet = new BitSet();
2309-
if (array == null) {
2310-
return bitSet;
2311-
}
2312-
while (startIndex < array.length) {
2313-
startIndex = indexOf(array, objectToFind, startIndex);
2314-
if (startIndex == INDEX_NOT_FOUND) {
2315-
break;
2299+
if (array != null) {
2300+
while (startIndex < array.length) {
2301+
startIndex = indexOf(array, objectToFind, startIndex);
2302+
if (startIndex == INDEX_NOT_FOUND) {
2303+
break;
2304+
}
2305+
bitSet.set(startIndex);
2306+
++startIndex;
23162307
}
2317-
bitSet.set(startIndex);
2318-
++startIndex;
23192308
}
23202309
return bitSet;
23212310
}
@@ -2352,16 +2341,15 @@ public static BitSet indexesOf(final short[] array, final short valueToFind) {
23522341
*/
23532342
public static BitSet indexesOf(final short[] array, final short valueToFind, int startIndex) {
23542343
final BitSet bitSet = new BitSet();
2355-
if (array == null) {
2356-
return bitSet;
2357-
}
2358-
while (startIndex < array.length) {
2359-
startIndex = indexOf(array, valueToFind, startIndex);
2360-
if (startIndex == INDEX_NOT_FOUND) {
2361-
break;
2344+
if (array != null) {
2345+
while (startIndex < array.length) {
2346+
startIndex = indexOf(array, valueToFind, startIndex);
2347+
if (startIndex == INDEX_NOT_FOUND) {
2348+
break;
2349+
}
2350+
bitSet.set(startIndex);
2351+
++startIndex;
23622352
}
2363-
bitSet.set(startIndex);
2364-
++startIndex;
23652353
}
23662354
return bitSet;
23672355
}

0 commit comments

Comments
 (0)