Skip to content

Commit f1b8d77

Browse files
committed
improvement(Addressed PR feedback): Removed redundant null checks.
1 parent c37a33a commit f1b8d77

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

src/main/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public GtfsPlusValidation(String feedVersionId, boolean published, List<Validati
5757

5858
public GtfsPlusValidation() {
5959
this(null);
60-
// Empty constructor for serialization
60+
// Constructor for serialization.
6161
}
6262

6363
/**

src/main/java/com/conveyal/datatools/manager/models/FeedVersionSummary.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,9 @@ public FeedVersionSummary(
7575
// The feed source's published feed version. Feed source's publishedVersionId mapped to feed version's namespace.
7676
feedSourcePublishedVersionId = feedVersionDocument.getString("publishedVersionId");
7777

78-
publishedFeedVersionErrorCount = feedVersionDocument.get("publishedFeedVersionErrorCount") != null
79-
? feedVersionDocument.getInteger("publishedFeedVersionErrorCount")
80-
: null;
81-
publishedFeedVersionStartDate = feedVersionDocument.get("publishedFeedVersionStartDate") != null
82-
? getDateFromString(feedVersionDocument.getString("publishedFeedVersionStartDate"))
83-
: null;
84-
publishedFeedVersionEndDate = feedVersionDocument.get("publishedFeedVersionEndDate") != null
85-
? getDateFromString(feedVersionDocument.getString("publishedFeedVersionEndDate"))
86-
: null;
78+
publishedFeedVersionErrorCount = feedVersionDocument.getInteger("publishedFeedVersionErrorCount");
79+
publishedFeedVersionStartDate = getDateFromString(feedVersionDocument.getString("publishedFeedVersionStartDate"));
80+
publishedFeedVersionEndDate = getDateFromString(feedVersionDocument.getString("publishedFeedVersionEndDate"));
8781
}
8882

8983
/**
@@ -118,7 +112,7 @@ private static GtfsPlusValidation getGtfsPlusValidation(String feedVersionId, Do
118112
return null;
119113
}
120114
List<ValidationIssue> issues = null;
121-
if (gtfsPlusValidationDocument.containsKey("issues") && gtfsPlusValidationDocument.get("issues") != null) {
115+
if (gtfsPlusValidationDocument.get("issues") != null) {
122116
List<Document> issueDocs = gtfsPlusValidationDocument.getList("issues", Document.class);
123117
issues = issueDocs
124118
.stream()

0 commit comments

Comments
 (0)