|
@@ -94,20 +94,33 @@ public abstract class GenericTestUtils {
|
|
public static final String ERROR_INVALID_ARGUMENT =
|
|
public static final String ERROR_INVALID_ARGUMENT =
|
|
"Total wait time should be greater than check interval time";
|
|
"Total wait time should be greater than check interval time";
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated use {@link #disableLog(org.slf4j.Logger)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
public static void disableLog(Log log) {
|
|
public static void disableLog(Log log) {
|
|
// We expect that commons-logging is a wrapper around Log4j.
|
|
// We expect that commons-logging is a wrapper around Log4j.
|
|
disableLog((Log4JLogger) log);
|
|
disableLog((Log4JLogger) log);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Deprecated
|
|
public static Logger toLog4j(org.slf4j.Logger logger) {
|
|
public static Logger toLog4j(org.slf4j.Logger logger) {
|
|
return LogManager.getLogger(logger.getName());
|
|
return LogManager.getLogger(logger.getName());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated use {@link #disableLog(org.slf4j.Logger)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
public static void disableLog(Log4JLogger log) {
|
|
public static void disableLog(Log4JLogger log) {
|
|
log.getLogger().setLevel(Level.OFF);
|
|
log.getLogger().setLevel(Level.OFF);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated use {@link #disableLog(org.slf4j.Logger)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
public static void disableLog(Logger logger) {
|
|
public static void disableLog(Logger logger) {
|
|
logger.setLevel(Level.OFF);
|
|
logger.setLevel(Level.OFF);
|
|
}
|
|
}
|
|
@@ -116,20 +129,40 @@ public abstract class GenericTestUtils {
|
|
disableLog(toLog4j(logger));
|
|
disableLog(toLog4j(logger));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated
|
|
|
|
+ * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
public static void setLogLevel(Log log, Level level) {
|
|
public static void setLogLevel(Log log, Level level) {
|
|
// We expect that commons-logging is a wrapper around Log4j.
|
|
// We expect that commons-logging is a wrapper around Log4j.
|
|
setLogLevel((Log4JLogger) log, level);
|
|
setLogLevel((Log4JLogger) log, level);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated
|
|
|
|
+ * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
public static void setLogLevel(Log4JLogger log, Level level) {
|
|
public static void setLogLevel(Log4JLogger log, Level level) {
|
|
log.getLogger().setLevel(level);
|
|
log.getLogger().setLevel(level);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated
|
|
|
|
+ * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
public static void setLogLevel(Logger logger, Level level) {
|
|
public static void setLogLevel(Logger logger, Level level) {
|
|
logger.setLevel(level);
|
|
logger.setLevel(level);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @deprecated
|
|
|
|
+ * use {@link #setLogLevel(org.slf4j.Logger, org.slf4j.event.Level)} instead
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
public static void setLogLevel(org.slf4j.Logger logger, Level level) {
|
|
public static void setLogLevel(org.slf4j.Logger logger, Level level) {
|
|
setLogLevel(toLog4j(logger), level);
|
|
setLogLevel(toLog4j(logger), level);
|
|
}
|
|
}
|