From 19ae9f37f56583b2141c1da163f0bbc2c7bfc964 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 19 Aug 2015 18:17:56 +0200 Subject: [PATCH] remove unused classes in package computation/measure/newcoverage --- ...ReportComputeEngineContainerPopulator.java | 4 -- .../newcoverage/FileCoverageMetricKeys.java | 60 ------------------- .../newcoverage/ItFileCoverageMetricKeys.java | 60 ------------------- .../newcoverage/NewCoverageMetricKeys.java | 41 ------------- .../NewCoverageMetricKeysModule.java | 32 ---------- .../OverallFileCoverageMetricKeys.java | 60 ------------------- .../measure/newcoverage/package-info.java | 24 -------- 7 files changed, 281 deletions(-) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/FileCoverageMetricKeys.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/ItFileCoverageMetricKeys.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeys.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/OverallFileCoverageMetricKeys.java delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java index 0ba7ab203e6..046d7cefcc1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java @@ -65,7 +65,6 @@ import org.sonar.server.computation.issue.commonrule.TestErrorRule; import org.sonar.server.computation.language.LanguageRepositoryImpl; import org.sonar.server.computation.measure.MeasureComputersHolderImpl; import org.sonar.server.computation.measure.MeasureRepositoryImpl; -import org.sonar.server.computation.measure.newcoverage.NewCoverageMetricKeysModule; import org.sonar.server.computation.metric.MetricModule; import org.sonar.server.computation.period.PeriodsHolderImpl; import org.sonar.server.computation.qualitygate.EvaluationResultTextConverterImpl; @@ -131,9 +130,6 @@ public final class ReportComputeEngineContainerPopulator implements ContainerPop QualityGateServiceImpl.class, EvaluationResultTextConverterImpl.class, - // new coverage measures - NewCoverageMetricKeysModule.class, - // issues RuleCacheLoader.class, RuleRepositoryImpl.class, diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/FileCoverageMetricKeys.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/FileCoverageMetricKeys.java deleted file mode 100644 index 56429894740..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/FileCoverageMetricKeys.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube 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. - * - * SonarQube 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.server.computation.measure.newcoverage; - -import org.sonar.api.measures.CoreMetrics; - -public class FileCoverageMetricKeys implements NewCoverageMetricKeys { - @Override - public String coverageLineHitsData() { - return CoreMetrics.COVERAGE_LINE_HITS_DATA_KEY; - } - - @Override - public String conditionsByLine() { - return CoreMetrics.CONDITIONS_BY_LINE_KEY; - } - - @Override - public String coveredConditionsByLine() { - return CoreMetrics.COVERED_CONDITIONS_BY_LINE_KEY; - } - - /* output metrics */ - @Override - public String newLinesToCover() { - return CoreMetrics.NEW_LINES_TO_COVER_KEY; - } - - @Override - public String newUncoveredLines() { - return CoreMetrics.NEW_UNCOVERED_LINES_KEY; - } - - @Override - public String newConditionsToCover() { - return CoreMetrics.NEW_CONDITIONS_TO_COVER_KEY; - } - - @Override - public String newUncoveredConditions() { - return CoreMetrics.NEW_UNCOVERED_CONDITIONS_KEY; - } -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/ItFileCoverageMetricKeys.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/ItFileCoverageMetricKeys.java deleted file mode 100644 index effd4ffa466..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/ItFileCoverageMetricKeys.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube 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. - * - * SonarQube 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.server.computation.measure.newcoverage; - -import org.sonar.api.measures.CoreMetrics; - -public class ItFileCoverageMetricKeys implements NewCoverageMetricKeys { - @Override - public String coverageLineHitsData() { - return CoreMetrics.IT_COVERAGE_LINE_HITS_DATA_KEY; - } - - @Override - public String conditionsByLine() { - return CoreMetrics.IT_CONDITIONS_BY_LINE_KEY; - } - - @Override - public String coveredConditionsByLine() { - return CoreMetrics.IT_COVERED_CONDITIONS_BY_LINE_KEY; - } - - /* output metrics */ - @Override - public String newLinesToCover() { - return CoreMetrics.NEW_IT_LINES_TO_COVER_KEY; - } - - @Override - public String newUncoveredLines() { - return CoreMetrics.NEW_IT_UNCOVERED_LINES_KEY; - } - - @Override - public String newConditionsToCover() { - return CoreMetrics.NEW_IT_CONDITIONS_TO_COVER_KEY; - } - - @Override - public String newUncoveredConditions() { - return CoreMetrics.NEW_IT_UNCOVERED_CONDITIONS_KEY; - } -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeys.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeys.java deleted file mode 100644 index 7aa98942aaa..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeys.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube 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. - * - * SonarQube 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.server.computation.measure.newcoverage; - -/** - * Holds the keys of the 3 metrics from which are computed 4 new coverage metrics. - */ -public interface NewCoverageMetricKeys { - /* input metrics */ - String coverageLineHitsData(); - - String conditionsByLine(); - - String coveredConditionsByLine(); - - /* output metrics */ - String newLinesToCover(); - - String newUncoveredLines(); - - String newConditionsToCover(); - - String newUncoveredConditions(); -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java deleted file mode 100644 index 7861952c45a..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/NewCoverageMetricKeysModule.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube 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. - * - * SonarQube 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.server.computation.measure.newcoverage; - -import org.sonar.core.platform.Module; - -public class NewCoverageMetricKeysModule extends Module { - @Override - protected void configureModule() { - add( - FileCoverageMetricKeys.class, - ItFileCoverageMetricKeys.class, - OverallFileCoverageMetricKeys.class); - } -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/OverallFileCoverageMetricKeys.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/OverallFileCoverageMetricKeys.java deleted file mode 100644 index aae257162a5..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/OverallFileCoverageMetricKeys.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube 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. - * - * SonarQube 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.server.computation.measure.newcoverage; - -import org.sonar.api.measures.CoreMetrics; - -public class OverallFileCoverageMetricKeys implements NewCoverageMetricKeys { - @Override - public String coverageLineHitsData() { - return CoreMetrics.OVERALL_COVERAGE_LINE_HITS_DATA_KEY; - } - - @Override - public String conditionsByLine() { - return CoreMetrics.OVERALL_CONDITIONS_BY_LINE_KEY; - } - - @Override - public String coveredConditionsByLine() { - return CoreMetrics.OVERALL_COVERED_CONDITIONS_BY_LINE_KEY; - } - - /* output metrics */ - @Override - public String newLinesToCover() { - return CoreMetrics.NEW_OVERALL_LINES_TO_COVER_KEY; - } - - @Override - public String newUncoveredLines() { - return CoreMetrics.NEW_OVERALL_UNCOVERED_LINES_KEY; - } - - @Override - public String newConditionsToCover() { - return CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER_KEY; - } - - @Override - public String newUncoveredConditions() { - return CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS_KEY; - } -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/package-info.java deleted file mode 100644 index 656c487e8bd..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/newcoverage/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SonarQube, open source software quality management tool. - * Copyright (C) 2008-2014 SonarSource - * mailto:contact AT sonarsource DOT com - * - * SonarQube 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. - * - * SonarQube 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. - */ - -@ParametersAreNonnullByDefault -package org.sonar.server.computation.measure.newcoverage; - -import javax.annotation.ParametersAreNonnullByDefault; -- 2.39.5