From 8bf3014f238206ecb370742f749608ae577fb43c Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 29 Mar 2017 15:03:10 +0200 Subject: SONAR-9014 Replace 'sonar.defaultGroup' setting usage by hardcoded 'sonar-users' --- .../main/java/org/sonar/core/config/SecurityProperties.java | 12 +++--------- .../org/sonar/core/config/CorePropertyDefinitionsTest.java | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'sonar-core/src') diff --git a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java index bdd72b397f9..27f4f178c5f 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/SecurityProperties.java @@ -19,12 +19,13 @@ */ package org.sonar.core.config; -import com.google.common.collect.ImmutableList; import java.util.List; import org.sonar.api.CoreProperties; import org.sonar.api.PropertyType; import org.sonar.api.config.PropertyDefinition; +import static java.util.Collections.singletonList; + class SecurityProperties { private SecurityProperties() { @@ -32,14 +33,7 @@ class SecurityProperties { } static List all() { - return ImmutableList.of( - PropertyDefinition.builder(CoreProperties.CORE_DEFAULT_GROUP) - .defaultValue(CoreProperties.CORE_DEFAULT_GROUP_DEFAULT_VALUE) - .name("Default user group") - .description("Any new users will automatically join this group.") - .category(CoreProperties.CATEGORY_SECURITY) - .build(), - + return singletonList( PropertyDefinition.builder(CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY) .defaultValue(Boolean.toString(CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE)) .name("Force user authentication") 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 50a3028672f..0d1e7f05b9f 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 @@ -33,7 +33,7 @@ public class CorePropertyDefinitionsTest { @Test public void all() { List defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(58); + assertThat(defs).hasSize(57); } @Test -- cgit v1.2.3