Browse Source

Add definition of property sonar.jdbc.password

so that its type is set to PropertyType.PASSWORD.
tags/5.6-RC1
Simon Brandhof 8 years ago
parent
commit
9d89994a75

+ 1
- 1
server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java View File

@@ -102,7 +102,7 @@ public class ComputeEngineContainerImplTest {
+ 22 // level 1
+ 45 // content of DaoModule
+ 1 // content of EsSearchModule
+ 56 // content of CorePropertyDefinitions
+ 57 // content of CorePropertyDefinitions
+ 1 // content of CePropertyDefinitions
);
assertThat(picoContainer.getParent().getParent().getParent().getParent()).isNull();

+ 6
- 0
sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java View File

@@ -28,6 +28,8 @@ import org.sonar.api.PropertyType;
import org.sonar.api.config.PropertyDefinition;
import org.sonar.api.resources.Qualifiers;

import static org.sonar.api.database.DatabaseProperties.PROP_PASSWORD;

public class CorePropertyDefinitions {

/* Time machine periods */
@@ -57,6 +59,10 @@ public class CorePropertyDefinitions {
defs.addAll(PurgeProperties.all());

defs.addAll(ImmutableList.of(
PropertyDefinition.builder(PROP_PASSWORD)
.type(PropertyType.PASSWORD)
.hidden()
.build(),
PropertyDefinition.builder(CoreProperties.SERVER_BASE_URL)
.name("Server base URL")
.description("HTTP URL of this SonarQube server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.")

+ 27
- 0
sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java View File

@@ -19,10 +19,16 @@
*/
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 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;

public class CorePropertyDefinitionsTest {
@@ -31,4 +37,25 @@ public class CorePropertyDefinitionsTest {
List<PropertyDefinition> defs = CorePropertyDefinitions.all();
assertThat(defs.size()).isGreaterThan(9);
}

@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();
assertThat(prop.isPresent()).isTrue();
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());
}
}
}

Loading…
Cancel
Save