Skip to content

Commit 7d17a76

Browse files
authored
Merge pull request #4 from 123Haynes/remove_deprecated_api
Remove old Gitlab V3 API
2 parents fe959e9 + b9502fe commit 7d17a76

File tree

7 files changed

+3
-1059
lines changed

7 files changed

+3
-1059
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ https://docs.gitlab.com/ce/ci/variables/#9-0-renaming
345345
| sonar.gitlab.ping_user | Ping the user who made an issue by @ mentioning. Only for default comment (default false) | Administration, Variable | >= 2.0.0 |
346346
| sonar.gitlab.unique_issue_per_inline | Unique issue per inline comment (default false) | Administration, Variable | >= 2.0.0 |
347347
| sonar.gitlab.prefix_directory | Add prefix when create link for GitLab | Variable | >= 2.1.0 |
348-
| sonar.gitlab.api_version | GitLab API version (default `v4` or `v3`) | Administration, Variable | >= 2.1.0 |
348+
| sonar.gitlab.api_version | GitLab API version (default `v4`) | Administration, Variable | >= 2.1.0 |
349349
| sonar.gitlab.all_issues | All issues new and old (default false, only new) | Administration, Variable | >= 2.1.0 |
350350
| sonar.gitlab.json_mode | Create a json report in root for GitLab EE (codeclimate.json or gl-sast-report.json) | Project, Variable | >= 3.0.0 |
351351
| sonar.gitlab.query_max_retry | Max retry for wait finish analyse for publish mode | Administration, Variable | >= 3.0.0 |

src/main/java/com/talanlabs/sonar/plugins/gitlab/CommitFacade.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ public CommitFacade(GitLabPluginConfiguration gitLabPluginConfiguration) {
5959

6060
this.ruleUrlPrefix = gitLabPluginConfiguration.baseUrl();
6161

62-
if (GitLabPlugin.V3_API_VERSION.equals(gitLabPluginConfiguration.apiVersion())) {
63-
this.gitLabWrapper = new GitLabApiV3Wrapper(gitLabPluginConfiguration);
64-
} else if (GitLabPlugin.V4_API_VERSION.equals(gitLabPluginConfiguration.apiVersion())) {
62+
if (GitLabPlugin.V4_API_VERSION.equals(gitLabPluginConfiguration.apiVersion())) {
6563
this.gitLabWrapper = new GitLabApiV4Wrapper(gitLabPluginConfiguration);
6664
}
6765
}

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabApiV3Wrapper.java

Lines changed: 0 additions & 289 deletions
This file was deleted.

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabPlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public class GitLabPlugin implements Plugin {
7272
public static final String CATEGORY = "gitlab";
7373
public static final String SUBCATEGORY = "reporting";
7474

75-
public static final String V3_API_VERSION = "v3";
7675
public static final String V4_API_VERSION = "v4";
7776

7877
public static List<PropertyDefinition> definitions() {
@@ -133,7 +132,7 @@ public static List<PropertyDefinition> definitions() {
133132
PropertyDefinition.builder(GITLAB_PREFIX_DIRECTORY).name("Prefix directory for GitLab link").description("Add prefix for GitLab link").category(CATEGORY).subCategory(SUBCATEGORY)
134133
.type(PropertyType.STRING).defaultValue("").index(24).build(),
135134
PropertyDefinition.builder(GITLAB_API_VERSION).name("Set GitLab API version").description("GitLab API version").category(CATEGORY).subCategory(SUBCATEGORY)
136-
.type(PropertyType.SINGLE_SELECT_LIST).options(V3_API_VERSION, V4_API_VERSION).defaultValue(V4_API_VERSION).index(25).build(),
135+
.type(PropertyType.SINGLE_SELECT_LIST).options(V4_API_VERSION).defaultValue(V4_API_VERSION).index(25).build(),
137136
PropertyDefinition.builder(GITLAB_ALL_ISSUES).name("All issues").description("Show all issues. (Default false, only new)").category(CATEGORY).subCategory(SUBCATEGORY)
138137
.type(PropertyType.BOOLEAN).defaultValue(String.valueOf(false)).index(26).build(),
139138
PropertyDefinition.builder(GITLAB_JSON_MODE).name("Generate json report").description("Create a json report in root for GitLab EE").category(CATEGORY).subCategory(SUBCATEGORY)

0 commit comments

Comments
 (0)