aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-core
diff options
context:
space:
mode:
authorGuillaume Jambet <guillaume.jambet@sonarsource.com>2018-02-16 16:56:38 +0100
committerGuillaume Jambet <guillaume.jambet@gmail.com>2018-03-01 15:21:05 +0100
commit6b3f8890aceafc0cc5e307e859170c3914bf2094 (patch)
tree703ccb53231fab8f64ea3ff1d02ecf75bc26c730 /sonar-core
parent74745908c3dd0c19cdde5e5a44fb9bb43c451d9b (diff)
downloadsonarqube-6b3f8890aceafc0cc5e307e859170c3914bf2094.tar.gz
sonarqube-6b3f8890aceafc0cc5e307e859170c3914bf2094.zip
SONAR-10345 Remove old webhook UI in the settings
Diffstat (limited to 'sonar-core')
-rw-r--r--sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/config/WebhookProperties.java98
-rw-r--r--sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java2
3 files changed, 2 insertions, 100 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
index 01acaad196a..286d0ece9be 100644
--- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
+++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
@@ -38,6 +38,7 @@ public class CorePropertyDefinitions {
public static final String LEAK_PERIOD_MODE_VERSION = "version";
public static final String LEAK_PERIOD_MODE_DAYS = "days";
public static final String LEAK_PERIOD_MODE_PREVIOUS_VERSION = "previous_version";
+ public static final String SONAR_ANALYSIS = "sonar.analysis.";
private static final String DEFAULT_LEAK_PERIOD = LEAK_PERIOD_MODE_PREVIOUS_VERSION;
@@ -60,7 +61,6 @@ public class CorePropertyDefinitions {
defs.addAll(DebtProperties.all());
defs.addAll(PurgeProperties.all());
defs.addAll(EmailSettings.definitions());
- defs.addAll(WebhookProperties.all());
defs.addAll(ScannerProperties.all());
defs.addAll(asList(
diff --git a/sonar-core/src/main/java/org/sonar/core/config/WebhookProperties.java b/sonar-core/src/main/java/org/sonar/core/config/WebhookProperties.java
deleted file mode 100644
index 91c654f8468..00000000000
--- a/sonar-core/src/main/java/org/sonar/core/config/WebhookProperties.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 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.core.config;
-
-import java.util.List;
-import org.sonar.api.PropertyType;
-import org.sonar.api.config.PropertyDefinition;
-import org.sonar.api.config.PropertyFieldDefinition;
-import org.sonar.api.resources.Qualifiers;
-
-import static java.util.Arrays.asList;
-
-public class WebhookProperties {
-
- public static final String GLOBAL_KEY = "sonar.webhooks.global";
- public static final String PROJECT_KEY = "sonar.webhooks.project";
- public static final String NAME_FIELD = "name";
- public static final String URL_FIELD = "url";
-
- /**
- * Maximum allowed number of webhooks per type (globally or per project).
- * That is required to not become a DoS attacker, for instance
- * if thousands of webhooks are configured.
- * Important - note that this number is written in full in {@link #DESCRIPTION}.
- */
- public static final long MAX_WEBHOOKS_PER_TYPE = 10;
-
- /**
- * Prefix of the properties to be automatically exported from scanner to payload
- */
- public static final String ANALYSIS_PROPERTY_PREFIX = "sonar.analysis.";
-
- private static final String CATEGORY = "webhooks";
- private static final String DESCRIPTION = "Webhooks are used to notify external services when a project analysis is done. " +
- "An HTTP POST request including a JSON payload is sent to each of the first ten provided URLs. <br/>" +
- "Learn more in the <a href=\"https://redirect.sonarsource.com/doc/webhooks.html\">Webhooks documentation</a>.";
- private static final String URL_DESCRIPTION = "Server endpoint that will receive the webhook payload, for example 'http://my_server/foo'. " +
- "If HTTP Basic authentication is used, HTTPS is recommended to avoid man in the middle attacks. " +
- "Example: 'https://myLogin:myPassword@my_server/foo'";
-
- private WebhookProperties() {
- // only static stuff
- }
-
- static List<PropertyDefinition> all() {
- return asList(
- PropertyDefinition.builder(GLOBAL_KEY)
- .category(CATEGORY)
- .name("Webhooks")
- .description(DESCRIPTION)
- .fields(
- PropertyFieldDefinition.build(NAME_FIELD)
- .name("Name")
- .type(PropertyType.STRING)
- .build(),
- PropertyFieldDefinition.build(URL_FIELD)
- .name("URL")
- .type(PropertyType.STRING)
- .description(URL_DESCRIPTION)
- .build())
- .build(),
-
- PropertyDefinition.builder(PROJECT_KEY)
- .category(CATEGORY)
- .name("Project Webhooks")
- .description(DESCRIPTION)
- .onlyOnQualifiers(Qualifiers.PROJECT)
- .fields(
- PropertyFieldDefinition.build(NAME_FIELD)
- .name("Name")
- .type(PropertyType.STRING)
- .build(),
- PropertyFieldDefinition.build(URL_FIELD)
- .name("URL")
- .type(PropertyType.STRING)
- .description(URL_DESCRIPTION)
- .build())
- .build());
- }
-
-}
diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
index b3054a31a22..a3cfb1e2bc5 100644
--- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java
@@ -30,7 +30,7 @@ public class CorePropertyDefinitionsTest {
@Test
public void all() {
List<PropertyDefinition> defs = CorePropertyDefinitions.all();
- assertThat(defs).hasSize(59);
+ assertThat(defs).hasSize(57);
}
@Test