SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Not allowing null entries for projects

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-08-02 13:58:52 +02:00
parent 4d29913917
commit 0e5d0735a6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/Projects.java
View File

@@ -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<ProjectVersion> {
@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<ProjectVersion> {
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);

2
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java
View File

@@ -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();