Skip to content

Commit cfe6d21

Browse files
authored
clean: Remove CLI colors (#821)
1 parent 06c8a9e commit cfe6d21

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

applications/spring-shell/src/main/java/org/springframework/sbm/shell/ApplyCommandRenderer.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import lombok.Setter;
1919
import org.jline.utils.AttributedString;
2020
import org.jline.utils.AttributedStringBuilder;
21-
import org.jline.utils.AttributedStyle;
2221
import org.springframework.context.event.EventListener;
2322
import org.springframework.sbm.engine.events.*;
2423
import org.springframework.sbm.engine.recipe.Action;
@@ -67,7 +66,6 @@ public class ApplyCommandRenderer {
6766
public AttributedString render(String recipeName, List<Action> actions) {
6867
AttributedStringBuilder builder = new AttributedStringBuilder();
6968
builder.append("\n");
70-
builder.style(AttributedStyle.DEFAULT.italicDefault());
7169
builder.append(recipeName);
7270
builder.append(" successfully applied the following actions:\n")
7371
.append(actions.stream()

applications/spring-shell/src/main/java/org/springframework/sbm/shell/ApplyShellCommand.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.jline.utils.AttributedString;
2222
import org.jline.utils.AttributedStringBuilder;
2323
import org.jline.utils.AttributedStyle;
24-
import org.jline.utils.Colors;
2524
import org.springframework.sbm.engine.commands.ApplicableRecipeListCommand;
2625
import org.springframework.sbm.engine.commands.ApplyCommand;
2726
import org.springframework.sbm.engine.context.ProjectContext;
@@ -84,7 +83,7 @@ public AttributedString apply(@ShellOption(arity = 1, valueProvider = ApplyRecip
8483
private AttributedStringBuilder buildHeader(String recipeName) {
8584
AttributedStringBuilder builder = new AttributedStringBuilder();
8685
builder.append("Applying recipe ");
87-
builder.style(AttributedStyle.DEFAULT.italicDefault().boldDefault().foreground(Colors.rgbColor("yellow")));
86+
builder.style(AttributedStyle.DEFAULT.boldDefault());
8887
builder.append("'")
8988
.append(recipeName)
9089
.append("'");

applications/spring-shell/src/main/java/org/springframework/sbm/shell/PreconditionVerificationRenderer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class PreconditionVerificationRenderer {
2828

2929
public String renderPreconditionCheckResults(PreconditionVerificationResult result) {
3030
AttributedStringBuilder stringBuilder = new AttributedStringBuilder();
31-
stringBuilder.style(stringBuilder.style().DEFAULT.bold().foreground(Colors.rgbColor("black")));
31+
stringBuilder.style(stringBuilder.style().DEFAULT.bold());
3232
stringBuilder.append("\n\n").append(String.format("Checked preconditions for '%s'", result.getProjectRoot())).append("\n");
3333

3434
result.getResults().forEach(r -> stringBuilder.append(renderCheckResult(r)));

applications/spring-shell/src/main/java/org/springframework/sbm/shell/ScanCommandHeaderRenderer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717

1818
import org.jline.utils.AttributedStringBuilder;
1919
import org.jline.utils.AttributedStyle;
20-
import org.jline.utils.Colors;
2120
import org.springframework.stereotype.Component;
2221

2322
@Component
2423
public class ScanCommandHeaderRenderer {
2524
public String renderHeader(String projectRoot) {
2625
AttributedStringBuilder builder = new AttributedStringBuilder();
2726
builder.append("\n");
28-
builder.style(AttributedStyle.DEFAULT.italicDefault().boldDefault().foreground(Colors.rgbColor("green")));
27+
builder.style(AttributedStyle.DEFAULT.boldDefault());
2928
builder.append("scanning '").append(projectRoot).append("'");
3029
return builder.toAnsi();
3130
}

applications/spring-shell/src/test/java/org/springframework/sbm/shell/ApplyRecipeCommandHeaderRendererTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ class ApplyRecipeCommandHeaderRendererTest {
2525
void renderHeader() {
2626
ScanCommandHeaderRenderer sut = new ScanCommandHeaderRenderer();
2727
String s = sut.renderHeader("some/path");
28-
assertThat(s).isEqualTo("\n\u001B[32mscanning 'some/path'\u001B[0m");
28+
assertThat(s).isEqualTo("\nscanning 'some/path'");
2929
}
3030
}

applications/spring-shell/src/test/java/org/springframework/sbm/shell/PreconditionVerificationRendererTest.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ void renderPreconditionCheckResult() {
4141
checkResult.addResult(failedResult);
4242

4343
String s = sut.renderPreconditionCheckResults(checkResult);
44-
assertThat(s).isEqualTo("\u001B[30;1m\n" +
44+
assertThat(s).isEqualTo(
45+
"\u001B[1m\n" +
4546
"\n" +
4647
"Checked preconditions for '" +projectRoot+ "'\n" +
4748
"\u001B[32;1m[ok]\u001B[0m passed\n" +
4849
"\u001B[93;1m [!]\u001B[0m warn\n" +
4950
"\u001B[91;1m [X]\u001B[0m failed\n" +
5051
"\n" +
51-
"\u001B[0m");
52+
"\u001B[0m"
53+
);
5254
}
5355
}

0 commit comments

Comments
 (0)