From 057850438b6de931c40d46fbe74ec6d960557753 Mon Sep 17 00:00:00 2001 From: danikov Date: Wed, 15 Feb 2012 02:52:06 +0000 Subject: [PATCH] update clients to use Reference --- .../v1_5/features/MediaAsyncClient.java | 43 ++++++++++--------- .../director/v1_5/features/MediaClient.java | 20 ++++----- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java index 89de50a001..39ef53d650 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java @@ -39,7 +39,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Owner; -import org.jclouds.vcloud.director.v1_5.domain.ReferenceType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest; import org.jclouds.vcloud.director.v1_5.functions.ReferenceToEndpoint; @@ -55,77 +55,79 @@ import com.google.common.util.concurrent.ListenableFuture; public interface MediaAsyncClient { /** - * @see MediaClient#getMedia(ReferenceType) + * @see MediaClient#getMedia(Reference) */ @GET @Consumes @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture getMedia(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef); + ListenableFuture getMedia(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef); /** - * @see MediaClient#updateMedia(ReferenceType, Media)) + * @see MediaClient#updateMedia(Reference, Media)) */ @PUT @Consumes(VCloudDirectorMediaType.TASK) @Produces(VCloudDirectorMediaType.MEDIA) @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture updateMedia(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef, + ListenableFuture updateMedia(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef, @BinderParam(BindToXMLPayload.class) Media media); /** - * @see MediaClient#deleteMedia(ReferenceType)) + * @see MediaClient#deleteMedia(Reference)) */ @DELETE @Consumes(VCloudDirectorMediaType.TASK) @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture deleteMedia(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef); + ListenableFuture deleteMedia(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef); /** - * @see MediaClient#getOwner(ReferenceType) + * @see MediaClient#getOwner(Reference) */ @GET @Path("/owner") @Consumes @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture getOwner(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef); + ListenableFuture getOwner(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef); /** - * @see MediaClient#getMetadata(ReferenceType)) + * @see MediaClient#getMetadata(Reference)) */ @GET @Path("/metadata") @Consumes @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture getMetadata(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef); + ListenableFuture getMetadata(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef); /** - * @see MediaClient#mergeMetadata(ReferenceType, Metadata)) + * @see MediaClient#mergeMetadata(Reference, Metadata)) */ @POST + @Path("/metadata") @Consumes(VCloudDirectorMediaType.TASK) @Produces(VCloudDirectorMediaType.METADATA) @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture mergeMetadata(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef, + ListenableFuture mergeMetadata(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef, @BinderParam(BindToXMLPayload.class) Metadata metadata); /** - * @see MediaClient#getMetadataEntry(ReferenceType, String)) + * @see MediaClient#getMetadataEntry(Reference, String)) */ @GET + @Path("/metadata/{key}") @Consumes @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture getMetadataEntry(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType mediaRef, - @BinderParam(BindToXMLPayload.class) String key); + ListenableFuture getMetadataEntry(@EndpointParam(parser = ReferenceToEndpoint.class) Reference mediaRef, + @PathParam("key") String key); /** - * @see MediaClient#setMetadata(ReferenceType, String, MetadataEntry)) + * @see MediaClient#setMetadata(Reference, String, MetadataEntry)) */ @PUT @Path("/metadata/{key}") @@ -133,18 +135,19 @@ public interface MediaAsyncClient { @Produces(VCloudDirectorMediaType.METADATA_VALUE) @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture setMetadata(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType metaDataRef, + ListenableFuture setMetadata(@EndpointParam(parser = ReferenceToEndpoint.class) Reference metaDataRef, @PathParam("key") String key, @BinderParam(BindToXMLPayload.class) MetadataValue metadataValue); /** - * @see MediaClient#deleteMetadataEntry(ReferenceType, String)) + * @see MediaClient#deleteMetadataEntry(Reference, String)) */ @DELETE + @Path("/metadata/{key}") @Consumes(VCloudDirectorMediaType.TASK) @JAXBResponseParser @ExceptionParser(ThrowVCloudErrorOn4xx.class) - ListenableFuture deleteMetadataEntry(@EndpointParam(parser = ReferenceToEndpoint.class) ReferenceType metaDataRef, + ListenableFuture deleteMetadataEntry(@EndpointParam(parser = ReferenceToEndpoint.class) Reference metaDataRef, @PathParam("key") String key); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java index 5bf1a06a64..92d539a019 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java @@ -26,7 +26,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Metadata; import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.Owner; -import org.jclouds.vcloud.director.v1_5.domain.ReferenceType; +import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.Task; /** @@ -45,7 +45,7 @@ public interface MediaClient { * * @return the media or null if not found */ - Media getMedia(ReferenceType mediaRef); + Media getMedia(Reference mediaRef); /** * Updates the name/description of a media. @@ -53,40 +53,40 @@ public interface MediaClient { * @return a task. This operation is asynchronous and the user should monitor the returned * task status in order to check when it is completed. */ - Task updateMedia(ReferenceType mediaRef, Media media); + Task updateMedia(Reference mediaRef, Media media); /** * Deletes a media. */ - Task deleteMedia(ReferenceType mediaRef); + Task deleteMedia(Reference mediaRef); /** * Retrieves an owner. * * @return the owner or null if not found */ - Owner getOwner(ReferenceType mediaRef); + Owner getOwner(Reference mediaRef); /** * Retrieves an list of the media's metadata * * @return a list of metadata */ - Metadata getMetadata(ReferenceType mediaRef); + Metadata getMetadata(Reference mediaRef); /** * Merges the metadata for a media with the information provided. * * @return a task. This operation is asynchronous and the user should monitor the returned * task status in order to check when it is completed. */ - Task mergeMetadata(ReferenceType mediaRef, Metadata metadata); + Task mergeMetadata(Reference mediaRef, Metadata metadata); /** * Retrieves a metadata entry * * @return the metadata entry, or null if not found */ - MetadataEntry getMetadataEntry(ReferenceType mediaRef, String key); + MetadataEntry getMetadataEntry(Reference mediaRef, String key); /** * Sets the metadata for the particular key for the media to the value provided. @@ -95,7 +95,7 @@ public interface MediaClient { * @return a task. This operation is asynchronous and the user should monitor the returned * task status in order to check when it is completed. */ - Task setMetadata(ReferenceType mediaRef, String key, MetadataValue metadataEntry); + Task setMetadata(Reference mediaRef, String key, MetadataValue metadataEntry); /** * Deletes a metadata entry. @@ -103,7 +103,7 @@ public interface MediaClient { * @return a task. This operation is asynchronous and the user should monitor the returned * task status in order to check when it is completed. */ - Task deleteMetadataEntry(ReferenceType mediaRef, String key); + Task deleteMetadataEntry(Reference mediaRef, String key); }