]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-18600 Remove deprecated items that are not used anymore
authorZipeng WU <zipeng.wu@sonarsource.com>
Mon, 6 Mar 2023 17:46:02 +0000 (18:46 +0100)
committersonartech <sonartech@sonarsource.com>
Tue, 7 Mar 2023 20:02:54 +0000 (20:02 +0000)
33 files changed:
server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/def/VarcharColumnDef.java
server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v00/CreateInitialSchema.java
server/sonar-webserver-es/src/main/java/org/sonar/server/issue/index/IssueQuery.java
server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAction.java
server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/SearchAdditionalField.java
sonar-core/src/main/java/org/sonar/core/config/ScannerProperties.java
sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/log/ExceptionHandlingMediumTest.java
sonar-ws-generator/src/main/resources/snapshot-of-api.json
sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java
sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java
sonar-ws/src/main/java/org/sonarqube/ws/client/ce/ComponentRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/components/AppRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/components/ComponentsService.java
sonar-ws/src/main/java/org/sonarqube/ws/client/components/ShowRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/components/TreeRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/issues/IssuesService.java
sonar-ws/src/main/java/org/sonarqube/ws/client/issues/SearchRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/measures/ComponentTreeRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/measures/MeasuresService.java
sonar-ws/src/main/java/org/sonarqube/ws/client/projects/SearchRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/properties/IndexRequest.java [deleted file]
sonar-ws/src/main/java/org/sonarqube/ws/client/properties/PropertiesService.java [deleted file]
sonar-ws/src/main/java/org/sonarqube/ws/client/properties/package-info.java [deleted file]
sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/DeselectRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/qualitygates/QualitygatesService.java
sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/TimemachineService.java [deleted file]
sonar-ws/src/main/java/org/sonarqube/ws/client/timemachine/package-info.java [deleted file]
sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/InstalledPluginsRequest.java [deleted file]
sonar-ws/src/main/java/org/sonarqube/ws/client/updatecenter/UpdatecenterService.java
sonar-ws/src/main/java/org/sonarqube/ws/client/users/CreateRequest.java
sonar-ws/src/main/java/org/sonarqube/ws/client/users/UpdateRequest.java

index 225b856021ea14f612db2995ba62cb7b98e0dfb0..1b7e3f59f5ce386e86b04e067dc63ea5cc57bddf 100644 (file)
@@ -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;
index e928f6de37bbda26d56a2850d34a19c25ebf5f3f..df08eaa4a98784c8fca72fba6df5777498a7d2a5 100644 (file)
@@ -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();
index acb8449f7c471ae6a9a9f307766cfd421a584652..fd73568089ff323310304a0dfedb685d12ce39b1 100644 (file)
@@ -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<String> 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<String> 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<String> issueKeys;
index 865ff04bb0153e6c0bf16ee0e7e20af5681fe05f..6e31e6b683ee9c37cb25ef812b9f0e8959959595 100644 (file)
@@ -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 {
         + "<br/>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)"),
index f8c5c05a0f2630a282461fd750965277f257495e..afb19d2af44f838795db53df268323de2ec3c66e 100644 (file)
@@ -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"),
index ea2fb1ab7de276f22a3bc704f071aa810f935182..b6755a22fb7f5eefac42549678dfb1e6ca287204 100644 (file)
@@ -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";
index e087c62d1a2fcebe1cee62b10e2cab3a3169f336..cb2e3d0c96bc1c79b76df6b49313d814b4ae19a3 100644 (file)
@@ -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<String, String> analysisProperties, Object... components) {
-    Map<String, String> mergedProps = new HashMap<>(this.globalProperties);
-    mergedProps.putAll(analysisProperties);
-    List<Object> 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<String, String> bootstrapProperties) {
-      this.globalProperties = bootstrapProperties;
-      return this;
-    }
-
     public Builder addComponents(Object... components) {
       Collections.addAll(this.components, components);
       return this;
index cf7fcca751019565b23367daed31d1691005420e..011c7b5eec897f34336a37c0c397baa747b3ea45 100644 (file)
@@ -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();
   }
index 47f92478d4f54844e19be372b49aaee154852f80..6f3a0b501982abaa87a53c83aa92413e5f362417 100644 (file)
         }
       ]
     },
-    {
-      "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",
         }
       ]
     },
-    {
-      "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.<br /> Requires 'Administer System' permission.",
index b8d060ef0e217304203312a9fca8b1a4e23ede85..fc9df74e81fb57400afbcfada8b043d288c7cac1 100644 (file)
@@ -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;
index 0ecc014aa8a095d35c647e1edc1a164ec8977449..7ea98457bfa7984aa9a0401061209e056458d1aa 100644 (file)
@@ -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();
index 58cd03d8a30568531145f3ef3b181a8211fcb6a6..2b03b0b8c0002f5ddf63b397a05c2113c430a9fb 100644 (file)
@@ -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;
   }
index 5da2792189c9e8878a4dfe4d5d00a5d2d81b9b6f..724f8e4d8451eafeeb6d4146fabc23bb7e9cf670 100644 (file)
@@ -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"
index f7191d850aaf02a6823662510e77d999d44d3683..204bc108d341461b2cddf0709d7295df08c5b344 100644 (file)
@@ -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())
index 9c2d5e7e5a5ea5d10969dcca88322cb3ac0c5d99..52cd065a936a531a2ed6d80ea154d7aebc9987db 100644 (file)
@@ -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"
index 56d95217bb046e9487d5848ebb40569ea0b1d74d..a796a094775c3aa12e2398607f6be95dc2a4ff87 100644 (file)
@@ -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"
    */
index c648deeb239af4b925e9ff3d2fe0e9271b35a520..09b293798d40e1ce448394d44984f512a05c8b68 100644 (file)
@@ -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())
index 47cc8d0a06cde83e58297d2490360ffc97879226..ecb5b417233f331bf6e0b5748155bace936e9f68 100644 (file)
@@ -38,7 +38,6 @@ public class SearchRequest {
   private List<String> author;
   private String branch;
   private List<String> componentKeys;
-  private List<String> 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<String> componentUuids) {
-    this.componentUuids = componentUuids;
-    return this;
-  }
-
-  public List<String> getComponentUuids() {
-    return componentUuids;
-  }
-
   /**
    * Example value: "2017-10-19 or 2017-10-19T13:00:00+0200"
    */
index 576fc255e6b12628b3b3655b4a1eecc88b969ca8..c77ff4f7f25fa52a49b336532a013d3118279191 100644 (file)
@@ -34,9 +34,6 @@ public class ComponentRequest {
   private List<String> additionalFields;
   private String branch;
   private String component;
-  private String componentId;
-  private String developerId;
-  private String developerKey;
   private List<String> 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"
index 3341f2567021517fc4596bfd067deda1392e5efe..7e3157d6958d51b21564f718bd9c5fa1b90872b0 100644 (file)
@@ -33,11 +33,8 @@ public class ComponentTreeRequest {
 
   private List<String> additionalFields;
   private String asc;
-  private String baseComponentId;
   private String branch;
   private String component;
-  private String developerId;
-  private String developerKey;
   private List<String> 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"
index 56e935cfdb7928307cd66b880260ea6d3d39326d..ac7963475cc8cbe9fe4b491cb61951a2f95867e5 100644 (file)
@@ -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())
index 8ae630b97543b2c3205a23811a25611120b7e0e4..32871887128847c072d97faee6e7c63af96df6d6 100644 (file)
@@ -34,7 +34,6 @@ public class SearchRequest {
   private String analyzedBefore;
   private String onProvisionedOnly;
   private String p;
-  private List<String> projectIds;
   private List<String> 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<String> projectIds) {
-    this.projectIds = projectIds;
-    return this;
-  }
-
-  public List<String> 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 (file)
index e073c43..0000000
+++ /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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/properties/index">Further information about this action online (including a response example)</a>
- * @since 2.6
- */
-@Generated("sonar-ws-generator")
-public class IndexRequest {
-
-  private String format;
-  private String id;
-  private String resource;
-
-  /**
-   * Possible values:
-   * <ul>
-   *   <li>"json"</li>
-   * </ul>
-   */
-  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 (file)
index 33ed9f9..0000000
+++ /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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/properties">Further information about this web service online</a>
- */
-@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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/properties/index">Further information about this action online (including a response example)</a>
-   * @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 (file)
index 6f1d24d..0000000
+++ /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;
-
index 2d1c226a14834a0877cca2cca1ae459d944512a9..f50e3218f1e07351443974226b3efe784c92e807 100644 (file)
@@ -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"
    */
index 49078e88b4d57de4159037274685ada1bddd3a66..1be54b15224a18a637c5ed4c941a72e937304814 100644 (file)
@@ -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 (file)
index 7b55e20..0000000
+++ /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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/timemachine">Further information about this web service online</a>
- */
-@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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/timemachine/index">Further information about this action online (including a response example)</a>
-   * @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 (file)
index 1ea258e..0000000
+++ /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 (file)
index 7d822e8..0000000
+++ /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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/updatecenter/installed_plugins">Further information about this action online (including a response example)</a>
- * @since 2.10
- */
-@Generated("sonar-ws-generator")
-public class InstalledPluginsRequest {
-
-  private String format;
-
-  /**
-   * Possible values:
-   * <ul>
-   *   <li>"json"</li>
-   * </ul>
-   */
-  public InstalledPluginsRequest setFormat(String format) {
-    this.format = format;
-    return this;
-  }
-
-  public String getFormat() {
-    return format;
-  }
-}
index a28233f8d25191ad2d489a1813d1c05302abdb4a..8eb127f7ee9ce70b51098f9d7da1619cb45aed55 100644 (file)
@@ -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 <a href="https://next.sonarqube.com/sonarqube/web_api/api/updatecenter/installed_plugins">Further information about this action online (including a response example)</a>
-   * @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.
index 1e446732fbc7263108dbb08eac8ab63fecd7f25a..404b1f3d0a787973aaa33ba5ae527da06589ba4f 100644 (file)
@@ -119,16 +119,6 @@ public class CreateRequest {
     return scmAccount;
   }
 
-  /**
-   * Example value: "myscmaccount1,myscmaccount2"
-   * @deprecated since 6.1
-   */
-  @Deprecated
-  public CreateRequest setScmAccounts(List<String> scmAccounts) {
-    this.scmAccounts = scmAccounts;
-    return this;
-  }
-
   public List<String> getScmAccounts() {
     return scmAccounts;
   }
index a0292c52ce26a0b4b9fc11d1259ed1e41d7690b9..9c89753ce0296fc25ef4b575d0f55e1d7b5d533b 100644 (file)
@@ -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;
   }