Skip to content
Permalink
Browse files
Use the OkHttp driver in Marconi to support PATCH methods
  • Loading branch information
nacx committed Feb 4, 2014
1 parent e437aba commit d8daea247d0127606c3977adc0c32ff1836032da
Showing 5 changed files with 9 additions and 5 deletions.
@@ -64,6 +64,11 @@
<artifactId>openstack-keystone</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-okhttp</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
@@ -92,7 +97,6 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -18,6 +18,8 @@

import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;

import org.jclouds.http.okhttp.config.OkHttpCommandExecutorServiceModule;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
@@ -76,6 +78,7 @@ protected Builder() {
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
.add(AuthenticationApiModule.class)
.add(KeystoneAuthenticationModule.class)
.add(OkHttpCommandExecutorServiceModule.class)
.add(ZoneModule.class)
.add(MarconiTypeAdapters.class)
.add(MarconiHttpApiModule.class).build());
@@ -105,7 +105,7 @@ public void getClaim() throws Exception {
*
* See https://issues.apache.org/jira/browse/JCLOUDS-405
*/
@Test(enabled = false)
@Test
public void updateClaim() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(new MockResponse().setBody(accessRackspace));
@@ -110,11 +110,9 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<!-- TODO: change jclouds parent base pom to okhttp MWS, as google one is dead -->
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -109,7 +109,6 @@
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>mockwebserver</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>

0 comments on commit d8daea2

Please sign in to comment.