Repository: jclouds-labs Updated Branches: refs/heads/1.9.x 5ee8fa876 -> 498f1d820
[JCLOUDS-1021] Add JavaDoc to cover behavior of repoTags() method in org.jclouds.docker.domain.Image Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/498f1d82 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/498f1d82 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/498f1d82 Branch: refs/heads/1.9.x Commit: 498f1d820747823f5a03e485a0768b74478ff7a6 Parents: 5ee8fa8 Author: Josef Cacek <[email protected]> Authored: Wed Oct 21 16:57:42 2015 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Oct 21 17:17:33 2015 +0200 ---------------------------------------------------------------------- .../compute/strategy/DockerComputeServiceAdapter.java | 6 ++++++ .../main/java/org/jclouds/docker/domain/Image.java | 14 ++++++++++++++ .../java/org/jclouds/docker/features/ImageApi.java | 3 +++ 3 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/498f1d82/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java b/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java index b1041d0..6af757f 100644 --- a/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java +++ b/docker/src/main/java/org/jclouds/docker/compute/strategy/DockerComputeServiceAdapter.java @@ -174,6 +174,12 @@ public class DockerComputeServiceAdapter implements return hardware; } + /** + * Method based on {@link org.jclouds.docker.features.ImageApi#listImages()}. It retrieves additional + * information by inspecting each image. + * + * @see org.jclouds.compute.ComputeServiceAdapter#listImages() + */ @Override public Set<Image> listImages() { Set<Image> images = Sets.newHashSet(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/498f1d82/docker/src/main/java/org/jclouds/docker/domain/Image.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/domain/Image.java b/docker/src/main/java/org/jclouds/docker/domain/Image.java index f49a7b0..a696c5f 100644 --- a/docker/src/main/java/org/jclouds/docker/domain/Image.java +++ b/docker/src/main/java/org/jclouds/docker/domain/Image.java @@ -26,6 +26,9 @@ import org.jclouds.json.SerializedNames; import com.google.auto.value.AutoValue; +/** + * Represents a response from Docker "Inspect an image" call (<code>GET /images/(name)/json</code>). + */ @AutoValue public abstract class Image { @@ -55,6 +58,17 @@ public abstract class Image { public abstract long virtualSize(); + /** + * Tags of the image. The value is <code>null</code> when the instance comes + * from {@link org.jclouds.docker.features.ImageApi#inspectImage(String)}. + * Other methods can populate the content (e.g. + * {@link org.jclouds.docker.compute.strategy.DockerComputeServiceAdapter#listImages()} + * call. + * <p> + * The tags are in form "ubuntu:12.10", "docker.io/busybox:1.23.2", ... + * </p> + * @return list of tags or <code>null</code> + */ @Nullable public abstract List<String> repoTags(); Image() { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/498f1d82/docker/src/main/java/org/jclouds/docker/features/ImageApi.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/features/ImageApi.java b/docker/src/main/java/org/jclouds/docker/features/ImageApi.java index cfca40d..441f1c0 100644 --- a/docker/src/main/java/org/jclouds/docker/features/ImageApi.java +++ b/docker/src/main/java/org/jclouds/docker/features/ImageApi.java @@ -63,6 +63,9 @@ public interface ImageApi { List<ImageSummary> listImages(ListImageOptions options); /** + * Return low-level information on the image with given name. Not all fields from the returned {@link Image} instance + * are populated by this method (e.g. {@link Image#repoTags()}). + * * @param imageName The id of the image to inspect. * @return low-level information on the image name */
