root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2023-08-13 18:18:48 -07:00
parent dc45532c94
commit 527b2f2cac
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java
View File

@ -109,31 +109,13 @@ public abstract class UpgradeDependencies extends DefaultTask {
Issue existingUpgradeIssue = findExistingUpgradeIssue(existingUpgradeIssues, upgrade); Issue existingUpgradeIssue = findExistingUpgradeIssue(existingUpgradeIssues, upgrade);
try { try {
Path modified = upgradeApplicator.apply(upgrade); Path modified = upgradeApplicator.apply(upgrade);
int issueNumber; int issueNumber = getOrOpenUpgradeIssue(repository, issueLabels, milestone, title,
if (existingUpgradeIssue != null && existingUpgradeIssue.getState() == Issue.State.OPEN) { existingUpgradeIssue);
issueNumber = existingUpgradeIssue.getNumber(); if (existingUpgradeIssue != null && existingUpgradeIssue.getState() == Issue.State.CLOSED) {
} existingUpgradeIssue.label(Arrays.asList("type: task", "status: superseded"));
else {
issueNumber = repository.openIssue(title,
(existingUpgradeIssue != null) ? "Supersedes #" + existingUpgradeIssue.getNumber() : "",
issueLabels, milestone);
if (existingUpgradeIssue != null && existingUpgradeIssue.getState() == Issue.State.CLOSED) {
existingUpgradeIssue.label(Arrays.asList("type: task", "status: superseded"));
}
}
if (existingUpgradeIssue != null) {
if (existingUpgradeIssue.getState() == Issue.State.CLOSED) {
System.out.println(" Issue: " + issueNumber + " - " + title + " (supersedes #"
+ existingUpgradeIssue.getNumber() + " " + existingUpgradeIssue.getTitle() + ")");
}
else {
System.out
.println(" Issue: " + issueNumber + " - " + title + " (completes existing upgrade)");
}
}
else {
System.out.println(" Issue: " + issueNumber + " - " + title);
} }
System.out.println(" Issue: " + issueNumber + " - " + title
+ getExistingUpgradeIssueMessageDetails(existingUpgradeIssue));
if (new ProcessBuilder().command("git", "add", modified.toFile().getAbsolutePath()) if (new ProcessBuilder().command("git", "add", modified.toFile().getAbsolutePath())
.start() .start()
.waitFor() != 0) { .waitFor() != 0) {
@ -154,6 +136,25 @@ public abstract class UpgradeDependencies extends DefaultTask {
} }
} }
private int getOrOpenUpgradeIssue(GitHubRepository repository, List<String> issueLabels, Milestone milestone,
String title, Issue existingUpgradeIssue) {
if (existingUpgradeIssue != null && existingUpgradeIssue.getState() == Issue.State.OPEN) {
return existingUpgradeIssue.getNumber();
}
String body = (existingUpgradeIssue != null) ? "Supersedes #" + existingUpgradeIssue.getNumber() : "";
return repository.openIssue(title, body, issueLabels, milestone);
}
private String getExistingUpgradeIssueMessageDetails(Issue existingUpgradeIssue) {
if (existingUpgradeIssue == null) {
return "";
}
if (existingUpgradeIssue.getState() != Issue.State.CLOSED) {
return " (completes existing upgrade)";
}
return " (supersedes #" + existingUpgradeIssue.getNumber() + " " + existingUpgradeIssue.getTitle() + ")";
}
private List<String> verifyLabels(GitHubRepository repository) { private List<String> verifyLabels(GitHubRepository repository) {
Set<String> availableLabels = repository.getLabels(); Set<String> availableLabels = repository.getLabels();
List<String> issueLabels = this.bom.getUpgrade().getGitHub().getIssueLabels(); List<String> issueLabels = this.bom.getUpgrade().getGitHub().getIssueLabels();

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java
View File

@ -117,9 +117,8 @@ public class JobLauncherApplicationRunner
public void afterPropertiesSet() { public void afterPropertiesSet() {
if (StringUtils.hasText(this.jobNames)) { if (StringUtils.hasText(this.jobNames)) {
for (String jobName : jobsToRun()) { for (String jobName : jobsToRun()) {
if (!isLocalJob(jobName) && !isRegisteredJob(jobName)) { Assert.isTrue(isLocalJob(jobName) || isRegisteredJob(jobName),
throw new IllegalArgumentException("No job found with name '" + jobName + "'"); () -> "No job found with name '" + jobName + "'");
}
} }
} }
} }

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
View File

@ -187,9 +187,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
} }
IllegalStateException ex = new IllegalStateException( IllegalStateException ex = new IllegalStateException(
String.format("Logback configuration error detected: %n%s", errors)); String.format("Logback configuration error detected: %n%s", errors));
for (Throwable suppressedException : suppressedExceptions) { suppressedExceptions.forEach(ex::addSuppressed);
ex.addSuppressed(suppressedException);
}
throw ex; throw ex;
} }