From 0e5d0735a6205b106038db333169e89da12c04ba Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 2 Aug 2018 13:58:52 +0200 Subject: [PATCH] Not allowing null entries for projects --- .../cloud/release/internal/pom/Projects.java | 10 +++++++++- .../cloud/release/internal/spring/SpringReleaser.java | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Projects.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Projects.java index 75fd8b75..531c54f0 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Projects.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Projects.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -20,7 +21,7 @@ public class Projects extends HashSet { @SuppressWarnings("unchecked") public Projects(ProjectVersion... versions) { - addAll(new HashSet<>(Arrays.asList(versions))); + addAll(new HashSet<>(Arrays.stream(versions).filter(Objects::nonNull).collect(Collectors.toList()))); } public static Projects forRollback(Projects projects, ProjectVersion originalVersion) { @@ -31,6 +32,13 @@ public class Projects extends HashSet { return newProjects; } + @Override public boolean add(ProjectVersion projectVersion) { + if (projectVersion == null) { + return false; + } + return super.add(projectVersion); + } + public void remove(String projectName) { ProjectVersion projectVersion = forName(projectName); remove(projectVersion); diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java index 21e98ddb..4f92b525 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java @@ -164,6 +164,8 @@ public class SpringReleaser { private ProjectsAndVersion projects(File project) { ProjectVersion versionFromScRelease; Projects projectsToUpdate; + log.info("Fetch from git [{}], meta release [{}]", this.properties.getGit().isFetchVersionsFromGit(), + this.properties.getMetaRelease().isEnabled()); if (this.properties.getGit().isFetchVersionsFromGit() && !this.properties.getMetaRelease().isEnabled()) { printVersionRetrieval(); projectsToUpdate = this.releaser.retrieveVersionsFromSCRelease();