Skip to content

Commit

Permalink
Merge pull request #34749 from Abhijeetmishr
Browse files Browse the repository at this point in the history 
* pr/34749:
  Polish "Add support for additional colors in Log4j2 and Logback"
  Add support for additional colors in Log4j2 and Logback

Closes gh-34749
  • Loading branch information
@snicoll
snicoll committed Apr 5, 2023
2 parents e7647a6 + 6cf08a3 commit 1fd68ae
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 3 deletions.
12 changes: 11 additions & 1 deletion ...ect/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 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.
Expand Down Expand Up @@ -53,13 +53,23 @@ public final class ColorConverter extends LogEventPatternConverter {

static {
Map<String, AnsiElement> ansiElements = new HashMap<>();
ansiElements.put("black", AnsiColor.BLACK);
ansiElements.put("white", AnsiColor.WHITE);
ansiElements.put("faint", AnsiStyle.FAINT);
ansiElements.put("red", AnsiColor.RED);
ansiElements.put("green", AnsiColor.GREEN);
ansiElements.put("yellow", AnsiColor.YELLOW);
ansiElements.put("blue", AnsiColor.BLUE);
ansiElements.put("magenta", AnsiColor.MAGENTA);
ansiElements.put("cyan", AnsiColor.CYAN);
ansiElements.put("bright_black", AnsiColor.BRIGHT_BLACK);
ansiElements.put("bright_white", AnsiColor.BRIGHT_WHITE);
ansiElements.put("bright_red", AnsiColor.BRIGHT_RED);
ansiElements.put("bright_green", AnsiColor.BRIGHT_GREEN);
ansiElements.put("bright_yellow", AnsiColor.BRIGHT_YELLOW);
ansiElements.put("bright_blue", AnsiColor.BRIGHT_BLUE);
ansiElements.put("bright_magenta", AnsiColor.BRIGHT_MAGENTA);
ansiElements.put("bright_cyan", AnsiColor.BRIGHT_CYAN);
ELEMENTS = Collections.unmodifiableMap(ansiElements);
}

Expand Down
12 changes: 11 additions & 1 deletion ...ct/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 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.
Expand Down Expand Up @@ -43,13 +43,23 @@ public class ColorConverter extends CompositeConverter<ILoggingEvent> {

static {
Map<String, AnsiElement> ansiElements = new HashMap<>();
ansiElements.put("black", AnsiColor.BLACK);
ansiElements.put("white", AnsiColor.WHITE);
ansiElements.put("faint", AnsiStyle.FAINT);
ansiElements.put("red", AnsiColor.RED);
ansiElements.put("green", AnsiColor.GREEN);
ansiElements.put("yellow", AnsiColor.YELLOW);
ansiElements.put("blue", AnsiColor.BLUE);
ansiElements.put("magenta", AnsiColor.MAGENTA);
ansiElements.put("cyan", AnsiColor.CYAN);
ansiElements.put("bright_black", AnsiColor.BRIGHT_BLACK);
ansiElements.put("bright_white", AnsiColor.BRIGHT_WHITE);
ansiElements.put("bright_red", AnsiColor.BRIGHT_RED);
ansiElements.put("bright_green", AnsiColor.BRIGHT_GREEN);
ansiElements.put("bright_yellow", AnsiColor.BRIGHT_YELLOW);
ansiElements.put("bright_blue", AnsiColor.BRIGHT_BLUE);
ansiElements.put("bright_magenta", AnsiColor.BRIGHT_MAGENTA);
ansiElements.put("bright_cyan", AnsiColor.BRIGHT_CYAN);
ELEMENTS = Collections.unmodifiableMap(ansiElements);
}

Expand Down
70 changes: 70 additions & 0 deletions ...pring-boot/src/test/java/org/springframework/boot/logging/log4j2/ColorConverterTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@ private ColorConverter newConverter(String styling) {
return ColorConverter.newInstance(null, new String[] { this.in, styling });
}

@Test
void black() {
StringBuilder output = new StringBuilder();
newConverter("black").format(this.event, output);
assertThat(output).hasToString("\033[30min\033[0;39m");
}

@Test
void white() {
StringBuilder output = new StringBuilder();
newConverter("white").format(this.event, output);
assertThat(output).hasToString("\033[37min\033[0;39m");
}

@Test
void faint() {
StringBuilder output = new StringBuilder();
Expand Down Expand Up @@ -106,6 +120,62 @@ void cyan() {
assertThat(output).hasToString("\033[36min\033[0;39m");
}

@Test
void brightBlack() {
StringBuilder output = new StringBuilder();
newConverter("bright_black").format(this.event, output);
assertThat(output).hasToString("\033[90min\033[0;39m");
}

@Test
void brightWhite() {
StringBuilder output = new StringBuilder();
newConverter("bright_white").format(this.event, output);
assertThat(output).hasToString("\033[97min\033[0;39m");
}

@Test
void brightRed() {
StringBuilder output = new StringBuilder();
newConverter("bright_red").format(this.event, output);
assertThat(output).hasToString("\033[91min\033[0;39m");
}

@Test
void brightGreen() {
StringBuilder output = new StringBuilder();
newConverter("bright_green").format(this.event, output);
assertThat(output).hasToString("\033[92min\033[0;39m");
}

@Test
void brightYellow() {
StringBuilder output = new StringBuilder();
newConverter("bright_yellow").format(this.event, output);
assertThat(output).hasToString("\033[93min\033[0;39m");
}

@Test
void brightBlue() {
StringBuilder output = new StringBuilder();
newConverter("bright_blue").format(this.event, output);
assertThat(output).hasToString("\033[94min\033[0;39m");
}

@Test
void brightMagenta() {
StringBuilder output = new StringBuilder();
newConverter("bright_magenta").format(this.event, output);
assertThat(output).hasToString("\033[95min\033[0;39m");
}

@Test
void brightCyan() {
StringBuilder output = new StringBuilder();
newConverter("bright_cyan").format(this.event, output);
assertThat(output).hasToString("\033[96min\033[0;39m");
}

@Test
void highlightFatal() {
this.event.setLevel(Level.FATAL);
Expand Down
72 changes: 71 additions & 1 deletion ...ring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 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.
Expand Down Expand Up @@ -51,6 +51,20 @@ static void resetAnsi() {
AnsiOutput.setEnabled(AnsiOutput.Enabled.DETECT);
}

@Test
void black() {
this.converter.setOptionList(Collections.singletonList("black"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[30min\033[0;39m");
}

@Test
void white() {
this.converter.setOptionList(Collections.singletonList("white"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[37min\033[0;39m");
}

@Test
void faint() {
this.converter.setOptionList(Collections.singletonList("faint"));
Expand Down Expand Up @@ -100,6 +114,62 @@ void cyan() {
assertThat(out).isEqualTo("\033[36min\033[0;39m");
}

@Test
void brightBlack() {
this.converter.setOptionList(Collections.singletonList("bright_black"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[90min\033[0;39m");
}

@Test
void brightWhite() {
this.converter.setOptionList(Collections.singletonList("bright_white"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[97min\033[0;39m");
}

@Test
void brightRed() {
this.converter.setOptionList(Collections.singletonList("bright_red"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[91min\033[0;39m");
}

@Test
void brightGreen() {
this.converter.setOptionList(Collections.singletonList("bright_green"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[92min\033[0;39m");
}

@Test
void brightYellow() {
this.converter.setOptionList(Collections.singletonList("bright_yellow"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[93min\033[0;39m");
}

@Test
void brightBlue() {
this.converter.setOptionList(Collections.singletonList("bright_blue"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[94min\033[0;39m");
}

@Test
void brightMagenta() {
this.converter.setOptionList(Collections.singletonList("bright_magenta"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[95min\033[0;39m");
}

@Test
void brightCyan() {
this.converter.setOptionList(Collections.singletonList("bright_cyan"));
String out = this.converter.transform(this.event, this.in);
assertThat(out).isEqualTo("\033[96min\033[0;39m");
}

@Test
void highlightError() {
this.event.setLevel(Level.ERROR);
Expand Down

0 comments on commit 1fd68ae

Please sign in to comment.