Mirrors/sonarqube
1
0
Fork 0
mirror of https://github.com/SonarSource/sonarqube.git synced 2024-09-13 15:45:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

SONAR-8355 Remove property 'supportsMeasureFilters' from ResourceType API

Browse Source
This commit is contained in:
Julien Lancelot 2016-11-08 15:11:13 +01:00
parent 003b0805e5
commit f0506597c5
4 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sonar-core/src/main/java/org/sonar/core/component/DefaultResourceTypes.java
View File

@ -31,7 +31,6 @@ import org.sonar.api.server.ServerSide;
@ComputeEngineSide
public final class DefaultResourceTypes {
private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters";
private static final String CONFIGURABLE = "configurable";
private static final String UPDATABLE_KEY = "updatable_key";
@ -43,29 +42,23 @@ public final class DefaultResourceTypes {
return ResourceTypeTree.builder()
.addType(ResourceType.builder(Qualifiers.PROJECT)
.setProperty("deletable", true)
.setProperty("supportsGlobalDashboards", true)
.setProperty("modifiable_history", true)
.setProperty("hasRolePolicy", true)
.setProperty(UPDATABLE_KEY, true)
.setProperty(SUPPORTS_MEASURE_FILTERS, true)
.setProperty("comparable", true)
.setProperty(CONFIGURABLE, true)
.build())
.addType(ResourceType.builder(Qualifiers.MODULE)
.setProperty(UPDATABLE_KEY, true)
.setProperty(SUPPORTS_MEASURE_FILTERS, true)
.setProperty(CONFIGURABLE, true)
.build())
.addType(ResourceType.builder(Qualifiers.DIRECTORY)
.setProperty(SUPPORTS_MEASURE_FILTERS, true)
.build())
.addType(ResourceType.builder(Qualifiers.FILE)
.hasSourceCode()
.setProperty(SUPPORTS_MEASURE_FILTERS, true)
.build())
.addType(ResourceType.builder(Qualifiers.UNIT_TEST_FILE)
.hasSourceCode()
.setProperty(SUPPORTS_MEASURE_FILTERS, true)
.build())
.addRelations(Qualifiers.PROJECT, Qualifiers.MODULE)

11
sonar-core/src/test/java/org/sonar/core/component/DefaultResourceTypesTest.java
View File

@ -21,7 +21,6 @@ package org.sonar.core.component;
import org.junit.Test;
import org.sonar.api.resources.Qualifiers;
import org.sonar.api.resources.ResourceType;
import org.sonar.api.resources.ResourceTypeTree;
import static org.assertj.core.api.Assertions.assertThat;
@ -34,14 +33,4 @@ public class DefaultResourceTypesTest {
assertThat(tree.getTypes()).hasSize(5);
assertThat(tree.getChildren(Qualifiers.PROJECT)).containsExactly(Qualifiers.MODULE);
}
@Test
public void projects_should_be_available_for_global_widgets() {
ResourceTypeTree tree = DefaultResourceTypes.get();
ResourceType projectResourceType = tree.getTypes().get(0);
assertThat(projectResourceType.getQualifier()).isEqualTo(Qualifiers.PROJECT);
assertThat(projectResourceType.getBooleanProperty("supportsGlobalDashboards")).isTrue();
}
}

11
sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
View File

@ -22,12 +22,10 @@ package org.sonar.api.resources;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import java.util.Map;
import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable;
import java.util.Map;
/**
* <p>Experimental extension to declare types of resources.
* <p>
@ -156,7 +154,6 @@ public class ResourceType {
* Builder used to create {@link ResourceType} objects.
*/
public static class Builder {
private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters";
private String qualifier;
private String iconPath;
private boolean hasSourceCode = false;
@ -184,7 +181,6 @@ public class ResourceType {
*/
@Deprecated
public Builder availableForFilters() {
setProperty(SUPPORTS_MEASURE_FILTERS, "true");
return this;
}
@ -205,11 +201,6 @@ public class ResourceType {
Preconditions.checkNotNull(key);
Preconditions.checkNotNull(value);
properties.put(key, value);
// for backward-compatibility since version 3.4
if ("availableForFilters".equals(key)) {
properties.put(SUPPORTS_MEASURE_FILTERS, value);
}
return this;
}

28
sonar-plugin-api/src/test/java/org/sonar/api/resources/ResourceTypeTest.java
View File

@ -46,7 +46,6 @@ public class ResourceTypeTest {
assertThat(def.getQualifier()).isEqualTo("qualifier");
assertThat(def.getIconPath()).isEqualTo("/custom-icon.png");
assertThat(def.hasSourceCode()).isTrue();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isTrue();
assertThat(def.getStringProperty("anotherProperty")).isEqualTo("foo");
}
@ -68,35 +67,26 @@ public class ResourceTypeTest {
assertThat(foo1.hashCode()).isEqualTo(foo1.hashCode());
}
@Test
public void testDeprecatedIsAvailableForFiltesCompatibility() {
ResourceType def = ResourceType.builder("qualifier").build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isFalse();
def = ResourceType.builder("qualifier").availableForFilters().build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isTrue();
}
@Test
public void getBooleanProperty_is_set() {
// set with boolean parameter
ResourceType def = ResourceType.builder("qualifier").setProperty("supportsMeasureFilters", true).build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isTrue();
ResourceType def = ResourceType.builder("qualifier").setProperty("test", true).build();
assertThat(def.getBooleanProperty("test")).isTrue();
def = ResourceType.builder("qualifier").setProperty("supportsMeasureFilters", false).build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isFalse();
def = ResourceType.builder("qualifier").setProperty("test", false).build();
assertThat(def.getBooleanProperty("test")).isFalse();
def = ResourceType.builder("qualifier").setProperty("supportsMeasureFilters", "true").build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isTrue();
def = ResourceType.builder("qualifier").setProperty("test", "true").build();
assertThat(def.getBooleanProperty("test")).isTrue();
def = ResourceType.builder("qualifier").setProperty("supportsMeasureFilters", "false").build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isFalse();
def = ResourceType.builder("qualifier").setProperty("test", "false").build();
assertThat(def.getBooleanProperty("test")).isFalse();
}
@Test
public void getBooleanProperty_is_not_set() {
ResourceType def = ResourceType.builder("qualifier").build();
assertThat(def.getBooleanProperty("supportsMeasureFilters")).isFalse();
assertThat(def.getBooleanProperty("test")).isFalse();
}
@Test