Browse Source

SONAR-7969 Replace fieldsValue by fieldValues in response

tags/6.1-RC1
Julien Lancelot 7 years ago
parent
commit
2e7d6f28ab

+ 2
- 2
it/it-tests/src/test/java/it/settings/PropertySetsTest.java View File

@@ -120,9 +120,9 @@ public class PropertySetsTest {

private void assertPropertySet(String baseSettingKey, List<Map.Entry<String, String>>... fieldsValues) {
Settings.Setting setting = getSetting(baseSettingKey);
assertThat(setting.getFieldsValues().getFieldValuesList()).hasSize(fieldsValues.length);
assertThat(setting.getFieldValues().getFieldValuesList()).hasSize(fieldsValues.length);
int index = 0;
for (Settings.FieldValues.Value fieldsValue : setting.getFieldsValues().getFieldValuesList()) {
for (Settings.FieldValues.Value fieldsValue : setting.getFieldValues().getFieldValuesList()) {
assertThat(fieldsValue.getValue()).containsOnly(fieldsValues[index].toArray(new Map.Entry[] {}));
index++;
}

+ 12
- 8
it/it-tests/src/test/java/it/settings/SettingsTest.java View File

@@ -26,6 +26,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.sonarqube.ws.Settings;
@@ -49,6 +50,13 @@ public class SettingsTest {
@ClassRule
public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;

static SettingsService SETTINGS;

@BeforeClass
public static void initSettingsService() throws Exception {
SETTINGS = newAdminWsClient(orchestrator).settingsService();
}

@After
public void reset_settings() throws Exception {
setServerProperty(orchestrator, PLUGIN_SETTING_KEY, null);
@@ -80,7 +88,7 @@ public class SettingsTest {

@Test
public void set_value() throws Exception {
settingsService().set(SetRequest.builder().setKey(PLUGIN_SETTING_KEY).setValue("some value").build());
SETTINGS.set(SetRequest.builder().setKey(PLUGIN_SETTING_KEY).setValue("some value").build());

String value = getSetting(PLUGIN_SETTING_KEY).getValue();
assertThat(value).isEqualTo("some value");
@@ -88,17 +96,13 @@ public class SettingsTest {

@Test
public void remove_value() throws Exception {
settingsService().set(SetRequest.builder().setKey(PLUGIN_SETTING_KEY).setValue("some value").build());
settingsService().reset(ResetRequest.builder().setKey(PLUGIN_SETTING_KEY).build());
SETTINGS.set(SetRequest.builder().setKey(PLUGIN_SETTING_KEY).setValue("some value").build());
SETTINGS.reset(ResetRequest.builder().setKey(PLUGIN_SETTING_KEY).build());
assertThat(getSetting(PLUGIN_SETTING_KEY).getValue()).isEqualTo("aDefaultValue");
}

private static SettingsService settingsService() {
return newAdminWsClient(orchestrator).settingsService();
}

private Settings.Setting getSetting(String key) {
Settings.ValuesWsResponse response = settingsService().values(ValuesRequest.builder().setKeys(key).build());
Settings.ValuesWsResponse response = SETTINGS.values(ValuesRequest.builder().setKeys(key).build());
List<Settings.Setting> settings = response.getSettingsList();
assertThat(settings).hasSize(1);
return settings.get(0);

+ 1
- 1
server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java View File

@@ -224,7 +224,7 @@ public class ValuesAction implements SettingsWsAction {
return;
}
if (definition.type().equals(PROPERTY_SET)) {
valueBuilder.setFieldsValues(createFieldValuesBuilder(setting.getPropertySets()));
valueBuilder.setFieldValues(createFieldValuesBuilder(setting.getPropertySets()));
} else if (definition.multiValues()) {
valueBuilder.setValues(createValuesBuilder(value));
} else {

+ 1
- 1
server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json View File

@@ -16,7 +16,7 @@
},
{
"key": "sonar.demo",
"fieldsValues": [
"fieldValues": [
{
"boolean": "true",
"text": "foo"

+ 5
- 5
server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java View File

@@ -105,7 +105,7 @@ public class ValuesActionTest {
assertThat(value.getKey()).isEqualTo("foo");
assertThat(value.getValue()).isEqualTo("one");
assertThat(value.hasValues()).isFalse();
assertThat(value.hasFieldsValues()).isFalse();
assertThat(value.hasFieldValues()).isFalse();
assertThat(value.getInherited()).isFalse();
}

@@ -132,13 +132,13 @@ public class ValuesActionTest {
assertThat(foo.getKey()).isEqualTo("default");
assertThat(foo.hasValue()).isFalse();
assertThat(foo.getValues().getValuesList()).containsOnly("one", "two");
assertThat(foo.hasFieldsValues()).isFalse();
assertThat(foo.hasFieldValues()).isFalse();

Settings.Setting bar = result.getSettings(1);
assertThat(bar.getKey()).isEqualTo("global");
assertThat(bar.hasValue()).isFalse();
assertThat(bar.getValues().getValuesList()).containsOnly("three", "four");
assertThat(bar.hasFieldsValues()).isFalse();
assertThat(bar.hasFieldValues()).isFalse();
}

@Test
@@ -588,9 +588,9 @@ public class ValuesActionTest {
}

private void assertFieldValues(Settings.Setting setting, Map<String, String>... fieldsValues) {
assertThat(setting.getFieldsValues().getFieldValuesList()).hasSize(fieldsValues.length);
assertThat(setting.getFieldValues().getFieldValuesList()).hasSize(fieldsValues.length);
int index = 0;
for (Settings.FieldValues.Value fieldsValue : setting.getFieldsValues().getFieldValuesList()) {
for (Settings.FieldValues.Value fieldsValue : setting.getFieldValues().getFieldValuesList()) {
assertThat(fieldsValue.getValue()).isEqualTo(fieldsValues[index]);
index++;
}

+ 1
- 1
sonar-ws/src/main/protobuf/ws-settings.proto View File

@@ -76,7 +76,7 @@ message Setting {
optional string key = 1;
optional string value = 2;
optional Values values = 3;
optional FieldValues fieldsValues = 4;
optional FieldValues fieldValues = 4;
optional bool inherited = 5;
optional string parentValue = 6;
optional Values parentValues = 7;

Loading…
Cancel
Save