Fix NPE when milestone does not exist

spring-io · Oct 11, 2023 · 4b8f63d · 4b8f63d
1 parent afc0530
commit 4b8f63d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/core/src/main/java/io/spring/release/SpringReleases.java b/core/src/main/java/io/spring/release/SpringReleases.java
@@ -161,9 +161,13 @@ public boolean hasNoOpenIssues(String owner, String repo, String version) {
 	public boolean isDueToday(String owner, String repo, String version) {
 		var repository = new Repository(owner, repo);
 		var milestone = this.gitHubApi.getMilestone(repository, version);
+		if (milestone == null || milestone.dueOn() == null) {
+			return false;
+		}
+
 		var today = LocalDate.now();
-		var dueOn = (milestone.dueOn() != null) ? milestone.dueOn().atZone(ZoneOffset.UTC).toLocalDate() : null;
-		return (dueOn != null && today.compareTo(dueOn) >= 0);
+		var dueOn = milestone.dueOn().atZone(ZoneOffset.UTC).toLocalDate();
+		return !today.isBefore(dueOn);
 	}
 
 	/**

diff --git a/core/src/test/java/io/spring/release/SpringReleasesTests.java b/core/src/test/java/io/spring/release/SpringReleasesTests.java
@@ -243,6 +243,23 @@ public void isDueTodayWhenDueTomorrowThenFalse() {
 		assertThat(repository.name()).isEqualTo(REPO);
 	}
 
+	@Test
+	public void isDueTodayWhenMilestoneDoesNotExistThenFalse() {
+		var version = "6.1.0";
+		when(this.gitHubApi.getMilestone(any(Repository.class), anyString())).thenReturn(null);
+
+		var isDueToday = this.springReleases.isDueToday(OWNER, REPO, version);
+		assertThat(isDueToday).isFalse();
+
+		var repositoryCaptor = forClass(Repository.class);
+		verify(this.gitHubApi).getMilestone(repositoryCaptor.capture(), eq(version));
+		verifyNoMoreInteractions(this.gitHubApi);
+
+		var repository = repositoryCaptor.getValue();
+		assertThat(repository.owner()).isEqualTo(OWNER);
+		assertThat(repository.name()).isEqualTo(REPO);
+	}
+
 	@Test
 	public void hasNoOpenIssuesWhenNoOpenIssuesThenTrue() {
 		var version = "6.1.0";