Skip to content

Commit 9e0229d

Browse files
committed
fix some deepsource warnings
1 parent 46cbd4f commit 9e0229d

File tree

4 files changed

+60
-13
lines changed

4 files changed

+60
-13
lines changed

src/main/java/lol/hyper/customlauncher/fieldofficetracker/FieldOffice.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package lol.hyper.customlauncher.fieldofficetracker;
1919

20+
import lol.hyper.customlauncher.invasiontracker.Invasion;
2021
import org.jetbrains.annotations.NotNull;
2122

2223
public class FieldOffice implements Comparable<FieldOffice> {
@@ -95,13 +96,24 @@ public void setTotalAnnexes(int totalAnnexes) {
9596

9697
@Override
9798
public int compareTo(@NotNull FieldOffice fieldOffice) {
98-
return (FieldOfficeTracker.zonesToStreets
99-
.get(area)
100-
.compareTo(FieldOfficeTracker.zonesToStreets.get(fieldOffice.getArea())));
99+
return Integer.compare(this.area, fieldOffice.area);
101100
}
102101

103102
@Override
104103
public String toString() {
105104
return FieldOfficeTracker.zonesToStreets.get(area);
106105
}
106+
107+
@Override
108+
public boolean equals(Object o) {
109+
if (o == this) {
110+
return true;
111+
}
112+
113+
if (!(o instanceof FieldOffice fieldOffice)) {
114+
return false;
115+
}
116+
117+
return fieldOffice.getArea() == this.getArea();
118+
}
107119
}

src/main/java/lol/hyper/customlauncher/invasiontracker/Invasion.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,17 @@ public String toString() {
8585
public int compareTo(Invasion invasion) {
8686
return (this.getDistrict().compareTo(invasion.getDistrict()));
8787
}
88+
89+
@Override
90+
public boolean equals(Object o) {
91+
if (o == this) {
92+
return true;
93+
}
94+
95+
if (!(o instanceof Invasion invasion)) {
96+
return false;
97+
}
98+
99+
return invasion.getDistrict().equals(this.getDistrict());
100+
}
88101
}

src/main/java/lol/hyper/customlauncher/login/LoginHandler.java

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@
3434
import org.json.JSONObject;
3535

3636
import javax.swing.*;
37+
import java.io.IOException;
38+
import java.io.UnsupportedEncodingException;
3739
import java.util.ArrayList;
3840
import java.util.HashMap;
3941
import java.util.List;
42+
import java.util.Map;
4043
import java.util.concurrent.TimeUnit;
4144

4245
public class LoginHandler {
@@ -149,26 +152,47 @@ private void handleLoginRequest(LoginRequest loginRequest) {
149152
*
150153
* @param loginRequest The login request to process.
151154
* @return The login request that is sent back.
152-
* @throws Exception Throws any errors about reading/sending data.
153155
*/
154-
private LoginRequest sendRequest(LoginRequest loginRequest) throws Exception {
156+
private LoginRequest sendRequest(LoginRequest loginRequest) {
155157
HttpPost post = new HttpPost(REQUEST_URL);
156158
post.setHeader("User-Agent", Main.userAgent);
157159
post.setHeader("Content-type", "application/x-www-form-urlencoded");
158160

159161
List<NameValuePair> urlParameters = new ArrayList<>();
160-
for (String x : loginRequest.getRequestDetails().keySet()) {
161-
urlParameters.add(new BasicNameValuePair(x, loginRequest.getRequestDetails().get(x)));
162+
logger.info(loginRequest.getRequestDetails());
163+
for (Map.Entry<String, String> entry : loginRequest.getRequestDetails().entrySet()) {
164+
urlParameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
162165
}
163166

164-
post.setEntity(new UrlEncodedFormEntity(urlParameters));
167+
try {
168+
post.setEntity(new UrlEncodedFormEntity(urlParameters));
169+
} catch (UnsupportedEncodingException exception) {
170+
logger.error("Unable to send login request!", exception);
171+
JFrame errorWindow = new ErrorWindow(null, exception);
172+
errorWindow.dispose();
173+
return null;
174+
}
165175

166176
String responseData;
167177

168-
try (CloseableHttpClient httpClient = HttpClients.createDefault();
169-
CloseableHttpResponse response = httpClient.execute(post)) {
178+
CloseableHttpClient httpClient = HttpClients.createDefault();
179+
CloseableHttpResponse response = null;
180+
try {
181+
response = httpClient.execute(post);
182+
} catch (IOException exception) {
183+
logger.error("Unable to send login request!", exception);
184+
JFrame errorWindow = new ErrorWindow(null, exception);
185+
errorWindow.dispose();
186+
return null;
187+
}
170188

189+
try {
171190
responseData = EntityUtils.toString(response.getEntity());
191+
} catch (IOException exception) {
192+
logger.error("Unable to send login request!", exception);
193+
JFrame errorWindow = new ErrorWindow(null, exception);
194+
errorWindow.dispose();
195+
return null;
172196
}
173197
JSONObject responseJSON = new JSONObject(responseData);
174198
LoginRequest newLogin = new LoginRequest();

src/main/java/lol/hyper/customlauncher/ttrupdater/TTRUpdater.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@
4545
import java.nio.file.Paths;
4646
import java.security.MessageDigest;
4747
import java.security.NoSuchAlgorithmException;
48-
import java.util.ArrayList;
48+
import java.util.*;
4949
import java.util.List;
50-
import java.util.Locale;
51-
import java.util.Objects;
5250
import java.util.concurrent.TimeUnit;
5351
import java.util.stream.Collectors;
5452

0 commit comments

Comments
 (0)