From 09e689ec112a163535a98a682c9a10a06e34de00 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 3 Feb 2017 09:52:54 +0100
Subject: SONAR-8208 Remove property "sonar.authenticator.createUser"

---
 .../sonar/core/config/CorePropertyDefinitions.java |  7 ------
 .../core/config/CorePropertyDefinitionsTest.java   | 25 ++++++----------------
 2 files changed, 6 insertions(+), 26 deletions(-)

(limited to 'sonar-core')

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 12bbe0a1185..ffac9913d82 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
@@ -135,13 +135,6 @@ public class CorePropertyDefinitions {
         .defaultValue(String.valueOf(false))
         .hidden()
         .build(),
-      PropertyDefinition.builder(CoreProperties.CORE_AUTHENTICATOR_CREATE_USERS)
-        .name("Create user accounts")
-        .description("Create accounts when authenticating users via an external system")
-        .type(PropertyType.BOOLEAN)
-        .defaultValue(String.valueOf(true))
-        .hidden()
-        .build(),
       PropertyDefinition.builder(CoreProperties.CORE_AUTHENTICATOR_IGNORE_STARTUP_FAILURE)
         .name("Ignore failures during authenticator startup")
         .type(PropertyType.BOOLEAN)
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 b1198a6ef83..01f3d1bf9d2 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
@@ -19,42 +19,29 @@
  */
 package org.sonar.core.config;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import java.util.List;
-import javax.annotation.Nonnull;
+import java.util.Optional;
 import org.junit.Test;
 import org.sonar.api.PropertyType;
 import org.sonar.api.config.PropertyDefinition;
-import org.sonar.api.database.DatabaseProperties;
 
-import static com.google.common.collect.FluentIterable.from;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.api.database.DatabaseProperties.PROP_PASSWORD;
 
 public class CorePropertyDefinitionsTest {
+
   @Test
   public void all() {
     List<PropertyDefinition> defs = CorePropertyDefinitions.all();
-    assertThat(defs).hasSize(63);
+    assertThat(defs).hasSize(62);
   }
 
   @Test
   public void jdbc_password_property_has_password_type() {
     List<PropertyDefinition> defs = CorePropertyDefinitions.all();
-    Optional<PropertyDefinition> prop = from(defs).filter(new HasKeyPredicate(DatabaseProperties.PROP_PASSWORD)).first();
+
+    Optional<PropertyDefinition> prop = defs.stream().filter(def -> PROP_PASSWORD.equals(def.key())).findFirst();
     assertThat(prop.get().type()).isEqualTo(PropertyType.PASSWORD);
   }
 
-  private final class HasKeyPredicate implements Predicate<PropertyDefinition> {
-    private final String key;
-
-    HasKeyPredicate(String key) {
-      this.key = key;
-    }
-
-    @Override
-    public boolean apply(@Nonnull PropertyDefinition input) {
-      return key.equals(input.key());
-    }
-  }
 }
-- 
cgit v1.2.3