Skip to content

Commit ee78614

Browse files
gk-browngk-brown
committed
Optimize imports.
1 parent e4f0770 commit ee78614

File tree

26 files changed

+310
-284
lines changed

26 files changed

+310
-284
lines changed

‎httprpc-client/src/main/java/org/httprpc/WebServiceProxy.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@
2929
import java.net.URL;
3030
import java.net.URLEncoder;
3131
import java.nio.charset.StandardCharsets;
32-
import java.util.Collections;
3332
import java.util.Date;
3433
import java.util.HashMap;
3534
import java.util.List;
3635
import java.util.Locale;
3736
import java.util.Map;
3837
import java.util.UUID;
3938

39+
import static java.util.Collections.emptyMap;
40+
import static java.util.Collections.singletonList;
41+
4042
/**
4143
* Web service proxy class.
4244
*/
@@ -105,8 +107,8 @@ public interface ResponseHandler<T> {
105107

106108
private Encoding encoding = Encoding.APPLICATION_X_WWW_FORM_URLENCODED;
107109

108-
private Map<String, ?> headers = Collections.emptyMap();
109-
private Map<String, ?> arguments = Collections.emptyMap();
110+
private Map<String, ?> headers = emptyMap();
111+
private Map<String, ?> arguments = emptyMap();
110112

111113
private RequestHandler requestHandler = null;
112114

@@ -571,7 +573,7 @@ private static Iterable<?> getParameterValues(Object argument) {
571573
if (argument instanceof Iterable<?>) {
572574
values = (Iterable<?>)getParameterValue(argument);
573575
} else {
574-
values = Collections.singletonList(getParameterValue(argument));
576+
values = singletonList(getParameterValue(argument));
575577
}
576578

577579
return values;
@@ -601,7 +603,7 @@ private static Object getParameterValue(Object argument) {
601603
* An instance of the given type that adapts the target service.
602604
*/
603605
public static <T> T adapt(URL baseURL, Class<T> type) {
604-
return adapt(baseURL, type, Collections.emptyMap());
606+
return adapt(baseURL, type, emptyMap());
605607
}
606608

607609
/**

‎httprpc-client/src/main/java/org/httprpc/io/CSVEncoder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
package org.httprpc.io;
1616

17+
import org.httprpc.beans.BeanAdapter;
18+
1719
import java.io.IOException;
1820
import java.io.Writer;
1921
import java.nio.charset.StandardCharsets;
2022
import java.util.Date;
2123
import java.util.List;
2224
import java.util.Map;
2325

24-
import org.httprpc.beans.BeanAdapter;
25-
2626
/**
2727
* CSV encoder.
2828
*/

‎httprpc-client/src/test/java/org/httprpc/beans/BeanAdapterTest.java‎

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package org.httprpc.beans;
1616

1717
import org.httprpc.io.JSONDecoder;
18-
import org.junit.jupiter.api.Assertions;
1918
import org.junit.jupiter.api.Test;
2019

2120
import java.io.IOException;
@@ -31,31 +30,38 @@
3130
import java.util.HashMap;
3231
import java.util.Map;
3332

34-
import static org.httprpc.util.Collections.*;
33+
import static org.httprpc.util.Collections.entry;
34+
import static org.httprpc.util.Collections.listOf;
35+
import static org.httprpc.util.Collections.mapOf;
36+
import static org.junit.jupiter.api.Assertions.assertEquals;
37+
import static org.junit.jupiter.api.Assertions.assertFalse;
38+
import static org.junit.jupiter.api.Assertions.assertNotNull;
39+
import static org.junit.jupiter.api.Assertions.assertNull;
40+
import static org.junit.jupiter.api.Assertions.assertTrue;
3541

3642
public class BeanAdapterTest {
3743
@Test
3844
public void testPrimitiveAdapt() {
39-
Assertions.assertEquals(BeanAdapter.adapt(null, Byte.TYPE), Byte.valueOf((byte)0));
40-
Assertions.assertEquals(BeanAdapter.adapt("1", Byte.TYPE), Byte.valueOf((byte)1));
45+
assertEquals(BeanAdapter.adapt(null, Byte.TYPE), Byte.valueOf((byte)0));
46+
assertEquals(BeanAdapter.adapt("1", Byte.TYPE), Byte.valueOf((byte)1));
4147

42-
Assertions.assertEquals(BeanAdapter.adapt(null, Short.TYPE), Short.valueOf((short)0));
43-
Assertions.assertEquals(BeanAdapter.adapt("2", Short.TYPE), Short.valueOf((short)2));
48+
assertEquals(BeanAdapter.adapt(null, Short.TYPE), Short.valueOf((short)0));
49+
assertEquals(BeanAdapter.adapt("2", Short.TYPE), Short.valueOf((short)2));
4450

45-
Assertions.assertEquals(BeanAdapter.adapt(null, Integer.TYPE), Integer.valueOf(0));
46-
Assertions.assertEquals(BeanAdapter.adapt("3", Integer.TYPE), Integer.valueOf(3));
51+
assertEquals(BeanAdapter.adapt(null, Integer.TYPE), Integer.valueOf(0));
52+
assertEquals(BeanAdapter.adapt("3", Integer.TYPE), Integer.valueOf(3));
4753

48-
Assertions.assertEquals(BeanAdapter.adapt(null, Long.TYPE), Long.valueOf(0));
49-
Assertions.assertEquals(BeanAdapter.adapt("4", Long.TYPE), Long.valueOf(4));
54+
assertEquals(BeanAdapter.adapt(null, Long.TYPE), Long.valueOf(0));
55+
assertEquals(BeanAdapter.adapt("4", Long.TYPE), Long.valueOf(4));
5056

51-
Assertions.assertEquals(BeanAdapter.adapt(null, Float.TYPE), Float.valueOf(0));
52-
Assertions.assertEquals(BeanAdapter.adapt("5.0", Float.TYPE), Float.valueOf(5));
57+
assertEquals(BeanAdapter.adapt(null, Float.TYPE), Float.valueOf(0));
58+
assertEquals(BeanAdapter.adapt("5.0", Float.TYPE), Float.valueOf(5));
5359

54-
Assertions.assertEquals(BeanAdapter.adapt(null, Double.TYPE), Double.valueOf(0));
55-
Assertions.assertEquals(BeanAdapter.adapt("6.0", Double.TYPE), Double.valueOf(6));
60+
assertEquals(BeanAdapter.adapt(null, Double.TYPE), Double.valueOf(0));
61+
assertEquals(BeanAdapter.adapt("6.0", Double.TYPE), Double.valueOf(6));
5662

57-
Assertions.assertEquals(BeanAdapter.adapt(null, Boolean.TYPE), Boolean.FALSE);
58-
Assertions.assertEquals(BeanAdapter.adapt("true", Boolean.TYPE), Boolean.TRUE);
63+
assertEquals(BeanAdapter.adapt(null, Boolean.TYPE), Boolean.FALSE);
64+
assertEquals(BeanAdapter.adapt("true", Boolean.TYPE), Boolean.TRUE);
5965
}
6066

6167
@Test
@@ -99,8 +105,8 @@ public void testBeanAdapter1() throws MalformedURLException {
99105

100106
Map<String, Object> actual = new BeanAdapter(new TestBean());
101107

102-
Assertions.assertEquals(expected, actual);
103-
Assertions.assertNull(actual.get("ignored"));
108+
assertEquals(expected, actual);
109+
assertNull(actual.get("ignored"));
104110
}
105111

106112
@Test
@@ -114,28 +120,28 @@ public void testBeanAdapter2() throws IOException {
114120

115121
TestInterface result = BeanAdapter.adapt(map, TestInterface.class);
116122

117-
Assertions.assertNotNull(result);
123+
assertNotNull(result);
118124

119-
Assertions.assertEquals(1, result.getInt());
120-
Assertions.assertEquals(2L, result.getLong());
121-
Assertions.assertEquals(4.0, result.getDouble(), 0.0);
122-
Assertions.assertEquals("abc", result.getString());
123-
Assertions.assertEquals(new Date(0), result.getDate());
124-
Assertions.assertEquals(LocalDate.parse("2018-06-28"), result.getLocalDate());
125-
Assertions.assertEquals(LocalTime.parse("10:45"), result.getLocalTime());
126-
Assertions.assertEquals(LocalDateTime.parse("2018-06-28T10:45"), result.getLocalDateTime());
125+
assertEquals(1, result.getInt());
126+
assertEquals(2L, result.getLong());
127+
assertEquals(4.0, result.getDouble(), 0.0);
128+
assertEquals("abc", result.getString());
129+
assertEquals(new Date(0), result.getDate());
130+
assertEquals(LocalDate.parse("2018-06-28"), result.getLocalDate());
131+
assertEquals(LocalTime.parse("10:45"), result.getLocalTime());
132+
assertEquals(LocalDateTime.parse("2018-06-28T10:45"), result.getLocalDateTime());
127133

128-
Assertions.assertTrue(result.getNestedBean().getFlag());
134+
assertTrue(result.getNestedBean().getFlag());
129135

130-
Assertions.assertEquals(2L, ((Number)result.getList().get(0)).longValue());
131-
Assertions.assertEquals(4.0, ((Number)result.getList().get(1)).doubleValue(), 0.0);
132-
Assertions.assertEquals(true, ((Map<?, ?>)result.getList().get(2)).get("flag"));
133-
Assertions.assertFalse(result.getNestedBeanList().get(0).getFlag());
136+
assertEquals(2L, ((Number)result.getList().get(0)).longValue());
137+
assertEquals(4.0, ((Number)result.getList().get(1)).doubleValue(), 0.0);
138+
assertEquals(true, ((Map<?, ?>)result.getList().get(2)).get("flag"));
139+
assertFalse(result.getNestedBeanList().get(0).getFlag());
134140

135-
Assertions.assertEquals(2L, ((Number)result.getMap().get("long")).longValue());
136-
Assertions.assertEquals(4.0, ((Number)result.getMap().get("double")).doubleValue(), 0.0);
137-
Assertions.assertEquals(true, ((Map<?, ?>)result.getMap().get("nestedBean")).get("flag"));
138-
Assertions.assertFalse(result.getNestedBeanMap().get("nestedBean").getFlag());
141+
assertEquals(2L, ((Number)result.getMap().get("long")).longValue());
142+
assertEquals(4.0, ((Number)result.getMap().get("double")).doubleValue(), 0.0);
143+
assertEquals(true, ((Map<?, ?>)result.getMap().get("nestedBean")).get("flag"));
144+
assertFalse(result.getNestedBeanMap().get("nestedBean").getFlag());
139145
}
140146

141147
@Test
@@ -148,7 +154,7 @@ public void testValueAt() {
148154
))
149155
);
150156

151-
Assertions.assertEquals(Integer.valueOf(123), BeanAdapter.valueAt(map, "a.b.c"));
157+
assertEquals(Integer.valueOf(123), BeanAdapter.valueAt(map, "a.b.c"));
152158
}
153159

154160
@Test
@@ -157,7 +163,7 @@ public void testDescribe() {
157163

158164
BeanAdapter.describe(TestBean.class, structures);
159165

160-
Assertions.assertEquals(
166+
assertEquals(
161167
"{\n" +
162168
" URL: url,\n" +
163169
" bigInteger: number,\n" +
@@ -181,7 +187,7 @@ public void testDescribe() {
181187
structures.get(TestBean.class)
182188
);
183189

184-
Assertions.assertEquals(
190+
assertEquals(
185191
"{\n" +
186192
" flag: boolean\n" +
187193
"}",
@@ -195,6 +201,6 @@ public void testInterfaceKey() {
195201

196202
Map<String, ?> map = new BeanAdapter(testInterface);
197203

198-
Assertions.assertEquals(10, map.get("i"));
204+
assertEquals(10, map.get("i"));
199205
}
200206
}

‎httprpc-client/src/test/java/org/httprpc/beans/TestBean.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import java.util.List;
2828
import java.util.Map;
2929

30-
import static org.httprpc.util.Collections.*;
30+
import static org.httprpc.util.Collections.entry;
31+
import static org.httprpc.util.Collections.listOf;
32+
import static org.httprpc.util.Collections.mapOf;
3133

3234
public class TestBean implements TestInterface {
3335
public static class NestedBean implements NestedInterface {

‎httprpc-client/src/test/java/org/httprpc/io/CSVDecoderTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@
1414

1515
package org.httprpc.io;
1616

17+
import org.junit.jupiter.api.Test;
18+
1719
import java.io.IOException;
1820
import java.io.StringReader;
1921
import java.util.List;
2022
import java.util.Map;
2123
import java.util.stream.Collectors;
2224

23-
import org.junit.jupiter.api.Assertions;
24-
import org.junit.jupiter.api.Test;
25-
26-
import static org.httprpc.util.Collections.*;
25+
import static org.httprpc.util.Collections.entry;
26+
import static org.httprpc.util.Collections.listOf;
27+
import static org.httprpc.util.Collections.mapOf;
28+
import static org.junit.jupiter.api.Assertions.assertEquals;
2729

2830
public class CSVDecoderTest {
2931
@Test
@@ -53,6 +55,6 @@ public void testRead() throws IOException {
5355

5456
List<Map<String, String>> actual = csvDecoder.read(reader).stream().collect(Collectors.toList());
5557

56-
Assertions.assertEquals(expected, actual);
58+
assertEquals(expected, actual);
5759
}
5860
}

‎httprpc-client/src/test/java/org/httprpc/io/CSVEncoderTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@
1414

1515
package org.httprpc.io;
1616

17+
import org.junit.jupiter.api.Test;
18+
1719
import java.io.IOException;
1820
import java.io.StringWriter;
1921
import java.time.DayOfWeek;
2022
import java.util.Date;
2123
import java.util.List;
2224
import java.util.Map;
2325

24-
import org.junit.jupiter.api.Assertions;
25-
import org.junit.jupiter.api.Test;
26-
27-
import static org.httprpc.util.Collections.*;
26+
import static org.httprpc.util.Collections.entry;
27+
import static org.httprpc.util.Collections.listOf;
28+
import static org.httprpc.util.Collections.mapOf;
29+
import static org.junit.jupiter.api.Assertions.assertEquals;
2830

2931
public class CSVEncoderTest {
3032
@Test
@@ -57,6 +59,6 @@ public void testWrite() throws IOException {
5759

5860
csvEncoder.write(values, writer);
5961

60-
Assertions.assertEquals(expected, writer.toString());
62+
assertEquals(expected, writer.toString());
6163
}
6264
}

‎httprpc-client/src/test/java/org/httprpc/io/JSONDecoderTest.java‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,40 @@
1414

1515
package org.httprpc.io;
1616

17+
import org.junit.jupiter.api.Test;
18+
1719
import java.io.IOException;
1820
import java.io.StringReader;
1921
import java.util.List;
2022
import java.util.Map;
2123

22-
import org.junit.jupiter.api.Assertions;
23-
import org.junit.jupiter.api.Test;
24-
25-
import static org.httprpc.util.Collections.*;
24+
import static org.httprpc.util.Collections.entry;
25+
import static org.httprpc.util.Collections.listOf;
26+
import static org.httprpc.util.Collections.mapOf;
27+
import static org.junit.jupiter.api.Assertions.assertEquals;
28+
import static org.junit.jupiter.api.Assertions.assertThrows;
2629

2730
public class JSONDecoderTest {
2831
@Test
2932
public void testString() throws IOException {
30-
Assertions.assertEquals("abcdéfg", decode("\"abcdéfg\""));
31-
Assertions.assertEquals("\b\f\r\n\t", decode("\"\\b\\f\\r\\n\\t\""));
32-
Assertions.assertEquals("é", decode("\"\\u00E9\""));
33+
assertEquals("abcdéfg", decode("\"abcdéfg\""));
34+
assertEquals("\b\f\r\n\t", decode("\"\\b\\f\\r\\n\\t\""));
35+
assertEquals("é", decode("\"\\u00E9\""));
3336
}
3437

3538
@Test
3639
public void testNumber() throws IOException {
37-
Assertions.assertEquals(42L, (long)decode("42"));
38-
Assertions.assertEquals(42.5, decode("42.5"), 0);
40+
assertEquals(42L, (long)decode("42"));
41+
assertEquals(42.5, decode("42.5"), 0);
3942

40-
Assertions.assertEquals(-789L, (long)decode("-789"));
41-
Assertions.assertEquals(-789.10, decode("-789.10"), 0);
43+
assertEquals(-789L, (long)decode("-789"));
44+
assertEquals(-789.10, decode("-789.10"), 0);
4245
}
4346

4447
@Test
4548
public void testBoolean() throws IOException {
46-
Assertions.assertEquals(true, decode("true"));
47-
Assertions.assertEquals(false, decode("false"));
49+
assertEquals(true, decode("true"));
50+
assertEquals(false, decode("false"));
4851
}
4952

5053
@Test
@@ -59,7 +62,7 @@ public void testArray() throws IOException {
5962

6063
List<?> list = decode("[\"abc\",\t123,,, true,\n[1, 2.0, 3.0],\n{\"x\": 1, \"y\": 2.0, \"z\": 3.0}]");
6164

62-
Assertions.assertEquals(expected, list);
65+
assertEquals(expected, list);
6366
}
6467

6568
@Test
@@ -74,7 +77,7 @@ public void testObject() throws IOException {
7477

7578
Map<String, ?> map = decode("{\"a\": \"abc\", \"b\":\t123,,, \"c\": true,\n\"d\": [1, 2.0, 3.0],\n\"e\": {\"x\": 1, \"y\": 2.0, \"z\": 3.0}}");
7679

77-
Assertions.assertEquals(expected, map);
80+
assertEquals(expected, map);
7881
}
7982

8083
@Test
@@ -109,7 +112,7 @@ public void testMissingObjectClosingBracket() throws IOException {
109112

110113
@Test
111114
public void testInvalidCharacters() {
112-
Assertions.assertThrows(IOException.class, () -> decode("xyz"));
115+
assertThrows(IOException.class, () -> decode("xyz"));
113116
}
114117

115118
private static <T> T decode(String text) throws IOException {

0 commit comments

Comments
 (0)