From 7f18edf39fd4d270f0420d890f0ccfd34a35fbfb Mon Sep 17 00:00:00 2001 From: Max Inno Date: Fri, 27 Feb 2026 08:21:07 +0200 Subject: [PATCH] refactor: migrate to Apache HTTP Client 5 (incomplete) --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 +- .../com/crowdin/client/core/CrowdinApi.java | 8 +- .../core/http/impl/http/ApacheHttpClient.java | 92 +++++++++++-------- .../java/com/crowdin/client/ai/AIApiTest.java | 8 +- .../applications/ApplicationsApiTest.java | 10 +- .../client/branches/BranchesApiTest.java | 4 +- .../client/bundles/BundlesApiTest.java | 8 +- .../client/clients/ClientsApiTest.java | 2 +- .../crowdin/client/core/CrowdinApiTest.java | 2 +- .../http/impl/http/ApacheHttpClientTest.java | 31 ++++--- .../dictionaries/DictionariesApiTest.java | 4 +- .../distributions/DistributionsApiTest.java | 8 +- .../crowdin/client/fields/FieldsApiTest.java | 8 +- .../client/framework/TestHttpClient.java | 12 +-- ...ossariesApiGlossariesOrderByIdAscTest.java | 2 +- ...ssariesApiGlossariesOrderByIdDescTest.java | 2 +- .../client/glossaries/GlossariesApiTest.java | 2 +- .../crowdin/client/issues/IssuesApiTest.java | 4 +- .../crowdin/client/labels/LabelsApiTest.java | 8 +- .../client/languages/LanguagesApiTest.java | 8 +- .../MachineTranslationEnginesApiTest.java | 8 +- .../notifications/NotificationsApiTest.java | 2 +- .../ListProjectsOrderByIdTest.java | 2 +- .../ProjectFileFormatSettingsApiTest.java | 8 +- ...ProjectStringsExporterSettingsApiTest.java | 8 +- .../projectsgroups/ProjectsGroupsApiTest.java | 8 +- .../client/reports/GroupReportsApiTest.java | 4 +- .../client/reports/ReportsApiTest.java | 8 +- .../screenshots/ScreenshotsApiTest.java | 10 +- .../client/securitylogs/SecurityLogsTest.java | 3 +- .../sourcefiles/SourceFilesApiTest.java | 10 +- .../sourcestrings/SourceStringsApiTest.java | 12 ++- .../client/storage/StorageApiTest.java | 6 +- .../stringcomments/StringCommentsApiTest.java | 8 +- .../bundles/StringCorrectionsApiTest.java | 12 ++- .../StringTranslationsApiTest.java | 2 +- .../client/tasks/TaskCommentsApiTest.java | 8 +- .../tasks/TaskSettingsTemplatesApiTest.java | 8 +- .../crowdin/client/tasks/TasksApiTest.java | 8 +- .../client/tasks/UserTasksOrderByIdTest.java | 2 +- .../TeamsApiListTeamsOrderByIdAscTest.java | 2 +- .../TeamsApiListTeamsOrderByIdDescTest.java | 2 +- .../TeamsApiListTeamsSearchByGroupIdTest.java | 2 +- .../TeamsApiListTeamsSearchByNameTest.java | 2 +- ...eamsApiListTeamsSearchByProjectIdTest.java | 2 +- ...sApiListTeamsSearchByProjectRolesTest.java | 2 +- .../crowdin/client/teams/TeamsApiTest.java | 8 +- ...ationMemoryApiListTmsOrderByIdAscTest.java | 2 +- ...tionMemoryApiListTmsOrderByIdDescTest.java | 2 +- .../TranslationMemoryApiTest.java | 8 +- .../TranslationMemorySegmentsApiTest.java | 8 +- .../TranslationsApiIssuesTest.java | 2 +- .../translations/TranslationsApiTest.java | 8 +- .../TranslationStatusApiTest.java | 2 +- .../client/users/UsersApiOrderyIdAscTest.java | 2 +- .../users/UsersApiOrderyIdDescTest.java | 2 +- .../users/UsersApiSearchByNullTest.java | 2 +- .../users/UsersApiSearchBySearchTest.java | 2 +- .../crowdin/client/users/UsersApiTest.java | 2 +- .../client/vendors/VendorsApiTest.java | 2 +- .../webhooks/OrganizationWebhooksApiTest.java | 8 +- .../client/webhooks/WebhooksApiTest.java | 8 +- .../client/workflows/WorkflowsApiTest.java | 2 +- 64 files changed, 240 insertions(+), 207 deletions(-) diff --git a/build.gradle b/build.gradle index a22eb7b55..bcaeb00fe 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.32' - implementation 'org.apache.httpcomponents:httpclient:4.5.13' + implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1' implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.3' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0','org.mockito:mockito-core:4.11.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3994438e2..2c891d6e2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sun Feb 22 22:18:26 EET 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/crowdin/client/core/CrowdinApi.java b/src/main/java/com/crowdin/client/core/CrowdinApi.java index e3f9954ad..a6a8ca4e0 100644 --- a/src/main/java/com/crowdin/client/core/CrowdinApi.java +++ b/src/main/java/com/crowdin/client/core/CrowdinApi.java @@ -6,9 +6,9 @@ import com.crowdin.client.core.http.impl.http.ApacheHttpClient; import com.crowdin.client.core.http.impl.json.JacksonJsonTransformer; import com.crowdin.client.core.model.*; -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.cookie.StandardCookieSpec; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import java.util.Collections; import java.util.HashMap; @@ -25,7 +25,7 @@ public CrowdinApi(Credentials credentials) { this(credentials, ClientConfig.builder() .httpClient(new ApacheHttpClient(credentials, new JacksonJsonTransformer(), Collections.emptyMap(), HttpClientBuilder .create() - .setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build()) + .setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(StandardCookieSpec.RELAXED).build()) .build())) .build()); } diff --git a/src/main/java/com/crowdin/client/core/http/impl/http/ApacheHttpClient.java b/src/main/java/com/crowdin/client/core/http/impl/http/ApacheHttpClient.java index 7f95c04d5..60dcc9f10 100644 --- a/src/main/java/com/crowdin/client/core/http/impl/http/ApacheHttpClient.java +++ b/src/main/java/com/crowdin/client/core/http/impl/http/ApacheHttpClient.java @@ -8,27 +8,41 @@ import com.crowdin.client.core.http.exceptions.HttpException; import com.crowdin.client.core.model.ClientConfig; import com.crowdin.client.core.model.Credentials; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHost; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.InputStreamEntity; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.classic.methods.*; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHost; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; +import org.apache.hc.client5.http.cookie.StandardCookieSpec; +import org.apache.hc.client5.http.config.RequestConfig; +//import org.apache.http.client.methods.HttpUriRequest; +//import org.apache.http.client.methods.RequestBuilder; +//import org.apache.http.entity.ContentType; +//import org.apache.http.entity.InputStreamEntity; +//import org.apache.http.entity.StringEntity; +//import org.apache.http.impl.client.BasicCredentialsProvider; +//import org.apache.http.impl.client.CloseableHttpClient; +//import org.apache.http.impl.client.HttpClientBuilder; + +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.core5.http.ContentType; +import org.apache.hc.core5.http.io.entity.InputStreamEntity; +import org.apache.hc.core5.http.io.entity.StringEntity; + +import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; + +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.core5.util.Timeout; + +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.apache.hc.client5.http.classic.methods.HttpPost; + +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.ContentType; +import org.apache.hc.core5.http.io.entity.InputStreamEntity; +import org.apache.hc.core5.http.io.entity.StringEntity; import java.io.IOException; import java.io.InputStream; @@ -38,6 +52,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; public class ApacheHttpClient implements HttpClient { @@ -62,11 +77,12 @@ public ApacheHttpClient(Credentials credentials, JsonTransformer jsonTransformer this.defaultHeaders = defaultHeaders; this.proxy = proxy; this.proxyCreds = proxyCreds; - RequestConfig.Builder requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD); + RequestConfig.Builder requestConfig = RequestConfig.custom().setCookieSpec(StandardCookieSpec.RELAXED); if (timeoutMs != null) { - requestConfig.setConnectionRequestTimeout(timeoutMs); - requestConfig.setConnectTimeout(timeoutMs); - requestConfig.setSocketTimeout(timeoutMs); + Timeout timeout = Timeout.of(timeoutMs, TimeUnit.MILLISECONDS); + requestConfig.setConnectionRequestTimeout(timeout); + requestConfig.setConnectTimeout(timeout); + requestConfig.setResponseTimeout(timeout); } this.httpClient = (proxy != null) ? HttpClientBuilder.create() @@ -74,7 +90,7 @@ public ApacheHttpClient(Credentials credentials, JsonTransformer jsonTransformer .setDefaultRequestConfig(requestConfig.build()) .setDefaultCredentialsProvider((proxyCreds != null) ? new BasicCredentialsProvider() {{ - setCredentials(new AuthScope(proxy.getHost(), proxy.getPort()), new UsernamePasswordCredentials(proxyCreds.getUsername(), proxyCreds.getPassword())); + setCredentials(new AuthScope(proxy.getHost(), proxy.getPort()), new UsernamePasswordCredentials(proxyCreds.getUsername(), proxyCreds.getPassword().toCharArray())); }} : new BasicCredentialsProvider()) .build() @@ -119,10 +135,10 @@ private T request(String url, HttpRequestConfig config, Class clazz, String method) throws HttpException, HttpBadRequestException { - HttpUriRequest request = this.buildRequest(method, url, data, config); + HttpUriRequestBase request = this.buildRequest(method, url, data, config); String httpResponse = null; try (CloseableHttpResponse response = httpClient.execute(request)) { - int statusCode = response.getStatusLine().getStatusCode(); + int statusCode = response.getCode(); if (statusCode < 200 || statusCode >= 300) { String error = this.toString(response.getEntity()); throw this.jsonTransformer.parse(error, CrowdinApiException.class); @@ -142,30 +158,32 @@ private T request(String url, } } - private HttpUriRequest buildRequest(String httpMethod, String url, V data, HttpRequestConfig config) { - RequestBuilder requestBuilder = RequestBuilder.create(httpMethod); - requestBuilder.setUri(URI.create(this.appendUrlParams(url, config.getUrlParams()))); - requestBuilder.addHeader("Authorization", "Bearer " + this.credentials.getToken()); + private HttpUriRequestBase buildRequest(String httpMethod, String url, V data, HttpRequestConfig config) { + //RequestBuilder requestBuilder = RequestBuilder.create(httpMethod); + HttpUriRequestBase request = new HttpUriRequestBase(httpMethod, URI.create(this.appendUrlParams(url, config.getUrlParams()))); + + //requestBuilder.setUri(URI.create(this.appendUrlParams(url, config.getUrlParams()))); + request.addHeader("Authorization", "Bearer " + this.credentials.getToken()); if (data != null) { HttpEntity entity; if (data instanceof InputStream) { - entity = new InputStreamEntity((InputStream) data); + entity = new InputStreamEntity((InputStream) data, ContentType.APPLICATION_OCTET_STREAM); } else if (data instanceof String) { entity = new StringEntity((String) data, ContentType.APPLICATION_OCTET_STREAM); } else { entity = new StringEntity(this.jsonTransformer.convert(data), ContentType.APPLICATION_JSON); } - requestBuilder.setEntity(entity); + request.setEntity(entity); } else if (HttpPost.METHOD_NAME.equals(httpMethod)) { - requestBuilder.setEntity(new StringEntity("", ContentType.APPLICATION_JSON)); + request.setEntity(new StringEntity("", ContentType.APPLICATION_JSON)); } Map headers = new HashMap<>(); headers.putAll(config.getHeaders()); headers.putAll(this.defaultHeaders); for (Map.Entry entry : headers.entrySet()) { - requestBuilder = requestBuilder.addHeader(entry.getKey(), entry.getValue().toString()); + request.addHeader(entry.getKey(), entry.getValue().toString()); } - return requestBuilder.build(); + return request; } private String toString(HttpEntity entity) throws IOException { diff --git a/src/test/java/com/crowdin/client/ai/AIApiTest.java b/src/test/java/com/crowdin/client/ai/AIApiTest.java index 44a9e0265..570216114 100644 --- a/src/test/java/com/crowdin/client/ai/AIApiTest.java +++ b/src/test/java/com/crowdin/client/ai/AIApiTest.java @@ -11,10 +11,10 @@ import com.crowdin.client.core.model.ResponseObject; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/applications/ApplicationsApiTest.java b/src/test/java/com/crowdin/client/applications/ApplicationsApiTest.java index baedf3727..780334812 100644 --- a/src/test/java/com/crowdin/client/applications/ApplicationsApiTest.java +++ b/src/test/java/com/crowdin/client/applications/ApplicationsApiTest.java @@ -7,11 +7,11 @@ import com.crowdin.client.core.model.ResponseObject; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/branches/BranchesApiTest.java b/src/test/java/com/crowdin/client/branches/BranchesApiTest.java index a195487a2..f70434873 100644 --- a/src/test/java/com/crowdin/client/branches/BranchesApiTest.java +++ b/src/test/java/com/crowdin/client/branches/BranchesApiTest.java @@ -4,8 +4,8 @@ import com.crowdin.client.core.model.ResponseObject; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/bundles/BundlesApiTest.java b/src/test/java/com/crowdin/client/bundles/BundlesApiTest.java index 29776c9f5..0b72a5637 100644 --- a/src/test/java/com/crowdin/client/bundles/BundlesApiTest.java +++ b/src/test/java/com/crowdin/client/bundles/BundlesApiTest.java @@ -11,10 +11,10 @@ import com.crowdin.client.sourcefiles.model.Branch; import com.crowdin.client.sourcefiles.model.File; import com.crowdin.client.sourcefiles.model.FileInfo; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/com/crowdin/client/clients/ClientsApiTest.java b/src/test/java/com/crowdin/client/clients/ClientsApiTest.java index 87f21f7ee..b06d726ce 100644 --- a/src/test/java/com/crowdin/client/clients/ClientsApiTest.java +++ b/src/test/java/com/crowdin/client/clients/ClientsApiTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.core.model.ResponseList; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/com/crowdin/client/core/CrowdinApiTest.java b/src/test/java/com/crowdin/client/core/CrowdinApiTest.java index 1d7fa94f0..de92ebb16 100644 --- a/src/test/java/com/crowdin/client/core/CrowdinApiTest.java +++ b/src/test/java/com/crowdin/client/core/CrowdinApiTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import lombok.Data; import lombok.var; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/core/http/impl/http/ApacheHttpClientTest.java b/src/test/java/com/crowdin/client/core/http/impl/http/ApacheHttpClientTest.java index a16645072..2952f89bc 100644 --- a/src/test/java/com/crowdin/client/core/http/impl/http/ApacheHttpClientTest.java +++ b/src/test/java/com/crowdin/client/core/http/impl/http/ApacheHttpClientTest.java @@ -8,12 +8,10 @@ import com.crowdin.client.core.model.BooleanInt; import com.crowdin.client.core.model.Credentials; import com.crowdin.client.labels.model.Label; -import org.apache.http.HttpStatus; -import org.apache.http.HttpVersion; -import org.apache.http.client.methods.*; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicStatusLine; +import org.apache.hc.client5.http.classic.methods.HttpUriRequest; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.core5.http.io.entity.StringEntity; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -85,7 +83,8 @@ private String getFile(String resourcePath) throws IOException { public void testGetRequest() throws IOException { // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity(jsonResponse)); // Make a GET request and check the response @@ -107,7 +106,8 @@ public void testGetRequest() throws IOException { public void testGetRequestError() throws IOException { // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_REQUEST, "FAIL")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_REQUEST, "FAIL")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity(errorResponse)); @@ -119,7 +119,8 @@ public void testGetRequestError() throws IOException { public void testDeleteRequest() throws IOException { // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity("Mocked response body")); @@ -143,7 +144,8 @@ public void tesPostRequest() throws IOException { requestData.setIsSystem(BooleanInt.TRUE); // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity(jsonResponse)); // Make a POST request and check the response @@ -165,7 +167,8 @@ public void tesPostRequestWithInputStream() throws IOException { InputStream requestData = new ByteArrayInputStream(jsonResponse.getBytes(StandardCharsets.UTF_8)); // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity(jsonResponse)); // Make a POSt request and check the response @@ -186,7 +189,8 @@ public void tesPostRequestWithInputStream() throws IOException { public void tesPostRequestWithString() throws IOException { // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity(jsonResponse)); // Make a POST request and check the response @@ -207,7 +211,8 @@ public void tesPostRequestWithString() throws IOException { public void tesPostRequestWithNullData() throws IOException { // Mock the behavior of client.execute to return mockedResponse when(client.execute(any(HttpUriRequest.class))).thenReturn(mockedResponse); - when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + //when(mockedResponse.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + when(mockedResponse.getCode()).thenReturn(200); when(mockedResponse.getEntity()).thenReturn(new StringEntity(jsonResponse)); // Make a POST request and check the response diff --git a/src/test/java/com/crowdin/client/dictionaries/DictionariesApiTest.java b/src/test/java/com/crowdin/client/dictionaries/DictionariesApiTest.java index 763d714e3..cb55d9ab0 100644 --- a/src/test/java/com/crowdin/client/dictionaries/DictionariesApiTest.java +++ b/src/test/java/com/crowdin/client/dictionaries/DictionariesApiTest.java @@ -7,8 +7,8 @@ import com.crowdin.client.dictionaries.model.Dictionary; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/distributions/DistributionsApiTest.java b/src/test/java/com/crowdin/client/distributions/DistributionsApiTest.java index b621fe076..2fda65615 100644 --- a/src/test/java/com/crowdin/client/distributions/DistributionsApiTest.java +++ b/src/test/java/com/crowdin/client/distributions/DistributionsApiTest.java @@ -12,10 +12,10 @@ import com.crowdin.client.distributions.model.ExportMode; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/fields/FieldsApiTest.java b/src/test/java/com/crowdin/client/fields/FieldsApiTest.java index ba372f2a1..2306182e0 100644 --- a/src/test/java/com/crowdin/client/fields/FieldsApiTest.java +++ b/src/test/java/com/crowdin/client/fields/FieldsApiTest.java @@ -10,10 +10,10 @@ import com.crowdin.client.fields.model.FieldRequest; import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/framework/TestHttpClient.java b/src/test/java/com/crowdin/client/framework/TestHttpClient.java index 84a774ab2..99958377e 100644 --- a/src/test/java/com/crowdin/client/framework/TestHttpClient.java +++ b/src/test/java/com/crowdin/client/framework/TestHttpClient.java @@ -6,12 +6,12 @@ import com.crowdin.client.core.http.exceptions.HttpException; import com.crowdin.client.core.http.impl.json.JacksonJsonTransformer; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpHead; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpHead; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; import java.io.BufferedReader; import java.io.InputStream; diff --git a/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdAscTest.java b/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdAscTest.java index 4b34f43b3..8dfffc5f4 100644 --- a/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdAscTest.java +++ b/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdAscTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.glossaries.model.*; -import org.apache.http.client.methods.*; +import org.apache.hc.client5.http.classic.methods.*; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdDescTest.java b/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdDescTest.java index 998312746..2e3daca1d 100644 --- a/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdDescTest.java +++ b/src/test/java/com/crowdin/client/glossaries/GlossariesApiGlossariesOrderByIdDescTest.java @@ -6,7 +6,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.glossaries.model.Glossary; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/glossaries/GlossariesApiTest.java b/src/test/java/com/crowdin/client/glossaries/GlossariesApiTest.java index 42886f017..002aff8b9 100644 --- a/src/test/java/com/crowdin/client/glossaries/GlossariesApiTest.java +++ b/src/test/java/com/crowdin/client/glossaries/GlossariesApiTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.glossaries.model.*; -import org.apache.http.client.methods.*; +import org.apache.hc.client5.http.classic.methods.*; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/issues/IssuesApiTest.java b/src/test/java/com/crowdin/client/issues/IssuesApiTest.java index ade8a8233..d20aa5eb8 100644 --- a/src/test/java/com/crowdin/client/issues/IssuesApiTest.java +++ b/src/test/java/com/crowdin/client/issues/IssuesApiTest.java @@ -8,8 +8,8 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.issues.model.Issue; import com.crowdin.client.issues.model.Status; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/labels/LabelsApiTest.java b/src/test/java/com/crowdin/client/labels/LabelsApiTest.java index d5e9b521d..060ecd899 100644 --- a/src/test/java/com/crowdin/client/labels/LabelsApiTest.java +++ b/src/test/java/com/crowdin/client/labels/LabelsApiTest.java @@ -9,10 +9,10 @@ import com.crowdin.client.labels.model.LabelToStringsRequest; import com.crowdin.client.screenshots.model.Screenshot; import com.crowdin.client.sourcestrings.model.SourceString; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/languages/LanguagesApiTest.java b/src/test/java/com/crowdin/client/languages/LanguagesApiTest.java index 3ed7a83f0..2952e741b 100644 --- a/src/test/java/com/crowdin/client/languages/LanguagesApiTest.java +++ b/src/test/java/com/crowdin/client/languages/LanguagesApiTest.java @@ -9,10 +9,10 @@ import com.crowdin.client.languages.model.AddCustomLanguageRequest; import com.crowdin.client.languages.model.Language; import com.crowdin.client.languages.model.TextDirection; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/machinetranslationengines/MachineTranslationEnginesApiTest.java b/src/test/java/com/crowdin/client/machinetranslationengines/MachineTranslationEnginesApiTest.java index e24085e80..8db3cfd0c 100644 --- a/src/test/java/com/crowdin/client/machinetranslationengines/MachineTranslationEnginesApiTest.java +++ b/src/test/java/com/crowdin/client/machinetranslationengines/MachineTranslationEnginesApiTest.java @@ -12,10 +12,10 @@ import com.crowdin.client.machinetranslationengines.model.MtTranslateRequest; import com.crowdin.client.machinetranslationengines.model.MtTranslateResponse; import com.crowdin.client.machinetranslationengines.model.Type; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/notifications/NotificationsApiTest.java b/src/test/java/com/crowdin/client/notifications/NotificationsApiTest.java index f9d698a68..8137442f3 100644 --- a/src/test/java/com/crowdin/client/notifications/NotificationsApiTest.java +++ b/src/test/java/com/crowdin/client/notifications/NotificationsApiTest.java @@ -8,7 +8,7 @@ import com.crowdin.client.notifications.model.SendNotificationToOrganizationMembersRequest; import com.crowdin.client.notifications.model.SendNotificationToProjectMemberRequest; import com.crowdin.client.notifications.model.SendNotificationToProjectMemberByRoleRequest; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/projectsgroups/ListProjectsOrderByIdTest.java b/src/test/java/com/crowdin/client/projectsgroups/ListProjectsOrderByIdTest.java index 58ee508e0..bad7e8c98 100644 --- a/src/test/java/com/crowdin/client/projectsgroups/ListProjectsOrderByIdTest.java +++ b/src/test/java/com/crowdin/client/projectsgroups/ListProjectsOrderByIdTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.projectsgroups.model.*; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/projectsgroups/ProjectFileFormatSettingsApiTest.java b/src/test/java/com/crowdin/client/projectsgroups/ProjectFileFormatSettingsApiTest.java index 4dbcce060..f8fd3fd0e 100644 --- a/src/test/java/com/crowdin/client/projectsgroups/ProjectFileFormatSettingsApiTest.java +++ b/src/test/java/com/crowdin/client/projectsgroups/ProjectFileFormatSettingsApiTest.java @@ -8,10 +8,10 @@ import com.crowdin.client.projectsgroups.model.FileFormatSettingsResource; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; diff --git a/src/test/java/com/crowdin/client/projectsgroups/ProjectStringsExporterSettingsApiTest.java b/src/test/java/com/crowdin/client/projectsgroups/ProjectStringsExporterSettingsApiTest.java index 932c83bed..dd1e0c144 100644 --- a/src/test/java/com/crowdin/client/projectsgroups/ProjectStringsExporterSettingsApiTest.java +++ b/src/test/java/com/crowdin/client/projectsgroups/ProjectStringsExporterSettingsApiTest.java @@ -7,10 +7,10 @@ import com.crowdin.client.projectsgroups.model.*; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; diff --git a/src/test/java/com/crowdin/client/projectsgroups/ProjectsGroupsApiTest.java b/src/test/java/com/crowdin/client/projectsgroups/ProjectsGroupsApiTest.java index 367b464d7..6d1049d95 100644 --- a/src/test/java/com/crowdin/client/projectsgroups/ProjectsGroupsApiTest.java +++ b/src/test/java/com/crowdin/client/projectsgroups/ProjectsGroupsApiTest.java @@ -15,10 +15,10 @@ import com.crowdin.client.projectsgroups.model.TmPenalties; import com.crowdin.client.projectsgroups.model.TmPriority; import com.crowdin.client.projectsgroups.model.TmTimeElapsed; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/com/crowdin/client/reports/GroupReportsApiTest.java b/src/test/java/com/crowdin/client/reports/GroupReportsApiTest.java index 08065b3b7..3df776900 100644 --- a/src/test/java/com/crowdin/client/reports/GroupReportsApiTest.java +++ b/src/test/java/com/crowdin/client/reports/GroupReportsApiTest.java @@ -7,8 +7,8 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.reports.model.*; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/reports/ReportsApiTest.java b/src/test/java/com/crowdin/client/reports/ReportsApiTest.java index b44671e63..c93a6c17d 100644 --- a/src/test/java/com/crowdin/client/reports/ReportsApiTest.java +++ b/src/test/java/com/crowdin/client/reports/ReportsApiTest.java @@ -6,10 +6,10 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.reports.model.*; import com.crowdin.client.reports.model.Currency; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/screenshots/ScreenshotsApiTest.java b/src/test/java/com/crowdin/client/screenshots/ScreenshotsApiTest.java index 9b5303831..751fdab4f 100644 --- a/src/test/java/com/crowdin/client/screenshots/ScreenshotsApiTest.java +++ b/src/test/java/com/crowdin/client/screenshots/ScreenshotsApiTest.java @@ -10,11 +10,11 @@ import com.crowdin.client.screenshots.model.Screenshot; import com.crowdin.client.screenshots.model.Tag; import com.crowdin.client.screenshots.model.UpdateScreenshotRequest; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/securitylogs/SecurityLogsTest.java b/src/test/java/com/crowdin/client/securitylogs/SecurityLogsTest.java index 56dde6e44..00b304903 100644 --- a/src/test/java/com/crowdin/client/securitylogs/SecurityLogsTest.java +++ b/src/test/java/com/crowdin/client/securitylogs/SecurityLogsTest.java @@ -5,7 +5,8 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.securitylogs.model.SecurityLogResource; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java b/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java index 88f07adee..6797f7b79 100644 --- a/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java +++ b/src/test/java/com/crowdin/client/sourcefiles/SourceFilesApiTest.java @@ -5,11 +5,11 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.sourcefiles.model.*; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/sourcestrings/SourceStringsApiTest.java b/src/test/java/com/crowdin/client/sourcestrings/SourceStringsApiTest.java index f134cb8bb..2d4475001 100644 --- a/src/test/java/com/crowdin/client/sourcestrings/SourceStringsApiTest.java +++ b/src/test/java/com/crowdin/client/sourcestrings/SourceStringsApiTest.java @@ -6,10 +6,14 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.sourcefiles.model.UpdateOption; import com.crowdin.client.sourcestrings.model.*; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +//import org.apache.hc.client5.http.classic.methods.HttpDelete; +//import org.apache.hc.client5.http.classic.methods.HttpGet; +//import org.apache.hc.client5.http.classic.methods.HttpPatch; +//import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/storage/StorageApiTest.java b/src/test/java/com/crowdin/client/storage/StorageApiTest.java index b3f2b29e6..678a19dbc 100644 --- a/src/test/java/com/crowdin/client/storage/StorageApiTest.java +++ b/src/test/java/com/crowdin/client/storage/StorageApiTest.java @@ -5,9 +5,9 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.storage.model.Storage; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/stringcomments/StringCommentsApiTest.java b/src/test/java/com/crowdin/client/stringcomments/StringCommentsApiTest.java index 64a597ab1..d39dd5448 100644 --- a/src/test/java/com/crowdin/client/stringcomments/StringCommentsApiTest.java +++ b/src/test/java/com/crowdin/client/stringcomments/StringCommentsApiTest.java @@ -8,10 +8,10 @@ import com.crowdin.client.stringcomments.model.IssueStatus; import com.crowdin.client.stringcomments.model.StringComment; import com.crowdin.client.stringcomments.model.Type; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/stringcorrections/bundles/StringCorrectionsApiTest.java b/src/test/java/com/crowdin/client/stringcorrections/bundles/StringCorrectionsApiTest.java index 55f505ecb..711e8ff18 100644 --- a/src/test/java/com/crowdin/client/stringcorrections/bundles/StringCorrectionsApiTest.java +++ b/src/test/java/com/crowdin/client/stringcorrections/bundles/StringCorrectionsApiTest.java @@ -7,10 +7,14 @@ import com.crowdin.client.stringcorrections.model.AddCorrectionRequest; import com.crowdin.client.stringcorrections.model.Correction; import com.crowdin.client.stringcorrections.model.ListCorrectionsQueryParams; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; +//import org.apache.hc.client5.http.classic.methods.HttpDelete; +//import org.apache.hc.client5.http.classic.methods.HttpGet; +//import org.apache.hc.client5.http.classic.methods.HttpPost; +//import org.apache.hc.client5.http.classic.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpPut; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/stringtranslations/StringTranslationsApiTest.java b/src/test/java/com/crowdin/client/stringtranslations/StringTranslationsApiTest.java index cfd17e878..580a47ef5 100644 --- a/src/test/java/com/crowdin/client/stringtranslations/StringTranslationsApiTest.java +++ b/src/test/java/com/crowdin/client/stringtranslations/StringTranslationsApiTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.stringtranslations.model.*; -import org.apache.http.client.methods.*; +import org.apache.hc.client5.http.classic.methods.*; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/tasks/TaskCommentsApiTest.java b/src/test/java/com/crowdin/client/tasks/TaskCommentsApiTest.java index 45bd273a5..de0059f4c 100644 --- a/src/test/java/com/crowdin/client/tasks/TaskCommentsApiTest.java +++ b/src/test/java/com/crowdin/client/tasks/TaskCommentsApiTest.java @@ -8,10 +8,10 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.tasks.model.*; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/crowdin/client/tasks/TaskSettingsTemplatesApiTest.java b/src/test/java/com/crowdin/client/tasks/TaskSettingsTemplatesApiTest.java index 61efc04a8..152b1798c 100644 --- a/src/test/java/com/crowdin/client/tasks/TaskSettingsTemplatesApiTest.java +++ b/src/test/java/com/crowdin/client/tasks/TaskSettingsTemplatesApiTest.java @@ -12,10 +12,10 @@ import com.crowdin.client.tasks.model.TaskSettingsTemplateConfig; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; diff --git a/src/test/java/com/crowdin/client/tasks/TasksApiTest.java b/src/test/java/com/crowdin/client/tasks/TasksApiTest.java index 500908ac1..131c896d5 100644 --- a/src/test/java/com/crowdin/client/tasks/TasksApiTest.java +++ b/src/test/java/com/crowdin/client/tasks/TasksApiTest.java @@ -7,10 +7,10 @@ import com.crowdin.client.tasks.model.pending.CreateEnterprisePendingTaskRequest; import com.crowdin.client.tasks.model.pending.CreatePendingTaskRequest; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/tasks/UserTasksOrderByIdTest.java b/src/test/java/com/crowdin/client/tasks/UserTasksOrderByIdTest.java index ab63e8e4c..90e2aa31f 100644 --- a/src/test/java/com/crowdin/client/tasks/UserTasksOrderByIdTest.java +++ b/src/test/java/com/crowdin/client/tasks/UserTasksOrderByIdTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.tasks.model.Task; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdAscTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdAscTest.java index 36b7409d2..be676a9ca 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdAscTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdAscTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.teams.model.*; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdDescTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdDescTest.java index c896aca2d..3e23f2428 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdDescTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsOrderByIdDescTest.java @@ -7,7 +7,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.teams.model.ListTeamsParams; import com.crowdin.client.teams.model.Team; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByGroupIdTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByGroupIdTest.java index b217afa60..18e6a4b37 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByGroupIdTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByGroupIdTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.teams.model.ListTeamsParams; import com.crowdin.client.teams.model.Team; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByNameTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByNameTest.java index a4b5aab77..efce80112 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByNameTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByNameTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.teams.model.ListTeamsParams; import com.crowdin.client.teams.model.Team; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectIdTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectIdTest.java index 330dde31d..f86cd8db4 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectIdTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectIdTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.teams.model.ListTeamsParams; import com.crowdin.client.teams.model.Team; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectRolesTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectRolesTest.java index b2555b9f4..69e1fc684 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectRolesTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiListTeamsSearchByProjectRolesTest.java @@ -6,7 +6,7 @@ import com.crowdin.client.teams.model.ListTeamsParams; import com.crowdin.client.teams.model.ProjectRoles; import com.crowdin.client.teams.model.Team; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/teams/TeamsApiTest.java b/src/test/java/com/crowdin/client/teams/TeamsApiTest.java index acc03fe8a..469efc8a8 100644 --- a/src/test/java/com/crowdin/client/teams/TeamsApiTest.java +++ b/src/test/java/com/crowdin/client/teams/TeamsApiTest.java @@ -7,10 +7,10 @@ import com.crowdin.client.users.model.TranslatorRole; import com.crowdin.client.users.model.TranslatorRoleName; import com.crowdin.client.users.model.TranslatorRolePermissions; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdAscTest.java b/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdAscTest.java index 594a572e8..fde46124e 100644 --- a/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdAscTest.java +++ b/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdAscTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.translationmemory.model.*; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdDescTest.java b/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdDescTest.java index de2dbfdbc..8130fc4ac 100644 --- a/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdDescTest.java +++ b/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiListTmsOrderByIdDescTest.java @@ -6,7 +6,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.translationmemory.model.TranslationMemory; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiTest.java b/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiTest.java index 7ef6ec545..f19259b2a 100644 --- a/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiTest.java +++ b/src/test/java/com/crowdin/client/translationmemory/TranslationMemoryApiTest.java @@ -16,10 +16,10 @@ import com.crowdin.client.translationmemory.model.TranslationMemoryFormat; import com.crowdin.client.translationmemory.model.TranslationMemoryImportRequest; import com.crowdin.client.translationmemory.model.TranslationMemoryImportStatus; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/translationmemory/TranslationMemorySegmentsApiTest.java b/src/test/java/com/crowdin/client/translationmemory/TranslationMemorySegmentsApiTest.java index 7b250d9ad..0f839ce7a 100644 --- a/src/test/java/com/crowdin/client/translationmemory/TranslationMemorySegmentsApiTest.java +++ b/src/test/java/com/crowdin/client/translationmemory/TranslationMemorySegmentsApiTest.java @@ -6,10 +6,10 @@ import com.crowdin.client.translationmemory.model.*; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.text.SimpleDateFormat; diff --git a/src/test/java/com/crowdin/client/translations/TranslationsApiIssuesTest.java b/src/test/java/com/crowdin/client/translations/TranslationsApiIssuesTest.java index 1c71473ff..50b2853ad 100644 --- a/src/test/java/com/crowdin/client/translations/TranslationsApiIssuesTest.java +++ b/src/test/java/com/crowdin/client/translations/TranslationsApiIssuesTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.translations.model.Method; import com.crowdin.client.translations.model.PreTranslationReportResponse; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/translations/TranslationsApiTest.java b/src/test/java/com/crowdin/client/translations/TranslationsApiTest.java index 0443b56f4..103c6c195 100644 --- a/src/test/java/com/crowdin/client/translations/TranslationsApiTest.java +++ b/src/test/java/com/crowdin/client/translations/TranslationsApiTest.java @@ -4,10 +4,10 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.translations.model.*; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/translationstatus/TranslationStatusApiTest.java b/src/test/java/com/crowdin/client/translationstatus/TranslationStatusApiTest.java index d62e8813c..66ffd8b63 100644 --- a/src/test/java/com/crowdin/client/translationstatus/TranslationStatusApiTest.java +++ b/src/test/java/com/crowdin/client/translationstatus/TranslationStatusApiTest.java @@ -6,7 +6,7 @@ import com.crowdin.client.translationstatus.model.FileBranchProgress; import com.crowdin.client.translationstatus.model.LanguageProgress; import com.crowdin.client.translationstatus.model.QaCheck; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/users/UsersApiOrderyIdAscTest.java b/src/test/java/com/crowdin/client/users/UsersApiOrderyIdAscTest.java index 92cd26089..88b4d9b55 100644 --- a/src/test/java/com/crowdin/client/users/UsersApiOrderyIdAscTest.java +++ b/src/test/java/com/crowdin/client/users/UsersApiOrderyIdAscTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.users.model.*; -import org.apache.http.client.methods.*; +import org.apache.hc.client5.http.classic.methods.*; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/com/crowdin/client/users/UsersApiOrderyIdDescTest.java b/src/test/java/com/crowdin/client/users/UsersApiOrderyIdDescTest.java index 8260b43cf..8d7f4ee96 100644 --- a/src/test/java/com/crowdin/client/users/UsersApiOrderyIdDescTest.java +++ b/src/test/java/com/crowdin/client/users/UsersApiOrderyIdDescTest.java @@ -7,7 +7,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.users.model.ListUsersParams; import com.crowdin.client.users.model.User; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/src/test/java/com/crowdin/client/users/UsersApiSearchByNullTest.java b/src/test/java/com/crowdin/client/users/UsersApiSearchByNullTest.java index c4a551c9d..0b0f35846 100644 --- a/src/test/java/com/crowdin/client/users/UsersApiSearchByNullTest.java +++ b/src/test/java/com/crowdin/client/users/UsersApiSearchByNullTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.users.model.User; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/com/crowdin/client/users/UsersApiSearchBySearchTest.java b/src/test/java/com/crowdin/client/users/UsersApiSearchBySearchTest.java index f9d5c4873..bf7ce515b 100644 --- a/src/test/java/com/crowdin/client/users/UsersApiSearchBySearchTest.java +++ b/src/test/java/com/crowdin/client/users/UsersApiSearchBySearchTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.users.model.ListUsersParams; import com.crowdin.client.users.model.User; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/src/test/java/com/crowdin/client/users/UsersApiTest.java b/src/test/java/com/crowdin/client/users/UsersApiTest.java index 09a6201eb..03697ce2e 100644 --- a/src/test/java/com/crowdin/client/users/UsersApiTest.java +++ b/src/test/java/com/crowdin/client/users/UsersApiTest.java @@ -4,7 +4,7 @@ import com.crowdin.client.framework.RequestMock; import com.crowdin.client.framework.TestClient; import com.crowdin.client.users.model.*; -import org.apache.http.client.methods.*; +import org.apache.hc.client5.http.classic.methods.*; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/vendors/VendorsApiTest.java b/src/test/java/com/crowdin/client/vendors/VendorsApiTest.java index 34a4614bc..b0e50a42b 100644 --- a/src/test/java/com/crowdin/client/vendors/VendorsApiTest.java +++ b/src/test/java/com/crowdin/client/vendors/VendorsApiTest.java @@ -5,7 +5,7 @@ import com.crowdin.client.framework.TestClient; import com.crowdin.client.vendors.model.Status; import com.crowdin.client.vendors.model.Vendor; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/com/crowdin/client/webhooks/OrganizationWebhooksApiTest.java b/src/test/java/com/crowdin/client/webhooks/OrganizationWebhooksApiTest.java index 2cf9b52c7..82ebdde13 100644 --- a/src/test/java/com/crowdin/client/webhooks/OrganizationWebhooksApiTest.java +++ b/src/test/java/com/crowdin/client/webhooks/OrganizationWebhooksApiTest.java @@ -13,10 +13,10 @@ import com.crowdin.client.webhooks.model.RequestType; import lombok.SneakyThrows; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/com/crowdin/client/webhooks/WebhooksApiTest.java b/src/test/java/com/crowdin/client/webhooks/WebhooksApiTest.java index 8fb5649c3..b19275c45 100644 --- a/src/test/java/com/crowdin/client/webhooks/WebhooksApiTest.java +++ b/src/test/java/com/crowdin/client/webhooks/WebhooksApiTest.java @@ -11,10 +11,10 @@ import com.crowdin.client.webhooks.model.Event; import com.crowdin.client.webhooks.model.RequestType; import com.crowdin.client.webhooks.model.Webhook; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpDelete; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpPatch; +import org.apache.hc.client5.http.classic.methods.HttpPost; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/src/test/java/com/crowdin/client/workflows/WorkflowsApiTest.java b/src/test/java/com/crowdin/client/workflows/WorkflowsApiTest.java index 5e617769c..0e5c29cb4 100644 --- a/src/test/java/com/crowdin/client/workflows/WorkflowsApiTest.java +++ b/src/test/java/com/crowdin/client/workflows/WorkflowsApiTest.java @@ -7,7 +7,7 @@ import com.crowdin.client.sourcestrings.model.SourceString; import com.crowdin.client.workflows.model.WorkflowStep; import com.crowdin.client.workflows.model.WorkflowTemplate; -import org.apache.http.client.methods.HttpGet; +import org.apache.hc.client5.http.classic.methods.HttpGet; import org.junit.jupiter.api.Test; import java.util.Arrays;