From b2458a2688f81e8370f672757640af32b23c8648 Mon Sep 17 00:00:00 2001 From: Zipeng WU Date: Mon, 6 Mar 2023 18:46:02 +0100 Subject: [PATCH] SONAR-18600 Remove deprecated items that are not used anymore --- .../db/migration/def/VarcharColumnDef.java | 5 -- .../version/v00/CreateInitialSchema.java | 3 +- .../sonar/server/issue/index/IssueQuery.java | 7 +- .../sonar/server/issue/ws/SearchAction.java | 4 +- .../issue/ws/SearchAdditionalField.java | 5 -- .../sonar/core/config/ScannerProperties.java | 2 - .../org/sonar/batch/bootstrapper/Batch.java | 39 --------- .../log/ExceptionHandlingMediumTest.java | 2 +- .../src/main/resources/snapshot-of-api.json | 80 ------------------- .../sonarqube/ws/client/DefaultWsClient.java | 16 ---- .../org/sonarqube/ws/client/WsClient.java | 6 -- .../ws/client/ce/ComponentRequest.java | 10 --- .../ws/client/components/AppRequest.java | 15 ---- .../client/components/ComponentsService.java | 3 - .../ws/client/components/ShowRequest.java | 15 ---- .../ws/client/components/TreeRequest.java | 15 ---- .../ws/client/issues/IssuesService.java | 1 - .../ws/client/issues/SearchRequest.java | 15 ---- .../ws/client/measures/ComponentRequest.java | 43 ---------- .../client/measures/ComponentTreeRequest.java | 43 ---------- .../ws/client/measures/MeasuresService.java | 6 -- .../ws/client/projects/SearchRequest.java | 15 ---- .../ws/client/properties/IndexRequest.java | 75 ----------------- .../client/properties/PropertiesService.java | 56 ------------- .../ws/client/properties/package-info.java | 26 ------ .../client/qualitygates/DeselectRequest.java | 15 ---- .../qualitygates/QualitygatesService.java | 1 - .../timemachine/TimemachineService.java | 53 ------------ .../ws/client/timemachine/package-info.java | 26 ------ .../updatecenter/InstalledPluginsRequest.java | 49 ------------ .../updatecenter/UpdatecenterService.java | 17 ---- .../ws/client/users/CreateRequest.java | 10 --- .../ws/client/users/UpdateRequest.java | 10 --- 33 files changed, 5 insertions(+), 683 deletions(-) delete mode 100644 sonar-ws/src/main/java/org/sonarqube/ws/client/properties/IndexRequest.java delete mode 100644 sonar-ws/src/main/java/org/sonarqube/ws/client/properties/PropertiesService.java delete mode 100644 sonar-ws/src/main/java/org/sonarqube/ws/client/properties/package-info.java delete mode 100644 sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/TimemachineService.java delete mode 100644 sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/package-info.java delete mode 100644 sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/InstalledPluginsRequest.java diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java index 225b856021e..1b7e3f59f5c 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java @@ -36,11 +36,6 @@ import static org.sonar.server.platform.db.migration.def.Validations.validateCol @Immutable public class VarcharColumnDef extends AbstractColumnDef { public static final int MAX_SIZE = 4_000; - /** - * @deprecated use {@link #UUID_SIZE} instead - */ - @Deprecated - public static final int UUID_VARCHAR_SIZE = 50; public static final int UUID_SIZE = 40; public static final int DESCRIPTION_SECTION_KEY_SIZE = 50; diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchema.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchema.java index e928f6de37b..df08eaa4a98 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchema.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchema.java @@ -47,7 +47,6 @@ import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.DESCRI import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.MAX_SIZE; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.USER_UUID_SIZE; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_SIZE; -import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.UUID_VARCHAR_SIZE; import static org.sonar.server.platform.db.migration.def.VarcharColumnDef.newVarcharColumnDefBuilder; public class CreateInitialSchema extends DdlChange { @@ -252,7 +251,7 @@ public class CreateInitialSchema extends DdlChange { private void createProjectAlmSettings(Context context) { String tableName = "project_alm_settings"; VarcharColumnDef almSettingUuidCol = newVarcharColumnDefBuilder("alm_setting_uuid").setIsNullable(false).setLimit(UUID_SIZE).build(); - VarcharColumnDef projectUuidCol = newVarcharColumnDefBuilder(PROJECT_UUID_COL_NAME).setIsNullable(false).setLimit(UUID_VARCHAR_SIZE).build(); + VarcharColumnDef projectUuidCol = newVarcharColumnDefBuilder(PROJECT_UUID_COL_NAME).setIsNullable(false).setLimit(OLD_UUID_VARCHAR_SIZE).build(); VarcharColumnDef almRepoCol = newVarcharColumnDefBuilder("alm_repo").setIsNullable(true).setLimit(256).build(); VarcharColumnDef almSlugCol = newVarcharColumnDefBuilder("alm_slug").setIsNullable(true).setLimit(256).build(); BooleanColumnDef summaryCommentEnabledCol = newBooleanColumnDefBuilder("summary_comment_enabled").setIsNullable(true).build(); diff --git a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQuery.java b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQuery.java index acb8449f7c4..fd73568089f 100644 --- a/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQuery.java +++ b/server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQuery.java @@ -42,11 +42,6 @@ public class IssueQuery { public static final String SORT_BY_CREATION_DATE = "CREATION_DATE"; public static final String SORT_BY_UPDATE_DATE = "UPDATE_DATE"; public static final String SORT_BY_CLOSE_DATE = "CLOSE_DATE"; - /** - * @deprecated since 7.2, it's no more possible to sort by assignee - */ - @Deprecated - public static final String SORT_BY_ASSIGNEE = "ASSIGNEE"; public static final String SORT_BY_SEVERITY = "SEVERITY"; public static final String SORT_BY_STATUS = "STATUS"; @@ -59,7 +54,7 @@ public class IssueQuery { */ public static final String SORT_HOTSPOTS = "HOTSPOTS"; - public static final Set SORTS = Set.of(SORT_BY_CREATION_DATE, SORT_BY_UPDATE_DATE, SORT_BY_CLOSE_DATE, SORT_BY_ASSIGNEE, SORT_BY_SEVERITY, + public static final Set SORTS = Set.of(SORT_BY_CREATION_DATE, SORT_BY_UPDATE_DATE, SORT_BY_CLOSE_DATE, SORT_BY_SEVERITY, SORT_BY_STATUS, SORT_BY_FILE_LINE, SORT_HOTSPOTS); private final Collection issueKeys; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java index 865ff04bb01..6e31e6b683e 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java @@ -79,7 +79,6 @@ import static org.sonar.core.util.stream.MoreCollectors.toSet; import static org.sonar.server.es.SearchOptions.MAX_PAGE_SIZE; import static org.sonar.server.issue.index.IssueIndex.FACET_ASSIGNED_TO_ME; import static org.sonar.server.issue.index.IssueIndex.FACET_PROJECTS; -import static org.sonar.server.issue.index.IssueQuery.SORT_BY_ASSIGNEE; import static org.sonar.server.issue.index.IssueQueryFactory.ISSUE_STATUSES; import static org.sonar.server.issue.index.IssueQueryFactory.UNKNOWN; import static org.sonar.server.security.SecurityStandards.SANS_TOP_25_INSECURE_INTERACTION; @@ -194,6 +193,7 @@ public class SearchAction implements IssuesWsAction { + "
When issue indexation is in progress returns 503 service unavailable HTTP code.") .setSince("3.6") .setChangelog( + new Change("10.0", format("Deprecated value 'ASSIGNEE' in parameter '%s' is dropped", Param.SORT)), new Change("10.0", format("Parameter 'sinceLeakPeriod' is removed, please use '%s' instead", PARAM_IN_NEW_CODE_PERIOD)), new Change("9.8", "Add message formatting to issue and locations response"), new Change("9.8", "response fields 'total', 's', 'ps' have been deprecated, please use 'paging' object instead"), @@ -226,7 +226,7 @@ public class SearchAction implements IssuesWsAction { new Change("7.3", "response field 'fromHotspot' added to issues that are security hotspots"), new Change("7.3", "added facets 'sansTop25', 'owaspTop10' and 'cwe'"), new Change("7.2", "response field 'externalRuleEngine' added to issues that have been imported from an external rule engine"), - new Change("7.2", format("value '%s' in parameter '%s' is deprecated, it won't have any effect", SORT_BY_ASSIGNEE, Param.SORT)), + new Change("7.2", format("value 'ASSIGNEE' in parameter '%s' is deprecated, it won't have any effect", Param.SORT)), new Change("6.5", "parameters 'projects', 'projectUuids', 'moduleUuids', 'directories', 'fileUuids' are marked as internal"), new Change("6.3", "response field 'email' is renamed 'avatar'"), new Change("5.5", "response fields 'reporter' and 'actionPlan' are removed (drop of action plan and manual issue features)"), diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java index f8c5c05a0f2..afb19d2af44 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java @@ -31,11 +31,6 @@ import org.sonar.server.issue.SearchRequest; public enum SearchAdditionalField { ACTIONS("actions"), - /** - * @deprecated since 5.5, action plan feature has been removed - */ - @Deprecated - DEPRECATED_ACTION_PLANS("actionPlans"), COMMENTS("comments"), LANGUAGES("languages"), RULES("rules"), diff --git a/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java b/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java index ea2fb1ab7de..b6755a22fb7 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java +++ b/sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java @@ -33,8 +33,6 @@ public class ScannerProperties { public static final String BRANCHES_DOC_LINK = "https://docs.sonarqube.org/latest/analyzing-source-code/branches/branch-analysis/"; public static final String BRANCH_NAME = "sonar.branch.name"; - @Deprecated - public static final String BRANCH_TARGET = "sonar.branch.target"; public static final String PULL_REQUEST_KEY = "sonar.pullrequest.key"; public static final String PULL_REQUEST_BRANCH = "sonar.pullrequest.branch"; diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java index e087c62d1a2..cb2e3d0c96b 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java @@ -76,28 +76,6 @@ public final class Batch { return this; } - /** - * @since 4.4 - * @deprecated since 6.6 use {@link #execute()} - */ - @Deprecated - public synchronized Batch start() { - return this; - } - - /** - * @since 4.4 - * @deprecated since 6.6 use {@link #execute()} - */ - @Deprecated - public Batch executeTask(Map analysisProperties, Object... components) { - Map mergedProps = new HashMap<>(this.globalProperties); - mergedProps.putAll(analysisProperties); - List mergedComponents = new ArrayList<>(this.components); - mergedComponents.addAll(Arrays.asList(components)); - return doExecute(mergedProps, mergedComponents); - } - private RuntimeException handleException(RuntimeException t) { if (loggingConfig.isVerbose()) { return t; @@ -114,14 +92,6 @@ public final class Batch { return t; } - /** - * @since 4.4 - * @deprecated since 6.6 use {@link #execute()} - */ - @Deprecated - public synchronized void stop() { - } - private void configureLogging() { if (loggingConfig != null) { loggingConfig.setProperties(globalProperties); @@ -163,15 +133,6 @@ public final class Batch { return this; } - /** - * @deprecated since 6.6 use {@link #setGlobalProperties(Map)} - */ - @Deprecated - public Builder setBootstrapProperties(Map bootstrapProperties) { - this.globalProperties = bootstrapProperties; - return this; - } - public Builder addComponents(Object... components) { Collections.addAll(this.components, components); return this; diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java index cf7fcca7510..011c7b5eec8 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java @@ -50,7 +50,7 @@ public class ExceptionHandlingMediumTest { new EnvironmentInformation("mediumTest", "1.0")); if (verbose) { - builder.setBootstrapProperties(Collections.singletonMap("sonar.verbose", "true")); + builder.setGlobalProperties(Collections.singletonMap("sonar.verbose", "true")); } batch = builder.build(); } diff --git a/sonar-ws-generator/src/main/resources/snapshot-of-api.json b/sonar-ws-generator/src/main/resources/snapshot-of-api.json index 47f92478d4f..6f3a0b50198 100644 --- a/sonar-ws-generator/src/main/resources/snapshot-of-api.json +++ b/sonar-ws-generator/src/main/resources/snapshot-of-api.json @@ -5521,48 +5521,6 @@ } ] }, - { - "path": "api/properties", - "since": "2.6", - "description": "This web service is deprecated, please use api/settings instead.", - "actions": [ - { - "key": "index", - "description": "This web service is deprecated, please use api/settings/values instead.", - "since": "2.6", - "deprecatedSince": "6.3", - "internal": false, - "post": false, - "hasResponseExample": true, - "changelog": [], - "params": [ - { - "key": "format", - "description": "Only json response format is available", - "required": false, - "internal": false, - "possibleValues": [ - "json" - ] - }, - { - "key": "id", - "description": "Setting key", - "required": false, - "internal": false, - "exampleValue": "sonar.test.inclusions" - }, - { - "key": "resource", - "description": "Component key or database id", - "required": false, - "internal": false, - "exampleValue": "my_project" - } - ] - } - ] - }, { "path": "api/qualitygates", "since": "4.3", @@ -9128,49 +9086,11 @@ } ] }, - { - "path": "api/timemachine", - "since": "2.10", - "description": "Removed since 6.3, please use api/measures/search_history instead", - "actions": [ - { - "key": "index", - "description": "The web service is removed and you're invited to use api/measures/search_history instead", - "since": "2.10", - "deprecatedSince": "6.3", - "internal": false, - "post": false, - "hasResponseExample": true, - "changelog": [] - } - ] - }, { "path": "api/updatecenter", "since": "2.10", "description": "Get list of installed plugins", "actions": [ - { - "key": "installed_plugins", - "description": "Get the list of all the plugins installed on the SonarQube instance", - "since": "2.10", - "deprecatedSince": "6.3", - "internal": true, - "post": false, - "hasResponseExample": true, - "changelog": [], - "params": [ - { - "key": "format", - "description": "Only json response format is available", - "required": false, - "internal": false, - "possibleValues": [ - "json" - ] - } - ] - }, { "key": "upload", "description": "Upload a plugin.
Requires 'Administer System' permission.", diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java index b8d060ef0e2..fc9df74e81f 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java @@ -55,7 +55,6 @@ import org.sonarqube.ws.client.projectlinks.ProjectLinksService; import org.sonarqube.ws.client.projectpullrequests.ProjectPullRequestsService; import org.sonarqube.ws.client.projects.ProjectsService; import org.sonarqube.ws.client.projecttags.ProjectTagsService; -import org.sonarqube.ws.client.properties.PropertiesService; import org.sonarqube.ws.client.push.SonarLintServerPushService; import org.sonarqube.ws.client.qualitygates.QualitygatesService; import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService; @@ -68,7 +67,6 @@ import org.sonarqube.ws.client.settings.SettingsService; import org.sonarqube.ws.client.sources.SourcesService; import org.sonarqube.ws.client.support.SupportService; import org.sonarqube.ws.client.system.SystemService; -import org.sonarqube.ws.client.timemachine.TimemachineService; import org.sonarqube.ws.client.updatecenter.UpdatecenterService; import org.sonarqube.ws.client.usergroups.UserGroupsService; import org.sonarqube.ws.client.users.UsersService; @@ -122,7 +120,6 @@ class DefaultWsClient implements WsClient { private final ProjectPullRequestsService projectPullRequestsService; private final ProjectTagsService projectTagsService; private final ProjectsService projectsService; - private final PropertiesService propertiesService; private final QualitygatesService qualitygatesService; private final QualityprofilesService qualityprofilesService; private final RootsService rootsService; @@ -132,7 +129,6 @@ class DefaultWsClient implements WsClient { private final SourcesService sourcesService; private final SupportService supportService; private final SystemService systemService; - private final TimemachineService timemachineService; private final UpdatecenterService updatecenterService; private final UserGroupsService userGroupsService; private final UserTokensService userTokensService; @@ -182,7 +178,6 @@ class DefaultWsClient implements WsClient { this.projectPullRequestsService = new ProjectPullRequestsService(wsConnector); this.projectTagsService = new ProjectTagsService(wsConnector); this.projectsService = new ProjectsService(wsConnector); - this.propertiesService = new PropertiesService(wsConnector); this.qualitygatesService = new QualitygatesService(wsConnector); this.qualityprofilesService = new QualityprofilesService(wsConnector); this.rootsService = new RootsService(wsConnector); @@ -192,7 +187,6 @@ class DefaultWsClient implements WsClient { this.sourcesService = new SourcesService(wsConnector); this.supportService = new SupportService(wsConnector); this.systemService = new SystemService(wsConnector); - this.timemachineService = new TimemachineService(wsConnector); this.updatecenterService = new UpdatecenterService(wsConnector); this.userGroupsService = new UserGroupsService(wsConnector); this.userTokensService = new UserTokensService(wsConnector); @@ -392,11 +386,6 @@ class DefaultWsClient implements WsClient { return projectsService; } - @Override - public PropertiesService properties() { - return propertiesService; - } - @Override public QualitygatesService qualitygates() { return qualitygatesService; @@ -442,11 +431,6 @@ class DefaultWsClient implements WsClient { return systemService; } - @Override - public TimemachineService timemachine() { - return timemachineService; - } - @Override public UpdatecenterService updatecenter() { return updatecenterService; diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java index 0ecc014aa8a..7ea98457bfa 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java @@ -55,7 +55,6 @@ import org.sonarqube.ws.client.projectlinks.ProjectLinksService; import org.sonarqube.ws.client.projectpullrequests.ProjectPullRequestsService; import org.sonarqube.ws.client.projects.ProjectsService; import org.sonarqube.ws.client.projecttags.ProjectTagsService; -import org.sonarqube.ws.client.properties.PropertiesService; import org.sonarqube.ws.client.push.SonarLintServerPushService; import org.sonarqube.ws.client.qualitygates.QualitygatesService; import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService; @@ -68,7 +67,6 @@ import org.sonarqube.ws.client.settings.SettingsService; import org.sonarqube.ws.client.sources.SourcesService; import org.sonarqube.ws.client.support.SupportService; import org.sonarqube.ws.client.system.SystemService; -import org.sonarqube.ws.client.timemachine.TimemachineService; import org.sonarqube.ws.client.updatecenter.UpdatecenterService; import org.sonarqube.ws.client.usergroups.UserGroupsService; import org.sonarqube.ws.client.users.UsersService; @@ -166,8 +164,6 @@ public interface WsClient { ProjectsService projects(); - PropertiesService properties(); - QualitygatesService qualitygates(); QualityprofilesService qualityprofiles(); @@ -186,8 +182,6 @@ public interface WsClient { SystemService system(); - TimemachineService timemachine(); - UpdatecenterService updatecenter(); UserGroupsService userGroups(); diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ComponentRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ComponentRequest.java index 58cd03d8a30..2b03b0b8c00 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ComponentRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ComponentRequest.java @@ -45,16 +45,6 @@ public class ComponentRequest { return component; } - /** - * Example value: "AU-Tpxb--iU5OvuD2FLy" - * @deprecated since 6.6 - */ - @Deprecated - public ComponentRequest setComponentId(String componentId) { - this.componentId = componentId; - return this; - } - public String getComponentId() { return componentId; } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/AppRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/AppRequest.java index 5da2792189c..724f8e4d845 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/AppRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/AppRequest.java @@ -32,7 +32,6 @@ public class AppRequest { private String branch; private String component; - private String componentId; private String pullRequest; /** @@ -60,20 +59,6 @@ public class AppRequest { return component; } - /** - * Example value: "AU-Tpxb--iU5OvuD2FLy" - * @deprecated since 6.4 - */ - @Deprecated - public AppRequest setComponentId(String componentId) { - this.componentId = componentId; - return this; - } - - public String getComponentId() { - return componentId; - } - /** * This is part of the internal API. * Example value: "5461" diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java index f7191d850aa..204bc108d34 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java @@ -53,7 +53,6 @@ public class ComponentsService extends BaseService { new GetRequest(path("app")) .setParam("branch", request.getBranch()) .setParam("component", request.getComponent()) - .setParam("componentId", request.getComponentId()) .setParam("pullRequest", request.getPullRequest()) .setMediaType(MediaTypes.JSON) ).content(); @@ -109,7 +108,6 @@ public class ComponentsService extends BaseService { new GetRequest(path("show")) .setParam("branch", request.getBranch()) .setParam("component", request.getComponent()) - .setParam("componentId", request.getComponentId()) .setParam("pullRequest", request.getPullRequest()), ShowWsResponse.parser()); } @@ -143,7 +141,6 @@ public class ComponentsService extends BaseService { .setParam("asc", request.getAsc()) .setParam("branch", request.getBranch()) .setParam("component", request.getComponent()) - .setParam("componentId", request.getComponentId()) .setParam("p", request.getP()) .setParam("ps", request.getPs()) .setParam("pullRequest", request.getPullRequest()) diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ShowRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ShowRequest.java index 9c2d5e7e5a5..52cd065a936 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ShowRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/ShowRequest.java @@ -32,7 +32,6 @@ public class ShowRequest { private String branch; private String component; - private String componentId; private String pullRequest; /** @@ -60,20 +59,6 @@ public class ShowRequest { return component; } - /** - * Example value: "AU-Tpxb--iU5OvuD2FLy" - * @deprecated since 6.4 - */ - @Deprecated - public ShowRequest setComponentId(String componentId) { - this.componentId = componentId; - return this; - } - - public String getComponentId() { - return componentId; - } - /** * This is part of the internal API. * Example value: "5461" diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/TreeRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/TreeRequest.java index 56d95217bb0..a796a094775 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/components/TreeRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/components/TreeRequest.java @@ -34,7 +34,6 @@ public class TreeRequest { private String asc; private String branch; private String component; - private String componentId; private String p; private String ps; private String pullRequest; @@ -86,20 +85,6 @@ public class TreeRequest { return component; } - /** - * Example value: "AU-TpxcA-iU5OvuD2FLz" - * @deprecated since 6.4 - */ - @Deprecated - public TreeRequest setComponentId(String componentId) { - this.componentId = componentId; - return this; - } - - public String getComponentId() { - return componentId; - } - /** * Example value: "42" */ diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java index c648deeb239..09b293798d4 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java @@ -222,7 +222,6 @@ public class IssuesService extends BaseService { .setParam("author", request.getAuthor()) .setParam("branch", request.getBranch()) .setParam("componentKeys", request.getComponentKeys() == null ? null : request.getComponentKeys().stream().collect(Collectors.joining(","))) - .setParam("componentUuids", request.getComponentUuids() == null ? null : request.getComponentUuids().stream().collect(Collectors.joining(","))) .setParam("createdAfter", request.getCreatedAfter()) .setParam("createdAt", request.getCreatedAt()) .setParam("createdBefore", request.getCreatedBefore()) diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java index 47cc8d0a06c..ecb5b417233 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java @@ -38,7 +38,6 @@ public class SearchRequest { private List author; private String branch; private List componentKeys; - private List componentUuids; private String createdAfter; private String createdAt; private String createdBefore; @@ -175,20 +174,6 @@ public class SearchRequest { return componentKeys; } - /** - * Example value: "584a89f2-8037-4f7b-b82c-8b45d2d63fb2" - * @deprecated since 6.5 - */ - @Deprecated - public SearchRequest setComponentUuids(List componentUuids) { - this.componentUuids = componentUuids; - return this; - } - - public List getComponentUuids() { - return componentUuids; - } - /** * Example value: "2017-10-19 or 2017-10-19T13:00:00+0200" */ diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentRequest.java index 576fc255e6b..c77ff4f7f25 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentRequest.java @@ -34,9 +34,6 @@ public class ComponentRequest { private List additionalFields; private String branch; private String component; - private String componentId; - private String developerId; - private String developerKey; private List metricKeys; private String pullRequest; @@ -82,46 +79,6 @@ public class ComponentRequest { return component; } - /** - * Example value: "AU-Tpxb--iU5OvuD2FLy" - * @deprecated since 6.6 - */ - @Deprecated - public ComponentRequest setComponentId(String componentId) { - this.componentId = componentId; - return this; - } - - public String getComponentId() { - return componentId; - } - - /** - * @deprecated since 6.4 - */ - @Deprecated - public ComponentRequest setDeveloperId(String developerId) { - this.developerId = developerId; - return this; - } - - public String getDeveloperId() { - return developerId; - } - - /** - * @deprecated since 6.4 - */ - @Deprecated - public ComponentRequest setDeveloperKey(String developerKey) { - this.developerKey = developerKey; - return this; - } - - public String getDeveloperKey() { - return developerKey; - } - /** * This is a mandatory parameter. * Example value: "ncloc,complexity,violations" diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentTreeRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentTreeRequest.java index 3341f256702..7e3157d6958 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentTreeRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentTreeRequest.java @@ -33,11 +33,8 @@ public class ComponentTreeRequest { private List additionalFields; private String asc; - private String baseComponentId; private String branch; private String component; - private String developerId; - private String developerKey; private List metricKeys; private String metricPeriodSort; private String metricSort; @@ -85,20 +82,6 @@ public class ComponentTreeRequest { return asc; } - /** - * Example value: "AU-TpxcA-iU5OvuD2FLz" - * @deprecated since 6.6 - */ - @Deprecated - public ComponentTreeRequest setBaseComponentId(String baseComponentId) { - this.baseComponentId = baseComponentId; - return this; - } - - public String getBaseComponentId() { - return baseComponentId; - } - /** * This is part of the internal API. * Example value: "feature/my_branch" @@ -124,32 +107,6 @@ public class ComponentTreeRequest { return component; } - /** - * @deprecated since 6.4 - */ - @Deprecated - public ComponentTreeRequest setDeveloperId(String developerId) { - this.developerId = developerId; - return this; - } - - public String getDeveloperId() { - return developerId; - } - - /** - * @deprecated since 6.4 - */ - @Deprecated - public ComponentTreeRequest setDeveloperKey(String developerKey) { - this.developerKey = developerKey; - return this; - } - - public String getDeveloperKey() { - return developerKey; - } - /** * This is a mandatory parameter. * Example value: "ncloc,complexity,violations" diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/MeasuresService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/MeasuresService.java index 56e935cfdb7..ac7963475cc 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/MeasuresService.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/measures/MeasuresService.java @@ -52,9 +52,6 @@ public class MeasuresService extends BaseService { .setParam("additionalFields", request.getAdditionalFields() == null ? null : request.getAdditionalFields().stream().collect(Collectors.joining(","))) .setParam("branch", request.getBranch()) .setParam("component", request.getComponent()) - .setParam("componentId", request.getComponentId()) - .setParam("developerId", request.getDeveloperId()) - .setParam("developerKey", request.getDeveloperKey()) .setParam("metricKeys", request.getMetricKeys() == null ? null : request.getMetricKeys().stream().collect(Collectors.joining(","))) .setParam("pullRequest", request.getPullRequest()), ComponentWsResponse.parser()); @@ -72,11 +69,8 @@ public class MeasuresService extends BaseService { new GetRequest(path("component_tree")) .setParam("additionalFields", request.getAdditionalFields() == null ? null : request.getAdditionalFields().stream().collect(Collectors.joining(","))) .setParam("asc", request.getAsc()) - .setParam("baseComponentId", request.getBaseComponentId()) .setParam("branch", request.getBranch()) .setParam("component", request.getComponent()) - .setParam("developerId", request.getDeveloperId()) - .setParam("developerKey", request.getDeveloperKey()) .setParam("metricKeys", request.getMetricKeys() == null ? null : request.getMetricKeys().stream().collect(Collectors.joining(","))) .setParam("metricPeriodSort", request.getMetricPeriodSort()) .setParam("metricSort", request.getMetricSort()) diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java index 8ae630b9754..32871887128 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java @@ -34,7 +34,6 @@ public class SearchRequest { private String analyzedBefore; private String onProvisionedOnly; private String p; - private List projectIds; private List projects; private String ps; private String q; @@ -83,20 +82,6 @@ public class SearchRequest { return p; } - /** - * Example value: "AU-Tpxb--iU5OvuD2FLy,AU-TpxcA-iU5OvuD2FLz" - * @deprecated since 6.6 - */ - @Deprecated - public SearchRequest setProjectIds(List projectIds) { - this.projectIds = projectIds; - return this; - } - - public List getProjectIds() { - return projectIds; - } - /** * Example value: "my_project,another_project" */ diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/IndexRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/IndexRequest.java deleted file mode 100644 index e073c43abe9..00000000000 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/IndexRequest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarqube.ws.client.properties; - -import javax.annotation.Generated; - -/** - * This is part of the internal API. - * This is a POST request. - * @see Further information about this action online (including a response example) - * @since 2.6 - */ -@Generated("sonar-ws-generator") -public class IndexRequest { - - private String format; - private String id; - private String resource; - - /** - * Possible values: - *
    - *
  • "json"
    • - *
- */ - public IndexRequest setFormat(String format) { - this.format = format; - return this; - } - - public String getFormat() { - return format; - } - - /** - * Example value: "sonar.test.inclusions" - */ - public IndexRequest setId(String id) { - this.id = id; - return this; - } - - public String getId() { - return id; - } - - /** - * Example value: "my_project" - */ - public IndexRequest setResource(String resource) { - this.resource = resource; - return this; - } - - public String getResource() { - return resource; - } -} diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/PropertiesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/PropertiesService.java deleted file mode 100644 index 33ed9f9d859..00000000000 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/PropertiesService.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarqube.ws.client.properties; - -import javax.annotation.Generated; -import org.sonarqube.ws.MediaTypes; -import org.sonarqube.ws.client.BaseService; -import org.sonarqube.ws.client.GetRequest; -import org.sonarqube.ws.client.WsConnector; - -/** - * @see Further information about this web service online - */ -@Generated("sonar-ws-generator") -public class PropertiesService extends BaseService { - - public PropertiesService(WsConnector wsConnector) { - super(wsConnector, "api/properties"); - } - - /** - * - * This is part of the internal API. - * This is a GET request. - * @see Further information about this action online (including a response example) - * @since 2.6 - * @deprecated since 6.3 - */ - @Deprecated - public String index(IndexRequest request) { - return call( - new GetRequest(path("index")) - .setParam("format", request.getFormat()) - .setParam("id", request.getId()) - .setParam("resource", request.getResource()) - .setMediaType(MediaTypes.JSON) - ).content(); - } -} diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/package-info.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/package-info.java deleted file mode 100644 index 6f1d24d8055..00000000000 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/properties/package-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -@Generated("sonar-ws-generator") -package org.sonarqube.ws.client.properties; - -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.Generated; - diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java index 2d1c226a148..f50e3218f1e 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java @@ -30,23 +30,8 @@ import javax.annotation.Generated; @Generated("sonar-ws-generator") public class DeselectRequest { - private String projectId; private String projectKey; - /** - * Example value: "AU-Tpxb--iU5OvuD2FLy" - * @deprecated since 6.1 - */ - @Deprecated - public DeselectRequest setProjectId(String projectId) { - this.projectId = projectId; - return this; - } - - public String getProjectId() { - return projectId; - } - /** * Example value: "my_project" */ diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java index 49078e88b4d..1be54b15224 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java @@ -125,7 +125,6 @@ public class QualitygatesService extends BaseService { public void deselect(DeselectRequest request) { call( new PostRequest(path("deselect")) - .setParam("projectId", request.getProjectId()) .setParam("projectKey", request.getProjectKey()) .setMediaType(MediaTypes.JSON)).content(); } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/TimemachineService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/TimemachineService.java deleted file mode 100644 index 7b55e200098..00000000000 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/TimemachineService.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarqube.ws.client.timemachine; - -import javax.annotation.Generated; -import org.sonarqube.ws.MediaTypes; -import org.sonarqube.ws.client.BaseService; -import org.sonarqube.ws.client.GetRequest; -import org.sonarqube.ws.client.WsConnector; - -/** - * @see Further information about this web service online - */ -@Generated("sonar-ws-generator") -public class TimemachineService extends BaseService { - - public TimemachineService(WsConnector wsConnector) { - super(wsConnector, "api/timemachine"); - } - - /** - * - * This is part of the internal API. - * This is a GET request. - * @see Further information about this action online (including a response example) - * @since 2.10 - * @deprecated since 6.3 - */ - @Deprecated - public String index() { - return call( - new GetRequest(path("index")) - .setMediaType(MediaTypes.JSON) - ).content(); - } -} diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/package-info.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/package-info.java deleted file mode 100644 index 1ea258ec110..00000000000 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/package-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -@ParametersAreNonnullByDefault -@Generated("sonar-ws-generator") -package org.sonarqube.ws.client.timemachine; - -import javax.annotation.ParametersAreNonnullByDefault; -import javax.annotation.Generated; - diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/InstalledPluginsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/InstalledPluginsRequest.java deleted file mode 100644 index 7d822e8a559..00000000000 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/InstalledPluginsRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2023 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonarqube.ws.client.updatecenter; - -import javax.annotation.Generated; - -/** - * This is part of the internal API. - * This is a POST request. - * @see Further information about this action online (including a response example) - * @since 2.10 - */ -@Generated("sonar-ws-generator") -public class InstalledPluginsRequest { - - private String format; - - /** - * Possible values: - *
    - *
  • "json"
    • - *
- */ - public InstalledPluginsRequest setFormat(String format) { - this.format = format; - return this; - } - - public String getFormat() { - return format; - } -} diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/UpdatecenterService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/UpdatecenterService.java index a28233f8d25..8eb127f7ee9 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/UpdatecenterService.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/UpdatecenterService.java @@ -36,23 +36,6 @@ public class UpdatecenterService extends BaseService { super(wsConnector, "api/updatecenter"); } - /** - * - * This is part of the internal API. - * This is a GET request. - * @see Further information about this action online (including a response example) - * @since 2.10 - * @deprecated since 6.3 - */ - @Deprecated - public String installedPlugins(InstalledPluginsRequest request) { - return call( - new GetRequest(path("installed_plugins")) - .setParam("format", request.getFormat()) - .setMediaType(MediaTypes.JSON) - ).content(); - } - /** * * This is part of the internal API. diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/CreateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/CreateRequest.java index 1e446732fbc..404b1f3d0a7 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/CreateRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/CreateRequest.java @@ -119,16 +119,6 @@ public class CreateRequest { return scmAccount; } - /** - * Example value: "myscmaccount1,myscmaccount2" - * @deprecated since 6.1 - */ - @Deprecated - public CreateRequest setScmAccounts(List scmAccounts) { - this.scmAccounts = scmAccounts; - return this; - } - public List getScmAccounts() { return scmAccounts; } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UpdateRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UpdateRequest.java index a0292c52ce2..9c89753ce02 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UpdateRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UpdateRequest.java @@ -85,16 +85,6 @@ public class UpdateRequest { return scmAccount; } - /** - * Example value: "myscmaccount1,myscmaccount2" - * @deprecated since 6.1 - */ - @Deprecated - public UpdateRequest setScmAccounts(String scmAccounts) { - this.scmAccounts = scmAccounts; - return this; - } - public String getScmAccounts() { return scmAccounts; } -- 2.39.5