This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds-labs-aws.git
commit 2f6ddef837b2d09b80de9899fa6fb24ee5bdb66b Author: gurkerl83 <[email protected]> AuthorDate: Wed Feb 3 13:16:57 2021 +0100 Upgrade OKHttp dependency The JClouds project module upgrades the okhttp server library and related dependencies such as mockwebserver from 2.2.0 to 3.14.9. The vendor switched the groupId declaration from com.squareup.okhttp to com.squareup.okhttp3. Adjust imports and api calls for newer okhttp vers --- elb/pom.xml | 2 +- .../org/jclouds/elb/internal/BaseELBApiMockTest.java | 10 +++++----- glacier/pom.xml | 2 +- .../org/jclouds/glacier/GlacierClientMockTest.java | 20 ++++++++++---------- .../internal/MultipartUploadStrategyMockTest.java | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/elb/pom.xml b/elb/pom.xml index b795be0..1f06bc9 100644 --- a/elb/pom.xml +++ b/elb/pom.xml @@ -110,7 +110,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>com.squareup.okhttp</groupId> + <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> <exclusions> diff --git a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java index 73b3a36..f20f635 100644 --- a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java +++ b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiMockTest.java @@ -34,9 +34,9 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.common.io.Resources; import com.google.inject.Module; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import com.squareup.okhttp.mockwebserver.RecordedRequest; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; public class BaseELBApiMockTest { @@ -52,7 +52,7 @@ public class BaseELBApiMockTest { @BeforeMethod public void start() throws IOException { server = new MockWebServer(); - server.play(); + server.start(); api = ContextBuilder.newBuilder("elb") .credentials("", MOCK_BEARER_TOKEN) .endpoint(url("")) @@ -72,7 +72,7 @@ public class BaseELBApiMockTest { } protected String url(String path) { - return server.getUrl(path).toString(); + return server.url(path).toString(); } protected MockResponse xmlResponse(String resource) { diff --git a/glacier/pom.xml b/glacier/pom.xml index c7ac9ee..a6d6c8d 100644 --- a/glacier/pom.xml +++ b/glacier/pom.xml @@ -109,7 +109,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.squareup.okhttp</groupId> + <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> <scope>test</scope> </dependency> diff --git a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java index f47606e..5965e59 100644 --- a/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/GlacierClientMockTest.java @@ -64,9 +64,9 @@ import com.google.common.net.HttpHeaders; import com.google.common.net.MediaType; import com.google.gson.Gson; import com.google.inject.Module; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import com.squareup.okhttp.mockwebserver.RecordedRequest; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; /** * Mock test for Glacier. @@ -125,8 +125,8 @@ public class GlacierClientMockTest { @BeforeMethod private void initServer() throws IOException { server = new MockWebServer(); - server.play(); - client = getGlacierClient(server.getUrl("/")); + server.start(); + client = getGlacierClient(server.url("/").url()); } @AfterMethod @@ -148,7 +148,7 @@ public class GlacierClientMockTest { mr.addHeader(HttpHeaders.LOCATION, VAULT_LOCATION); server.enqueue(mr); - assertThat(client.createVault(VAULT_NAME)).isEqualTo(URI.create(server.getUrl("/") + VAULT_LOCATION.substring(1))); + assertThat(client.createVault(VAULT_NAME)).isEqualTo(URI.create(server.url("/") + VAULT_LOCATION.substring(1))); assertEquals(server.takeRequest().getRequestLine(), "PUT /-/vaults/" + VAULT_NAME + " " + HTTP); } @@ -232,8 +232,8 @@ public class GlacierClientMockTest { RecordedRequest request = server.takeRequest(); assertEquals(request.getRequestLine(), "POST /-/vaults/" + VAULT_NAME + "/archives " + HTTP); assertEquals(request.getHeader(GlacierHeaders.ARCHIVE_DESCRIPTION), DESCRIPTION); - assertNotNull(request.getHeaders(GlacierHeaders.TREE_HASH)); - assertNotNull(request.getHeaders(GlacierHeaders.LINEAR_HASH)); + assertNotNull(request.getHeader(GlacierHeaders.TREE_HASH)); + assertNotNull(request.getHeader(GlacierHeaders.LINEAR_HASH)); } @Test @@ -407,7 +407,7 @@ public class GlacierClientMockTest { RecordedRequest request = server.takeRequest(); Json json = new GsonWrapper(new Gson()); - ArchiveRetrievalJobRequest job = json.fromJson(new String(request.getBody()), ArchiveRetrievalJobRequest.class); + ArchiveRetrievalJobRequest job = json.fromJson(request.getBody().readUtf8(), ArchiveRetrievalJobRequest.class); assertThat(job.getDescription()).isEqualTo(DESCRIPTION); assertThat(job.getRange()).isEqualTo(range); assertThat(job.getArchiveId()).isEqualTo(ARCHIVE_ID); @@ -439,7 +439,7 @@ public class GlacierClientMockTest { RecordedRequest request = server.takeRequest(); Json json = new GsonWrapper(new Gson()); - job = json.fromJson(new String(request.getBody()), InventoryRetrievalJobRequest.class); + job = json.fromJson(request.getBody().readUtf8(), InventoryRetrievalJobRequest.class); assertThat(job.getFormat()).isEqualTo(format); assertThat(job.getParameters().getMarker()).isEqualTo(marker); assertThat(job.getParameters().getLimit()).isEqualTo(limit); diff --git a/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java b/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java index 54639c8..1a92f1a 100644 --- a/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java +++ b/glacier/src/test/java/org/jclouds/glacier/blobstore/strategy/internal/MultipartUploadStrategyMockTest.java @@ -48,9 +48,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.hash.HashCode; import com.google.common.net.HttpHeaders; import com.google.inject.Module; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import com.squareup.okhttp.mockwebserver.RecordedRequest; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; @Test(groups = {"mock"}, singleThreaded = true) public class MultipartUploadStrategyMockTest { @@ -75,8 +75,8 @@ public class MultipartUploadStrategyMockTest { @BeforeMethod private void initServer() throws IOException { server = new MockWebServer(); - server.play(); - client = getGlacierClient(server.getUrl("/")); + server.start(); + client = getGlacierClient(server.url("/").url()); } @AfterMethod
