From 86261b233c9f4cef11dd491bb0500dea77811cf5 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Thu, 2 Oct 2014 18:03:22 +0200 Subject: [PATCH] Log cleanup --- .../src/main/java/org/sonar/batch/index/DefaultIndex.java | 2 +- .../src/main/java/org/sonar/batch/scan/SensorWrapper.java | 6 +++++- .../java/org/sonar/batch/scan2/DefaultSensorContext.java | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java index 870bf5ab875..ecf5e24d8e5 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java @@ -216,7 +216,7 @@ public class DefaultIndex extends SonarIndex { throw new SonarException("Unknown metric: " + measure.getMetricKey()); } if (!isTechnicalProjectCopy(resource) && !measure.isFromCore() && DefaultSensorContext.INTERNAL_METRICS.contains(metric)) { - LOG.warn("Metric " + metric.key() + " is an internal metric computed by SonarQube. Please update your plugin."); + LOG.debug("Metric " + metric.key() + " is an internal metric computed by SonarQube. Please update your plugin."); return measure; } measure.setMetric(metric); diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/SensorWrapper.java b/sonar-batch/src/main/java/org/sonar/batch/scan/SensorWrapper.java index 32a49a16492..4639a8fbd83 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/SensorWrapper.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/SensorWrapper.java @@ -19,6 +19,8 @@ */ package org.sonar.batch.scan; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.DependedUpon; import org.sonar.api.batch.DependsUpon; import org.sonar.api.batch.measure.Metric; @@ -33,6 +35,8 @@ import java.util.List; public class SensorWrapper implements org.sonar.api.batch.Sensor { + private static final Logger LOG = LoggerFactory.getLogger(SensorWrapper.class); + private Sensor wrappedSensor; private SensorContext adaptor; private DefaultSensorDescriptor descriptor; @@ -72,6 +76,6 @@ public class SensorWrapper implements org.sonar.api.batch.Sensor { @Override public String toString() { - return descriptor.name() + " (wrapped)"; + return descriptor.name() + (LOG.isDebugEnabled() ? " (wrapped)" : ""); } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java index 0438d44c763..486c241f7a2 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultSensorContext.java @@ -110,8 +110,7 @@ public class DefaultSensorContext extends BaseSensorContext { public void store(Measure newMeasure) { DefaultMeasure measure = (DefaultMeasure) newMeasure; if (!measure.isFromCore() && INTERNAL_METRICS.contains(measure.metric())) { - LOG.warn("Metric " + measure.metric().key() + " is an internal metric computed by SonarQube. Please remove or update offending plugin."); - return; + throw new IllegalArgumentException("Metric " + measure.metric().key() + " is an internal metric computed by SonarQube. Please remove or update offending plugin."); } InputFile inputFile = measure.inputFile(); if (inputFile != null) { -- 2.39.5