Skip to content
Open
Changes from 1 commit
Commits
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
39 changes: 18 additions & 21 deletions common/main/java/com/couchbase/lite/internal/logging/Log.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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.
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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.
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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.
Expand All @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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
Expand All @@ -254,7 +250,8 @@ public static void setStandardErrorMessages(@NonNull Map<String, String> 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,
Expand Down