Bläddra i källkod

SONAR-17150 removed unused MetricKeyValidator

tags/9.6.0.59041
Aurelien Poscia 1 år sedan
förälder
incheckning
682da49347

+ 0
- 60
server/sonar-webserver-webapi/src/main/java/org/sonar/server/metric/ws/MetricKeyValidator.java Visa fil

@@ -1,60 +0,0 @@
/*
* SonarQube
* Copyright (C) 2009-2022 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.server.metric.ws;

public class MetricKeyValidator {
/*
* Allowed characters are alphanumeric, '-', '_', with at least one non-digit
*/
private static final String VALID_METRIC_KEY_REGEXP = "[\\p{Alnum}\\-_]*[\\p{Alpha}\\-_]+[\\p{Alnum}\\-_]*";

private MetricKeyValidator() {
// static stuff only
}

/**
* <p>Test if given parameter is valid for a project/module. Valid format is:</p>
* <ul>
* <li>Allowed characters:
* <ul>
* <li>Uppercase ASCII letters A-Z</li>
* <li>Lowercase ASCII letters a-z</li>
* <li>ASCII digits 0-9</li>
* <li>Punctuation signs dash '-', underscore '_'</li>
* </ul>
* </li>
* <li>At least one non-digit</li>
* </ul>
* @param candidateKey
* @return <code>true</code> if <code>candidateKey</code> can be used for a metric
*/
public static boolean isMetricKeyValid(String candidateKey) {
return candidateKey.matches(VALID_METRIC_KEY_REGEXP);
}

public static String checkMetricKeyFormat(String candidateKey) {
if (!isMetricKeyValid(candidateKey)) {
throw new IllegalArgumentException(String.format("Malformed metric key '%s'. Allowed characters are alphanumeric, '-', '_', with at least one non-digit.",
candidateKey));
}

return candidateKey;
}
}

+ 0
- 45
server/sonar-webserver-webapi/src/test/java/org/sonar/server/metric/ws/MetricKeyValidatorTest.java Visa fil

@@ -1,45 +0,0 @@
/*
* SonarQube
* Copyright (C) 2009-2022 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.server.metric.ws;

import org.junit.Test;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class MetricKeyValidatorTest {


@Test
public void isMetricKeyValid() {
assertThat(MetricKeyValidator.isMetricKeyValid("")).isFalse();
assertThat(MetricKeyValidator.isMetricKeyValid("1_2_3-ABC-1_2_3")).isTrue();
assertThat(MetricKeyValidator.isMetricKeyValid("123_321")).isTrue();
assertThat(MetricKeyValidator.isMetricKeyValid("123456")).isFalse();
assertThat(MetricKeyValidator.isMetricKeyValid("1.2.3_A_3:2:1")).isFalse();
}

@Test
public void checkMetricKeyFormat() {
assertThatThrownBy(() -> MetricKeyValidator.checkMetricKeyFormat("123456"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Malformed metric key '123456'. Allowed characters are alphanumeric, '-', '_', with at least one non-digit.");
}
}

Laddar…
Avbryt
Spara