Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Moritz Halbritter
2023-08-08 09:27:45 +02:00
parent 00264cb9c8
commit ed9169501e
24 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/main/java/org/springframework/boot/jarmode/layertools/HelpCommand.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,10 +40,10 @@ class HelpCommand extends Command {
@Override
protected void run(Map<Option, String> options, List<String> parameters) {
run(System.out, options, parameters);
run(System.out, parameters);
}
void run(PrintStream out, Map<Option, String> options, List<String> parameters) {
void run(PrintStream out, List<String> parameters) {
Command command = (!parameters.isEmpty()) ? Command.find(this.commands, parameters.get(0)) : null;
if (command != null) {
printCommandHelp(out, command);
@@ -66,8 +66,7 @@ class HelpCommand extends Command {
}
private void printOptionSummary(PrintStream out, Option option, int padding) {
out.println(String.format(" --%-" + padding + "s %s", option.getNameAndValueDescription(),
option.getDescription()));
out.printf(" --%-" + padding + "s %s%n", option.getNameAndValueDescription(), option.getDescription());
}
private String getUsage(Command command) {
@@ -76,7 +75,7 @@ class HelpCommand extends Command {
if (!command.getOptions().isEmpty()) {
usage.append(" [options]");
}
command.getParameters().getDescriptions().forEach((param) -> usage.append(" " + param));
command.getParameters().getDescriptions().forEach((param) -> usage.append(" ").append(param));
return usage.toString();
}
@@ -95,7 +94,7 @@ class HelpCommand extends Command {
}
private void printCommandSummary(PrintStream out, Command command, int padding) {
out.println(String.format(" %-" + padding + "s %s", command.getName(), command.getDescription()));
out.printf(" %-" + padding + "s %s%n", command.getName(), command.getDescription());
}
private String getJavaCommand() {

6
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/HelpCommandTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,13 +62,13 @@ class HelpCommandTests {
@Test
void runWhenHasNoParametersPrintsUsage() {
this.command.run(this.out, Collections.emptyMap(), Collections.emptyList());
this.command.run(this.out, Collections.emptyList());
assertThat(this.out).hasSameContentAsResource("help-output.txt");
}
@Test
void runWhenHasNoCommandParameterPrintsUsage() {
this.command.run(this.out, Collections.emptyMap(), Arrays.asList("extract"));
this.command.run(this.out, Arrays.asList("extract"));
System.out.println(this.out);
assertThat(this.out).hasSameContentAsResource("help-extract-output.txt");
}