Skip to content

Improve generics arguments #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
exoego merged 2 commits into from
Jan 31, 2023
Merged

Improve generics arguments #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a212fb4
Use diamond to shorten generic arguments
exoego Jan 29, 2023
0c12fc0
Fix untyped generics
exoego Jan 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/treasuredata/client/TDHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public Request prepareRequest(TDApiRequest apiRequest, Optional<String> apiKeyCa
: String.format("%s://%s%s%s", config.useSSL ? "https" : "http", config.endpoint, portStr, apiRequest.getPath());

if (!apiRequest.getQueryParams().isEmpty()) {
List<String> queryParamList = new ArrayList<String>(apiRequest.getQueryParams().size());
List<String> queryParamList = new ArrayList<>(apiRequest.getQueryParams().size());
for (Map.Entry<String, String> queryParam : apiRequest.getQueryParams().entrySet()) {
queryParamList.add(String.format("%s=%s", urlEncode(queryParam.getKey()), urlEncode(queryParam.getValue())));
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/treasuredata/client/model/TDColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static List<TDColumn> parseTuple(String jsonStr)
try {
String unescaped = jsonStr.replaceAll("\\\"", "\"");
JSONArray arr = castToArray(new JSONParser().parse(unescaped));
List<TDColumn> columnList = new ArrayList<TDColumn>(arr.size());
List<TDColumn> columnList = new ArrayList<>(arr.size());
for (Object e : arr) {
JSONArray columnNameAndType = castToArray(e);
String[] s = new String[columnNameAndType.size()];
Expand All @@ -121,7 +121,7 @@ public static List<TDColumn> parseTuple(String jsonStr)
}
catch (ParseException e) {
LoggerFactory.getLogger(TDColumn.class).error("Failed to parse json string", e);
return new ArrayList<TDColumn>(0);
return new ArrayList<>(0);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/treasuredata/client/TestTDClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class TestTDClientConfig
static ImmutableMap<TDClientConfig.Type, Object> m;

static {
ImmutableMap.Builder p = ImmutableMap.<TDClientConfig.Type, Object>builder();
ImmutableMap.Builder<TDClientConfig.Type, Object> p = ImmutableMap.builder();
p.put(API_ENDPOINT, "api2.treasuredata.com");
p.put(API_PORT, 8981);
p.put(USESSL, true);
Expand All @@ -83,7 +83,7 @@ public class TestTDClientConfig
p.put(PASSOWRD, "yyyy");
m = p.build();

assertTrue(new HashSet(TDClientConfig.knownProperties()).containsAll(m.keySet()));
assertTrue(new HashSet<>(TDClientConfig.knownProperties()).containsAll(m.keySet()));
}

private void validate(TDClientConfig config)
Expand Down Expand Up @@ -136,7 +136,7 @@ public void testConfigParam()
@Test
public void testProxyParam()
{
Map<TDClientConfig.Type, Object> m = new HashMap<TDClientConfig.Type, Object>();
Map<TDClientConfig.Type, Object> m = new HashMap<>();
m.put(PROXY_HOST, "localhost1");
m.put(PROXY_PORT, 8982);
m.put(PROXY_USER, "pp");
Expand Down