aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2019-11-15 16:08:57 +0100
committerSonarTech <sonartech@sonarsource.com>2019-11-21 20:21:09 +0100
commit85ea67c9c1e440af9b346f3668058756fc86ad5d (patch)
treea80a26289bb36b21d2e8b85da33e68c406d6c4ef
parentedb900d518a022846a4ac646a4d66b757d6dc1eb (diff)
downloadsonarqube-85ea67c9c1e440af9b346f3668058756fc86ad5d.tar.gz
sonarqube-85ea67c9c1e440af9b346f3668058756fc86ad5d.zip
Restore backward compatibility
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/utils/log/AbstractLogTester.java10
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTester.java2
-rw-r--r--sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTesterJUnit5.java2
3 files changed, 7 insertions, 7 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/AbstractLogTester.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/AbstractLogTester.java
index e6b8ad41864..1fc14c581db 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/AbstractLogTester.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/AbstractLogTester.java
@@ -21,7 +21,7 @@ package org.sonar.api.utils.log;
import java.util.List;
-class AbstractLogTester {
+class AbstractLogTester<G extends AbstractLogTester> {
protected void before() {
// this shared instance breaks compatibility with parallel execution of tests
@@ -42,9 +42,9 @@ class AbstractLogTester {
* Enable/disable debug logs. Info, warn and error logs are always enabled.
* By default INFO logs are enabled when LogTester is started.
*/
- public AbstractLogTester setLevel(LoggerLevel level) {
+ public G setLevel(LoggerLevel level) {
Loggers.getFactory().setLevel(level);
- return this;
+ return (G) this;
}
/**
@@ -77,8 +77,8 @@ class AbstractLogTester {
return ((ListInterceptor) LogInterceptors.get()).getLogs(level);
}
- public AbstractLogTester clear() {
+ public G clear() {
((ListInterceptor) LogInterceptors.get()).clear();
- return this;
+ return (G) this;
}
}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTester.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTester.java
index 0a85da680a4..28798f4ee2b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTester.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTester.java
@@ -56,7 +56,7 @@ import org.junit.runners.model.Statement;
*
* @since 5.1
*/
-public class LogTester extends AbstractLogTester implements TestRule {
+public class LogTester extends AbstractLogTester<LogTester> implements TestRule {
public Statement apply(Statement base, Description description) {
return statement(base);
}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTesterJUnit5.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTesterJUnit5.java
index 7ed6a717078..d4bae55c4ce 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTesterJUnit5.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LogTesterJUnit5.java
@@ -56,7 +56,7 @@ import org.junit.jupiter.api.extension.ExtensionContext;
*
* @since 8.1
*/
-public class LogTesterJUnit5 extends AbstractLogTester implements BeforeTestExecutionCallback, AfterTestExecutionCallback {
+public class LogTesterJUnit5 extends AbstractLogTester<LogTesterJUnit5> implements BeforeTestExecutionCallback, AfterTestExecutionCallback {
@Override
public void beforeTestExecution(ExtensionContext context) throws Exception {