Class should not access its own subclass during initialization

3 files changed, 65 insertions, 25 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
index 9a1aa4e82b2..5ae6979ac5f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Languages.java
@@ -26,8 +26,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang.ArrayUtils;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.ce.ComputeEngineSide;
+import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LoggerFactory.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LoggerFactory.java
new file mode 100644
index 00000000000..266b414be6f
--- /dev/null
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/LoggerFactory.java
@@ -0,0 +1,55 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2020 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.api.utils.log;
+
+/**
+ * @since 8.7
+ */
+public abstract class LoggerFactory {
+
+  private static Loggers factory;
+
+  private LoggerFactory() {
+    // no new instance
+  }
+
+  static {
+    try {
+      Class.forName("ch.qos.logback.classic.Logger");
+      factory = new LogbackLoggers();
+    } catch (Exception e) {
+      // no slf4j -> testing environment
+      factory = new ConsoleLoggers();
+    }
+  }
+
+  static Loggers getFactory(){
+    return factory;
+  }
+
+  static Logger get(Class<?> name) {
+    return factory.newInstance(name.getName());
+  }
+
+  static Logger get(String name) {
+    return factory.newInstance(name);
+  }
+
+}
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Loggers.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Loggers.java
index 7b7cd853fff..3d1217afc2f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Loggers.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/log/Loggers.java
@@ -19,33 +19,10 @@
  */
 package org.sonar.api.utils.log;
 
-/**
- * @since 5.1
- */
 public abstract class Loggers {
 
-  private static volatile Loggers factory;
-
-  static {
-    try {
-      Class.forName("ch.qos.logback.classic.Logger");
-      factory = new LogbackLoggers();
-    } catch (Throwable e) {
-      // no slf4j -> testing environment
-      factory = new ConsoleLoggers();
-    }
-  }
-
-  public static Logger get(Class<?> name) {
-    return factory.newInstance(name.getName());
-  }
-
-  public static Logger get(String name) {
-    return factory.newInstance(name);
-  }
-
   static Loggers getFactory() {
-    return factory;
+    return LoggerFactory.getFactory();
   }
 
   protected abstract Logger newInstance(String name);
@@ -54,4 +31,12 @@ public abstract class Loggers {
 
   protected abstract void setLevel(LoggerLevel level);
 
+  public static Logger get(Class<?> name) {
+    return LoggerFactory.get(name);
+  }
+
+  public static Logger get(String name) {
+    return LoggerFactory.get(name);
+  }
+
 }