From 2ca3e28c0bc9990f774b7c927e04f100894b1004 Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Tue, 19 Oct 2010 11:12:35 +0000 Subject: [PATCH] SONAR-1879 Remove the character '-' from plugin keys --- .../mavenplugin/AbstractSonarPluginMojo.java | 2 +- .../AbstractSonarPluginMojoTest.java | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojo.java b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojo.java index 3841ae85ccc..fd3d4252ab0 100644 --- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojo.java +++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/main/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojo.java @@ -179,7 +179,7 @@ public abstract class AbstractSonarPluginMojo extends AbstractMojo { if (StringUtils.endsWith(pluginKey, "-sonar-plugin")) { return StringUtils.removeEnd(pluginKey, "-sonar-plugin"); } - return pluginKey; + return StringUtils.remove(pluginKey, "-"); } protected final String getPluginClass() { diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/test/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojoTest.java b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/test/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojoTest.java index a2412a26963..27f8acfb396 100644 --- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/test/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojoTest.java +++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/test/java/org/sonar/updatecenter/mavenplugin/AbstractSonarPluginMojoTest.java @@ -1,3 +1,22 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2009 SonarSource SA + * mailto:contact AT sonarsource DOT com + * + * Sonar 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. + * + * Sonar 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 Sonar; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 + */ package org.sonar.updatecenter.mavenplugin; import static org.hamcrest.MatcherAssert.assertThat; @@ -21,6 +40,9 @@ public class AbstractSonarPluginMojoTest { assertThat(mojo.getPluginKey(), is("test")); mojo.pluginKey = "test"; assertThat(mojo.getPluginKey(), is("test")); + mojo.pluginKey = "test-foo"; + assertThat(mojo.getPluginKey(), is("testfoo")); + } } -- 2.39.5