diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/GradleLogger.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/GradleLogger.java deleted file mode 100644 index 8acbe9319c964..0000000000000 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/GradleLogger.java +++ /dev/null @@ -1,197 +0,0 @@ -package io.quarkus.gradle.tasks; - -import java.text.MessageFormat; -import java.util.Collections; -import java.util.Map; -import java.util.function.Supplier; - -import org.jboss.logging.Logger; -import org.jboss.logging.LoggerProvider; -import org.wildfly.common.Assert; - -public class GradleLogger implements LoggerProvider { - static final Object[] NO_PARAMS = new Object[0]; - - public static volatile Supplier logSupplier; - - @Override - public Logger getLogger(final String name) { - return new Logger(name) { - @Override - protected void doLog(final Level level, final String loggerClassName, final Object message, - final Object[] parameters, final Throwable thrown) { - final Supplier logSupplier = GradleLogger.logSupplier; - if (logSupplier != null) { - org.gradle.api.logging.Logger log = logSupplier.get(); - String text; - if (parameters == null || parameters.length == 0) { - text = String.valueOf(message); - } else - try { - text = MessageFormat.format(String.valueOf(message), parameters); - } catch (Exception e) { - text = invalidFormat(String.valueOf(message), parameters); - } - doActualLog(log, level, text, thrown); - } - } - - @Override - protected void doLogf(final Level level, final String loggerClassName, final String format, - final Object[] parameters, final Throwable thrown) { - final Supplier logSupplier = GradleLogger.logSupplier; - if (logSupplier != null) { - org.gradle.api.logging.Logger log = logSupplier.get(); - String text; - if (parameters == null) - try { - //noinspection RedundantStringFormatCall - text = String.format(format); - } catch (Exception e) { - text = invalidFormat(format, NO_PARAMS); - } - else - try { - text = String.format(format, (Object[]) parameters); - } catch (Exception e) { - text = invalidFormat(format, parameters); - } - if (!text.startsWith("JBoss Threads version")) { - doActualLog(log, level, text, thrown); - } - } - } - - @Override - public boolean isEnabled(final Level level) { - final Supplier logSupplier = GradleLogger.logSupplier; - if (logSupplier == null) - return false; - org.gradle.api.logging.Logger log = logSupplier.get(); - switch (level) { - case FATAL: - case ERROR: - return log.isErrorEnabled(); - case WARN: - return log.isWarnEnabled(); - case INFO: - return log.isInfoEnabled(); - default: - return log.isDebugEnabled(); - } - } - - void doActualLog(final org.gradle.api.logging.Logger log, final Level level, final String message, - final Throwable thrown) { - //TODO: will fix this in the upcoming version of æsh - // style options are limited unless we crack into jansi ourselves - //buffer.strong("[").project(name).strong("]").a(" ").a(message); - StringBuilder buffer = new StringBuilder(); - buffer.append("[").append(name).append("]").append(" ").append(message); - if (thrown != null) { - switch (level) { - case FATAL: - case ERROR: - log.error(buffer.toString(), thrown); - break; - case WARN: - log.warn(buffer.toString(), thrown); - break; - case INFO: - log.info(buffer.toString(), thrown); - break; - default: - log.debug(buffer.toString(), thrown); - break; - } - } else { - switch (level) { - case FATAL: - case ERROR: - log.error(buffer.toString()); - break; - case WARN: - log.warn(buffer.toString()); - break; - case INFO: - log.info(buffer.toString()); - break; - default: - log.debug(buffer.toString()); - break; - } - } - } - }; - } - - String invalidFormat(final String format, final Object[] parameters) { - final StringBuilder b = new StringBuilder("** invalid format \'" + format + "\'"); - if (parameters != null && parameters.length > 0) { - b.append(" [").append(parameters[0]); - for (int i = 1; i < parameters.length; i++) { - b.append(',').append(parameters[i]); - } - b.append("]"); - } - return b.toString(); - } - - @Override - public void clearMdc() { - } - - @Override - public Object putMdc(final String key, final Object value) { - //throw Assert.unsupported(); - return null; - } - - @Override - public Object getMdc(final String key) { - return null; - } - - @Override - public void removeMdc(final String key) { - } - - @Override - public Map getMdcMap() { - return Collections.emptyMap(); - } - - @Override - public void clearNdc() { - } - - @Override - public String getNdc() { - return ""; - } - - @Override - public int getNdcDepth() { - return 0; - } - - @Override - public String popNdc() { - return ""; - } - - @Override - public String peekNdc() { - return ""; - } - - @Override - public void pushNdc(final String message) { - throw Assert.unsupported(); - } - - @Override - public void setNdcMaxDepth(final int maxDepth) { - } - -} diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java index 254433b5155c3..62a24bbdc5abc 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusTask.java @@ -13,8 +13,6 @@ public abstract class QuarkusTask extends DefaultTask { private QuarkusPluginExtension extension; QuarkusTask(String description) { - GradleLogger.logSupplier = this::getLogger; - setDescription(description); setGroup("quarkus"); }