Skip to content
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

Refactor language level migration #459

Merged
merged 3 commits into from
Apr 15, 2019
+48 −37
Merged

Refactor language level migration #459

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0190030
refactor: type information can be inferred in modern versions of Java
fractalwrench Apr 6, 2019
f6bb473
refactor: if statement replaceable with switch statement
fractalwrench Apr 6, 2019
5c18e01
refactor: inline local variables as per review feedback
fractalwrench Apr 15, 2019
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
4 changes: 2 additions & 2 deletions sdk/src/main/java/com/bugsnag/android/Error.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
public class Error implements JsonStream.Streamable {

@NonNull
private Map<String, Object> appData = new HashMap<String, Object>();
private Map<String, Object> appData = new HashMap<>();

@NonNull
private Map<String, Object> deviceData = new HashMap<String, Object>();
private Map<String, Object> deviceData = new HashMap<>();

@NonNull
private User user = new User();
Expand Down
80 changes: 47 additions & 33 deletions sdk/src/main/java/com/bugsnag/android/ErrorReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,19 @@ private static ArrayList<String> readSeverityReason(JsonReader reader) throws IO
String attributeValue = null;
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("type")) {
type = reader.nextString();
} else if (name.equals("attributes")) {
reader.beginObject();
reader.nextName();
attributeValue = reader.nextString();
reader.endObject();
} else {
reader.skipValue();
switch (name) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could just do switch (reader.nextName()) { as the name variable is only used once

case "type":
type = reader.nextString();
break;
case "attributes":
reader.beginObject();
reader.nextName();
attributeValue = reader.nextString();
reader.endObject();
break;
default:
reader.skipValue();
break;
}
}
reader.endObject();
Expand All @@ -325,31 +329,41 @@ private static Session readSession(JsonReader reader) throws IOException {
reader.beginObject();
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("id")) {
id = reader.nextString();
} else if (name.equals("startedAt")) {
try {
startedAt = DateUtils.fromIso8601(reader.nextString());
} catch (Exception ex) {
throw new IOException("Unable to parse session startedAt: ", ex);
}
} else if (name.equals("events")) {
reader.beginObject();
while (reader.hasNext()) {
String eventName = reader.nextName();
if (eventName.equals("unhandled")) {
unhandled = reader.nextInt();
} else if (eventName.equals("handled")) {
handled = reader.nextInt();
} else {
reader.skipValue();
switch (name) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

case "id":
id = reader.nextString();
break;
case "startedAt":
try {
startedAt = DateUtils.fromIso8601(reader.nextString());
} catch (Exception ex) {
throw new IOException("Unable to parse session startedAt: ", ex);
}
}
reader.endObject();
} else if (name.equals("user")) {
user = readUser(reader);
} else {
reader.skipValue();
break;
case "events":
reader.beginObject();
while (reader.hasNext()) {
String eventName = reader.nextName();
switch (eventName) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

case "unhandled":
unhandled = reader.nextInt();
break;
case "handled":
handled = reader.nextInt();
break;
default:
reader.skipValue();
break;
}
}
reader.endObject();
break;
case "user":
user = readUser(reader);
break;
default:
reader.skipValue();
break;
}
}
reader.endObject();
Expand Down