Skip to content

Commit 8a5ea52

Browse files
garydgregorygarydgregory
committed
Use JRE constants
1 parent 42fef8b commit 8a5ea52

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public static byte binaryToByte(final boolean[] src, final int srcPos, final byt
156156
if (src.length == 0 && srcPos == 0 || 0 == nBools) {
157157
return dstInit;
158158
}
159-
if (nBools - 1 + dstPos >= 8) {
159+
if (nBools - 1 + dstPos >= Byte.SIZE) {
160160
throw new IllegalArgumentException("nBools - 1 + dstPos >= 8");
161161
}
162162
byte out = dstInit;
@@ -256,7 +256,7 @@ public static char binaryToHexDigitMsb0_4bits(final boolean[] src) {
256256
* @throws NullPointerException if {@code src} is {@code null}.
257257
*/
258258
public static char binaryToHexDigitMsb0_4bits(final boolean[] src, final int srcPos) {
259-
if (src.length > 8) {
259+
if (src.length > Byte.SIZE) {
260260
throw new IllegalArgumentException("src.length > 8: src.length=" + src.length);
261261
}
262262
if (src.length - srcPos < 4) {
@@ -303,7 +303,7 @@ public static int binaryToInt(final boolean[] src, final int srcPos, final int d
303303
if (src.length == 0 && srcPos == 0 || 0 == nBools) {
304304
return dstInit;
305305
}
306-
if (nBools - 1 + dstPos >= 32) {
306+
if (nBools - 1 + dstPos >= Integer.SIZE) {
307307
throw new IllegalArgumentException("nBools - 1 + dstPos >= 32");
308308
}
309309
int out = dstInit;
@@ -333,7 +333,7 @@ public static long binaryToLong(final boolean[] src, final int srcPos, final lon
333333
if (src.length == 0 && srcPos == 0 || 0 == nBools) {
334334
return dstInit;
335335
}
336-
if (nBools - 1 + dstPos >= 64) {
336+
if (nBools - 1 + dstPos >= Long.SIZE) {
337337
throw new IllegalArgumentException("nBools - 1 + dstPos >= 64");
338338
}
339339
long out = dstInit;
@@ -363,7 +363,7 @@ public static short binaryToShort(final boolean[] src, final int srcPos, final s
363363
if (src.length == 0 && srcPos == 0 || 0 == nBools) {
364364
return dstInit;
365365
}
366-
if (nBools - 1 + dstPos >= 16) {
366+
if (nBools - 1 + dstPos >= Short.SIZE) {
367367
throw new IllegalArgumentException("nBools - 1 + dstPos >= 16");
368368
}
369369
short out = dstInit;
@@ -393,12 +393,12 @@ public static int byteArrayToInt(final byte[] src, final int srcPos, final int d
393393
if (src.length == 0 && srcPos == 0 || 0 == nBytes) {
394394
return dstInit;
395395
}
396-
if ((nBytes - 1) * 8 + dstPos >= 32) {
396+
if ((nBytes - 1) * Byte.SIZE + dstPos >= Integer.SIZE) {
397397
throw new IllegalArgumentException("(nBytes - 1) * 8 + dstPos >= 32");
398398
}
399399
int out = dstInit;
400400
for (int i = 0; i < nBytes; i++) {
401-
final int shift = i * 8 + dstPos;
401+
final int shift = i * Byte.SIZE + dstPos;
402402
final int bits = (0xff & src[i + srcPos]) << shift;
403403
final int mask = 0xff << shift;
404404
out = out & ~mask | bits;
@@ -423,12 +423,12 @@ public static long byteArrayToLong(final byte[] src, final int srcPos, final lon
423423
if (src.length == 0 && srcPos == 0 || 0 == nBytes) {
424424
return dstInit;
425425
}
426-
if ((nBytes - 1) * 8 + dstPos >= 64) {
426+
if ((nBytes - 1) * Byte.SIZE + dstPos >= Long.SIZE) {
427427
throw new IllegalArgumentException("(nBytes - 1) * 8 + dstPos >= 64");
428428
}
429429
long out = dstInit;
430430
for (int i = 0; i < nBytes; i++) {
431-
final int shift = i * 8 + dstPos;
431+
final int shift = i * Byte.SIZE + dstPos;
432432
final long bits = (0xffL & src[i + srcPos]) << shift;
433433
final long mask = 0xffL << shift;
434434
out = out & ~mask | bits;
@@ -453,12 +453,12 @@ public static short byteArrayToShort(final byte[] src, final int srcPos, final s
453453
if (src.length == 0 && srcPos == 0 || 0 == nBytes) {
454454
return dstInit;
455455
}
456-
if ((nBytes - 1) * 8 + dstPos >= 16) {
456+
if ((nBytes - 1) * Byte.SIZE + dstPos >= Short.SIZE) {
457457
throw new IllegalArgumentException("(nBytes - 1) * 8 + dstPos >= 16");
458458
}
459459
short out = dstInit;
460460
for (int i = 0; i < nBytes; i++) {
461-
final int shift = i * 8 + dstPos;
461+
final int shift = i * Byte.SIZE + dstPos;
462462
final int bits = (0xff & src[i + srcPos]) << shift;
463463
final int mask = 0xff << shift;
464464
out = (short) (out & ~mask | bits);
@@ -479,7 +479,7 @@ public static UUID byteArrayToUuid(final byte[] src, final int srcPos) {
479479
if (src.length - srcPos < 16) {
480480
throw new IllegalArgumentException("Need at least 16 bytes for UUID");
481481
}
482-
return new UUID(byteArrayToLong(src, srcPos, 0, 0, 8), byteArrayToLong(src, srcPos + 8, 0, 0, 8));
482+
return new UUID(byteArrayToLong(src, srcPos, 0, 0, Byte.SIZE), byteArrayToLong(src, srcPos + 8, 0, 0, Byte.SIZE));
483483
}
484484

485485
/**
@@ -499,7 +499,7 @@ public static boolean[] byteToBinary(final byte src, final int srcPos, final boo
499499
if (0 == nBools) {
500500
return dst;
501501
}
502-
if (nBools - 1 + srcPos >= 8) {
502+
if (nBools - 1 + srcPos >= Byte.SIZE) {
503503
throw new IllegalArgumentException("nBools - 1 + srcPos >= 8");
504504
}
505505
for (int i = 0; i < nBools; i++) {
@@ -525,7 +525,7 @@ public static String byteToHex(final byte src, final int srcPos, final String ds
525525
if (0 == nHexs) {
526526
return dstInit;
527527
}
528-
if ((nHexs - 1) * 4 + srcPos >= 8) {
528+
if ((nHexs - 1) * 4 + srcPos >= Byte.SIZE) {
529529
throw new IllegalArgumentException("(nHexs - 1) * 4 + srcPos >= 8");
530530
}
531531
final StringBuilder sb = new StringBuilder(dstInit);
@@ -745,7 +745,7 @@ public static byte hexToByte(final String src, final int srcPos, final byte dstI
745745
if (0 == nHex) {
746746
return dstInit;
747747
}
748-
if ((nHex - 1) * 4 + dstPos >= 8) {
748+
if ((nHex - 1) * 4 + dstPos >= Byte.SIZE) {
749749
throw new IllegalArgumentException("(nHex - 1) * 4 + dstPos >= 8");
750750
}
751751
byte out = dstInit;
@@ -773,7 +773,7 @@ public static int hexToInt(final String src, final int srcPos, final int dstInit
773773
if (0 == nHex) {
774774
return dstInit;
775775
}
776-
if ((nHex - 1) * 4 + dstPos >= 32) {
776+
if ((nHex - 1) * 4 + dstPos >= Integer.SIZE) {
777777
throw new IllegalArgumentException("(nHexs - 1) * 4 + dstPos >= 32");
778778
}
779779
int out = dstInit;
@@ -801,7 +801,7 @@ public static long hexToLong(final String src, final int srcPos, final long dstI
801801
if (0 == nHex) {
802802
return dstInit;
803803
}
804-
if ((nHex - 1) * 4 + dstPos >= 64) {
804+
if ((nHex - 1) * 4 + dstPos >= Long.SIZE) {
805805
throw new IllegalArgumentException("(nHexs - 1) * 4 + dstPos >= 64");
806806
}
807807
long out = dstInit;
@@ -829,7 +829,7 @@ public static short hexToShort(final String src, final int srcPos, final short d
829829
if (0 == nHex) {
830830
return dstInit;
831831
}
832-
if ((nHex - 1) * 4 + dstPos >= 16) {
832+
if ((nHex - 1) * 4 + dstPos >= Short.SIZE) {
833833
throw new IllegalArgumentException("(nHexs - 1) * 4 + dstPos >= 16");
834834
}
835835
short out = dstInit;
@@ -859,12 +859,12 @@ public static long intArrayToLong(final int[] src, final int srcPos, final long
859859
if (src.length == 0 && srcPos == 0 || 0 == nInts) {
860860
return dstInit;
861861
}
862-
if ((nInts - 1) * 32 + dstPos >= 64) {
862+
if ((nInts - 1) * Integer.SIZE + dstPos >= Long.SIZE) {
863863
throw new IllegalArgumentException("(nInts - 1) * 32 + dstPos >= 64");
864864
}
865865
long out = dstInit;
866866
for (int i = 0; i < nInts; i++) {
867-
final int shift = i * 32 + dstPos;
867+
final int shift = i * Integer.SIZE + dstPos;
868868
final long bits = (0xffffffffL & src[i + srcPos]) << shift;
869869
final long mask = 0xffffffffL << shift;
870870
out = out & ~mask | bits;
@@ -889,7 +889,7 @@ public static boolean[] intToBinary(final int src, final int srcPos, final boole
889889
if (0 == nBools) {
890890
return dst;
891891
}
892-
if (nBools - 1 + srcPos >= 32) {
892+
if (nBools - 1 + srcPos >= Integer.SIZE) {
893893
throw new IllegalArgumentException("nBools - 1 + srcPos >= 32");
894894
}
895895
for (int i = 0; i < nBools; i++) {
@@ -916,11 +916,11 @@ public static byte[] intToByteArray(final int src, final int srcPos, final byte[
916916
if (0 == nBytes) {
917917
return dst;
918918
}
919-
if ((nBytes - 1) * 8 + srcPos >= 32) {
919+
if ((nBytes - 1) * Byte.SIZE + srcPos >= Integer.SIZE) {
920920
throw new IllegalArgumentException("(nBytes - 1) * 8 + srcPos >= 32");
921921
}
922922
for (int i = 0; i < nBytes; i++) {
923-
final int shift = i * 8 + srcPos;
923+
final int shift = i * Byte.SIZE + srcPos;
924924
dst[dstPos + i] = (byte) (0xff & src >> shift);
925925
}
926926
return dst;
@@ -942,7 +942,7 @@ public static String intToHex(final int src, final int srcPos, final String dstI
942942
if (0 == nHexs) {
943943
return dstInit;
944944
}
945-
if ((nHexs - 1) * 4 + srcPos >= 32) {
945+
if ((nHexs - 1) * 4 + srcPos >= Integer.SIZE) {
946946
throw new IllegalArgumentException("(nHexs - 1) * 4 + srcPos >= 32");
947947
}
948948
final StringBuilder sb = new StringBuilder(dstInit);
@@ -1058,11 +1058,11 @@ public static short[] intToShortArray(final int src, final int srcPos, final sho
10581058
if (0 == nShorts) {
10591059
return dst;
10601060
}
1061-
if ((nShorts - 1) * 16 + srcPos >= 32) {
1061+
if ((nShorts - 1) * Short.SIZE + srcPos >= Integer.SIZE) {
10621062
throw new IllegalArgumentException("(nShorts - 1) * 16 + srcPos >= 32");
10631063
}
10641064
for (int i = 0; i < nShorts; i++) {
1065-
final int shift = i * 16 + srcPos;
1065+
final int shift = i * Short.SIZE + srcPos;
10661066
dst[dstPos + i] = (short) (0xffff & src >> shift);
10671067
}
10681068
return dst;
@@ -1085,7 +1085,7 @@ public static boolean[] longToBinary(final long src, final int srcPos, final boo
10851085
if (0 == nBools) {
10861086
return dst;
10871087
}
1088-
if (nBools - 1 + srcPos >= 64) {
1088+
if (nBools - 1 + srcPos >= Long.SIZE) {
10891089
throw new IllegalArgumentException("nBools - 1 + srcPos >= 64");
10901090
}
10911091
for (int i = 0; i < nBools; i++) {
@@ -1112,11 +1112,11 @@ public static byte[] longToByteArray(final long src, final int srcPos, final byt
11121112
if (0 == nBytes) {
11131113
return dst;
11141114
}
1115-
if ((nBytes - 1) * 8 + srcPos >= 64) {
1115+
if ((nBytes - 1) * Byte.SIZE + srcPos >= Long.SIZE) {
11161116
throw new IllegalArgumentException("(nBytes - 1) * 8 + srcPos >= 64");
11171117
}
11181118
for (int i = 0; i < nBytes; i++) {
1119-
final int shift = i * 8 + srcPos;
1119+
final int shift = i * Byte.SIZE + srcPos;
11201120
dst[dstPos + i] = (byte) (0xff & src >> shift);
11211121
}
11221122
return dst;
@@ -1138,7 +1138,7 @@ public static String longToHex(final long src, final int srcPos, final String ds
11381138
if (0 == nHexs) {
11391139
return dstInit;
11401140
}
1141-
if ((nHexs - 1) * 4 + srcPos >= 64) {
1141+
if ((nHexs - 1) * 4 + srcPos >= Long.SIZE) {
11421142
throw new IllegalArgumentException("(nHexs - 1) * 4 + srcPos >= 64");
11431143
}
11441144
final StringBuilder sb = new StringBuilder(dstInit);
@@ -1173,11 +1173,11 @@ public static int[] longToIntArray(final long src, final int srcPos, final int[]
11731173
if (0 == nInts) {
11741174
return dst;
11751175
}
1176-
if ((nInts - 1) * 32 + srcPos >= 64) {
1176+
if ((nInts - 1) * Integer.SIZE + srcPos >= Long.SIZE) {
11771177
throw new IllegalArgumentException("(nInts - 1) * 32 + srcPos >= 64");
11781178
}
11791179
for (int i = 0; i < nInts; i++) {
1180-
final int shift = i * 32 + srcPos;
1180+
final int shift = i * Integer.SIZE + srcPos;
11811181
dst[dstPos + i] = (int) (0xffffffff & src >> shift);
11821182
}
11831183
return dst;
@@ -1200,11 +1200,11 @@ public static short[] longToShortArray(final long src, final int srcPos, final s
12001200
if (0 == nShorts) {
12011201
return dst;
12021202
}
1203-
if ((nShorts - 1) * 16 + srcPos >= 64) {
1203+
if ((nShorts - 1) * Short.SIZE + srcPos >= Long.SIZE) {
12041204
throw new IllegalArgumentException("(nShorts - 1) * 16 + srcPos >= 64");
12051205
}
12061206
for (int i = 0; i < nShorts; i++) {
1207-
final int shift = i * 16 + srcPos;
1207+
final int shift = i * Short.SIZE + srcPos;
12081208
dst[dstPos + i] = (short) (0xffff & src >> shift);
12091209
}
12101210
return dst;
@@ -1227,12 +1227,12 @@ public static int shortArrayToInt(final short[] src, final int srcPos, final int
12271227
if (src.length == 0 && srcPos == 0 || 0 == nShorts) {
12281228
return dstInit;
12291229
}
1230-
if ((nShorts - 1) * 16 + dstPos >= 32) {
1230+
if ((nShorts - 1) * Short.SIZE + dstPos >= Integer.SIZE) {
12311231
throw new IllegalArgumentException("(nShorts - 1) * 16 + dstPos >= 32");
12321232
}
12331233
int out = dstInit;
12341234
for (int i = 0; i < nShorts; i++) {
1235-
final int shift = i * 16 + dstPos;
1235+
final int shift = i * Short.SIZE + dstPos;
12361236
final int bits = (0xffff & src[i + srcPos]) << shift;
12371237
final int mask = 0xffff << shift;
12381238
out = out & ~mask | bits;
@@ -1257,12 +1257,12 @@ public static long shortArrayToLong(final short[] src, final int srcPos, final l
12571257
if (src.length == 0 && srcPos == 0 || 0 == nShorts) {
12581258
return dstInit;
12591259
}
1260-
if ((nShorts - 1) * 16 + dstPos >= 64) {
1260+
if ((nShorts - 1) * Short.SIZE + dstPos >= Long.SIZE) {
12611261
throw new IllegalArgumentException("(nShorts - 1) * 16 + dstPos >= 64");
12621262
}
12631263
long out = dstInit;
12641264
for (int i = 0; i < nShorts; i++) {
1265-
final int shift = i * 16 + dstPos;
1265+
final int shift = i * Short.SIZE + dstPos;
12661266
final long bits = (0xffffL & src[i + srcPos]) << shift;
12671267
final long mask = 0xffffL << shift;
12681268
out = out & ~mask | bits;
@@ -1287,10 +1287,10 @@ public static boolean[] shortToBinary(final short src, final int srcPos, final b
12871287
if (0 == nBools) {
12881288
return dst;
12891289
}
1290-
if (nBools - 1 + srcPos >= 16) {
1290+
if (nBools - 1 + srcPos >= Short.SIZE) {
12911291
throw new IllegalArgumentException("nBools - 1 + srcPos >= 16");
12921292
}
1293-
assert nBools - 1 < 16 - srcPos;
1293+
assert nBools - 1 < Short.SIZE - srcPos;
12941294
for (int i = 0; i < nBools; i++) {
12951295
final int shift = i + srcPos;
12961296
dst[dstPos + i] = (0x1 & src >> shift) != 0;
@@ -1315,11 +1315,11 @@ public static byte[] shortToByteArray(final short src, final int srcPos, final b
13151315
if (0 == nBytes) {
13161316
return dst;
13171317
}
1318-
if ((nBytes - 1) * 8 + srcPos >= 16) {
1318+
if ((nBytes - 1) * Byte.SIZE + srcPos >= Short.SIZE) {
13191319
throw new IllegalArgumentException("(nBytes - 1) * 8 + srcPos >= 16");
13201320
}
13211321
for (int i = 0; i < nBytes; i++) {
1322-
final int shift = i * 8 + srcPos;
1322+
final int shift = i * Byte.SIZE + srcPos;
13231323
dst[dstPos + i] = (byte) (0xff & src >> shift);
13241324
}
13251325
return dst;
@@ -1341,7 +1341,7 @@ public static String shortToHex(final short src, final int srcPos, final String
13411341
if (0 == nHexs) {
13421342
return dstInit;
13431343
}
1344-
if ((nHexs - 1) * 4 + srcPos >= 16) {
1344+
if ((nHexs - 1) * 4 + srcPos >= Short.SIZE) {
13451345
throw new IllegalArgumentException("(nHexs - 1) * 4 + srcPos >= 16");
13461346
}
13471347
final StringBuilder sb = new StringBuilder(dstInit);

‎src/test/java/org/apache/commons/lang3/ConversionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static String dbgPrint(final boolean[] src) {
4949
}
5050

5151
@ParameterizedTest
52-
@ValueSource(ints = {Integer.MIN_VALUE -1, 8, 9, Integer.MAX_VALUE})
52+
@ValueSource(ints = { Integer.MIN_VALUE, -1, 8, 9, Integer.MAX_VALUE })
5353
public void binaryBeMsb0ToHexDigitPosOutsideArray(final int index) {
5454
assertIndexOutOfBoundsException(() -> Conversion.binaryBeMsb0ToHexDigit(new boolean[8], index));
5555
}

0 commit comments

Comments
 (0)