aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-ws
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2022-03-29 16:20:40 -0500
committersonartech <sonartech@sonarsource.com>2022-04-01 08:22:58 +0000
commitdc84e9f271f4a72de0b55c0cfd141bf67e1ddeb8 (patch)
tree53d489c0daf9151261fcab862bd6ba23020e3697 /sonar-ws
parentd27e2321560f15d7d5a59e1c99c80891d7632bdd (diff)
downloadsonarqube-dc84e9f271f4a72de0b55c0cfd141bf67e1ddeb8.tar.gz
sonarqube-dc84e9f271f4a72de0b55c0cfd141bf67e1ddeb8.zip
SONAR-16139 Drop api/users/set_setting and related db table
Diffstat (limited to 'sonar-ws')
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/DefaultWsClient.java8
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/WsClient.java3
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/UserPropertiesService.java53
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/package-info.java26
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetSettingRequest.java65
-rw-r--r--sonar-ws/src/main/java/org/sonarqube/ws/client/users/UsersService.java15
-rw-r--r--sonar-ws/src/main/protobuf/ws-users.proto2
7 files changed, 1 insertions, 171 deletions
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 39c97e4b4ba..bdbd30cb92a 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
@@ -69,7 +69,6 @@ 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.userproperties.UserPropertiesService;
import org.sonarqube.ws.client.users.UsersService;
import org.sonarqube.ws.client.usertokens.UserTokensService;
import org.sonarqube.ws.client.views.ViewsService;
@@ -133,7 +132,6 @@ class DefaultWsClient implements WsClient {
private final TimemachineService timemachineService;
private final UpdatecenterService updatecenterService;
private final UserGroupsService userGroupsService;
- private final UserPropertiesService userPropertiesService;
private final UserTokensService userTokensService;
private final UsersService usersService;
private final ViewsService viewsService;
@@ -192,7 +190,6 @@ class DefaultWsClient implements WsClient {
this.timemachineService = new TimemachineService(wsConnector);
this.updatecenterService = new UpdatecenterService(wsConnector);
this.userGroupsService = new UserGroupsService(wsConnector);
- this.userPropertiesService = new UserPropertiesService(wsConnector);
this.userTokensService = new UserTokensService(wsConnector);
this.usersService = new UsersService(wsConnector);
this.viewsService = new ViewsService(wsConnector);
@@ -445,11 +442,6 @@ class DefaultWsClient implements WsClient {
}
@Override
- public UserPropertiesService userProperties() {
- return userPropertiesService;
- }
-
- @Override
public UserTokensService userTokens() {
return userTokensService;
}
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 23f90cfd7ad..f616d7574ed 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
@@ -69,7 +69,6 @@ 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.userproperties.UserPropertiesService;
import org.sonarqube.ws.client.users.UsersService;
import org.sonarqube.ws.client.usertokens.UserTokensService;
import org.sonarqube.ws.client.views.ViewsService;
@@ -189,8 +188,6 @@ public interface WsClient {
UserGroupsService userGroups();
- UserPropertiesService userProperties();
-
UserTokensService userTokens();
UsersService users();
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/UserPropertiesService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/UserPropertiesService.java
deleted file mode 100644
index 8d59fc3f496..00000000000
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/UserPropertiesService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2022 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.userproperties;
-
-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/user_properties">Further information about this web service online</a>
- */
-@Generated("sonar-ws-generator")
-public class UserPropertiesService extends BaseService {
-
- public UserPropertiesService(WsConnector wsConnector) {
- super(wsConnector, "api/user_properties");
- }
-
- /**
- *
- * This is part of the internal API.
- * This is a GET request.
- * @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/user_properties/index">Further information about this action online (including a response example)</a>
- * @since 2.6
- * @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/userproperties/package-info.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/package-info.java
deleted file mode 100644
index 82954fa5ca5..00000000000
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/userproperties/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2022 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.userproperties;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.annotation.Generated;
-
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetSettingRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetSettingRequest.java
deleted file mode 100644
index 7fe93db639a..00000000000
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/SetSettingRequest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2022 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.users;
-
-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/users/set_setting">Further information about this action online (including a response example)</a>
- * @since 7.6
- */
-@Generated("sonar-ws-generator")
-public class SetSettingRequest {
-
- private String key;
- private String value;
-
- /**
- * This is a mandatory parameter.
- */
- public SetSettingRequest setKey(String key) {
- this.key = key;
- return this;
- }
-
- public String getKey() {
- return key;
- }
-
- /**
- * This is a mandatory parameter.
- * Possible values:
- * <ul>
- * <li>"tutorials.jenkins.skipBitbucketPreReqs"</li>
- * <li>"notifications.optOut"</li>
- * <li>"notifications.readDate"</li>
- * </ul>
- */
- public SetSettingRequest setValue(String value) {
- this.value = value;
- return this;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UsersService.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UsersService.java
index ecfe01f6ac9..b90eaecf034 100644
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UsersService.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/users/UsersService.java
@@ -171,21 +171,6 @@ public class UsersService extends BaseService {
*
* This is part of the internal API.
* This is a POST request.
- * @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/users/set_setting">Further information about this action online (including a response example)</a>
- * @since 7.6
- */
- public void setSetting(SetSettingRequest request) {
- call(
- new PostRequest(path("set_setting"))
- .setParam("key", request.getKey())
- .setParam("value", request.getValue())
- .setMediaType(MediaTypes.JSON)).content();
- }
-
- /**
- *
- * This is part of the internal API.
- * This is a POST request.
* @see <a href="https://next.sonarqube.com/sonarqube/web_api/api/users/skip_onboarding_tutorial">Further information about this action online (including a response example)</a>
* @since 6.5
*/
diff --git a/sonar-ws/src/main/protobuf/ws-users.proto b/sonar-ws/src/main/protobuf/ws-users.proto
index e75a4692f02..ec2af94934e 100644
--- a/sonar-ws/src/main/protobuf/ws-users.proto
+++ b/sonar-ws/src/main/protobuf/ws-users.proto
@@ -110,7 +110,7 @@ message CurrentWsResponse {
optional bool showOnboardingTutorial = 11;
optional string avatar = 12;
optional Homepage homepage = 13;
- repeated Setting settings = 15;
+ reserved 15; // settings removed
optional bool usingSonarLintConnectedMode = 16;
optional bool sonarLintAdSeen = 17;