Skip to content

Commit

Permalink
Merge pull request #23149 from qmonmert/fix/23141
Browse files Browse the repository at this point in the history
Sonar: Remove this use of 'getMarker'; it is deprecated
  • Loading branch information
DanielFran authored Aug 12, 2023
2 parents bc180e0 + cfcdea6 commit dbf9c01
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ch.qos.logback.core.pattern.CompositeConverter;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.slf4j.Marker;
Expand Down Expand Up @@ -46,7 +47,8 @@ public class CRLFLogConverter extends CompositeConverter<ILoggingEvent> {
@Override
protected String transform(ILoggingEvent event, String in) {
AnsiElement element = ELEMENTS.get(getFirstOption());
if ((event.getMarker() != null && event.getMarker().contains(CRLF_SAFE_MARKER)) || isLoggerSafe(event)) {
List<Marker> markers = event.getMarkerList();
if ((markers != null && !markers.isEmpty() && markers.get(0).contains(CRLF_SAFE_MARKER)) || isLoggerSafe(event)) {
return in;
}
String replacement = element == null ? "_" : toAnsiString("_", element);
Expand Down

0 comments on commit dbf9c01

Please sign in to comment.