You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/31 05:17:45 UTC
[1/2] git commit: Remove source of service loader typos with
AutoService.
Repository: jclouds-labs
Updated Branches:
refs/heads/master d8b13c318 -> e49ee80d8
Remove source of service loader typos with AutoService.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/6ddf5982
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/6ddf5982
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/6ddf5982
Branch: refs/heads/master
Commit: 6ddf5982c657845d0659156c6b8e874ee371f69a
Parents: d8b13c3
Author: Adrian Cole <ac...@twitter.com>
Authored: Tue Oct 28 08:55:04 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Thu Oct 30 21:14:42 2014 -0700
----------------------------------------------------------------------
docker/pom.xml | 1 -
docker/src/main/java/org/jclouds/docker/DockerApiMetadata.java | 5 ++---
.../resources/META-INF/services/org.jclouds.apis.ApiMetadata | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ddf5982/docker/pom.xml
----------------------------------------------------------------------
diff --git a/docker/pom.xml b/docker/pom.xml
index cc6716c..0469d60 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
- <version>1.0-rc2</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ddf5982/docker/src/main/java/org/jclouds/docker/DockerApiMetadata.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/DockerApiMetadata.java b/docker/src/main/java/org/jclouds/docker/DockerApiMetadata.java
index b281eb7..a533614 100644
--- a/docker/src/main/java/org/jclouds/docker/DockerApiMetadata.java
+++ b/docker/src/main/java/org/jclouds/docker/DockerApiMetadata.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
import org.jclouds.Constants;
@@ -33,9 +34,7 @@ import java.util.Properties;
import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
import static org.jclouds.reflect.Reflection2.typeToken;
-/**
- * Implementation of {@link BaseHttpApiMetadata} for the Docker API
- */
+@AutoService(ApiMetadata.class)
public class DockerApiMetadata extends BaseHttpApiMetadata<DockerApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/6ddf5982/docker/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/docker/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index ca1a6cb..0000000
--- a/docker/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.docker.DockerApiMetadata
\ No newline at end of file
[2/2] git commit: Decomplicate consuming the output of docker
commands in tests.
Posted by ad...@apache.org.
Decomplicate consuming the output of docker commands in tests.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/e49ee80d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/e49ee80d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/e49ee80d
Branch: refs/heads/master
Commit: e49ee80d86b0dbec6ff80050c4b2bff1bddbd51b
Parents: 6ddf598
Author: Adrian Cole <ac...@twitter.com>
Authored: Wed Oct 29 12:52:13 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Thu Oct 30 21:15:07 2014 -0700
----------------------------------------------------------------------
.../docker/compute/BaseDockerApiLiveTest.java | 22 +++++++-------------
.../docker/features/RemoteApiLiveTest.java | 10 +++------
2 files changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e49ee80d/docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java b/docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java
index ce64e01..54f61a1 100644
--- a/docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java
+++ b/docker/src/test/java/org/jclouds/docker/compute/BaseDockerApiLiveTest.java
@@ -16,6 +16,9 @@
*/
package org.jclouds.docker.compute;
+import static com.google.common.base.Charsets.UTF_8;
+import static org.jclouds.util.Closeables2.closeQuietly;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -32,10 +35,8 @@ import org.jclouds.docker.DockerApi;
import org.jclouds.io.Payload;
import org.jclouds.io.Payloads;
import org.jclouds.sshj.config.SshjSshClientModule;
-import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.CharStreams;
import com.google.inject.Module;
@@ -60,23 +61,14 @@ public class BaseDockerApiLiveTest extends BaseApiLiveTest<DockerApi> {
return overrides;
}
- protected String consumeStream(InputStream stream, boolean swallowIOException) {
- String result = null;
+ protected String consumeStream(InputStream stream) {
try {
- result = CharStreams.toString(new InputStreamReader(stream, Charsets.UTF_8));
+ return CharStreams.toString(new InputStreamReader(stream, UTF_8));
} catch (IOException e) {
- Assert.fail();
+ throw new AssertionError(e);
} finally {
- // TODO: remove swallowIOException over-optimization and just use Closeables2.closeQuietly
- try {
- stream.close();
- } catch (IOException e) {
- if (!swallowIOException) {
- throw new RuntimeException(e);
- }
- }
+ closeQuietly(stream);
}
- return result;
}
public static Payload tarredDockerfile() throws IOException {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e49ee80d/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java
----------------------------------------------------------------------
diff --git a/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java b/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java
index a489ac3..3f23212 100644
--- a/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java
+++ b/docker/src/test/java/org/jclouds/docker/features/RemoteApiLiveTest.java
@@ -23,7 +23,6 @@ import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URISyntaxException;
import org.jclouds.docker.compute.BaseDockerApiLiveTest;
@@ -55,8 +54,7 @@ public class RemoteApiLiveTest extends BaseDockerApiLiveTest {
@Test(dependsOnMethods = "testVersion")
public void testCreateImage() throws IOException, InterruptedException {
CreateImageOptions options = CreateImageOptions.Builder.fromImage(BUSYBOX_IMAGE);
- InputStream createImageStream = api().createImage(options);
- consumeStream(createImageStream, false);
+ consumeStream(api().createImage(options));
image = api().inspectImage(BUSYBOX_IMAGE);
assertNotNull(image);
}
@@ -96,15 +94,13 @@ public class RemoteApiLiveTest extends BaseDockerApiLiveTest {
@Test(dependsOnMethods = "testRemoveContainer", expectedExceptions = ResourceNotFoundException.class)
public void testDeleteImage() {
- InputStream deleteImageStream = api().deleteImage(image.id());
- consumeStream(deleteImageStream, false);
+ consumeStream(api().deleteImage(image.id()));
assertNull(api().inspectImage(image.id()));
}
public void testBuildImage() throws IOException, InterruptedException, URISyntaxException {
BuildOptions options = BuildOptions.Builder.tag("testBuildImage").verbose(false).nocache(false);
- InputStream buildImageStream = api().build(tarredDockerfile(), options);
- String buildStream = consumeStream(buildImageStream, false);
+ String buildStream = consumeStream(api().build(tarredDockerfile(), options));
Iterable<String> splitted = Splitter.on("\n").split(buildStream.replace("\r", "").trim());
String lastStreamedLine = Iterables.getLast(splitted).trim();
String rawImageId = Iterables.getLast(Splitter.on("Successfully built ").split(lastStreamedLine));