Skip to content

Fix main branch by reverting requirements on message for log to not be #23299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apupier merged 1 commit into from
May 19, 2026
+9 −18
Merged

Fix main branch by reverting requirements on message for log to not be #23299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ public String toString() {
return "Logger[" + log + "]";
}

public void log(String message, LoggingLevel loggingLevel) {
Objects.requireNonNull(message, "message");
public void log(@Nullable String message, LoggingLevel loggingLevel) {
Objects.requireNonNull(loggingLevel, "loggingLevel");
LoggingLevel oldLogLevel = getLevel();
setLevel(loggingLevel);
Expand All @@ -86,8 +85,7 @@ public void log(String message, LoggingLevel loggingLevel) {
*
* @param message the message to log, if {@link #shouldLog()} returned <tt>true</tt>
*/
public void log(String message) {
Objects.requireNonNull(message, "message");
public void log(@Nullable String message) {
if (shouldLog(log, level)) {
if (marker != null) {
log(log, level, marker, message);
Expand All @@ -102,24 +100,21 @@ public void log(String message) {
*
* @param message the message to log
*/
public void doLog(String message) {
Objects.requireNonNull(message, "message");
public void doLog(@Nullable String message) {
if (marker != null) {
log(log, level, marker, message);
} else {
log(log, level, message);
}
}

public void log(String message, Throwable exception, LoggingLevel loggingLevel) {
Objects.requireNonNull(message, "message");
public void log(@Nullable String message, Throwable exception, LoggingLevel loggingLevel) {
Objects.requireNonNull(exception, "exception");
Objects.requireNonNull(loggingLevel, "loggingLevel");
log(log, loggingLevel, marker, message, exception);
}

public void log(String message, Throwable exception) {
Objects.requireNonNull(message, "message");
public void log(@Nullable String message, Throwable exception) {
Objects.requireNonNull(exception, "exception");
if (shouldLog(log, level)) {
log(log, level, marker, message, exception);
Expand Down Expand Up @@ -167,10 +162,9 @@ public void setMarker(@Nullable String marker) {
}
}

public static void log(Logger log, LoggingLevel level, String message) {
public static void log(Logger log, LoggingLevel level, @Nullable String message) {
Objects.requireNonNull(log, "log");
Objects.requireNonNull(level, "level");
Objects.requireNonNull(message, "message");
switch (level) {
case DEBUG:
log.debug(message);
Expand All @@ -191,11 +185,10 @@ public static void log(Logger log, LoggingLevel level, String message) {
}
}

public static void log(Logger log, LoggingLevel level, Marker marker, String message) {
public static void log(Logger log, LoggingLevel level, Marker marker, @Nullable String message) {
Objects.requireNonNull(log, "log");
Objects.requireNonNull(level, "level");
Objects.requireNonNull(marker, "marker");
Objects.requireNonNull(message, "message");
switch (level) {
case DEBUG:
log.debug(marker, message);
Expand All @@ -216,10 +209,9 @@ public static void log(Logger log, LoggingLevel level, Marker marker, String mes
}
}

public static void log(Logger log, LoggingLevel level, String message, Throwable th) {
public static void log(Logger log, LoggingLevel level, @Nullable String message, Throwable th) {
Objects.requireNonNull(log, "log");
Objects.requireNonNull(level, "level");
Objects.requireNonNull(message, "message");
Objects.requireNonNull(th, "th");
switch (level) {
case DEBUG:
Expand All @@ -241,10 +233,9 @@ public static void log(Logger log, LoggingLevel level, String message, Throwable
}
}

public static void log(Logger log, LoggingLevel level, @Nullable Marker marker, String message, Throwable th) {
public static void log(Logger log, LoggingLevel level, @Nullable Marker marker, @Nullable String message, Throwable th) {
Objects.requireNonNull(log, "log");
Objects.requireNonNull(level, "level");
Objects.requireNonNull(message, "message");
Objects.requireNonNull(th, "th");
if (marker == null) {
log(log, level, message, th);
Expand Down