Skip to content

Commit 201af46

Browse files
committed
ICU-22675 Migrate from deprecated boxed primitive constructors to their replacements
1 parent 394341e commit 201af46

File tree

95 files changed

+539
-519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+539
-519
lines changed

icu4j/main/charset/src/test/java/com/ibm/icu/dev/test/charset/TestCharset.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -926,16 +926,16 @@ public void TestSurrogateBehavior() {
926926
// offsets.put(0);
927927
// offsets.put(1);
928928
// char[] buffer = null;
929-
// Integer length = new Integer(2);
930-
// Integer cp = new Integer(0);
929+
// Integer length = 2;
930+
// Integer cp = 0;
931931
// CoderResult unmap = CoderResult.unmappableForLength(2);
932932
// CoderResult malf = CoderResult.malformedForLength(2);
933933
// CoderResult under = CoderResult.UNDERFLOW;
934934
//
935935
// // set up error arrays
936-
// Integer invalidCharLength = new Integer(1);
937-
// Byte subChar1 = new Byte((byte)0);
938-
// Byte subChar1_alternate = new Byte((byte)1); // for TO_U_CALLBACK_SUBSTITUTE
936+
// Integer invalidCharLength = 1;
937+
// Byte subChar1 = (byte)0;
938+
// Byte subChar1_alternate = (byte)1; // for TO_U_CALLBACK_SUBSTITUTE
939939
//
940940
// // set up chars and bytes backups and expected values for certain cases
941941
// CharBuffer charsBackup = bufferCopy(chars);
@@ -961,14 +961,14 @@ public void TestSurrogateBehavior() {
961961
// // run toUWriteUChars with normal data
962962
// Method toUWriteUChars = CharsetDecoderICU.class.getDeclaredMethod("toUWriteUChars", new Class[] { CharsetDecoderICU.class, char[].class, int.class, int.class, CharBuffer.class, IntBuffer.class, int.class});
963963
// toUWriteUChars.setAccessible(true);
964-
// CoderResult decoderResultExpected1 = (CoderResult)toUWriteUChars.invoke(decoder, new Object[] {decoder, new char[] {0xFFFD}, new Integer(0), new Integer(1), decoderCharsExpected1, decoderOffsetsExpected1, new Integer(bytes.position())});
964+
// CoderResult decoderResultExpected1 = (CoderResult)toUWriteUChars.invoke(decoder, new Object[] {decoder, new char[] {0xFFFD}, Integer.valueOf(0), Integer.valueOf(1), decoderCharsExpected1, decoderOffsetsExpected1, Integer.valueOf(bytes.position())});
965965
//
966966
// // reset certain fields
967967
// setFieldValue(CharsetDecoderICU.class, "invalidCharLength", decoder, invalidCharLength);
968968
// setFieldValue(CharsetICU.class, "subChar1", ((CharsetICU) decoder.charset()), subChar1_alternate);
969969
//
970970
// // run toUWriteUChars again
971-
// CoderResult decoderResultExpected2 = (CoderResult)toUWriteUChars.invoke(decoder, new Object[] {decoder, new char[] {0x1A}, new Integer(0), new Integer(1), decoderCharsExpected2, decoderOffsetsExpected2, new Integer(bytes.position())});
971+
// CoderResult decoderResultExpected2 = (CoderResult)toUWriteUChars.invoke(decoder, new Object[] {decoder, new char[] {0x1A}, Integer.valueOf(0), Integer.valueOf(1), decoderCharsExpected2, decoderOffsetsExpected2, Integer.valueOf(bytes.position())});
972972
//
973973
// // begin creating the tests array
974974
// ArrayList tests = new ArrayList();

icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,7 @@ public void TestSchSt() {
993993
List<String> labels = index.getBucketLabels();
994994
for (String[] testCase : testCases) {
995995
String name = testCase[0];
996-
int bucketIndex = Integer.valueOf(testCase[1]);
996+
int bucketIndex = Integer.parseInt(testCase[1]);
997997
String label = testCase[2];
998998
String msg = "getBucketIndex(" + name + ")";
999999
assertEquals(msg, bucketIndex, index.getBucketIndex(name));

icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationMiscTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -530,11 +530,10 @@ public void TestNewJapanese() {
530530
};
531531

532532
String[] att = { "strength", };
533-
Object[] val = { new Integer(Collator.QUATERNARY), };
533+
Object[] val = { Collator.QUATERNARY, };
534534

535535
String[] attShifted = { "strength", "AlternateHandling"};
536-
Object valShifted[] = { new Integer(Collator.QUATERNARY),
537-
Boolean.TRUE };
536+
Object valShifted[] = { Collator.QUATERNARY, Boolean.TRUE };
538537

539538
genericLocaleStarterWithOptions(Locale.JAPANESE, test1, att, val);
540539
genericLocaleStarterWithOptions(Locale.JAPANESE, test2, att, val);
@@ -2210,7 +2209,7 @@ public void TestUpperFirstQuaternary()
22102209
{
22112210
String tests[] = { "B", "b", "Bb", "bB" };
22122211
String[] att = { "strength", "UpperFirst" };
2213-
Object attVals[] = { new Integer(Collator.QUATERNARY), Boolean.TRUE };
2212+
Object attVals[] = { Collator.QUATERNARY, Boolean.TRUE };
22142213
genericLocaleStarterWithOptions(new Locale("root","",""), tests, att, attVals);
22152214
}
22162215

@@ -2219,7 +2218,7 @@ public void TestJ4960()
22192218
{
22202219
String tests[] = { "\\u00e2T", "aT" };
22212220
String att[] = { "strength", "CaseLevel" };
2222-
Object attVals[] = { new Integer(Collator.PRIMARY), Boolean.TRUE };
2221+
Object attVals[] = { Collator.PRIMARY, Boolean.TRUE };
22232222
String tests2[] = { "a", "A" };
22242223
String rule = "&[first tertiary ignorable]=A=a";
22252224
String att2[] = { "CaseLevel" };

icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationRegressionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ public void Test4179686() throws Exception {
10771077

10781078
// Iterate forward and collect all of the elements into a Vector
10791079
while ((elem = iter.next()) != CollationElementIterator.NULLORDER) {
1080-
elements.add(new Integer(elem));
1080+
elements.add(elem);
10811081
}
10821082

10831083
// Now iterate backward and make sure they're the same

icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationServiceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,10 @@ public void TestGetFunctionalEquivalent() {
424424
boolean expectAvailable = DATA[(i*3)+2].equals("t");
425425
ULocale actual = Collator.getFunctionalEquivalent(kw[0],input,isAvailable);
426426
if(!actual.equals(expect) || (expectAvailable!=isAvailable[0])) {
427-
errln("#" + i + ": Collator.getFunctionalEquivalent(" + input + ")=" + actual + ", avail " + new Boolean(isAvailable[0]) + ", " +
428-
"expected " + expect + " avail " + new Boolean(expectAvailable));
427+
errln("#" + i + ": Collator.getFunctionalEquivalent(" + input + ")=" + actual + ", avail " + isAvailable[0] + ", " +
428+
"expected " + expect + " avail " + expectAvailable);
429429
} else {
430-
logln("#" + i + ": Collator.getFunctionalEquivalent(" + input + ")=" + actual + ", avail " + new Boolean(isAvailable[0]));
430+
logln("#" + i + ": Collator.getFunctionalEquivalent(" + input + ")=" + actual + ", avail " + isAvailable[0]);
431431
}
432432
}
433433
}

icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void TestKeywordValues(){
129129
logln("Testing getting collation values:");
130130
kwVals = ICUResourceBundle.getKeywordValues(ICUData.ICU_COLLATION_BASE_NAME,COLLATION_RESNAME);
131131
for(n=0;n<kwVals.length;n++) {
132-
logln(new Integer(n).toString() + ": " + kwVals[n]);
132+
logln(Integer.valueOf(n).toString() + ": " + kwVals[n]);
133133
if(DEFAULT_NAME.equals(kwVals[n])) {
134134
errln("getKeywordValues for collation returned 'default' in the list.");
135135
} else if(STANDARD_NAME.equals(kwVals[n])) {
@@ -169,16 +169,16 @@ private void getFunctionalEquivalentTestCases(String path, ClassLoader cl, Strin
169169
ULocale inLocale = new ULocale(testCases[i+1]);
170170
ULocale expectLocale = new ULocale(testCases[i+2]);
171171

172-
logln(new Integer(i/3).toString() + ": " + new Boolean(expectAvail).toString() + "\t\t" +
173-
inLocale.toString() + "\t\t" + expectLocale.toString());
172+
logln("" + i/3 + ": " + expectAvail + "\t\t" +
173+
inLocale + "\t\t" + expectLocale);
174174

175175
ULocale equivLocale = ICUResourceBundle.getFunctionalEquivalent(path, cl, resName, keyword, inLocale, isAvail, truncate);
176176
boolean gotAvail = isAvail[0];
177177

178178
if((gotAvail != expectAvail) || !equivLocale.equals(expectLocale)) {
179-
errln(new Integer(i/3).toString() + ": Error, expected Equiv=" + new Boolean(expectAvail).toString() + "\t\t" +
180-
inLocale.toString() + "\t\t--> " + expectLocale.toString() + ", but got " + new Boolean(gotAvail).toString() + " " +
181-
equivLocale.toString());
179+
errln("" + i/3 + ": Error, expected Equiv=" + expectAvail + "\t\t" +
180+
inLocale + "\t\t--> " + expectLocale + ", but got " + gotAvail + " " +
181+
equivLocale);
182182
}
183183
}
184184
}

icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2487,7 +2487,7 @@ public void TestCoverage() {
24872487

24882488
f.format((Object)cal, buf, pos);
24892489
f.format((Object)now, buf, pos);
2490-
f.format(new Long(now.getTime()), buf, pos);
2490+
f.format(now.getTime(), buf, pos);
24912491
try {
24922492
f.format("Howdy", buf, pos);
24932493
}
@@ -3619,7 +3619,7 @@ public void TestFormatToCharacterIteratorCoverage() {
36193619
errln("FAIL: Date must be accepted by formatToCharacterIterator");
36203620
}
36213621

3622-
Number num = new Long(d.getTime());
3622+
Number num = d.getTime();
36233623
try {
36243624
acit = df.formatToCharacterIterator(num);
36253625
if (acit == null) {

icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/IntlTestDecimalFormatAPIC.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ public void TestRounding() {
305305
@Test
306306
public void testFormatToCharacterIterator() {
307307

308-
Number number = new Double(350.76);
309-
Number negativeNumber = new Double(-350.76);
308+
Number number = 350.76d;
309+
Number negativeNumber = -350.76d;
310310

311311
Locale us = Locale.US;
312312

@@ -339,12 +339,12 @@ public void testFormatToCharacterIterator() {
339339
getNegativeCurrencyVectorUS());
340340

341341
// test multiple grouping separators
342-
number = new Long(100300400);
342+
number = 100300400L;
343343
t_Format(11, number, NumberFormat.getNumberInstance(us),
344344
getNumberVector2US());
345345

346346
// test 0
347-
number = new Long(0);
347+
number = 0L;
348348
t_Format(12, number, NumberFormat.getNumberInstance(us),
349349
getZeroVector());
350350
}
@@ -508,7 +508,7 @@ public FieldContainer(int start, int end,
508508

509509
// called from support_messageformat tests
510510
public FieldContainer(int start, int end, AttributedCharacterIterator.Attribute attribute, int value) {
511-
this(start, end, attribute, new Integer(value));
511+
this(start, end, attribute, Integer.valueOf(value));
512512
}
513513

514514
// called from support_messageformat tests

icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3916,7 +3916,7 @@ static void generateCXXHConstants(String thisVersion) {
39163916
System.out.println(" * Returns by value, unit of " + type + ": " + code + ".");
39173917
System.out.printf(" * Also see {@link #create%s()}.\n", name);
39183918
String getterVersion = getVersion(javaName, thisVersion);
3919-
if (Integer.valueOf(getterVersion) < 64) {
3919+
if (Integer.parseInt(getterVersion) < 64) {
39203920
getterVersion = "64";
39213921
}
39223922
if (isDraft(javaName)) {

0 commit comments

Comments
 (0)