From 0b74a629aca0628d04f6f0633f70bba946e44620 Mon Sep 17 00:00:00 2001 From: Aniket Singh Date: Thu, 6 Nov 2025 11:41:21 +0530 Subject: [PATCH 1/2] CBL-7612 : Exposing _log APi for React Native --- .../couchbase/lite/internal/logging/Log.java | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/common/main/java/com/couchbase/lite/internal/logging/Log.java b/common/main/java/com/couchbase/lite/internal/logging/Log.java index e81879662..590e2bb25 100644 --- a/common/main/java/com/couchbase/lite/internal/logging/Log.java +++ b/common/main/java/com/couchbase/lite/internal/logging/Log.java @@ -64,7 +64,7 @@ private Log() { } // Utility class * @param domain The log domain. * @param msg The message you would like logged. */ - public static void d(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.DEBUG, domain, null, msg); } + public static void d(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.DEBUG, domain, null, msg); } /** * Send a DEBUG message and log the exception. @@ -74,7 +74,7 @@ private Log() { } // Utility class * @param err An exception to log */ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - log(LogLevel.DEBUG, domain, err, msg); + _log(LogLevel.DEBUG, domain, err, msg); } /** @@ -85,7 +85,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void d(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - log(LogLevel.DEBUG, domain, null, msg, args); + _log(LogLevel.DEBUG, domain, null, msg, args); } /** @@ -97,7 +97,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - log(LogLevel.DEBUG, domain, err, msg, args); + _log(LogLevel.DEBUG, domain, err, msg, args); } /** @@ -106,7 +106,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param domain The log domain. * @param msg The message you would like logged. */ - public static void i(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.INFO, domain, null, msg); } + public static void i(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.INFO, domain, null, msg); } /** * Send a INFO message and log the exception. @@ -116,11 +116,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param err An exception to log */ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - log(LogLevel.INFO, domain, err, msg); - } - - public static void info(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - i(domain, msg, err); + _log(LogLevel.INFO, domain, err, msg); } /** @@ -131,7 +127,7 @@ public static void info(@NonNull LogDomain domain, @NonNull String msg, @Nullabl * @param args Variable number of Object args to be used as params to formatString. */ public static void i(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - log(LogLevel.INFO, domain, null, msg, args); + _log(LogLevel.INFO, domain, null, msg, args); } /** @@ -143,7 +139,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - log(LogLevel.INFO, domain, err, msg, args); + _log(LogLevel.INFO, domain, err, msg, args); } /** @@ -152,7 +148,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param domain The log domain. * @param msg The message you would like logged. */ - public static void w(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.WARNING, domain, null, msg); } + public static void w(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.WARNING, domain, null, msg); } /** * Send a WARN message and log the exception. @@ -162,7 +158,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param err An exception to log */ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - log(LogLevel.WARNING, domain, err, msg); + _log(LogLevel.WARNING, domain, err, msg); } /** @@ -173,7 +169,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void w(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - log(LogLevel.WARNING, domain, null, msg, args); + _log(LogLevel.WARNING, domain, null, msg, args); } /** @@ -185,7 +181,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - log(LogLevel.WARNING, domain, err, msg, args); + _log(LogLevel.WARNING, domain, err, msg, args); } /** @@ -194,7 +190,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param domain The log domain. * @param msg The message you would like logged. */ - public static void e(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.ERROR, domain, null, msg); } + public static void e(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.ERROR, domain, null, msg); } /** * Send a ERROR message and log the exception. @@ -204,7 +200,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param err An exception to log */ public static void e(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - log(LogLevel.ERROR, domain, err, msg); + _log(LogLevel.ERROR, domain, err, msg); } /** @@ -215,7 +211,7 @@ public static void e(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void e(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - log(LogLevel.ERROR, domain, null, msg, args); + _log(LogLevel.ERROR, domain, null, msg, args); } /** @@ -227,7 +223,7 @@ public static void e(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void e(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - log(LogLevel.ERROR, domain, err, msg, args); + _log(LogLevel.ERROR, domain, err, msg, args); } @NonNull @@ -254,7 +250,8 @@ public static void setStandardErrorMessages(@NonNull Map stdErrM errorMessages = Collections.unmodifiableMap(new HashMap<>(stdErrMsgs)); } - private static void log( + @SuppressWarnings({"checkstyle:MethodName", "PMD.MethodNamingConventions"}) + public static void _log( @NonNull LogLevel level, @NonNull LogDomain domain, @Nullable Throwable err, From d40e3d577a94934be4663d10e98ddd872bb0f819 Mon Sep 17 00:00:00 2001 From: Aniket Singh Date: Thu, 6 Nov 2025 14:10:39 +0530 Subject: [PATCH 2/2] Updated from _log to log --- .../couchbase/lite/internal/logging/Log.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/common/main/java/com/couchbase/lite/internal/logging/Log.java b/common/main/java/com/couchbase/lite/internal/logging/Log.java index 590e2bb25..eefb8e9ec 100644 --- a/common/main/java/com/couchbase/lite/internal/logging/Log.java +++ b/common/main/java/com/couchbase/lite/internal/logging/Log.java @@ -31,6 +31,7 @@ import com.couchbase.lite.LogDomain; import com.couchbase.lite.LogLevel; import com.couchbase.lite.internal.CouchbaseLiteInternal; +import com.couchbase.lite.internal.utils.Internal; /** @@ -43,6 +44,7 @@ * v: used by core: please do not use in platform coded. * d: low-level debugging information */ +@Internal("This class is not part of the public API") @SuppressWarnings("PMD.TooManyMethods") public final class Log { private Log() { } // Utility class @@ -64,7 +66,7 @@ private Log() { } // Utility class * @param domain The log domain. * @param msg The message you would like logged. */ - public static void d(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.DEBUG, domain, null, msg); } + public static void d(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.DEBUG, domain, null, msg); } /** * Send a DEBUG message and log the exception. @@ -74,7 +76,7 @@ private Log() { } // Utility class * @param err An exception to log */ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - _log(LogLevel.DEBUG, domain, err, msg); + log(LogLevel.DEBUG, domain, err, msg); } /** @@ -85,7 +87,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void d(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - _log(LogLevel.DEBUG, domain, null, msg, args); + log(LogLevel.DEBUG, domain, null, msg, args); } /** @@ -97,7 +99,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - _log(LogLevel.DEBUG, domain, err, msg, args); + log(LogLevel.DEBUG, domain, err, msg, args); } /** @@ -106,7 +108,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param domain The log domain. * @param msg The message you would like logged. */ - public static void i(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.INFO, domain, null, msg); } + public static void i(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.INFO, domain, null, msg); } /** * Send a INFO message and log the exception. @@ -116,7 +118,7 @@ public static void d(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param err An exception to log */ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - _log(LogLevel.INFO, domain, err, msg); + log(LogLevel.INFO, domain, err, msg); } /** @@ -127,7 +129,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void i(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - _log(LogLevel.INFO, domain, null, msg, args); + log(LogLevel.INFO, domain, null, msg, args); } /** @@ -139,7 +141,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - _log(LogLevel.INFO, domain, err, msg, args); + log(LogLevel.INFO, domain, err, msg, args); } /** @@ -148,7 +150,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param domain The log domain. * @param msg The message you would like logged. */ - public static void w(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.WARNING, domain, null, msg); } + public static void w(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.WARNING, domain, null, msg); } /** * Send a WARN message and log the exception. @@ -158,7 +160,7 @@ public static void i(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param err An exception to log */ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - _log(LogLevel.WARNING, domain, err, msg); + log(LogLevel.WARNING, domain, err, msg); } /** @@ -169,7 +171,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void w(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - _log(LogLevel.WARNING, domain, null, msg, args); + log(LogLevel.WARNING, domain, null, msg, args); } /** @@ -181,7 +183,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - _log(LogLevel.WARNING, domain, err, msg, args); + log(LogLevel.WARNING, domain, err, msg, args); } /** @@ -190,7 +192,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param domain The log domain. * @param msg The message you would like logged. */ - public static void e(@NonNull LogDomain domain, @NonNull String msg) { _log(LogLevel.ERROR, domain, null, msg); } + public static void e(@NonNull LogDomain domain, @NonNull String msg) { log(LogLevel.ERROR, domain, null, msg); } /** * Send a ERROR message and log the exception. @@ -200,7 +202,7 @@ public static void w(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param err An exception to log */ public static void e(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err) { - _log(LogLevel.ERROR, domain, err, msg); + log(LogLevel.ERROR, domain, err, msg); } /** @@ -211,7 +213,7 @@ public static void e(@NonNull LogDomain domain, @NonNull String msg, @Nullable T * @param args Variable number of Object args to be used as params to formatString. */ public static void e(@NonNull LogDomain domain, @NonNull String msg, Object... args) { - _log(LogLevel.ERROR, domain, null, msg, args); + log(LogLevel.ERROR, domain, null, msg, args); } /** @@ -223,7 +225,7 @@ public static void e(@NonNull LogDomain domain, @NonNull String msg, Object... a * @param args Variable number of Object args to be used as params to formatString. */ public static void e(@NonNull LogDomain domain, @NonNull String msg, @Nullable Throwable err, Object... args) { - _log(LogLevel.ERROR, domain, err, msg, args); + log(LogLevel.ERROR, domain, err, msg, args); } @NonNull @@ -250,8 +252,8 @@ public static void setStandardErrorMessages(@NonNull Map stdErrM errorMessages = Collections.unmodifiableMap(new HashMap<>(stdErrMsgs)); } - @SuppressWarnings({"checkstyle:MethodName", "PMD.MethodNamingConventions"}) - public static void _log( + /* Internal used for testing purpose. */ + public static void log( @NonNull LogLevel level, @NonNull LogDomain domain, @Nullable Throwable err,