summaryrefslogtreecommitdiffstats
path: root/server/sonar-webserver-webapi
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2020-10-06 14:45:57 -0500
committersonartech <sonartech@sonarsource.com>2020-10-23 20:08:29 +0000
commit31a08c185e0e730305861b7b3c6592ac8965d277 (patch)
treea9212f25bd8d8871e03def9dd96dfa30fbf5ea28 /server/sonar-webserver-webapi
parent9f6d5dc513227f52562dfaebc098341a92eded54 (diff)
downloadsonarqube-31a08c185e0e730305861b7b3c6592ac8965d277.tar.gz
sonarqube-31a08c185e0e730305861b7b3c6592ac8965d277.zip
SONAR-13941 Make applications WS available in developer edition
Diffstat (limited to 'server/sonar-webserver-webapi')
-rw-r--r--server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java2
-rw-r--r--server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
index 2e2217837b6..9553d20716a 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java
@@ -54,7 +54,7 @@ public class DefaultTemplatesResolverImpl implements DefaultTemplatesResolver {
return resourceTypes.getRoots()
.stream()
.map(ResourceType::getQualifier)
- .anyMatch(Qualifiers.VIEW::equals);
+ .anyMatch(qualifier -> Qualifiers.VIEW.equals(qualifier) || Qualifiers.APP.equals(qualifier));
}
}
diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
index 17a0d91f4bc..ead26f0ac17 100644
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
@@ -207,11 +207,11 @@ public class PermissionTemplateService {
return dbClient.permissionTemplateDao().selectByUuid(dbSession, resolvedDefaultTemplates.getProject());
case Qualifiers.VIEW:
String portDefaultTemplateUuid = resolvedDefaultTemplates.getPortfolio().orElseThrow(
- () -> new IllegalStateException("Attempt to create a view when Governance plugin is not installed"));
+ () -> new IllegalStateException("Failed to find default template for portfolios"));
return dbClient.permissionTemplateDao().selectByUuid(dbSession, portDefaultTemplateUuid);
case Qualifiers.APP:
String appDefaultTemplateUuid = resolvedDefaultTemplates.getApplication().orElseThrow(
- () -> new IllegalStateException("Attempt to create a view when Governance plugin is not installed"));
+ () -> new IllegalStateException("Failed to find default template for applications"));
return dbClient.permissionTemplateDao().selectByUuid(dbSession, appDefaultTemplateUuid);
default:
throw new IllegalArgumentException(format("Qualifier '%s' is not supported", qualifier));