aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-auth-gitlab/src
diff options
context:
space:
mode:
authorPierre Guillot <50145663+pierre-guillot-sonarsource@users.noreply.github.com>2020-11-25 16:03:57 +0100
committersonartech <sonartech@sonarsource.com>2020-11-25 20:06:27 +0000
commitca8d160e00e48c957e7fda1268089bee411a0187 (patch)
tree23aa603b699e516032fbf6f84ccc38a94847658e /server/sonar-auth-gitlab/src
parent926ff7f595de3d1d978965b61f4e07af0a310c98 (diff)
downloadsonarqube-ca8d160e00e48c957e7fda1268089bee411a0187.tar.gz
sonarqube-ca8d160e00e48c957e7fda1268089bee411a0187.zip
remove code smells
Diffstat (limited to 'server/sonar-auth-gitlab/src')
-rw-r--r--server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java3
-rw-r--r--server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GsonGroup.java10
2 files changed, 8 insertions, 5 deletions
diff --git a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
index 860d7e89fae..62d8310cff4 100644
--- a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
+++ b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GitLabSettings.java
@@ -120,7 +120,8 @@ public class GitLabSettings {
PropertyDefinition.builder(GITLAB_AUTH_SYNC_USER_GROUPS)
.deprecatedKey("sonar.auth.gitlab.sync_user_groups")
.name("Synchronize user groups")
- .description("For each GitLab group he belongs to, the user will be associated to a group with the same name (if it exists) in SonarQube. If enabled, the GitLab Oauth2 application will need to provide the api scope")
+ .description("For each GitLab group he belongs to, the user will be associated to a group with the same name (if it exists) in SonarQube." +
+ " If enabled, the GitLab Oauth2 application will need to provide the api scope")
.category(CATEGORY)
.subCategory(SUBCATEGORY)
.type(PropertyType.BOOLEAN)
diff --git a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GsonGroup.java b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GsonGroup.java
index a89743075fc..b5b70c5a13e 100644
--- a/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GsonGroup.java
+++ b/server/sonar-auth-gitlab/src/main/java/org/sonar/auth/gitlab/GsonGroup.java
@@ -20,6 +20,7 @@
package org.sonar.auth.gitlab;
import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.Collection;
@@ -30,19 +31,20 @@ import java.util.List;
*/
public class GsonGroup {
- private String full_path;
+ @SerializedName("full_path")
+ private String fullPath;
public GsonGroup() {
// http://stackoverflow.com/a/18645370/229031
this("");
}
- GsonGroup(String full_path) {
- this.full_path = full_path;
+ GsonGroup(String fullPath) {
+ this.fullPath = fullPath;
}
String getFullPath() {
- return full_path;
+ return fullPath;
}
static List<GsonGroup> parse(String json) {