Skip to content

Commit fc09db3

Browse files
committed
Update serialization ID. Resolve some deprecation issues of Integer.
1 parent e079e4e commit fc09db3

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

core/src/test/java/feign/UtilTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void removesEmptyStrings() {
5151

5252
@Test
5353
public void removesEvenNumbers() {
54-
Integer[] values = new Integer[] {22, 23};
54+
Integer[] values = {22, 23};
5555
assertThat(removeValues(values, number -> number % 2 == 0, Integer.class))
5656
.containsExactly(23);
5757
}
@@ -167,7 +167,7 @@ public void checkNotNullInputZeroNotNull0OutputZero() {
167167
// Act
168168
final Object retval = Util.checkNotNull(reference, errorMessageTemplate, errorMessageArgs);
169169
// Assert result
170-
assertEquals(new Integer(0), retval);
170+
assertEquals(0, retval);
171171
}
172172

173173
@Test

hystrix/src/test/java/feign/hystrix/HystrixBuilderTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void hystrixCommandInt() {
8686
final HystrixCommand<Integer> command = api.intCommand();
8787

8888
assertThat(command).isNotNull();
89-
assertThat(command.execute()).isEqualTo(new Integer(1));
89+
assertThat(command.execute()).isEqualTo(Integer.valueOf(1));
9090
}
9191

9292
@Test
@@ -98,7 +98,7 @@ public void hystrixCommandIntFallback() {
9898
final HystrixCommand<Integer> command = api.intCommand();
9999

100100
assertThat(command).isNotNull();
101-
assertThat(command.execute()).isEqualTo(new Integer(0));
101+
assertThat(command.execute()).isEqualTo(Integer.valueOf(0));
102102
}
103103

104104
@Test
@@ -250,7 +250,7 @@ public void rxObservableInt() {
250250
final TestSubscriber<Integer> testSubscriber = new TestSubscriber<Integer>();
251251
observable.subscribe(testSubscriber);
252252
testSubscriber.awaitTerminalEvent();
253-
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(new Integer(1));
253+
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(Integer.valueOf(1));
254254
}
255255

256256
@Test
@@ -267,7 +267,7 @@ public void rxObservableIntFallback() {
267267
final TestSubscriber<Integer> testSubscriber = new TestSubscriber<Integer>();
268268
observable.subscribe(testSubscriber);
269269
testSubscriber.awaitTerminalEvent();
270-
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(new Integer(0));
270+
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(Integer.valueOf(0));
271271
}
272272

273273
@Test
@@ -373,7 +373,7 @@ public void rxSingleInt() {
373373
final TestSubscriber<Integer> testSubscriber = new TestSubscriber<Integer>();
374374
single.subscribe(testSubscriber);
375375
testSubscriber.awaitTerminalEvent();
376-
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(new Integer(1));
376+
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(Integer.valueOf(1));
377377
}
378378

379379
@Test
@@ -390,7 +390,7 @@ public void rxSingleIntFallback() {
390390
final TestSubscriber<Integer> testSubscriber = new TestSubscriber<Integer>();
391391
single.subscribe(testSubscriber);
392392
testSubscriber.awaitTerminalEvent();
393-
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(new Integer(0));
393+
Assertions.assertThat(testSubscriber.getOnNextEvents().get(0)).isEqualTo(Integer.valueOf(0));
394394
}
395395

396396
@Test

jaxrs2/src/main/java/feign/jaxrs2/JAXRSClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private Integer integerHeader(Response response, String header) {
8686
}
8787

8888
try {
89-
return new Integer(headers.getFirst(header));
89+
return Integer.valueOf(headers.getFirst(header));
9090
} catch (final NumberFormatException e) {
9191
// not a number or too big to fit Integer
9292
return null;

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,8 @@
637637
<exclude>NOTICE</exclude>
638638
<exclude>OSSMETADATA</exclude>
639639
<exclude>**/*.md</exclude>
640+
<exclude>**/*.asciidoc</exclude>
641+
<exclude>**/*.iuml</exclude>
640642
<exclude>bnd.bnd</exclude>
641643
<exclude>travis/**</exclude>
642644
<exclude>src/test/resources/**</exclude>

0 commit comments

Comments
 (0)