You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2021/02/12 09:58:02 UTC
[jclouds-labs] 01/02: Upgrade OKHttp dependency
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.git
commit 4539cb731e540d59735f3329a40bc2505010ff8f
Author: gurkerl83 <ma...@gmx.de>
AuthorDate: Wed Feb 3 13:04:06 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
---
aliyun-ecs/pom.xml | 2 +-
.../aliyun/ecs/compute/features/InstanceApiMockTest.java | 2 +-
.../compute/internal/BaseECSComputeServiceApiMockTest.java | 10 +++++-----
dimensiondata/pom.xml | 2 +-
.../cloudcontrol/features/CustomerImageApiMockTest.java | 2 +-
.../cloudcontrol/features/NetworkApiMockTest.java | 4 ++--
.../cloudcontrol/features/ServerApiMockTest.java | 2 +-
.../cloudcontrol/features/TagApiMockTest.java | 2 +-
.../internal/BaseAccountAwareCloudControlMockTest.java | 2 +-
.../internal/BaseDimensionDataCloudControlMockTest.java | 14 +++++++-------
oneandone/pom.xml | 2 +-
.../rest/compute/function/ServerToNodeMetadataTest.java | 2 +-
.../compute/function/SingleServerApplianceToImageTest.java | 2 +-
.../oneandone/rest/features/BlockStorageApiMockTest.java | 2 +-
.../oneandone/rest/features/DataCenterApiMockTest.java | 2 +-
.../oneandone/rest/features/FirewallPolicyApiMockTest.java | 2 +-
.../jclouds/oneandone/rest/features/ImageApiMockTest.java | 2 +-
.../oneandone/rest/features/LoadBalancerApiMockTest.java | 2 +-
.../rest/features/MonitoringCenterApiMockTest.java | 2 +-
.../rest/features/MonitoringPolicyApiMockTest.java | 2 +-
.../oneandone/rest/features/PrivateNetworkApiMockTest.java | 2 +-
.../oneandone/rest/features/PublicIpApiMockTest.java | 2 +-
.../jclouds/oneandone/rest/features/ServerApiMockTest.java | 2 +-
.../rest/features/ServerApplianceApiMockTest.java | 2 +-
.../oneandone/rest/features/SharedStorageApiMockTest.java | 2 +-
.../jclouds/oneandone/rest/features/SshKeyApiMockTest.java | 2 +-
.../jclouds/oneandone/rest/features/VpnApiMockTest.java | 2 +-
.../oneandone/rest/internal/BaseOneAndOneApiMockTest.java | 10 +++++-----
profitbricks-rest/pom.xml | 2 +-
.../rest/compute/config/StatusPredicateTest.java | 2 +-
.../rest/compute/function/ProvisionableToImageTest.java | 2 +-
.../function/ServerInDataCenterToNodeMetadataTest.java | 2 +-
.../rest/compute/function/VolumeToVolumeTest.java | 2 +-
.../profitbricks/rest/features/DataCenterApiMockTest.java | 2 +-
.../profitbricks/rest/features/FirewallApiMockTest.java | 2 +-
.../profitbricks/rest/features/ImageApiMockTest.java | 2 +-
.../profitbricks/rest/features/IpBlockApiMockTest.java | 2 +-
.../jclouds/profitbricks/rest/features/LanApiMockTest.java | 2 +-
.../jclouds/profitbricks/rest/features/NicApiMockTest.java | 2 +-
.../profitbricks/rest/features/ServerApiMockTest.java | 2 +-
.../profitbricks/rest/features/SnapshotApiMockTest.java | 2 +-
.../profitbricks/rest/features/VolumeApiMockTest.java | 2 +-
.../rest/internal/BaseProfitBricksApiMockTest.java | 12 ++++++------
43 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/aliyun-ecs/pom.xml b/aliyun-ecs/pom.xml
index 305f6ae..0d77a08 100644
--- a/aliyun-ecs/pom.xml
+++ b/aliyun-ecs/pom.xml
@@ -77,7 +77,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp</groupId>
+ <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
<exclusions>
diff --git a/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/features/InstanceApiMockTest.java b/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/features/InstanceApiMockTest.java
index 95609b9..1b588db 100644
--- a/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/features/InstanceApiMockTest.java
+++ b/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/features/InstanceApiMockTest.java
@@ -17,7 +17,7 @@
package org.jclouds.aliyun.ecs.compute.features;
import com.google.common.collect.Iterables;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import org.jclouds.aliyun.ecs.compute.internal.BaseECSComputeServiceApiMockTest;
import org.jclouds.aliyun.ecs.domain.AvailableZone;
import org.jclouds.aliyun.ecs.domain.Instance;
diff --git a/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/internal/BaseECSComputeServiceApiMockTest.java b/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/internal/BaseECSComputeServiceApiMockTest.java
index e25b08f..7c240fd 100644
--- a/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/internal/BaseECSComputeServiceApiMockTest.java
+++ b/aliyun-ecs/src/test/java/org/jclouds/aliyun/ecs/compute/internal/BaseECSComputeServiceApiMockTest.java
@@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableMap;
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;
import org.jclouds.ContextBuilder;
import org.jclouds.aliyun.ecs.ECSComputeServiceApi;
import org.jclouds.aliyun.ecs.ECSComputeServiceProviderMetadata;
@@ -61,7 +61,7 @@ public class BaseECSComputeServiceApiMockTest {
@BeforeMethod
public void start() throws IOException {
server = new MockWebServer();
- server.play();
+ server.start();
ctx = ContextBuilder.newBuilder("alibaba-ecs").credentials("user", "password").endpoint(url("")).modules(modules)
.overrides(overrides()).build();
json = ctx.utils().injector().getInstance(Json.class);
@@ -81,7 +81,7 @@ public class BaseECSComputeServiceApiMockTest {
}
protected String url(String path) {
- return server.getUrl(path).toString();
+ return server.url(path).toString();
}
protected MockResponse jsonResponse(String resource) {
diff --git a/dimensiondata/pom.xml b/dimensiondata/pom.xml
index a2626d0..8af86be 100644
--- a/dimensiondata/pom.xml
+++ b/dimensiondata/pom.xml
@@ -83,7 +83,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp</groupId>
+ <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
<exclusions>
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/CustomerImageApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/CustomerImageApiMockTest.java
index 40e71eb..bb142f7 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/CustomerImageApiMockTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/CustomerImageApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.dimensiondata.cloudcontrol.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import org.jclouds.dimensiondata.cloudcontrol.internal.BaseAccountAwareCloudControlMockTest;
import org.testng.annotations.Test;
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/NetworkApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/NetworkApiMockTest.java
index ba94b0f..a048e28 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/NetworkApiMockTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/NetworkApiMockTest.java
@@ -17,8 +17,8 @@
package org.jclouds.dimensiondata.cloudcontrol.features;
import com.google.common.collect.Lists;
-import com.squareup.okhttp.mockwebserver.MockResponse;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.dimensiondata.cloudcontrol.domain.FirewallRule;
import org.jclouds.dimensiondata.cloudcontrol.domain.FirewallRuleTarget;
import org.jclouds.dimensiondata.cloudcontrol.domain.IpRange;
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerApiMockTest.java
index 553be1d..dd5bc0b 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerApiMockTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/ServerApiMockTest.java
@@ -17,7 +17,7 @@
package org.jclouds.dimensiondata.cloudcontrol.features;
import com.google.common.collect.Lists;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.dimensiondata.cloudcontrol.domain.CPU;
import org.jclouds.dimensiondata.cloudcontrol.domain.Disk;
import org.jclouds.dimensiondata.cloudcontrol.domain.NIC;
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/TagApiMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/TagApiMockTest.java
index 0f35cda..8ef460c 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/TagApiMockTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/features/TagApiMockTest.java
@@ -17,7 +17,7 @@
package org.jclouds.dimensiondata.cloudcontrol.features;
import com.google.common.collect.ImmutableList;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.RecordedRequest;
import org.jclouds.dimensiondata.cloudcontrol.domain.Tag;
import org.jclouds.dimensiondata.cloudcontrol.domain.TagInfo;
import org.jclouds.dimensiondata.cloudcontrol.domain.TagKey;
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java
index b15b469..8b192ce 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseAccountAwareCloudControlMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.dimensiondata.cloudcontrol.internal;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.RecordedRequest;
import org.testng.annotations.BeforeMethod;
import javax.ws.rs.HttpMethod;
diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java
index 00fddf8..7d65641 100644
--- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java
+++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java
@@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import com.google.gson.JsonParser;
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;
import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.dimensiondata.cloudcontrol.DimensionDataCloudControlApi;
@@ -79,7 +79,7 @@ public class BaseDimensionDataCloudControlMockTest implements IHookable {
@BeforeMethod
public void start() throws IOException {
server = new MockWebServer();
- server.play();
+ server.start();
ctx = ContextBuilder.newBuilder(DimensionDataCloudControlProviderMetadata.builder().build()).credentials("", "")
.endpoint(url("")).modules(modules).overrides(new Properties()).build();
json = ctx.utils().injector().getInstance(Json.class);
@@ -135,7 +135,7 @@ public class BaseDimensionDataCloudControlMockTest implements IHookable {
}
protected String url(String path) {
- return server.getUrl(path).toString();
+ return server.url(path).toString();
}
protected MockResponse jsonResponse(String resource) {
@@ -236,9 +236,9 @@ public class BaseDimensionDataCloudControlMockTest implements IHookable {
return uriBuilder;
}
- public byte[] payloadFromResource(String resource) {
+ public String payloadFromResource(String resource) {
try {
- return toStringAndClose(getClass().getResourceAsStream(resource)).getBytes(Charsets.UTF_8);
+ return toStringAndClose(getClass().getResourceAsStream(resource));
} catch (IOException e) {
throw Throwables.propagate(e);
}
diff --git a/oneandone/pom.xml b/oneandone/pom.xml
index a76550b..a8fc4d4 100644
--- a/oneandone/pom.xml
+++ b/oneandone/pom.xml
@@ -86,7 +86,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp</groupId>
+ <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<exclusions>
<!-- Already provided by jclouds-sshj -->
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/ServerToNodeMetadataTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/ServerToNodeMetadataTest.java
index 13fd5e6..451d5e4 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/ServerToNodeMetadataTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/ServerToNodeMetadataTest.java
@@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.name.Names;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImageTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImageTest.java
index b03c9eb..027d475 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImageTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/compute/function/SingleServerApplianceToImageTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.compute.function;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import org.apache.jclouds.oneandone.rest.domain.SingleServerAppliance;
import org.apache.jclouds.oneandone.rest.internal.BaseOneAndOneApiMockTest;
import org.jclouds.compute.domain.Image;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/BlockStorageApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/BlockStorageApiMockTest.java
index f97a8c7..647cbca 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/BlockStorageApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/BlockStorageApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import org.apache.jclouds.oneandone.rest.domain.BlockStorage;
import org.apache.jclouds.oneandone.rest.domain.options.GenericQueryOptions;
import org.apache.jclouds.oneandone.rest.internal.BaseOneAndOneApiMockTest;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/DataCenterApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/DataCenterApiMockTest.java
index b702993..34eeeba 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/DataCenterApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/DataCenterApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.DataCenter;
import org.apache.jclouds.oneandone.rest.domain.options.GenericQueryOptions;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/FirewallPolicyApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/FirewallPolicyApiMockTest.java
index 91fb59a..a5a111c 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/FirewallPolicyApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/FirewallPolicyApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.FirewallPolicy;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ImageApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ImageApiMockTest.java
index ae3c4f6..6e31ac8 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ImageApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ImageApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.Image;
import org.apache.jclouds.oneandone.rest.domain.Image.CreateImage;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/LoadBalancerApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/LoadBalancerApiMockTest.java
index 909e063..73d3372 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/LoadBalancerApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/LoadBalancerApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.LoadBalancer;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiMockTest.java
index dc74551..8a541dd 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringPolicyApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringPolicyApiMockTest.java
index 59c21de..ee23945 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringPolicyApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringPolicyApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.MonitoringPolicy;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PrivateNetworkApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PrivateNetworkApiMockTest.java
index 9032ed7..f027c3e 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PrivateNetworkApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PrivateNetworkApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.PrivateNetwork;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PublicIpApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PublicIpApiMockTest.java
index c833ee4..3d816cb 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PublicIpApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/PublicIpApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.PublicIp;
import org.apache.jclouds.oneandone.rest.domain.Types;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApiMockTest.java
index 32b7138..379f4bb 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.Dvd;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApplianceApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApplianceApiMockTest.java
index 664bde5..00e4e95 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApplianceApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerApplianceApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.ServerAppliance;
import org.apache.jclouds.oneandone.rest.domain.SingleServerAppliance;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SharedStorageApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SharedStorageApiMockTest.java
index d54476c..a2dd123 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SharedStorageApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SharedStorageApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.ArrayList;
import java.util.List;
import org.apache.jclouds.oneandone.rest.domain.SharedStorage;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SshKeyApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SshKeyApiMockTest.java
index 0edfa6f..dbf08d8 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SshKeyApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/SshKeyApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import org.apache.jclouds.oneandone.rest.domain.SshKey;
import org.apache.jclouds.oneandone.rest.domain.options.GenericQueryOptions;
import org.apache.jclouds.oneandone.rest.internal.BaseOneAndOneApiMockTest;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/VpnApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/VpnApiMockTest.java
index 102378b..581136c 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/VpnApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/VpnApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.oneandone.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import java.util.zip.ZipInputStream;
import org.apache.jclouds.oneandone.rest.domain.Vpn;
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java
index 30c4683..44b44df 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java
@@ -23,8 +23,8 @@ import com.google.common.io.Resources;
import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import com.google.gson.JsonParser;
import com.google.inject.Module;
-import com.squareup.okhttp.mockwebserver.MockWebServer;
-import com.squareup.okhttp.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
import java.io.IOException;
import java.util.Properties;
import java.util.Set;
@@ -53,7 +53,7 @@ public class BaseOneAndOneApiMockTest {
@BeforeMethod
public void start() throws IOException {
server = new MockWebServer();
- server.play();
+ server.start();
ApiContext<OneAndOneApi> ctx = ContextBuilder.newBuilder("oneandone")
.credentials("token", "token")
.endpoint(url(""))
@@ -75,7 +75,7 @@ public class BaseOneAndOneApiMockTest {
}
protected String url(String path) {
- return server.getUrl(path).toString();
+ return server.url(path).toString();
}
protected String stringFromResource(String resourceName) {
@@ -104,7 +104,7 @@ public class BaseOneAndOneApiMockTest {
String expectedContentType = "application/json";
assertEquals(request.getHeader("Content-Type"), expectedContentType);
- assertEquals(parser.parse(new String(request.getBody(), Charsets.UTF_8)), parser.parse(json));
+ assertEquals(parser.parse(request.getBody().readUtf8()), parser.parse(json));
return request;
}
}
diff --git a/profitbricks-rest/pom.xml b/profitbricks-rest/pom.xml
index 6dc285d..459678a 100644
--- a/profitbricks-rest/pom.xml
+++ b/profitbricks-rest/pom.xml
@@ -86,7 +86,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp</groupId>
+ <groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<exclusions>
<!-- Already provided by jclouds-sshj -->
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/config/StatusPredicateTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/config/StatusPredicateTest.java
index 2956daa..7c63b29 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/config/StatusPredicateTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/config/StatusPredicateTest.java
@@ -17,7 +17,7 @@
package org.apache.jclouds.profitbricks.rest.compute.config;
import com.google.common.base.Predicate;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.concurrent.TimeUnit;
import org.apache.jclouds.profitbricks.rest.compute.config.ProfitBricksComputeServiceContextModule.DataCenterProvisioningStatePredicate;
import org.apache.jclouds.profitbricks.rest.compute.config.ProfitBricksComputeServiceContextModule.ServerStatusPredicate;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ProvisionableToImageTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ProvisionableToImageTest.java
index 1861ebf..09e4f7e 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ProvisionableToImageTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ProvisionableToImageTest.java
@@ -18,7 +18,7 @@ package org.apache.jclouds.profitbricks.rest.compute.function;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableSet;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.Set;
import org.apache.jclouds.profitbricks.rest.internal.BaseProfitBricksApiMockTest;
import org.jclouds.compute.domain.Image;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ServerInDataCenterToNodeMetadataTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ServerInDataCenterToNodeMetadataTest.java
index 3c35e56..86d96d0 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ServerInDataCenterToNodeMetadataTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/ServerInDataCenterToNodeMetadataTest.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.name.Names;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.Set;
import org.apache.jclouds.profitbricks.rest.ProfitBricksApi;
import org.apache.jclouds.profitbricks.rest.ProfitBricksApiMetadata;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/VolumeToVolumeTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/VolumeToVolumeTest.java
index 979fee7..c0d6934 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/VolumeToVolumeTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/compute/function/VolumeToVolumeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.compute.function;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import org.apache.jclouds.profitbricks.rest.internal.BaseProfitBricksApiMockTest;
import org.jclouds.compute.domain.Volume;
import org.jclouds.compute.domain.VolumeBuilder;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiMockTest.java
index 5a5777e..0b57699 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/DataCenterApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.net.URI;
import java.util.List;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/FirewallApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/FirewallApiMockTest.java
index ea63604..f55f49a 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/FirewallApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/FirewallApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.FirewallRule;
import org.apache.jclouds.profitbricks.rest.domain.options.DepthOptions;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ImageApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ImageApiMockTest.java
index 1034425..7ef2d97 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ImageApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ImageApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.Image;
import org.apache.jclouds.profitbricks.rest.domain.options.DepthOptions;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/IpBlockApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/IpBlockApiMockTest.java
index 9970bd5..cc8904e 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/IpBlockApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/IpBlockApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.IpBlock;
import org.apache.jclouds.profitbricks.rest.domain.Location;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/LanApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/LanApiMockTest.java
index 9c69697..f807406 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/LanApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/LanApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.Lan;
import org.apache.jclouds.profitbricks.rest.domain.options.DepthOptions;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/NicApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/NicApiMockTest.java
index 80ae74c..a2e843e 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/NicApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/NicApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.Nic;
import org.apache.jclouds.profitbricks.rest.domain.options.DepthOptions;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ServerApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ServerApiMockTest.java
index d904340..5ffcf9e 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ServerApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/ServerApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.Image;
import org.apache.jclouds.profitbricks.rest.domain.Server;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/SnapshotApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/SnapshotApiMockTest.java
index c6cd99b..526bfa8 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/SnapshotApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/SnapshotApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.Snapshot;
import org.apache.jclouds.profitbricks.rest.domain.options.DepthOptions;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/VolumeApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/VolumeApiMockTest.java
index 36c22cf..44c9d02 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/VolumeApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/features/VolumeApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jclouds.profitbricks.rest.features;
-import com.squareup.okhttp.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockResponse;
import java.util.HashSet;
import java.util.List;
import org.apache.jclouds.profitbricks.rest.domain.LicenceType;
diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java
index f55a10d..6c952ac 100644
--- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java
+++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java
@@ -38,9 +38,9 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.io.Resources;
import com.google.gson.JsonParser;
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 BaseProfitBricksApiMockTest {
@@ -58,7 +58,7 @@ public class BaseProfitBricksApiMockTest {
@BeforeMethod
public void start() throws IOException {
server = new MockWebServer();
- server.play();
+ server.start();
ApiContext<ProfitBricksApi> ctx = ContextBuilder.newBuilder("profitbricks-rest")
.credentials("username", "password")
.endpoint(url(""))
@@ -79,7 +79,7 @@ public class BaseProfitBricksApiMockTest {
}
protected String url(String path) {
- return server.getUrl(path).toString();
+ return server.url(path).toString();
}
protected MockResponse response204() {
@@ -119,7 +119,7 @@ public class BaseProfitBricksApiMockTest {
expectedContentType = "application/json";
assertEquals(request.getHeader("Content-Type"), expectedContentType);
- assertEquals(parser.parse(new String(request.getBody(), Charsets.UTF_8)), parser.parse(json));
+ assertEquals(parser.parse(request.getBody().readUtf8()), parser.parse(json));
return request;
}
}