diff options
4 files changed, 5 insertions, 32 deletions
diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseRequest.java index 6a92121fd8c..73e99ed14b6 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/BaseRequest.java @@ -29,8 +29,6 @@ import java.util.Objects; import java.util.Optional; import java.util.OptionalInt; import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonarqube.ws.MediaTypes; @@ -90,7 +88,7 @@ abstract class BaseRequest<SELF extends BaseRequest<SELF>> implements WsRequest * Expected media type of response. Default is {@link MediaTypes#JSON}. */ @SuppressWarnings("unchecked") - public <T extends SELF> T setMediaType(String s) { + public <T extends SELF> T setMediaType(String s) { requireNonNull(s, "media type of response cannot be null"); this.mediaType = s; return (T) this; @@ -143,18 +141,6 @@ abstract class BaseRequest<SELF extends BaseRequest<SELF>> implements WsRequest } @Override - public Map<String, String> getParams() { - return parameters.keyValues.keySet().stream() - .collect(Collectors.toMap( - Function.identity(), - key -> parameters.keyValues.get(key).get(0), - (v1, v2) -> { - throw new IllegalStateException(String.format("Duplicate key '%s' in request", v1)); - }, - LinkedHashMap::new)); - } - - @Override public Parameters getParameters() { return parameters; } diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsRequest.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsRequest.java index bf338d5a9cc..65dee5e36b2 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/client/WsRequest.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/WsRequest.java @@ -19,7 +19,6 @@ */ package org.sonarqube.ws.client; -import java.util.Map; import java.util.OptionalInt; /** @@ -37,15 +36,6 @@ public interface WsRequest { OptionalInt getWriteTimeOutInMs(); - /** - * - * In case of multi value parameters, returns the first value - * - * @deprecated since 6.1. Use {@link #getParameters()} instead - */ - @Deprecated - Map<String, String> getParams(); - Parameters getParameters(); Headers getHeaders(); diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/BaseRequestTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/BaseRequestTest.java index b8d51afcc99..74e91caa23d 100644 --- a/sonar-ws/src/test/java/org/sonarqube/ws/client/BaseRequestTest.java +++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/BaseRequestTest.java @@ -33,12 +33,12 @@ import static org.assertj.core.data.MapEntry.entry; public class BaseRequestTest { - private FakeRequest underTest = new FakeRequest("api/foo"); + private final FakeRequest underTest = new FakeRequest("api/foo"); @Test public void test_defaults() { assertThat(underTest.getMethod()).isEqualTo(WsRequest.Method.GET); - assertThat(underTest.getParams()).isEmpty(); + assertThat(underTest.getParameters().getKeys()).isEmpty(); assertThat(underTest.getMediaType()).isEqualTo(MediaTypes.JSON); assertThat(underTest.getPath()).isEqualTo("api/foo"); assertThat(underTest.getWriteTimeOutInMs()).isEmpty(); @@ -58,16 +58,13 @@ public class BaseRequestTest { @Test public void keep_order_of_params() { - assertThat(underTest.getParams()).isEmpty(); assertThat(underTest.getParameters().getKeys()).isEmpty(); underTest.setParam("keyB", "b"); - assertThat(underTest.getParams()).containsExactly(entry("keyB", "b")); assertParameters(entry("keyB", "b")); assertMultiValueParameters(entry("keyB", singletonList("b"))); underTest.setParam("keyA", "a"); - assertThat(underTest.getParams()).containsExactly(entry("keyB", "b"), entry("keyA", "a")); assertParameters(entry("keyB", "b"), entry("keyA", "a")); assertMultiValueParameters(entry("keyB", singletonList("b")), entry("keyA", singletonList("a"))); @@ -90,7 +87,7 @@ public class BaseRequestTest { public void null_param_value() { Boolean nullBool = null; underTest.setParam("key", nullBool); - assertThat(underTest.getParams()).isEmpty(); + assertThat(underTest.getParameters().getKeys()).isEmpty(); } @Test diff --git a/sonar-ws/src/test/java/org/sonarqube/ws/client/PostRequestTest.java b/sonar-ws/src/test/java/org/sonarqube/ws/client/PostRequestTest.java index ec50a1c7267..cf7882aca48 100644 --- a/sonar-ws/src/test/java/org/sonarqube/ws/client/PostRequestTest.java +++ b/sonar-ws/src/test/java/org/sonarqube/ws/client/PostRequestTest.java @@ -43,7 +43,7 @@ public class PostRequestTest { public void empty_parts_and_params_by_default() { PostRequest request = new PostRequest("api/issues/search"); assertThat(request.getParts()).isEmpty(); - assertThat(request.getParams()).isEmpty(); + assertThat(request.getParameters().getKeys()).isEmpty(); } @Test |