Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 1022:Move naming convention to Api from Client or Services:: vcloud-director

This commit is contained in:
Adrian Cole 2012-07-15 01:50:18 -07:00
parent 05fd64af44
commit 6d13652338
149 changed files with 1950 additions and 1950 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
View File

@ -30,8 +30,8 @@ import java.util.Properties;
import org.jclouds.apis.ApiMetadata;
import org.jclouds.rest.internal.BaseRestApiMetadata;
import org.jclouds.vcloud.director.v1_5.config.VCloudDirectorRestClientModule;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
import com.google.common.reflect.TypeToken;
@ -82,7 +82,7 @@ public class VCloudDirectorApiMetadata extends BaseRestApiMetadata {
BaseRestApiMetadata.Builder {
protected Builder() {
super(VCloudDirectorClient.class, VCloudDirectorAsyncClient.class);
super(VCloudDirectorApi.class, VCloudDirectorAsyncApi.class);
id("vcloud-director")
.name("vCloud Director 1.5 API")
.identityName("User at Organization (user@org)")

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
View File

@ -19,19 +19,19 @@
package org.jclouds.vcloud.director.v1_5;
import org.jclouds.rest.RestContext;
import org.jclouds.vcloud.director.v1_5.login.SessionAsyncClient;
import org.jclouds.vcloud.director.v1_5.login.SessionClient;
import org.jclouds.vcloud.director.v1_5.login.SessionAsyncApi;
import org.jclouds.vcloud.director.v1_5.login.SessionApi;
import com.google.common.reflect.TypeToken;
/**
* Constants used by VCloudDirector clients
* Constants used by VCloudDirector apis
*
* @author grkvlt@apache.org
*/
public class VCloudDirectorConstants {
/** The XML namespace used by the clients. */
/** The XML namespace used by the apis. */
public static final String VCLOUD_1_5_NS = "http://www.vmware.com/vcloud/v1.5";
public static final String VCLOUD_VMW_NS = "http://www.vmware.com/schema/ovf";
@ -71,8 +71,8 @@ public class VCloudDirectorConstants {
public static final String PROPERTY_NS_NAME_LEN_MAX = "jclouds.dns_name_length_max";
/** TODO javadoc */
public static final TypeToken<RestContext<SessionClient, SessionAsyncClient>> SESSION_CONTEXT_TYPE =
new TypeToken<RestContext<SessionClient, SessionAsyncClient>>() {
public static final TypeToken<RestContext<SessionApi, SessionAsyncApi>> SESSION_CONTEXT_TYPE =
new TypeToken<RestContext<SessionApi, SessionAsyncApi>>() {
/** The serialVersionUID */
private static final long serialVersionUID = -3625362618882122604L;
};

14
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
View File

@ -19,11 +19,11 @@
package org.jclouds.vcloud.director.v1_5;
import org.jclouds.rest.RestContext;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncApi;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorContextImpl;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
import com.google.inject.ImplementedBy;
@ -31,7 +31,7 @@ import com.google.inject.ImplementedBy;
* @author danikov
*/
@ImplementedBy(VCloudDirectorContextImpl.class)
public interface VCloudDirectorContext extends RestContext<VCloudDirectorClient, VCloudDirectorAsyncClient> {
public interface VCloudDirectorContext extends RestContext<VCloudDirectorApi, VCloudDirectorAsyncApi> {
RestContext<VCloudDirectorAdminClient, VCloudDirectorAdminAsyncClient> getAdminContext();
}
RestContext<VCloudDirectorAdminApi, VCloudDirectorAdminAsyncApi> getAdminContext();
}

34
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
View File

@ -22,67 +22,67 @@ import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.rest.annotations.Delegate;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient;
import org.jclouds.vcloud.director.v1_5.features.admin.UserClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcApi;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupApi;
import org.jclouds.vcloud.director.v1_5.features.admin.UserApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
/**
* Provides synchronous access to VCloudDirector Admin.
*
* @see VCloudDirectorAsyncClient
* @see VCloudDirectorAsyncApi
* @author Adrian Cole
*/
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface VCloudDirectorAdminClient extends VCloudDirectorClient {
public interface VCloudDirectorAdminApi extends VCloudDirectorApi {
/**
* @return asynchronous access to admin query features
*/
@Override
@Delegate
AdminQueryClient getQueryClient();
AdminQueryApi getQueryApi();
/**
* @return synchronous access to {@link Catalog} admin features
*/
@Override
@Delegate
AdminCatalogClient getCatalogClient();
AdminCatalogApi getCatalogApi();
/**
* @return synchronous access to admin {@link Group} features
*/
@Delegate
GroupClient getGroupClient();
GroupApi getGroupApi();
/**
* @return synchronous access to {@link AdminOrg} features
*/
@Override
@Delegate
AdminOrgClient getOrgClient();
AdminOrgApi getOrgApi();
/**
* @return synchronous access to {@link User} features
*/
@Delegate
UserClient getUserClient();
UserApi getUserApi();
/**
* @return synchronous access to {@link AdminVdc} features
*/
@Override
@Delegate
AdminVdcClient getVdcClient();
AdminVdcApi getVdcApi();
/**
* @return synchronous access to admin {@link Network} features
*/
@Override
@Delegate
AdminNetworkClient getNetworkClient();
AdminNetworkApi getNetworkApi();
}

34
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminAsyncApi.java
View File

@ -19,28 +19,28 @@
package org.jclouds.vcloud.director.v1_5.admin;
import org.jclouds.rest.annotations.Delegate;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
/**
* Provides asynchronous access to VCloudDirector Admin via their REST API.
*
* @see VCloudDirectorAdminClient
* @see VCloudDirectorAdminApi
* @author danikov
*/
public interface VCloudDirectorAdminAsyncClient extends VCloudDirectorAsyncClient {
public interface VCloudDirectorAdminAsyncApi extends VCloudDirectorAsyncApi {
/**
* @return asynchronous access to admin query features
*/
@Override
@Delegate
AdminQueryAsyncClient getQueryClient();
AdminQueryAsyncApi getQueryApi();
/**
@ -48,38 +48,38 @@ public interface VCloudDirectorAdminAsyncClient extends VCloudDirectorAsyncClien
*/
@Override
@Delegate
AdminCatalogAsyncClient getCatalogClient();
AdminCatalogAsyncApi getCatalogApi();
/**
* @return asynchronous access to admin {@link Group} features
*/
@Delegate
GroupAsyncClient getGroupClient();
GroupAsyncApi getGroupApi();
/**
* @return asynchronous access to {@link AdminOrg} features
*/
@Override
@Delegate
AdminOrgAsyncClient getOrgClient();
AdminOrgAsyncApi getOrgApi();
/**
* @return asynchronous access to {@link User} features
*/
@Delegate
UserAsyncClient getUserClient();
UserAsyncApi getUserApi();
/**
* @return asynchronous access to {@link AdminVdc} features
*/
@Override
@Delegate
AdminVdcAsyncClient getVdcClient();
AdminVdcAsyncApi getVdcApi();
/**
* @return asynchronous access to admin {@link Network} features
*/
@Override
@Delegate
AdminNetworkAsyncClient getNetworkClient();
AdminNetworkAsyncApi getNetworkApi();
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/binders/BindUserOrgAndPasswordAsBasicAuthorizationHeader.java
View File

@ -60,4 +60,4 @@ public class BindUserOrgAndPasswordAsBasicAuthorizationHeader implements MapBind
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
throw new UnsupportedOperationException();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/FindLocationForResource.java
View File

@ -68,4 +68,4 @@ public class FindLocationForResource implements Function<Reference, Location> {
throw new NoSuchElementException(String.format("resource: %s not found in locations: %s", resource,
locations.get()));
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVAppTemplate.java
View File

@ -87,4 +87,4 @@ public class HardwareForVAppTemplate implements Function<VAppTemplate, Hardware>
protected String getName(String name) {
return name;
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/HardwareForVm.java
View File

@ -75,4 +75,4 @@ public class HardwareForVm implements Function<Vm, Hardware> {
builder.hypervisor("VMware");
return builder.build();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/ImageForVAppTemplate.java
View File

@ -86,4 +86,4 @@ public class ImageForVAppTemplate implements Function<VAppTemplate, Image> {
return builder.build();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VCloudHardwareBuilderFromResourceAllocations.java
View File

@ -40,4 +40,4 @@ public class VCloudHardwareBuilderFromResourceAllocations extends HardwareBuilde
return super.apply(from);
// }
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/compute/functions/VmToNodeMetadata.java
View File

@ -95,4 +95,4 @@ public class VmToNodeMetadata implements Function<Vm, NodeMetadata> {
credentialStore.put("node#" + from.getHref().toASCIIString(), fromApi);
return builder.build();
}
}
}

160
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/config/VCloudDirectorRestClientModule.java
View File

@ -41,56 +41,56 @@ import org.jclouds.rest.config.BinderUtils;
import org.jclouds.rest.config.RestClientModule;
import org.jclouds.rest.internal.RestContextImpl;
import org.jclouds.util.Suppliers2;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncApi;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
import org.jclouds.vcloud.director.v1_5.annotations.Login;
import org.jclouds.vcloud.director.v1_5.domain.Session;
import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.CatalogClient;
import org.jclouds.vcloud.director.v1_5.features.MediaAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.MediaClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataClient;
import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.NetworkClient;
import org.jclouds.vcloud.director.v1_5.features.OrgAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.OrgClient;
import org.jclouds.vcloud.director.v1_5.features.QueryAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.QueryClient;
import org.jclouds.vcloud.director.v1_5.features.TaskAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.TaskClient;
import org.jclouds.vcloud.director.v1_5.features.UploadAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.UploadClient;
import org.jclouds.vcloud.director.v1_5.features.VAppAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.VAppClient;
import org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient;
import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.VdcClient;
import org.jclouds.vcloud.director.v1_5.features.VmAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.VmClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcClient;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupClient;
import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.admin.UserClient;
import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.CatalogApi;
import org.jclouds.vcloud.director.v1_5.features.MediaAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.MediaApi;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.NetworkApi;
import org.jclouds.vcloud.director.v1_5.features.OrgAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.OrgApi;
import org.jclouds.vcloud.director.v1_5.features.QueryAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.QueryApi;
import org.jclouds.vcloud.director.v1_5.features.TaskAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.TaskApi;
import org.jclouds.vcloud.director.v1_5.features.UploadAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.UploadApi;
import org.jclouds.vcloud.director.v1_5.features.VAppAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.VAppApi;
import org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.VAppTemplateApi;
import org.jclouds.vcloud.director.v1_5.features.VdcAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.VdcApi;
import org.jclouds.vcloud.director.v1_5.features.VmAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.VmApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminCatalogApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminNetworkApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminOrgApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminQueryApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.AdminVdcApi;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.GroupApi;
import org.jclouds.vcloud.director.v1_5.features.admin.UserAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.admin.UserApi;
import org.jclouds.vcloud.director.v1_5.functions.LoginUserInOrgWithPassword;
import org.jclouds.vcloud.director.v1_5.handlers.InvalidateSessionAndRetryOn401AndLogoutOnClose;
import org.jclouds.vcloud.director.v1_5.handlers.VCloudDirectorErrorHandler;
import org.jclouds.vcloud.director.v1_5.login.SessionAsyncClient;
import org.jclouds.vcloud.director.v1_5.login.SessionClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import org.jclouds.vcloud.director.v1_5.login.SessionAsyncApi;
import org.jclouds.vcloud.director.v1_5.login.SessionApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
@ -109,49 +109,49 @@ import com.google.inject.name.Named;
* @author Adrian Cole
*/
@ConfiguresRestClient
public class VCloudDirectorRestClientModule extends RestClientModule<VCloudDirectorClient, VCloudDirectorAsyncClient> {
public class VCloudDirectorRestClientModule extends RestClientModule<VCloudDirectorApi, VCloudDirectorAsyncApi> {
public static final Map<Class<?>, Class<?>> USER_DELEGATE_MAP = ImmutableMap.<Class<?>, Class<?>>builder()
.put(CatalogClient.class, CatalogAsyncClient.class)
.put(MediaClient.class, MediaAsyncClient.class)
.put(MetadataClient.Readable.class, MetadataAsyncClient.Readable.class)
.put(MetadataClient.Writeable.class, MetadataAsyncClient.Writeable.class)
.put(NetworkClient.class, NetworkAsyncClient.class)
.put(OrgClient.class, OrgAsyncClient.class)
.put(QueryClient.class, QueryAsyncClient.class)
.put(TaskClient.class, TaskAsyncClient.class)
.put(UploadClient.class, UploadAsyncClient.class)
.put(VAppClient.class, VAppAsyncClient.class)
.put(VAppTemplateClient.class, VAppTemplateAsyncClient.class)
.put(VdcClient.class, VdcAsyncClient.class)
.put(VmClient.class, VmAsyncClient.class)
.put(CatalogApi.class, CatalogAsyncApi.class)
.put(MediaApi.class, MediaAsyncApi.class)
.put(MetadataApi.Readable.class, MetadataAsyncApi.Readable.class)
.put(MetadataApi.Writeable.class, MetadataAsyncApi.Writeable.class)
.put(NetworkApi.class, NetworkAsyncApi.class)
.put(OrgApi.class, OrgAsyncApi.class)
.put(QueryApi.class, QueryAsyncApi.class)
.put(TaskApi.class, TaskAsyncApi.class)
.put(UploadApi.class, UploadAsyncApi.class)
.put(VAppApi.class, VAppAsyncApi.class)
.put(VAppTemplateApi.class, VAppTemplateAsyncApi.class)
.put(VdcApi.class, VdcAsyncApi.class)
.put(VmApi.class, VmAsyncApi.class)
.build();
public static final Map<Class<?>, Class<?>> ADMIN_DELEGATE_MAP = ImmutableMap.<Class<?>, Class<?>>builder()
.putAll(USER_DELEGATE_MAP)
.put(AdminCatalogClient.class, AdminCatalogAsyncClient.class)
.put(AdminNetworkClient.class, AdminNetworkAsyncClient.class)
.put(AdminOrgClient.class, AdminOrgAsyncClient.class)
.put(AdminQueryClient.class, AdminQueryAsyncClient.class)
.put(AdminVdcClient.class, AdminVdcAsyncClient.class)
.put(GroupClient.class, GroupAsyncClient.class)
.put(UserClient.class, UserAsyncClient.class)
.put(AdminCatalogApi.class, AdminCatalogAsyncApi.class)
.put(AdminNetworkApi.class, AdminNetworkAsyncApi.class)
.put(AdminOrgApi.class, AdminOrgAsyncApi.class)
.put(AdminQueryApi.class, AdminQueryAsyncApi.class)
.put(AdminVdcApi.class, AdminVdcAsyncApi.class)
.put(GroupApi.class, GroupAsyncApi.class)
.put(UserApi.class, UserAsyncApi.class)
.build();
@Override
protected void bindAsyncClient() {
// bind the user client (default)
// bind the user api (default)
super.bindAsyncClient();
// bind the admin client
BinderUtils.bindAsyncClient(binder(), VCloudDirectorAdminAsyncClient.class);
// bind the admin api
BinderUtils.bindAsyncClient(binder(), VCloudDirectorAdminAsyncApi.class);
}
@Override
protected void bindClient() {
// bind the user client (default)
// bind the user api (default)
super.bindClient();
// bind the admin client
BinderUtils.bindClient(binder(), VCloudDirectorAdminClient.class, VCloudDirectorAdminAsyncClient.class, ADMIN_DELEGATE_MAP);
// bind the admin api
BinderUtils.bindClient(binder(), VCloudDirectorAdminApi.class, VCloudDirectorAdminAsyncApi.class, ADMIN_DELEGATE_MAP);
}
public VCloudDirectorRestClientModule() {
@ -160,16 +160,16 @@ public class VCloudDirectorRestClientModule extends RestClientModule<VCloudDirec
@Override
protected void configure() {
bind(new TypeLiteral<RestContext<VCloudDirectorAdminClient, VCloudDirectorAdminAsyncClient>>() {
}).to(new TypeLiteral<RestContextImpl<VCloudDirectorAdminClient, VCloudDirectorAdminAsyncClient>>() {
bind(new TypeLiteral<RestContext<VCloudDirectorAdminApi, VCloudDirectorAdminAsyncApi>>() {
}).to(new TypeLiteral<RestContextImpl<VCloudDirectorAdminApi, VCloudDirectorAdminAsyncApi>>() {
});
// Bind clients that are used directly in Functions, Predicates and other circumstances
bindClientAndAsyncClient(binder(), OrgClient.class, OrgAsyncClient.class);
bindClientAndAsyncClient(binder(), SessionClient.class, SessionAsyncClient.class);
bindClientAndAsyncClient(binder(), TaskClient.class, TaskAsyncClient.class);
bindClientAndAsyncClient(binder(), VAppClient.class, VAppAsyncClient.class);
bindClientAndAsyncClient(binder(), VmClient.class, VmAsyncClient.class);
// Bind apis that are used directly in Functions, Predicates and other circumstances
bindClientAndAsyncClient(binder(), OrgApi.class, OrgAsyncApi.class);
bindClientAndAsyncClient(binder(), SessionApi.class, SessionAsyncApi.class);
bindClientAndAsyncClient(binder(), TaskApi.class, TaskAsyncApi.class);
bindClientAndAsyncClient(binder(), VAppApi.class, VAppAsyncApi.class);
bindClientAndAsyncClient(binder(), VmApi.class, VmAsyncApi.class);
bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(InvalidateSessionAndRetryOn401AndLogoutOnClose.class);
@ -186,7 +186,7 @@ public class VCloudDirectorRestClientModule extends RestClientModule<VCloudDirec
@Provides
@Login
protected Supplier<URI> loginUrl(@Provider Supplier<URI> provider) {
// TODO: technically, we should implement version client, but this will work
// TODO: technically, we should implement version api, but this will work
return Suppliers2.compose(new Function<URI, URI>() {
@Override

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
View File

@ -256,4 +256,4 @@ public class Error {
.add("vendorSpecificErrorCode", vendorSpecificErrorCode).add("stackTrace", stackTrace)
.toString();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
View File

@ -163,7 +163,7 @@ public class Reference {
* the object, and is never reused. The value of the href attribute is a reference to a view of
* the object, and can be used to access a representation of the object that is valid in a
* particular context. Although URLs have a well-known syntax and a well-understood
* interpretation, a client should treat each href as an opaque string. The rules that govern how
* interpretation, a api should treat each href as an opaque string. The rules that govern how
* the server constructs href strings might change in future releases.
*
* @return an opaque reference and should never be parsed

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
View File

@ -146,7 +146,7 @@ public class Resource {
* the object, and is never reused. The value of the href attribute is a reference to a view of
* the object, and can be used to access a representation of the object that is valid in a
* particular context. Although URLs have a well-known syntax and a well-understood
* interpretation, a client should treat each href as an opaque string. The rules that govern how
* interpretation, a api should treat each href as an opaque string. The rules that govern how
* the server constructs href strings might change in future releases.
*
* @return an opaque reference and should never be parsed

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
View File

@ -93,7 +93,7 @@ public class SessionWithToken {
* the object, and is never reused. The value of the token attribute is a reference to a view of
* the object, and can be used to access a representation of the object that is valid in a
* particular context. Although URLs have a well-known syntax and a well-understood
* interpretation, a client should treat each token as an opaque string. The rules that govern
* interpretation, a api should treat each token as an opaque string. The rules that govern
* how the server constructs token strings might change in future releases.
*
* @return an opaque reference and should never be parsed
@ -121,4 +121,4 @@ public class SessionWithToken {
public String toString() {
return Objects.toStringHelper("").add("session", session).add("token", token).toString();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/Envelope.java
View File

@ -61,4 +61,4 @@ public class Envelope extends BaseEnvelope<VirtualSystem, Envelope> {
protected Envelope() {
// For JaxB
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
View File

@ -187,4 +187,4 @@ public class RasdItem extends ResourceAllocationSettingData {
&& equal(this.links, that.links);
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
View File

@ -148,4 +148,4 @@ public class VirtualSystem extends BaseVirtualSystem {
.add("operatingSystem", operatingSystem)
.add("virtualHardwareSections", virtualHardwareSections);
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecordType.java
View File

@ -174,7 +174,7 @@ public class QueryResultRecordType {
* portion of the id attribute value, it uniquely identifies the object, persists for the life of the object, and is never
* reused. The value of the href attribute is a reference to a view of the object, and can be used to access a representation of
* the object that is valid in a particular context. Although URLs have a well-known syntax and a well-understood interpretation,
* a client should treat each href as an opaque string. The rules that govern how the server constructs href strings might change
* a api should treat each href as an opaque string. The rules that govern how the server constructs href strings might change
* in future releases.
*
* @return an opaque reference and should never be parsed

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
View File

@ -210,4 +210,4 @@ public class OperatingSystemSection extends org.jclouds.dmtf.ovf.OperatingSystem
.add("href", href)
.add("links", links);
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
View File

@ -191,4 +191,4 @@ public class VirtualHardwareSection extends org.jclouds.dmtf.ovf.VirtualHardware
&& equal(this.href, that.href)
&& equal(this.links, that.links);
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
View File

@ -36,4 +36,4 @@ import javax.inject.Qualifier;
@Qualifier
public @interface Catalog {
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
View File

@ -36,4 +36,4 @@ import javax.inject.Qualifier;
@Qualifier
public @interface Network {
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
View File

@ -36,4 +36,4 @@ import javax.inject.Qualifier;
@Qualifier
public @interface Org {
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
View File

@ -36,4 +36,4 @@ import javax.inject.Qualifier;
@Qualifier
public @interface OrgList {
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
View File

@ -36,4 +36,4 @@ import javax.inject.Qualifier;
@Qualifier
public @interface TasksList {
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
View File

@ -36,4 +36,4 @@ import javax.inject.Qualifier;
@Qualifier
public @interface Vdc {
}
}

8
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java
View File

@ -29,11 +29,11 @@ import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
/**
* Provides synchronous access to {@link Catalog} objects.
*
* @see CatalogAsyncClient
* @see CatalogAsyncApi
* @author grkvlt@apache.org
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface CatalogClient {
public interface CatalogApi {
/**
* Retrieves a catalog.
@ -100,12 +100,12 @@ public interface CatalogClient {
* @return synchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataClient.Readable getMetadataClient();
MetadataApi.Readable getMetadataApi();
/**
* @return synchronous access to {@link Metadata.Writeable} features for CatalogItems
*/
@Delegate
MetadataClient.Writeable getCatalogItemMetadataClient();
MetadataApi.Writeable getCatalogItemMetadataApi();
}

8
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogAsyncApi.java
View File

@ -44,11 +44,11 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see CatalogClient
* @see CatalogApi
* @author grkvlt@apache.org
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface CatalogAsyncClient {
public interface CatalogAsyncApi {
/**
* Retrieves a catalog.
@ -101,11 +101,11 @@ public interface CatalogAsyncClient {
* @return asynchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataAsyncClient.Readable getMetadataClient();
MetadataAsyncApi.Readable getMetadataApi();
/**
* @return asynchronous access to {@link Metadata.Writeable} features for CatalogItems
*/
@Delegate
MetadataAsyncClient.Writeable getCatalogItemMetadataClient();
MetadataAsyncApi.Writeable getCatalogItemMetadataApi();
}

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java
View File

@ -31,11 +31,11 @@ import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
/**
* Provides synchronous access to {@link Media}.
*
* @see MediaAsyncClient
* @see MediaAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface MediaClient {
public interface MediaApi {
/**
* Retrieves a media.
@ -84,6 +84,6 @@ public interface MediaClient {
* @return synchronous access to {@link Metadata.Writeable} features
*/
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

18
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaAsyncApi.java
View File

@ -46,14 +46,14 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see MediaClient
* @see MediaApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface MediaAsyncClient {
public interface MediaAsyncApi {
/**
* @see MediaClient#getMedia(URI)
* @see MediaApi#getMedia(URI)
*/
@GET
@Consumes
@ -62,7 +62,7 @@ public interface MediaAsyncClient {
ListenableFuture<Media> getMedia(@EndpointParam URI uri);
/**
* @see MediaClient#createMedia(URI, Media)
* @see MediaApi#createMedia(URI, Media)
*/
@POST
@Consumes(VCloudDirectorMediaType.MEDIA)
@ -73,7 +73,7 @@ public interface MediaAsyncClient {
/**
* @see MediaClient#cloneMedia(URI, CloneMediaParams)
* @see MediaApi#cloneMedia(URI, CloneMediaParams)
*/
@POST
@Path("/action/cloneMedia")
@ -84,7 +84,7 @@ public interface MediaAsyncClient {
@BinderParam(BindToXMLPayload.class) CloneMediaParams params);
/**
* @see MediaClient#updateMedia(URI, Media))
* @see MediaApi#updateMedia(URI, Media))
*/
@PUT
@Consumes(VCloudDirectorMediaType.TASK)
@ -93,7 +93,7 @@ public interface MediaAsyncClient {
ListenableFuture<Task> updateMedia(@EndpointParam URI uri, @BinderParam(BindToXMLPayload.class) Media media);
/**
* @see MediaClient#deleteMedia(URI))
* @see MediaApi#deleteMedia(URI))
*/
@DELETE
@Consumes(VCloudDirectorMediaType.TASK)
@ -101,7 +101,7 @@ public interface MediaAsyncClient {
ListenableFuture<Task> deleteMedia(@EndpointParam URI uri);
/**
* @see MediaClient#getOwner(URI)
* @see MediaApi#getOwner(URI)
*/
@GET
@Path("/owner")
@ -114,5 +114,5 @@ public interface MediaAsyncClient {
* @return asynchronous access to {@link Metadata.Writeable} features
*/
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
View File

@ -29,13 +29,13 @@ import org.jclouds.vcloud.director.v1_5.domain.Task;
/**
* Provides synchronous access to {@linkl Metadata}.
*
* @see MetadataAsyncClient
* @see MetadataAsyncApi
* @author danikov
*/
public interface MetadataClient {
public interface MetadataApi {
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public static interface Readable extends MetadataClient {
public static interface Readable extends MetadataApi {
/**
* Retrieves an list of metadata

16
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataAsyncApi.java
View File

@ -45,16 +45,16 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see MetadataClient
* @see MetadataApi
* @author danikov
*/
public interface MetadataAsyncClient {
public interface MetadataAsyncApi {
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public static interface Readable extends MetadataAsyncClient {
public static interface Readable extends MetadataAsyncApi {
/**
* @see MetadataClient.Readable#getMetadata(URISupplier)
* @see MetadataApi.Readable#getMetadata(URISupplier)
*/
@GET
@Path("/metadata")
@ -64,7 +64,7 @@ public interface MetadataAsyncClient {
ListenableFuture<Metadata> getMetadata(@EndpointParam URI metaDataUri);
/**
* @see MetadataClient.Readable#getMetadataValue(URI, String)
* @see MetadataApi.Readable#getMetadataValue(URI, String)
*/
@GET
@Path("/metadata/{key}")
@ -78,7 +78,7 @@ public interface MetadataAsyncClient {
public static interface Writeable extends Readable {
/**
* @see MetadataClient.Writable#mergeMetadata(URI, Metadata))
* @see MetadataApi.Writable#mergeMetadata(URI, Metadata))
*/
@POST
@Path("/metadata")
@ -88,7 +88,7 @@ public interface MetadataAsyncClient {
ListenableFuture<Task> mergeMetadata(@EndpointParam URI metaDataUri, @BinderParam(BindToXMLPayload.class) Metadata metadata);
/**
* @see MetadataClient.Writable#setMetadata(URI, String, MetadataEntry))
* @see MetadataApi.Writable#setMetadata(URI, String, MetadataEntry))
*/
@PUT
@Path("/metadata/{key}")
@ -100,7 +100,7 @@ public interface MetadataAsyncClient {
@BinderParam(BindToXMLPayload.class) MetadataValue metadataValue);
/**
* @see MetadataClient.Writable#deleteMetadataEntry(URISupplier, String))
* @see MetadataApi.Writable#deleteMetadataEntry(URISupplier, String))
*/
@DELETE
@Path("/metadata/{key}")

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
View File

@ -28,11 +28,11 @@ import org.jclouds.vcloud.director.v1_5.domain.network.Network;
/**
* Provides synchronous access to {@link Network}.
*
* @see NetworkAsyncClient
* @see NetworkAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface NetworkClient {
public interface NetworkApi {
/**
* Retrieves a network.
@ -45,5 +45,5 @@ public interface NetworkClient {
* @return synchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataClient.Readable getMetadataClient();
MetadataApi.Readable getMetadataApi();
}

8
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkAsyncApi.java
View File

@ -35,14 +35,14 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see NetworkClient
* @see NetworkApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface NetworkAsyncClient {
public interface NetworkAsyncApi {
/**
* @see NetworkClient#getNetwork(URI)
* @see NetworkApi#getNetwork(URI)
*/
@GET
@Consumes
@ -54,6 +54,6 @@ public interface NetworkAsyncClient {
* @return asynchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataAsyncClient.Readable getMetadataClient();
MetadataAsyncApi.Readable getMetadataApi();
}

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
View File

@ -30,11 +30,11 @@ import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
/**
* Provides synchronous access to {@link Org}.
*
* @see OrgAsyncClient
* @see OrgAsyncApi
* @author Adrian Cole
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface OrgClient {
public interface OrgApi {
/**
* Retrieves a list of organizations.
@ -84,5 +84,5 @@ public interface OrgClient {
* @return synchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataClient.Readable getMetadataClient();
MetadataApi.Readable getMetadataApi();
}

14
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgAsyncApi.java
View File

@ -45,14 +45,14 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see OrgClient
* @see OrgApi
* @author Adrian Cole
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface OrgAsyncClient {
public interface OrgAsyncApi {
/**
* @see OrgClient#getOrgList()
* @see OrgApi#getOrgList()
*/
@GET
@Path("/org/")
@ -61,7 +61,7 @@ public interface OrgAsyncClient {
ListenableFuture<OrgList> getOrgList();
/**
* @see OrgClient#getOrg(URI)
* @see OrgApi#getOrg(URI)
*/
@GET
@Consumes
@ -70,7 +70,7 @@ public interface OrgAsyncClient {
ListenableFuture<? extends Org> getOrg(@EndpointParam URI orgUri);
/**
* @see OrgClient#modifyControlAccess(URI, URI, ControlAccessParams)
* @see OrgApi#modifyControlAccess(URI, URI, ControlAccessParams)
*/
@POST
@Path("/catalog/{catalogId}/action/controlAccess")
@ -82,7 +82,7 @@ public interface OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) ControlAccessParams params);
/**
* @see OrgClient#getControlAccess(URI, URI, ControlAccessParams)
* @see OrgApi#getControlAccess(URI, URI, ControlAccessParams)
*/
@GET
@Path("/catalog/{catalogId}/controlAccess")
@ -96,5 +96,5 @@ public interface OrgAsyncClient {
* @return asynchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataAsyncClient.Readable getMetadataClient();
MetadataAsyncApi.Readable getMetadataApi();
}

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
View File

@ -35,11 +35,11 @@ import org.jclouds.vcloud.director.v1_5.domain.query.VAppReferences;
/**
* Provides synchronous access to the REST API query interface.
*
* @see QueryAsyncClient
* @see QueryAsyncApi
* @author grkvlt@apache.org
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface QueryClient {
public interface QueryApi {
/**
* Redirects to the URL of an entity with the given VCD ID.

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryAsyncApi.java
View File

@ -41,15 +41,15 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see QueryClient
* @see QueryApi
* @author grkvlt@apache.org
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
@SkipEncoding({ '=' })
public interface QueryAsyncClient {
public interface QueryAsyncApi {
/**
* @see QueryClient#entity(String)
* @see QueryApi#entity(String)
*/
@GET
@Path("/entity/{id}")

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
View File

@ -28,11 +28,11 @@ import org.jclouds.vcloud.director.v1_5.domain.TasksList;
/**
* Provides synchronous access to {@link Task} objects.
*
* @see TaskAsyncClient
* @see TaskAsyncApi
* @author grkvlt@apache.org
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface TaskClient {
public interface TaskApi {
/**
* Retrieves a list of tasks.

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskAsyncApi.java
View File

@ -38,14 +38,14 @@ import org.jclouds.vcloud.director.v1_5.functions.OrgReferenceToTaskListEndpoint
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see TaskClient
* @see TaskApi
* @author grkvlt@apache.org
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface TaskAsyncClient {
public interface TaskAsyncApi {
/**
* @see TaskClient#getTaskList(URISupplier)
* @see TaskApi#getTaskList(URISupplier)
*/
@GET
@Consumes
@ -54,7 +54,7 @@ public interface TaskAsyncClient {
ListenableFuture<TasksList> getTaskList(@EndpointParam(parser = OrgReferenceToTaskListEndpoint.class) URI orgURI);
/**
* @see TaskClient#getTask(URI)
* @see TaskApi#getTask(URI)
*/
@GET
@Consumes
@ -63,7 +63,7 @@ public interface TaskAsyncClient {
ListenableFuture<Task> getTask(@EndpointParam URI taskURI);
/**
* @see TaskClient#cancelTask(URI)
* @see TaskApi#cancelTask(URI)
*/
@POST
@Path("/action/cancel")

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
View File

@ -27,11 +27,11 @@ import org.jclouds.io.Payload;
/**
* Provides synchronous access to upload.
*
* @see UploadAsyncClient
* @see UploadAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface UploadClient {
public interface UploadApi {
/**
* @return eTag

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadAsyncApi.java
View File

@ -30,14 +30,14 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see UploadClient
* @see UploadApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface UploadAsyncClient {
public interface UploadAsyncApi {
/**
* @see UploadClient#put
* @see UploadApi#put
*/
@PUT
ListenableFuture<Void> upload(@EndpointParam URI location, Payload payload);

8
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
View File

@ -41,11 +41,11 @@ import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
* Provides synchronous access to {@link VApp} objects.
*
* @author grkvlt@apache.org
* @see VAppAsyncClient
* @see VAppAsyncApi
* @version 1.5
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VAppClient {
public interface VAppApi {
/**
* Retrieves a {@link VApp}.
@ -186,7 +186,7 @@ public interface VAppClient {
*
* To remove VMs you should put their references in elements. The way you add
* VMs is the same as described in compose vApp operation
* {@link VdcClient#composeVApp(URI, org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams)}.
* {@link VdcApi#composeVApp(URI, org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams)}.
* The status of vApp will be in {@link org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status#UNRESOLVED}
* until the recompose task is finished.
*
@ -434,5 +434,5 @@ public interface VAppClient {
* Synchronous access to {@link VApp} {@link Metadata} features.
*/
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

62
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppAsyncApi.java
View File

@ -66,13 +66,13 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* @author grkvlt@apache.org
* @see VAppClient
* @see VAppApi
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface VAppAsyncClient {
public interface VAppAsyncApi {
/**
* @see VAppClient#getVApp(URI)
* @see VAppApi#getVApp(URI)
*/
@GET
@Consumes(VAPP)
@ -81,7 +81,7 @@ public interface VAppAsyncClient {
ListenableFuture<VApp> getVApp(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyVApp(URI, VApp)
* @see VAppApi#modifyVApp(URI, VApp)
*/
@PUT
@Produces(VAPP)
@ -91,7 +91,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) VApp vApp);
/**
* @see VAppClient#deleteVApp(URI)
* @see VAppApi#deleteVApp(URI)
*/
@DELETE
@Consumes(TASK)
@ -99,7 +99,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> deleteVApp(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyControlAccess(URI, ControlAccessParams)
* @see VAppApi#modifyControlAccess(URI, ControlAccessParams)
*/
@POST
@Path("/action/controlAccess")
@ -110,7 +110,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) ControlAccessParams params);
/**
* @see VAppClient#deploy(URI, DeployVAppParams)
* @see VAppApi#deploy(URI, DeployVAppParams)
*/
@POST
@Path("/action/deploy")
@ -121,7 +121,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) DeployVAppParams params);
/**
* @see VAppClient#discardSuspendedState(URI)
* @see VAppApi#discardSuspendedState(URI)
*/
@POST
@Path("/action/discardSuspendedState")
@ -130,7 +130,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> discardSuspendedState(@EndpointParam URI vAppURI);
/**
* @see VAppClient#enterMaintenanceMode(URI)
* @see VAppApi#enterMaintenanceMode(URI)
*/
@POST
@Path("/action/enterMaintenanceMode")
@ -139,7 +139,7 @@ public interface VAppAsyncClient {
ListenableFuture<Void> enterMaintenanceMode(@EndpointParam URI vAppURI);
/**
* @see VAppClient#exitMaintenanceMode(URI)
* @see VAppApi#exitMaintenanceMode(URI)
*/
@POST
@Path("/action/exitMaintenanceMode")
@ -148,7 +148,7 @@ public interface VAppAsyncClient {
ListenableFuture<Void> exitMaintenanceMode(@EndpointParam URI vAppURI);
/**
* @see VAppClient#recompose(URI, RecomposeVAppParams)
* @see VAppApi#recompose(URI, RecomposeVAppParams)
*/
@POST
@Path("/action/recomposeVApp")
@ -159,7 +159,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) RecomposeVAppParams params);
/**
* @see VAppClient#undeploy(URI, UndeployVAppParams)
* @see VAppApi#undeploy(URI, UndeployVAppParams)
*/
@POST
@Path("/action/undeploy")
@ -170,7 +170,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) UndeployVAppParams params);
/**
* @see VAppClient#getControlAccess(URI)
* @see VAppApi#getControlAccess(URI)
*/
@GET
@Path("/controlAccess")
@ -180,7 +180,7 @@ public interface VAppAsyncClient {
ListenableFuture<ControlAccessParams> getControlAccess(@EndpointParam URI vAppURI);
/**
* @see VAppClient#powerOff(URI)
* @see VAppApi#powerOff(URI)
*/
@POST
@Path("/power/action/powerOff")
@ -189,7 +189,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> powerOff(@EndpointParam URI vAppURI);
/**
* @see VAppClient#powerOn(URI)
* @see VAppApi#powerOn(URI)
*/
@POST
@Path("/power/action/powerOn")
@ -198,7 +198,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> powerOn(@EndpointParam URI vAppURI);
/**
* @see VAppClient#reboot(URI)
* @see VAppApi#reboot(URI)
*/
@POST
@Path("/power/action/powerOff")
@ -207,7 +207,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> reboot(@EndpointParam URI vAppURI);
/**
* @see VAppClient#reset(URI)
* @see VAppApi#reset(URI)
*/
@POST
@Path("/power/action/reset")
@ -216,7 +216,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> reset(@EndpointParam URI vAppURI);
/**
* @see VAppClient#shutdown(URI)
* @see VAppApi#shutdown(URI)
*/
@POST
@Path("/power/action/shutdown")
@ -225,7 +225,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> shutdown(@EndpointParam URI vAppURI);
/**
* @see VAppClient#suspend(URI)
* @see VAppApi#suspend(URI)
*/
@POST
@Path("/power/action/suspend")
@ -234,7 +234,7 @@ public interface VAppAsyncClient {
ListenableFuture<Task> suspend(@EndpointParam URI vAppURI);
/**
* @see VAppClient#getLeaseSettingsSection(URI)
* @see VAppApi#getLeaseSettingsSection(URI)
*/
@GET
@Path("/leaseSettingsSection")
@ -244,7 +244,7 @@ public interface VAppAsyncClient {
ListenableFuture<LeaseSettingsSection> getLeaseSettingsSection(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyLeaseSettingsSection(URI, LeaseSettingsSection)
* @see VAppApi#modifyLeaseSettingsSection(URI, LeaseSettingsSection)
*/
@PUT
@Path("/leaseSettingsSection")
@ -255,7 +255,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) LeaseSettingsSection section);
/**
* @see VAppClient#getNetworkConfigSection(URI)
* @see VAppApi#getNetworkConfigSection(URI)
*/
@GET
@Path("/networkConfigSection")
@ -265,7 +265,7 @@ public interface VAppAsyncClient {
ListenableFuture<NetworkConfigSection> getNetworkConfigSection(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyNetworkConfigSection(URI, NetworkConfigSection)
* @see VAppApi#modifyNetworkConfigSection(URI, NetworkConfigSection)
*/
@PUT
@Path("/networkConfigSection")
@ -276,7 +276,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) NetworkConfigSection section);
/**
* @see VAppClient#getNetworkSection(URI)
* @see VAppApi#getNetworkSection(URI)
*/
@GET
@Path("/networkSection")
@ -286,7 +286,7 @@ public interface VAppAsyncClient {
ListenableFuture<NetworkSection> getNetworkSection(@EndpointParam URI vAppURI);
/**
* @see VAppClient#getOwner(URI)
* @see VAppApi#getOwner(URI)
*/
@GET
@Path("/owner")
@ -296,7 +296,7 @@ public interface VAppAsyncClient {
ListenableFuture<Owner> getOwner(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyOwner(URI, Owner)
* @see VAppApi#modifyOwner(URI, Owner)
*/
@PUT
@Path("/owner")
@ -307,7 +307,7 @@ public interface VAppAsyncClient {
@BinderParam(BindToXMLPayload.class) Owner owner);
/**
* @see VAppClient#getProductSections(URI)
* @see VAppApi#getProductSections(URI)
*/
@GET
@Path("/productSections")
@ -317,7 +317,7 @@ public interface VAppAsyncClient {
ListenableFuture<ProductSectionList> getProductSections(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyProductSections(URI, ProductSectionList)
* @see VAppApi#modifyProductSections(URI, ProductSectionList)
*/
@PUT
@Path("/productSections")
@ -329,7 +329,7 @@ public interface VAppAsyncClient {
/**
* @see VAppClient#getStartupSection(URI)
* @see VAppApi#getStartupSection(URI)
*/
@GET
@Path("/startupSection")
@ -339,7 +339,7 @@ public interface VAppAsyncClient {
ListenableFuture<StartupSection> getStartupSection(@EndpointParam URI vAppURI);
/**
* @see VAppClient#modifyStartupSection(URI, StartupSection)
* @see VAppApi#modifyStartupSection(URI, StartupSection)
*/
@PUT
@Path("/startupSection")
@ -353,5 +353,5 @@ public interface VAppAsyncClient {
* Asynchronous access to {@link VApp} {@link Metadata} features
*/
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java
View File

@ -41,10 +41,10 @@ import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
* Provides synchronous access to {@link VAppTemplate} objects.
*
* @author Adam Lowe
* @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncClient
* @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateAsyncApi
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VAppTemplateClient {
public interface VAppTemplateApi {
/**
* Retrieves a vApp template (can be used also to retrieve a VM from a vApp Template).
@ -362,5 +362,5 @@ public interface VAppTemplateClient {
* @return synchronous access to {@link Metadata} features
*/
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

54
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateAsyncApi.java
View File

@ -67,13 +67,13 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* @author Adam Lowe
* @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient
* @see org.jclouds.vcloud.director.v1_5.features.VAppTemplateApi
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface VAppTemplateAsyncClient {
public interface VAppTemplateAsyncApi {
/**
* @see VAppTemplateClient#getVAppTemplate(URI)
* @see VAppTemplateApi#getVAppTemplate(URI)
*/
@GET
@Consumes(VAPP_TEMPLATE)
@ -83,7 +83,7 @@ public interface VAppTemplateAsyncClient {
/**
* @see VAppTemplateClient#modifyVAppTemplate(URI, VAppTemplate)
* @see VAppTemplateApi#modifyVAppTemplate(URI, VAppTemplate)
*/
@PUT
@Produces(VAPP_TEMPLATE)
@ -93,7 +93,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) VAppTemplate template);
/**
* @see VAppTemplateClient#deleteVappTemplate(URI)
* @see VAppTemplateApi#deleteVappTemplate(URI)
*/
@DELETE
@Consumes(TASK)
@ -101,7 +101,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<Task> deleteVappTemplate(@EndpointParam URI templateUri);
/**
* @see VAppTemplateClient#consolidateVm(URI)
* @see VAppTemplateApi#consolidateVm(URI)
*/
@POST
@Consumes(TASK)
@ -110,7 +110,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<Task> consolidateVm(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#disableDownload(URI)
* @see VAppTemplateApi#disableDownload(URI)
*/
@POST
@Path("/action/disableDownload")
@ -118,7 +118,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<Void> disableDownload(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#enableDownloadVappTemplate(URI)
* @see VAppTemplateApi#enableDownloadVappTemplate(URI)
*/
@POST
@Consumes(TASK)
@ -127,7 +127,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<Task> enableDownload(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#relocateVm(URI, RelocateParams)
* @see VAppTemplateApi#relocateVm(URI, RelocateParams)
*/
@POST
@Produces(RELOCATE_TEMPLATE)
@ -138,7 +138,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) RelocateParams params);
/**
* @see VAppTemplateClient#getCustomizationSection(URI)
* @see VAppTemplateApi#getCustomizationSection(URI)
*/
@GET
@Consumes(CUSTOMIZATION_SECTION)
@ -148,7 +148,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<CustomizationSection> getCustomizationSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#modifyCustomizationSection(URI, CustomizationSection)
* @see VAppTemplateApi#modifyCustomizationSection(URI, CustomizationSection)
*/
@PUT
@Produces(CUSTOMIZATION_SECTION)
@ -159,7 +159,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) CustomizationSection sectionType);
/**
* @see VAppTemplateClient#getGuestCustomizationSection(URI)
* @see VAppTemplateApi#getGuestCustomizationSection(URI)
*/
@GET
@Consumes(GUEST_CUSTOMIZATION_SECTION)
@ -169,7 +169,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<GuestCustomizationSection> getGuestCustomizationSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#modifyGuestCustomizationSection(URI, org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection)
* @see VAppTemplateApi#modifyGuestCustomizationSection(URI, org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection)
*/
@PUT
@Produces(GUEST_CUSTOMIZATION_SECTION)
@ -180,7 +180,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) GuestCustomizationSection section);
/**
* @see VAppTemplateClient#getLeaseSettingsSection(URI)
* @see VAppTemplateApi#getLeaseSettingsSection(URI)
*/
@GET
@Consumes(LEASE_SETTINGS_SECTION)
@ -190,7 +190,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<LeaseSettingsSection> getLeaseSettingsSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#modifyLeaseSettingsSection(URI, LeaseSettingsSection)
* @see VAppTemplateApi#modifyLeaseSettingsSection(URI, LeaseSettingsSection)
*/
@PUT
@Produces(LEASE_SETTINGS_SECTION)
@ -201,7 +201,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) LeaseSettingsSection settingsSection);
/**
* @see VAppTemplateClient#getNetworkConnectionSection(URI)
* @see VAppTemplateApi#getNetworkConnectionSection(URI)
*/
@GET
@Consumes(NETWORK_CONNECTION_SECTION)
@ -211,7 +211,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<NetworkConnectionSection> getNetworkConnectionSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#getNetworkConfigSection(URI)
* @see VAppTemplateApi#getNetworkConfigSection(URI)
*/
@GET
@Consumes(NETWORK_CONFIG_SECTION)
@ -221,7 +221,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<NetworkConfigSection> getNetworkConfigSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#modifyNetworkConfigSection(URI, NetworkConfigSection)
* @see VAppTemplateApi#modifyNetworkConfigSection(URI, NetworkConfigSection)
*/
@PUT
@Produces(NETWORK_CONFIG_SECTION)
@ -232,7 +232,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) NetworkConfigSection section);
/**
* @see VAppTemplateClient#getNetworkConnectionSection(URI)
* @see VAppTemplateApi#getNetworkConnectionSection(URI)
*/
@GET
@Consumes(NETWORK_CONNECTION_SECTION)
@ -242,7 +242,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<NetworkConnectionSection> getVAppTemplateNetworkConnectionSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#modifyNetworkConnectionSection(URI, NetworkConnectionSection)
* @see VAppTemplateApi#modifyNetworkConnectionSection(URI, NetworkConnectionSection)
*/
@PUT
@Produces(NETWORK_CONNECTION_SECTION)
@ -253,7 +253,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) NetworkConnectionSection section);
/**
* @see VAppTemplateClient#getNetworkSection(URI)
* @see VAppTemplateApi#getNetworkSection(URI)
*/
@GET
@Consumes(NETWORK_SECTION)
@ -263,7 +263,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<NetworkSection> getNetworkSection(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#getOvf(URI)
* @see VAppTemplateApi#getOvf(URI)
*/
@GET
@Consumes
@ -273,7 +273,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<Envelope> getOvf(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#getOwnerOfVAppTemplate(URI)
* @see VAppTemplateApi#getOwnerOfVAppTemplate(URI)
*/
@GET
@Consumes(OWNER)
@ -283,7 +283,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<Owner> getOwner(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#getProductSectionsForVAppTemplate(URI)
* @see VAppTemplateApi#getProductSectionsForVAppTemplate(URI)
*/
@GET
@Consumes(PRODUCT_SECTION_LIST)
@ -293,7 +293,7 @@ public interface VAppTemplateAsyncClient {
ListenableFuture<ProductSectionList> getProductSections(@EndpointParam URI templateURI);
/**
* @see VAppTemplateClient#modifyProductSections(URI, ProductSectionList)
* @see VAppTemplateApi#modifyProductSections(URI, ProductSectionList)
*/
@PUT
@Produces(PRODUCT_SECTION_LIST)
@ -304,7 +304,7 @@ public interface VAppTemplateAsyncClient {
@BinderParam(BindToXMLPayload.class) ProductSectionList sections);
/**
* @see VAppTemplateClient#getShadowVms(URI)
* @see VAppTemplateApi#getShadowVms(URI)
*/
@GET
@Consumes
@ -317,5 +317,5 @@ public interface VAppTemplateAsyncClient {
* @return asynchronous access to {@link Metadata} features
*/
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

8
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
View File

@ -39,12 +39,12 @@ import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams;
/**
* Provides synchronous access to a vDC.
*
* @see VdcAsyncClient
* @see VdcAsyncApi
* @see <a href= "http://support.theenterprisecloud.com/kb/default.asp?id=984&Lang=1&SID=" />
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VdcClient {
public interface VdcApi {
/**
* Retrieves a vdc.
@ -105,7 +105,7 @@ public interface VdcClient {
*
* The vCloud API supports composing a vApp from any combination of vApp templates, vApps,
* or virtual machines. When you compose a vApp, all children of each composition source
* become peers in the Children collection of the composed vApp. To compose a vApp, a client
* become peers in the Children collection of the composed vApp. To compose a vApp, a api
* makes a compose vApp request whose body is a ComposeVAppParams element, includes the
* following information:
* <ul>
@ -179,6 +179,6 @@ public interface VdcClient {
* @return synchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataClient.Readable getMetadataClient();
MetadataApi.Readable getMetadataApi();
}

26
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcAsyncApi.java
View File

@ -51,14 +51,14 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see VdcClient
* @see VdcApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface VdcAsyncClient {
public interface VdcAsyncApi {
/**
* @see VdcClient#getVdc(URI)
* @see VdcApi#getVdc(URI)
*/
@GET
@Consumes
@ -67,7 +67,7 @@ public interface VdcAsyncClient {
ListenableFuture<? extends Vdc> getVdc(@EndpointParam URI vdcURI);
/**
* @see VdcClient#captureVApp(URI, CaptureVAppParams)
* @see VdcApi#captureVApp(URI, CaptureVAppParams)
*/
@POST
@Path("/action/captureVApp")
@ -78,7 +78,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) CaptureVAppParams params);
/**
* @see VdcClient#cloneMedia(URI, CloneMediaParams)
* @see VdcApi#cloneMedia(URI, CloneMediaParams)
*/
@POST
@Path("/action/cloneMedia")
@ -89,7 +89,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) CloneMediaParams params);
/**
* @see VdcClient#cloneVApp(URI, CloneVAppParams)
* @see VdcApi#cloneVApp(URI, CloneVAppParams)
*/
@POST
@Path("/action/cloneVApp")
@ -100,7 +100,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) CloneVAppParams params);
/**
* @see VdcClient#cloneVAppTemplate(URI, CloneVAppTemplateParams)
* @see VdcApi#cloneVAppTemplate(URI, CloneVAppTemplateParams)
*/
@POST
@Path("/action/cloneVAppTemplate")
@ -111,7 +111,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) CloneVAppTemplateParams params);
/**
* @see VdcClient#composeVApp(URI, ComposeVAppParams)
* @see VdcApi#composeVApp(URI, ComposeVAppParams)
*/
@POST
@Path("/action/composeVApp")
@ -122,7 +122,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) ComposeVAppParams params);
/**
* @see VdcClient#instantiateVApp(URI, InstantiateVAppParamsType)
* @see VdcApi#instantiateVApp(URI, InstantiateVAppParamsType)
*/
@POST
@Path("/action/instantiateVAppTemplate")
@ -133,7 +133,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) InstantiateVAppParams params);
/**
* @see VdcClient#uploadVAppTemplate(URI, UploadVAppTemplateParams)
* @see VdcApi#uploadVAppTemplate(URI, UploadVAppTemplateParams)
*/
@POST
@Path("/action/uploadVAppTemplate")
@ -144,7 +144,7 @@ public interface VdcAsyncClient {
@BinderParam(BindToXMLPayload.class) UploadVAppTemplateParams params);
/**
* @see VdcClient#createMedia(URI, Media)
* @see VdcApi#createMedia(URI, Media)
*/
@POST
@Path("/media")
@ -158,6 +158,6 @@ public interface VdcAsyncClient {
* @return asynchronous access to {@link Metadata.Readable} features
*/
@Delegate
MetadataAsyncClient.Readable getMetadataClient();
MetadataAsyncApi.Readable getMetadataApi();
}
}

36
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmApi.java
View File

@ -46,17 +46,17 @@ import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
* Provides synchronous access to {@link Vm} objects.
*
* @author grkvlt@apache.org
* @see VmAsyncClient
* @see VmAsyncApi
* @version 1.5
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VmClient {
public interface VmApi {
/**
* Retrieves a {@link Vm}.
*
* @since 0.9
* @see VAppClient#getVApp(URI)
* @see VAppApi#getVApp(URI)
*/
Vm getVm(URI vmURI);
@ -64,7 +64,7 @@ public interface VmClient {
* Modifies the name/description of a {@link Vm}.
*
* @since 0.9
* @see VAppClient#modifyVApp(URI, VApp)
* @see VAppApi#modifyVApp(URI, VApp)
*/
Task modifyVm(URI vmURI, Vm vm);
@ -72,7 +72,7 @@ public interface VmClient {
* Deletes a {@link Vm}.
*
* @since 0.9
* @see VAppClient#deleteVApp(URI)
* @see VAppApi#deleteVApp(URI)
*/
Task deleteVm(URI vmURI);
@ -91,7 +91,7 @@ public interface VmClient {
* Deploys a {@link Vm}.
*
* @since 0.9
* @see VAppClient#deploy(URI, DeployVAppParams)
* @see VAppApi#deploy(URI, DeployVAppParams)
*/
Task deploy(URI vmURI, DeployVAppParams params);
@ -99,7 +99,7 @@ public interface VmClient {
* Discard suspended state of a {@link Vm}.
*
* @since 0.9
* @see VAppClient#discardSuspendedState(URI)
* @see VAppApi#discardSuspendedState(URI)
*/
Task discardSuspendedState(URI vmURI);
@ -131,7 +131,7 @@ public interface VmClient {
* Undeploy a {@link Vm}.
*
* @since 0.9
* @see VAppClient#undeploy(URI, UndeployVAppParams)
* @see VAppApi#undeploy(URI, UndeployVAppParams)
*/
Task undeploy(URI vmURI, UndeployVAppParams params);
@ -151,7 +151,7 @@ public interface VmClient {
* Powers off a {@link Vm}.
*
* @since 0.9
* @see VAppClient#powerOff(URI)
* @see VAppApi#powerOff(URI)
*/
Task powerOff(URI vmURI);
@ -159,7 +159,7 @@ public interface VmClient {
* Powers on a {@link Vm}.
*
* @since 0.9
* @see VAppClient#powerOn(URI)
* @see VAppApi#powerOn(URI)
*/
Task powerOn(URI vmURI);
@ -167,7 +167,7 @@ public interface VmClient {
* Reboots a {@link Vm}.
*
* @since 0.9
* @see VAppClient#reboot(URI)
* @see VAppApi#reboot(URI)
*/
Task reboot(URI vmURI);
@ -175,7 +175,7 @@ public interface VmClient {
* Resets a {@link Vm}.
*
* @since 0.9
* @see VAppClient#reset(URI)
* @see VAppApi#reset(URI)
*/
Task reset(URI vmURI);
@ -183,7 +183,7 @@ public interface VmClient {
* Shuts down a {@link Vm}.
*
* @since 0.9
* @see VAppClient#shutdown(URI)
* @see VAppApi#shutdown(URI)
*/
Task shutdown(URI vmURI);
@ -191,7 +191,7 @@ public interface VmClient {
* Suspends a {@link Vm}.
*
* @since 0.9
* @see VAppClient#suspend(URI)
* @see VAppApi#suspend(URI)
*/
Task suspend(URI vmURI);
@ -203,7 +203,7 @@ public interface VmClient {
* </pre>
*
* @since 1.0
* @see VAppClient#
* @see VAppApi#
*/
GuestCustomizationSection getGuestCustomizationSection(URI vmURI);
@ -288,7 +288,7 @@ public interface VmClient {
* Retrieves {@link Vm} product sections.
*
* @since 1.5
* @see VAppClient#getProductSections(URI)
* @see VAppApi#getProductSections(URI)
*/
ProductSectionList getProductSections(URI vmURI);
@ -296,7 +296,7 @@ public interface VmClient {
* Modifies the product section information of a {@link Vm}.
*
* @since 1.5
* @see VAppClient#modifyProductSections(URI, ProductSectionList)
* @see VAppApi#modifyProductSections(URI, ProductSectionList)
*/
Task modifyProductSections(URI vmURI, ProductSectionList sectionList);
@ -514,5 +514,5 @@ public interface VmClient {
* Synchronous access to {@link Vm} {@link Metadata} features.
*/
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

94
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VmAsyncApi.java
View File

@ -77,13 +77,13 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* @author grkvlt@apache.org
* @see VmClient
* @see VmApi
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface VmAsyncClient {
public interface VmAsyncApi {
/**
* @see VmClient#getVm(URI)
* @see VmApi#getVm(URI)
*/
@GET
@Consumes(VM)
@ -92,7 +92,7 @@ public interface VmAsyncClient {
ListenableFuture<Vm> getVm(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVm(URI, Vm)
* @see VmApi#modifyVm(URI, Vm)
*/
@PUT
@Produces(VM)
@ -102,7 +102,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) Vm vApp);
/**
* @see VmClient#deleteVm(URI)
* @see VmApi#deleteVm(URI)
*/
@DELETE
@Consumes(TASK)
@ -110,7 +110,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> deleteVm(@EndpointParam URI vmURI);
/**
* @see VmClient#consolidateVm(URI)
* @see VmApi#consolidateVm(URI)
*/
@POST
@Path("/action/consolidate")
@ -119,7 +119,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> consolidateVm(@EndpointParam URI vmURI);
/**
* @see VmClient#deploy(URI, DeployVAppParams)
* @see VmApi#deploy(URI, DeployVAppParams)
*/
@POST
@Path("/action/deploy")
@ -130,7 +130,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) DeployVAppParams params);
/**
* @see VmClient#discardSuspendedState(URI)
* @see VmApi#discardSuspendedState(URI)
*/
@POST
@Path("/action/discardSuspendedState")
@ -139,7 +139,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> discardSuspendedState(@EndpointParam URI vmURI);
/**
* @see VmClient#installVMwareTools(URI)
* @see VmApi#installVMwareTools(URI)
*/
@POST
@Path("/action/installVMwareTools")
@ -148,7 +148,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> installVMwareTools(@EndpointParam URI vmURI);
/**
* @see VmClient#relocateVm(URI, RelocateParams)
* @see VmApi#relocateVm(URI, RelocateParams)
*/
@POST
@Path("/action/relocate")
@ -159,7 +159,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) RelocateParams params);
/**
* @see VmClient#undeploy(URI, UndeployVAppParams)
* @see VmApi#undeploy(URI, UndeployVAppParams)
*/
@POST
@Path("/action/undeploy")
@ -170,7 +170,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) UndeployVAppParams params);
/**
* @see VmClient#upgradeHardwareVersion(URI)
* @see VmApi#upgradeHardwareVersion(URI)
*/
@POST
@Path("/action/upgradeHardwareVersion")
@ -179,7 +179,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> upgradeHardwareVersion(@EndpointParam URI vmURI);
/**
* @see VmClient#powerOff(URI)
* @see VmApi#powerOff(URI)
*/
@POST
@Path("/power/action/powerOff")
@ -188,7 +188,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> powerOff(@EndpointParam URI vmURI);
/**
* @see VmClient#powerOn(URI)
* @see VmApi#powerOn(URI)
*/
@POST
@Path("/power/action/powerOn")
@ -197,7 +197,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> powerOn(@EndpointParam URI vmURI);
/**
* @see VmClient#reboot(URI)
* @see VmApi#reboot(URI)
*/
@POST
@Path("/power/action/powerOff")
@ -206,7 +206,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> reboot(@EndpointParam URI vmURI);
/**
* @see VmClient#reset(URI)
* @see VmApi#reset(URI)
*/
@POST
@Path("/power/action/reset")
@ -215,7 +215,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> reset(@EndpointParam URI vmURI);
/**
* @see VmClient#shutdown(URI)
* @see VmApi#shutdown(URI)
*/
@POST
@Path("/power/action/shutdown")
@ -224,7 +224,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> shutdown(@EndpointParam URI vmURI);
/**
* @see VmClient#suspend(URI)
* @see VmApi#suspend(URI)
*/
@POST
@Path("/power/action/suspend")
@ -233,7 +233,7 @@ public interface VmAsyncClient {
ListenableFuture<Task> suspend(@EndpointParam URI vmURI);
/**
* @see VmClient#getGuestCustomizationSection(URI)
* @see VmApi#getGuestCustomizationSection(URI)
*/
@GET
@Path("/guestCustomizationSection")
@ -243,7 +243,7 @@ public interface VmAsyncClient {
ListenableFuture<GuestCustomizationSection> getGuestCustomizationSection(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyGuestCustomizationSection(URI, GuestCustomizationSection)
* @see VmApi#modifyGuestCustomizationSection(URI, GuestCustomizationSection)
*/
@PUT
@Path("/guestCustomizationSection")
@ -254,7 +254,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) GuestCustomizationSection section);
/**
* @see VmClient#ejectMedia(URI, MediaInsertOrEjectParams)
* @see VmApi#ejectMedia(URI, MediaInsertOrEjectParams)
*/
@POST
@Path("/media/action/ejectMedia")
@ -265,7 +265,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) MediaInsertOrEjectParams mediaParams);
/**
* @see VmClient#insertMedia(URI, MediaInsertOrEjectParams)
* @see VmApi#insertMedia(URI, MediaInsertOrEjectParams)
*/
@POST
@Path("/media/action/insertMedia")
@ -276,7 +276,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) MediaInsertOrEjectParams mediaParams);
/**
* @see VmClient#getNetworkConnectionSection(URI)
* @see VmApi#getNetworkConnectionSection(URI)
*/
@GET
@Path("/networkConnectionSection")
@ -286,7 +286,7 @@ public interface VmAsyncClient {
ListenableFuture<NetworkConnectionSection> getNetworkConnectionSection(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyNetworkConnectionSection(URI, NetworkConnectionSection)
* @see VmApi#modifyNetworkConnectionSection(URI, NetworkConnectionSection)
*/
@PUT
@Path("/networkConnectionSection")
@ -297,7 +297,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) NetworkConnectionSection section);
/**
* @see VmClient#getOperatingSystemSection(URI)
* @see VmApi#getOperatingSystemSection(URI)
*/
@GET
@Path("/operatingSystemSection")
@ -307,7 +307,7 @@ public interface VmAsyncClient {
ListenableFuture<OperatingSystemSection> getOperatingSystemSection(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyOperatingSystemSection(URI, OperatingSystemSection)
* @see VmApi#modifyOperatingSystemSection(URI, OperatingSystemSection)
*/
@PUT
@Path("/operatingSystemSection")
@ -318,7 +318,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) OperatingSystemSection section);
/**
* @see VmClient#getProductSections(URI)
* @see VmApi#getProductSections(URI)
*/
@GET
@Path("/productSections")
@ -328,7 +328,7 @@ public interface VmAsyncClient {
ListenableFuture<ProductSectionList> getProductSections(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyProductSections(URI, ProductSectionList)
* @see VmApi#modifyProductSections(URI, ProductSectionList)
*/
@PUT
@Path("/productSections")
@ -339,7 +339,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) ProductSectionList sectionList);
/**
* @see VmClient#getPendingQuestion(URI)
* @see VmApi#getPendingQuestion(URI)
*/
@GET
@Path("/question")
@ -349,7 +349,7 @@ public interface VmAsyncClient {
ListenableFuture<VmPendingQuestion> getPendingQuestion(@EndpointParam URI vmURI);
/**
* @see VmClient#answerQuestion(URI, VmQuestionAnswer)
* @see VmApi#answerQuestion(URI, VmQuestionAnswer)
*/
@POST
@Path("/question/action/answer")
@ -360,7 +360,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) VmQuestionAnswer answer);
/**
* @see VmClient#getRuntimeInfoSection(URI)
* @see VmApi#getRuntimeInfoSection(URI)
*/
@GET
@Path("/runtimeInfoSection")
@ -370,7 +370,7 @@ public interface VmAsyncClient {
ListenableFuture<RuntimeInfoSection> getRuntimeInfoSection(@EndpointParam URI vmURI);
/**
* @see VmClient#getScreenImage(URI)
* @see VmApi#getScreenImage(URI)
*/
@GET
@Path("/screen")
@ -380,7 +380,7 @@ public interface VmAsyncClient {
ListenableFuture<byte[]> getScreenImage(@EndpointParam URI vmURI);
/**
* @see VmClient#getScreenTicket(URI)
* @see VmApi#getScreenTicket(URI)
*/
@POST
@Path("/screen/action/acquireTicket")
@ -390,7 +390,7 @@ public interface VmAsyncClient {
ListenableFuture<ScreenTicket> getScreenTicket(@EndpointParam URI vmURI);
/**
* @see VmClient#getVirtualHardwareSection(URI)
* @see VmApi#getVirtualHardwareSection(URI)
*/
@GET
@Path("/virtualHardwareSection")
@ -400,7 +400,7 @@ public interface VmAsyncClient {
ListenableFuture<VirtualHardwareSection> getVirtualHardwareSection(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVirtualHardwareSection(URI, VirtualHardwareSection)
* @see VmApi#modifyVirtualHardwareSection(URI, VirtualHardwareSection)
*/
@PUT
@Path("/virtualHardwareSection")
@ -411,7 +411,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) VirtualHardwareSection section);
/**
* @see VmClient#getVirtualHardwareSectionCpu(URI)
* @see VmApi#getVirtualHardwareSectionCpu(URI)
*/
@GET
@Path("/virtualHardwareSection/cpu")
@ -421,7 +421,7 @@ public interface VmAsyncClient {
ListenableFuture<RasdItem> getVirtualHardwareSectionCpu(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVirtualHardwareSectionCpu(URI, ResourceAllocationSettingData)
* @see VmApi#modifyVirtualHardwareSectionCpu(URI, ResourceAllocationSettingData)
*/
@PUT
@Path("/virtualHardwareSection/cpu")
@ -432,7 +432,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) RasdItem rasd);
/**
* @see VmClient#getVirtualHardwareSectionDisks(URI)
* @see VmApi#getVirtualHardwareSectionDisks(URI)
*/
@GET
@Path("/virtualHardwareSection/disks")
@ -442,7 +442,7 @@ public interface VmAsyncClient {
ListenableFuture<RasdItemsList> getVirtualHardwareSectionDisks(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVirtualHardwareSectionDisks(URI, RasdItemsList)
* @see VmApi#modifyVirtualHardwareSectionDisks(URI, RasdItemsList)
*/
@PUT
@Path("/virtualHardwareSection/disks")
@ -453,7 +453,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) RasdItemsList rasdItemsList);
/**
* @see VmClient#getVirtualHardwareSectionMedia(URI)
* @see VmApi#getVirtualHardwareSectionMedia(URI)
*/
@GET
@Path("/virtualHardwareSection/media")
@ -463,7 +463,7 @@ public interface VmAsyncClient {
ListenableFuture<RasdItemsList> getVirtualHardwareSectionMedia(@EndpointParam URI vmURI);
/**
* @see VmClient#getVirtualHardwareSectionMemory(URI)
* @see VmApi#getVirtualHardwareSectionMemory(URI)
*/
@GET
@Path("/virtualHardwareSection/memory")
@ -473,7 +473,7 @@ public interface VmAsyncClient {
ListenableFuture<RasdItem> getVirtualHardwareSectionMemory(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVirtualHardwareSectionMemory(URI, ResourceAllocationSettingData)
* @see VmApi#modifyVirtualHardwareSectionMemory(URI, ResourceAllocationSettingData)
*/
@PUT
@Path("/virtualHardwareSection/memory")
@ -484,7 +484,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) RasdItem rasd);
/**
* @see VmClient#getVirtualHardwareSectionNetworkCards(URI)
* @see VmApi#getVirtualHardwareSectionNetworkCards(URI)
*/
@GET
@Path("/virtualHardwareSection/networkCards")
@ -494,7 +494,7 @@ public interface VmAsyncClient {
ListenableFuture<RasdItemsList> getVirtualHardwareSectionNetworkCards(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVirtualHardwareSectionNetworkCards(URI, RasdItemsList)
* @see VmApi#modifyVirtualHardwareSectionNetworkCards(URI, RasdItemsList)
*/
@PUT
@Path("/virtualHardwareSection/networkCards")
@ -505,7 +505,7 @@ public interface VmAsyncClient {
@BinderParam(BindToXMLPayload.class) RasdItemsList rasdItemsList);
/**
* @see VmClient#getVirtualHardwareSectionSerialPorts(URI)
* @see VmApi#getVirtualHardwareSectionSerialPorts(URI)
*/
@GET
@Path("/virtualHardwareSection/serialPorts")
@ -515,7 +515,7 @@ public interface VmAsyncClient {
ListenableFuture<RasdItemsList> getVirtualHardwareSectionSerialPorts(@EndpointParam URI vmURI);
/**
* @see VmClient#modifyVirtualHardwareSectionSerialPorts(URI, RasdItemsList)
* @see VmApi#modifyVirtualHardwareSectionSerialPorts(URI, RasdItemsList)
*/
@PUT
@Path("/virtualHardwareSection/serialPorts")
@ -529,5 +529,5 @@ public interface VmAsyncClient {
* Asynchronous access to {@Vm} {@link Metadata} features.
*/
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogApi.java
View File

@ -26,17 +26,17 @@ import org.jclouds.rest.annotations.Delegate;
import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
import org.jclouds.vcloud.director.v1_5.domain.Owner;
import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams;
import org.jclouds.vcloud.director.v1_5.features.CatalogClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataClient;
import org.jclouds.vcloud.director.v1_5.features.CatalogApi;
import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
/**
* Provides synchronous access to {@link AdminCatalog} objects.
*
* @see AdminCatalogAsyncClient
* @see AdminCatalogAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface AdminCatalogClient extends CatalogClient {
public interface AdminCatalogApi extends CatalogApi {
/**
@ -118,5 +118,5 @@ public interface AdminCatalogClient extends CatalogClient {
*/
@Override
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

24
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminCatalogAsyncApi.java
View File

@ -40,21 +40,21 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog;
import org.jclouds.vcloud.director.v1_5.domain.Owner;
import org.jclouds.vcloud.director.v1_5.domain.params.PublishCatalogParams;
import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.CatalogAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncApi;
import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see AdminCatalogClient
* @see AdminCatalogApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
public interface AdminCatalogAsyncApi extends CatalogAsyncApi {
/**
* @see AdminClient#createCatalog(URI, AdminCatalog)
* @see AdminApi#createCatalog(URI, AdminCatalog)
*/
@POST
@Path("/catalogs")
@ -65,7 +65,7 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
@BinderParam(BindToXMLPayload.class) AdminCatalog catalog);
/**
* @see AdminClient#getCatalog(URI)
* @see AdminApi#getCatalog(URI)
*/
@Override
@GET
@ -75,7 +75,7 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
ListenableFuture<AdminCatalog> getCatalog(@EndpointParam URI catalogRef);
/**
* @see AdminClient#getCatalog(URI)
* @see AdminApi#getCatalog(URI)
*/
@PUT
@Consumes(VCloudDirectorMediaType.ADMIN_CATALOG)
@ -85,7 +85,7 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
@BinderParam(BindToXMLPayload.class) AdminCatalog catalog);
/**
* @see AdminClient#deleteCatalog(URI)
* @see AdminApi#deleteCatalog(URI)
*/
@DELETE
@Consumes
@ -93,7 +93,7 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
ListenableFuture<Void> deleteCatalog(@EndpointParam URI catalogRef);
/**
* @see AdminClient#getOwner(URI)
* @see AdminApi#getOwner(URI)
*/
@GET
@Path("/owner")
@ -103,7 +103,7 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
ListenableFuture<Owner> getOwner(@EndpointParam URI catalogRef);
/**
* @see AdminClient#setOwner(URI, Owner)
* @see AdminApi#setOwner(URI, Owner)
*/
@PUT
@Path("/owner")
@ -114,7 +114,7 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
@BinderParam(BindToXMLPayload.class) Owner newOwner);
/**
* @see AdminClient#AdminClient(URI, PublishCatalogParams)
* @see AdminApi#AdminApi(URI, PublishCatalogParams)
*/
@POST
@Path("/action/publish")
@ -129,6 +129,6 @@ public interface AdminCatalogAsyncClient extends CatalogAsyncClient {
*/
@Override
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkApi.java
View File

@ -26,17 +26,17 @@ import org.jclouds.rest.annotations.Delegate;
import org.jclouds.vcloud.director.v1_5.domain.Task;
import org.jclouds.vcloud.director.v1_5.domain.network.Network;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
import org.jclouds.vcloud.director.v1_5.features.MetadataClient;
import org.jclouds.vcloud.director.v1_5.features.NetworkClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
import org.jclouds.vcloud.director.v1_5.features.NetworkApi;
/**
* Provides synchronous access to admin {@link Network} objects.
*
* @see AdminNetworkAsyncClient
* @see AdminNetworkAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface AdminNetworkClient extends NetworkClient {
public interface AdminNetworkApi extends NetworkApi {
/**
* Gets admin representation of network. This operation could return admin
@ -86,10 +86,10 @@ public interface AdminNetworkClient extends NetworkClient {
Task resetNetwork(URI networkRef);
/**
* @return synchronous access to admin {@link MetadataClient.Writeable} features
* @return synchronous access to admin {@link MetadataApi.Writeable} features
*/
@Override
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

18
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminNetworkAsyncApi.java
View File

@ -39,21 +39,21 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.Task;
import org.jclouds.vcloud.director.v1_5.domain.network.ExternalNetwork;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.NetworkAsyncApi;
import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see AdminNetworkClient
* @see AdminNetworkApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface AdminNetworkAsyncClient extends NetworkAsyncClient {
public interface AdminNetworkAsyncApi extends NetworkAsyncApi {
/**
* @see AdminNetworkClient#getNetwork(URI)
* @see AdminNetworkApi#getNetwork(URI)
*/
@Override
@GET
@ -63,7 +63,7 @@ public interface AdminNetworkAsyncClient extends NetworkAsyncClient {
ListenableFuture<ExternalNetwork> getNetwork(@EndpointParam URI networkRef);
/**
* @see AdminNetworkClient#updateNetwork(URI, OrgNetwork)
* @see AdminNetworkApi#updateNetwork(URI, OrgNetwork)
*/
@PUT
@Consumes(VCloudDirectorMediaType.TASK)
@ -73,7 +73,7 @@ public interface AdminNetworkAsyncClient extends NetworkAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgNetwork network);
/**
* @see AdminNetworkClient#resetNetwork(URI)
* @see AdminNetworkApi#resetNetwork(URI)
*/
@POST
@Path("/action/reset")
@ -82,9 +82,9 @@ public interface AdminNetworkAsyncClient extends NetworkAsyncClient {
ListenableFuture<Task> resetNetwork(@EndpointParam URI networkRef);
/**
* @return asynchronous access to admin {@link MetadataAsyncClient.Writeable} features
* @return asynchronous access to admin {@link MetadataAsyncApi.Writeable} features
*/
@Override
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgApi.java
View File

@ -31,17 +31,17 @@ import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings;
import org.jclouds.vcloud.director.v1_5.features.MetadataClient;
import org.jclouds.vcloud.director.v1_5.features.OrgClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
import org.jclouds.vcloud.director.v1_5.features.OrgApi;
/**
* Provides synchronous access to {@link Org} objects.
*
* @see GroupAsyncClient
* @see GroupAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface AdminOrgClient extends OrgClient {
public interface AdminOrgApi extends OrgApi {
/**
* Retrieves an admin view of an organization.
@ -220,10 +220,10 @@ public interface AdminOrgClient extends OrgClient {
OrgVAppTemplateLeaseSettings newSettings);
/**
* @return synchronous access to admin {@link MetadataClient.Writeable} features
* @return synchronous access to admin {@link MetadataApi.Writeable} features
*/
@Override
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

40
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminOrgAsyncApi.java
View File

@ -43,21 +43,21 @@ import org.jclouds.vcloud.director.v1_5.domain.org.OrgLeaseSettings;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgPasswordPolicySettings;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgSettings;
import org.jclouds.vcloud.director.v1_5.domain.org.OrgVAppTemplateLeaseSettings;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.OrgAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.OrgAsyncApi;
import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see AdminOrgClient
* @see AdminOrgApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface AdminOrgAsyncClient extends OrgAsyncClient {
public interface AdminOrgAsyncApi extends OrgAsyncApi {
/**
* @see AdminOrgClient#getOrg(URI)
* @see AdminOrgApi#getOrg(URI)
*/
@Override
@GET
@ -67,7 +67,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<AdminOrg> getOrg(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#getSettings(URI)
* @see AdminOrgApi#getSettings(URI)
*/
@GET
@Path("/settings")
@ -77,7 +77,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgSettings> getSettings(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#updateSettings(URI, OrgSettings)
* @see AdminOrgApi#updateSettings(URI, OrgSettings)
*/
@PUT
@Path("/settings")
@ -88,7 +88,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgSettings settings);
/**
* @see AdminOrgClient#getEmailSettings(URI)
* @see AdminOrgApi#getEmailSettings(URI)
*/
@GET
@Path("/settings/email")
@ -98,7 +98,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgEmailSettings> getEmailSettings(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#updateEmailSettings(URI, OrgEmailSettings)
* @see AdminOrgApi#updateEmailSettings(URI, OrgEmailSettings)
*/
@PUT
@Path("/settings/email")
@ -109,7 +109,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgEmailSettings settings);
/**
* @see AdminOrgClient#getGeneralSettings(URI)
* @see AdminOrgApi#getGeneralSettings(URI)
*/
@GET
@Path("/settings/general")
@ -119,7 +119,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgGeneralSettings> getGeneralSettings(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#updateGeneralSettings(URI, OrgGeneralSettings)
* @see AdminOrgApi#updateGeneralSettings(URI, OrgGeneralSettings)
*/
@PUT
@Path("/settings/general")
@ -131,7 +131,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgGeneralSettings settings);
/**
* @see AdminOrgClient#getPasswordPolicy(URI)
* @see AdminOrgApi#getPasswordPolicy(URI)
*/
@GET
@Path("/settings/ldap")
@ -141,7 +141,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgLdapSettings> getLdapSettings(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#getPasswordPolicy(URI)
* @see AdminOrgApi#getPasswordPolicy(URI)
*/
@GET
@Path("/settings/passwordPolicy")
@ -151,7 +151,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgPasswordPolicySettings> getPasswordPolicy(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#updatePasswordPolicy(URI, OrgPasswordPolicySettings)
* @see AdminOrgApi#updatePasswordPolicy(URI, OrgPasswordPolicySettings)
*/
@PUT
@Path("/settings/passwordPolicy")
@ -162,7 +162,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgPasswordPolicySettings settings);
/**
* @see AdminOrgClient#getVAppLeaseSettings(URI)
* @see AdminOrgApi#getVAppLeaseSettings(URI)
*/
@GET
@Path("/settings/vAppLeaseSettings")
@ -172,7 +172,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgLeaseSettings> getVAppLeaseSettings(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#updateVAppLeaseSettings(URI, OrgVAppLeaseSettings)
* @see AdminOrgApi#updateVAppLeaseSettings(URI, OrgVAppLeaseSettings)
*/
@PUT
@Path("/settings/vAppLeaseSettings")
@ -183,7 +183,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgLeaseSettings settings);
/**
* @see AdminOrgClient#getVAppTemplateLeaseSettings(URI)
* @see AdminOrgApi#getVAppTemplateLeaseSettings(URI)
*/
@GET
@Path("/settings/vAppTemplateLeaseSettings")
@ -193,7 +193,7 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
ListenableFuture<OrgVAppTemplateLeaseSettings> getVAppTemplateLeaseSettings(@EndpointParam URI orgRef);
/**
* @see AdminOrgClient#updateVAppTemplateLeaseSettings(URI, OrgVAppTemplateLeaseSettings)
* @see AdminOrgApi#updateVAppTemplateLeaseSettings(URI, OrgVAppTemplateLeaseSettings)
*/
@PUT
@Path("/settings/vAppTemplateLeaseSettings")
@ -204,9 +204,9 @@ public interface AdminOrgAsyncClient extends OrgAsyncClient {
@BinderParam(BindToXMLPayload.class) OrgVAppTemplateLeaseSettings settings);
/**
* @return asynchronous access to admin {@link MetadataAsyncClient.Writeable} features
* @return asynchronous access to admin {@link MetadataAsyncApi.Writeable} features
*/
@Override
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryApi.java
View File

@ -23,16 +23,16 @@ import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.vcloud.director.v1_5.domain.RoleReferences;
import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
import org.jclouds.vcloud.director.v1_5.features.QueryClient;
import org.jclouds.vcloud.director.v1_5.features.QueryApi;
/**
* Provides synchronous access to {@link AdminQuery} objects.
*
* @see AdminQueryAsyncClient
* @see AdminQueryAsyncApi
* @author Aled Sage
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface AdminQueryClient extends QueryClient {
public interface AdminQueryApi extends QueryApi {
/**
* Retrieves a list of {@link Group}s for organization the org admin belongs to by using REST API general QueryHandler

6
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminQueryAsyncApi.java
View File

@ -31,7 +31,7 @@ import org.jclouds.rest.annotations.QueryParams;
import org.jclouds.rest.annotations.RequestFilters;
import org.jclouds.vcloud.director.v1_5.domain.RoleReferences;
import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
import org.jclouds.vcloud.director.v1_5.features.QueryAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.QueryAsyncApi;
import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
@ -39,12 +39,12 @@ import com.google.common.util.concurrent.ListenableFuture;
/**
* Provides asynchronous access to {@link AdminQuery} objects.
*
* @see AdminQueryClient
* @see AdminQueryApi
* @author Aled Sage
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface AdminQueryAsyncClient extends QueryAsyncClient {
public interface AdminQueryAsyncApi extends QueryAsyncApi {
@GET
@Path("/admin/groups/query")

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcApi.java
View File

@ -26,17 +26,17 @@ import org.jclouds.rest.annotations.Delegate;
import org.jclouds.rest.annotations.EndpointParam;
import org.jclouds.vcloud.director.v1_5.domain.AdminVdc;
import org.jclouds.vcloud.director.v1_5.domain.Task;
import org.jclouds.vcloud.director.v1_5.features.MetadataClient;
import org.jclouds.vcloud.director.v1_5.features.VdcClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataApi;
import org.jclouds.vcloud.director.v1_5.features.VdcApi;
/**
* Provides synchronous access to {@link AdminVdc}.
*
* @see AdminVdcAsyncClient
* @see AdminVdcAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface AdminVdcClient extends VdcClient {
public interface AdminVdcApi extends VdcApi {
/**
* Retrieves an admin view of virtual data center. The redwood admin can disable an
@ -80,5 +80,5 @@ public interface AdminVdcClient extends VdcClient {
* @return synchronous access to {@link Writeable} features
*/
@Delegate
MetadataClient.Writeable getMetadataClient();
MetadataApi.Writeable getMetadataApi();
}

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/AdminVdcAsyncApi.java
View File

@ -37,18 +37,18 @@ import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.AdminVdc;
import org.jclouds.vcloud.director.v1_5.domain.Task;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.VdcAsyncClient;
import org.jclouds.vcloud.director.v1_5.features.MetadataAsyncApi;
import org.jclouds.vcloud.director.v1_5.features.VdcAsyncApi;
import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see AdminVdcClient
* @see AdminVdcApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface AdminVdcAsyncClient extends VdcAsyncClient {
public interface AdminVdcAsyncApi extends VdcAsyncApi {
@Override
@GET
@ -85,5 +85,5 @@ public interface AdminVdcAsyncClient extends VdcAsyncClient {
*/
@Override
@Delegate
MetadataAsyncClient.Writeable getMetadataClient();
MetadataAsyncApi.Writeable getMetadataApi();
}

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupApi.java
View File

@ -27,11 +27,11 @@ import org.jclouds.vcloud.director.v1_5.domain.Group;
/**
* Provides synchronous access to {@link Group} objects.
*
* @see GroupAsyncClient
* @see GroupAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface GroupClient {
public interface GroupApi {
/**
* Imports a group in an organization.

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/GroupAsyncApi.java
View File

@ -42,11 +42,11 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see GroupClient
* @see GroupApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface GroupAsyncClient {
public interface GroupAsyncApi {
@POST
@Path("/groups")
@ -57,7 +57,7 @@ public interface GroupAsyncClient {
@BinderParam(BindToXMLPayload.class) Group group);
/**
* @see GroupClient#getGroup(URI)
* @see GroupApi#getGroup(URI)
*/
@GET
@Consumes
@ -66,7 +66,7 @@ public interface GroupAsyncClient {
ListenableFuture<Group> getGroup(@EndpointParam URI groupUri);
/**
* @see GroupClient#updateGroup(URI, Group)
* @see GroupApi#updateGroup(URI, Group)
*/
@PUT
@Consumes(VCloudDirectorMediaType.GROUP)
@ -76,7 +76,7 @@ public interface GroupAsyncClient {
@BinderParam(BindToXMLPayload.class) Group group);
/**
* @see GroupClient#deleteGroup(URI)
* @see GroupApi#deleteGroup(URI)
*/
@DELETE
@Consumes

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserApi.java
View File

@ -27,11 +27,11 @@ import org.jclouds.vcloud.director.v1_5.domain.User;
/**
* Provides synchronous access to {@link Group} objects.
*
* @see GroupAsyncClient
* @see GroupAsyncApi
* @author danikov
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface UserClient {
public interface UserApi {
/**
* Creates or imports a user in an organization. The user could be enabled or disabled.

14
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/admin/UserAsyncApi.java
View File

@ -42,14 +42,14 @@ import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationToRequest;
import com.google.common.util.concurrent.ListenableFuture;
/**
* @see UserClient
* @see UserApi
* @author danikov
*/
@RequestFilters(AddVCloudAuthorizationToRequest.class)
public interface UserAsyncClient {
public interface UserAsyncApi {
/**
* @see UserClient#createUser(URI, User)
* @see UserApi#createUser(URI, User)
*/
@POST
@Path("/users")
@ -60,7 +60,7 @@ public interface UserAsyncClient {
@BinderParam(BindToXMLPayload.class) User user);
/**
* @see UserClient#getUser(URI)
* @see UserApi#getUser(URI)
*/
@GET
@Consumes
@ -69,7 +69,7 @@ public interface UserAsyncClient {
ListenableFuture<User> getUser(@EndpointParam URI userRef);
/**
* @see UserClient#updateUser(URI, User)
* @see UserApi#updateUser(URI, User)
*/
@PUT
@Consumes(VCloudDirectorMediaType.USER)
@ -79,7 +79,7 @@ public interface UserAsyncClient {
@BinderParam(BindToXMLPayload.class) User user);
/**
* @see UserClient#deleteUser(URI)
* @see UserApi#deleteUser(URI)
*/
@DELETE
@Consumes
@ -87,7 +87,7 @@ public interface UserAsyncClient {
ListenableFuture<Void> deleteUser(@EndpointParam URI userRef);
/**
* @see UserClient#unlockUser(URI)
* @see UserApi#unlockUser(URI)
*/
@POST
@Path("/action/unlock")

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/filters/AddVCloudAuthorizationToRequest.java
View File

@ -29,4 +29,4 @@ public class AddVCloudAuthorizationToRequest implements HttpRequestFilter {
return request.toBuilder().replaceHeader("x-vcloud-authorization", sessionSupplier.get()).build();
}
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/AllCatalogItemsInCatalog.java
View File

@ -35,7 +35,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.Catalog;
import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@ -48,12 +48,12 @@ public class AllCatalogItemsInCatalog implements Function<Catalog, Iterable<? ex
@Resource
public Logger logger = Logger.NULL;
private final VCloudDirectorAsyncClient aclient;
private final VCloudDirectorAsyncApi aapi;
private final ExecutorService executor;
@Inject
AllCatalogItemsInCatalog(VCloudDirectorAsyncClient aclient, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aclient = aclient;
AllCatalogItemsInCatalog(VCloudDirectorAsyncApi aapi, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aapi = aapi;
this.executor = executor;
}
@ -71,11 +71,11 @@ public class AllCatalogItemsInCatalog implements Function<Catalog, Iterable<? ex
@Override
public Future<CatalogItem> apply(Reference from) {
return aclient.getCatalogClient().getCatalogItem(from.getHref());
return aapi.getCatalogApi().getCatalogItem(from.getHref());
}
}, executor, null, logger, "catalogItems in " + from.getHref());
return catalogItems;
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/AllCatalogItemsInOrg.java
View File

@ -56,4 +56,4 @@ public class AllCatalogItemsInOrg implements Function<Org, Iterable<CatalogItem>
}));
}
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/AllCatalogsInOrg.java
View File

@ -32,7 +32,7 @@ import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.domain.Catalog;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import com.google.common.base.Function;
@ -44,12 +44,12 @@ public class AllCatalogsInOrg implements Function<AdminOrg, Iterable<? extends C
@Resource
public Logger logger = Logger.NULL;
private final VCloudDirectorAsyncClient aclient;
private final VCloudDirectorAsyncApi aapi;
private final ExecutorService executor;
@Inject
AllCatalogsInOrg(VCloudDirectorAsyncClient aclient, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aclient = aclient;
AllCatalogsInOrg(VCloudDirectorAsyncApi aapi, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aapi = aapi;
this.executor = executor;
}
@ -59,10 +59,10 @@ public class AllCatalogsInOrg implements Function<AdminOrg, Iterable<? extends C
new Function<Reference, Future<? extends Catalog>>() {
@Override
public Future<? extends Catalog> apply(Reference from) {
return aclient.getCatalogClient().getCatalog(from.getHref());
return aapi.getCatalogApi().getCatalog(from.getHref());
}
}, executor, null, logger, "catalogs in " + org.getName());
return catalogs;
}
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/AllVdcsInOrg.java
View File

@ -33,7 +33,7 @@ import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.Vdc;
import org.jclouds.vcloud.director.v1_5.domain.org.AdminOrg;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import com.google.common.base.Function;
@ -45,12 +45,12 @@ public class AllVdcsInOrg implements Function<AdminOrg, Iterable<? extends Vdc>>
@Resource
public Logger logger = Logger.NULL;
private final VCloudDirectorAsyncClient aclient;
private final VCloudDirectorAsyncApi aapi;
private final ExecutorService executor;
@Inject
AllVdcsInOrg(VCloudDirectorAsyncClient aclient, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aclient = aclient;
AllVdcsInOrg(VCloudDirectorAsyncApi aapi, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aapi = aapi;
this.executor = executor;
}
@ -61,11 +61,11 @@ public class AllVdcsInOrg implements Function<AdminOrg, Iterable<? extends Vdc>>
new Function<Reference, Future<? extends Vdc>>() {
@Override
public Future<? extends Vdc> apply(Reference from) {
return aclient.getVdcClient().getVdc(from.getHref());
return aapi.getVdcApi().getVdc(from.getHref());
}
}, executor, null, logger, "vdcs in org " + org.getName());
return catalogItems;
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/DefaultNetworkNameInTemplate.java
View File

@ -51,4 +51,4 @@ public class DefaultNetworkNameInTemplate implements Function<VAppTemplate, Stri
logger.warn("multiple networks found for %s, choosing first from: %s", vAppTemplate.getName(), networks);
return get(networks, 0).getName();
}
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/LoginUserInOrgWithPassword.java
View File

@ -26,19 +26,19 @@ import javax.inject.Singleton;
import org.jclouds.domain.Credentials;
import org.jclouds.vcloud.director.v1_5.annotations.Login;
import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
import org.jclouds.vcloud.director.v1_5.login.SessionClient;
import org.jclouds.vcloud.director.v1_5.login.SessionApi;
import com.google.common.base.Function;
import com.google.common.base.Supplier;
@Singleton
public class LoginUserInOrgWithPassword implements Function<Credentials, SessionWithToken> {
private final SessionClient client;
private final SessionApi api;
private final Supplier<URI> loginUrl;
@Inject
public LoginUserInOrgWithPassword(SessionClient client, @Login Supplier<URI> loginUrl) {
this.client = client;
public LoginUserInOrgWithPassword(SessionApi api, @Login Supplier<URI> loginUrl) {
this.api = api;
this.loginUrl = loginUrl;
}
@ -48,11 +48,11 @@ public class LoginUserInOrgWithPassword implements Function<Credentials, Session
String org = input.identity.substring(input.identity.lastIndexOf('@') + 1);
String password = input.credential;
return client.loginUserInOrgWithPassword(loginUrl.get(), user, org, password);
return api.loginUserInOrgWithPassword(loginUrl.get(), user, org, password);
}
@Override
public String toString() {
return "loginUserInOrgWithPassword()";
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameAndCatalogNameToEndpoint.java
View File

@ -75,4 +75,4 @@ public class OrgNameAndCatalogNameToEndpoint implements Function<Object, URI> {
}
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameAndVdcNameToEndpoint.java
View File

@ -74,4 +74,4 @@ public class OrgNameAndVdcNameToEndpoint implements Function<Object, URI> {
}
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameCatalogNameItemNameToEndpoint.java
View File

@ -75,4 +75,4 @@ public class OrgNameCatalogNameItemNameToEndpoint implements Function<Object, UR
}
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameCatalogNameVAppTemplateNameToEndpoint.java
View File

@ -84,4 +84,4 @@ public class OrgNameCatalogNameVAppTemplateNameToEndpoint implements Function<Ob
.getHref();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameToEndpoint.java
View File

@ -56,4 +56,4 @@ public class OrgNameToEndpoint implements Function<Object, URI> {
}
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameToTasksListEndpoint.java
View File

@ -61,4 +61,4 @@ public class OrgNameToTasksListEndpoint implements Function<Object, URI> {
}
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameVdcNameNetworkNameToEndpoint.java
View File

@ -56,4 +56,4 @@ public class OrgNameVdcNameNetworkNameToEndpoint extends OrgNameVdcNameResourceN
return resourceEntity.getHref();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameVdcNameResourceEntityNameToEndpoint.java
View File

@ -56,4 +56,4 @@ public class OrgNameVdcNameResourceEntityNameToEndpoint extends OrgNameVdcNameRe
return resourceEntity.getHref();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgNameVdcNameResourceNameToEndpoint.java
View File

@ -76,4 +76,4 @@ public abstract class OrgNameVdcNameResourceNameToEndpoint implements Function<
protected abstract URI getEndpointOfResourceInVdc(Object org, Object Vdc, Object resource, Vdc VdcObject);
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgReferenceToTaskListEndpoint.java
View File

@ -27,7 +27,7 @@ import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.Link;
import org.jclouds.vcloud.director.v1_5.domain.org.Org;
import org.jclouds.vcloud.director.v1_5.features.OrgClient;
import org.jclouds.vcloud.director.v1_5.features.OrgApi;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
@ -37,11 +37,11 @@ import com.google.common.base.Preconditions;
*/
@Singleton
public class OrgReferenceToTaskListEndpoint implements Function<Object, URI> {
private final OrgClient client;
private final OrgApi api;
@Inject
public OrgReferenceToTaskListEndpoint(OrgClient client) {
this.client = client;
public OrgReferenceToTaskListEndpoint(OrgApi api) {
this.api = api;
}
@Override
@ -49,7 +49,7 @@ public class OrgReferenceToTaskListEndpoint implements Function<Object, URI> {
Preconditions.checkNotNull(input);
Preconditions.checkArgument(input instanceof URI);
URI reference = (URI) input;
Org org = client.getOrg(reference);
Org org = api.getOrg(reference);
if (org == null) {
throw new ResourceNotFoundException();
}
@ -60,4 +60,4 @@ public class OrgReferenceToTaskListEndpoint implements Function<Object, URI> {
}
throw new RuntimeException(String.format("Could not find a link of type %s", VCloudDirectorMediaType.TASKS_LIST));
};
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgsForLocations.java
View File

@ -36,7 +36,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.domain.org.Org;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@ -49,12 +49,12 @@ import com.google.common.collect.Sets;
public class OrgsForLocations implements Function<Iterable<Location>, Iterable<? extends Org>> {
@Resource
public Logger logger = Logger.NULL;
private final VCloudDirectorAsyncClient aclient;
private final VCloudDirectorAsyncApi aapi;
private final ExecutorService executor;
@Inject
OrgsForLocations(VCloudDirectorAsyncClient aclient, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aclient = aclient;
OrgsForLocations(VCloudDirectorAsyncApi aapi, @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aapi = aapi;
this.executor = executor;
}
@ -83,10 +83,10 @@ public class OrgsForLocations implements Function<Iterable<Location>, Iterable<?
@Override
public Future<? extends Org> apply(URI from) {
return aclient.getOrgClient().getOrg(from);
return aapi.getOrgApi().getOrg(from);
}
}, executor, null, logger, "organizations for uris");
}
}
}

22
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/OrgsForNames.java
View File

@ -34,8 +34,8 @@ import org.jclouds.Constants;
import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.org.Org;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@ -47,31 +47,31 @@ import com.google.common.collect.Iterables;
public class OrgsForNames implements Function<Iterable<String>, Iterable<? extends Org>> {
@Resource
public Logger logger = Logger.NULL;
private final VCloudDirectorAsyncClient aclient;
private final VCloudDirectorClient sclient;
private final VCloudDirectorAsyncApi aapi;
private final VCloudDirectorApi sapi;
private final ExecutorService executor;
@Inject
OrgsForNames(VCloudDirectorAsyncClient aclient,
VCloudDirectorClient sclient,
OrgsForNames(VCloudDirectorAsyncApi aapi,
VCloudDirectorApi sapi,
@Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor) {
this.aclient = aclient;
this.sclient = sclient;
this.aapi = aapi;
this.sapi = sapi;
this.executor = executor;
}
@Override
public Iterable<? extends Org> apply(Iterable<String> from) {
final Set<Reference> orgs = sclient.getOrgClient().getOrgList().getOrgs();
final Set<Reference> orgs = sapi.getOrgApi().getOrgList().getOrgs();
return transformParallel(from, new Function<String, Future<? extends Org>>() {
@Override
public Future<? extends Org> apply(String from) {
return aclient.getOrgClient().getOrg(Iterables.find(orgs, nameEquals(from)).getHref());
return aapi.getOrgApi().getOrg(Iterables.find(orgs, nameEquals(from)).getHref());
}
}, executor, null, logger, "organizations for names");
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReferenceToEndpoint.java
View File

@ -36,4 +36,4 @@ public class ReferenceToEndpoint implements Function<Reference, URI> {
public URI apply(Reference from) {
return from.getHref();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReferenceToName.java
View File

@ -34,4 +34,4 @@ public class ReferenceToName implements Function<Reference, String> {
public String apply(Reference from) {
return from.getName();
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/ReturnPayloadBytes.java
View File

@ -42,4 +42,4 @@ public class ReturnPayloadBytes implements Function<HttpResponse, byte[]> {
throw Throwables.propagate(e);
}
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVApp.java
View File

@ -44,4 +44,4 @@ public class SectionForVApp<S extends SectionType> implements Function<AbstractV
}
return null;
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/SectionForVAppTemplate.java
View File

@ -49,4 +49,4 @@ public class SectionForVAppTemplate<S extends SectionType> implements Function<V
}
return null;
}
}
}

14
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/VAppTemplatesForCatalogItems.java
View File

@ -38,7 +38,7 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@ -52,7 +52,7 @@ public class VAppTemplatesForCatalogItems implements Function<Iterable<CatalogIt
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
public Logger logger = Logger.NULL;
private final VCloudDirectorAsyncClient aclient;
private final VCloudDirectorAsyncApi aapi;
private final ExecutorService executor;
private final ReturnNullOnAuthorizationException returnNullOnAuthorizationException;
@ -68,10 +68,10 @@ public class VAppTemplatesForCatalogItems implements Function<Iterable<CatalogIt
}
@Inject
VAppTemplatesForCatalogItems(VCloudDirectorAsyncClient aclient,
VAppTemplatesForCatalogItems(VCloudDirectorAsyncApi aapi,
@Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor,
ReturnNullOnAuthorizationException returnNullOnAuthorizationException) {
this.aclient = aclient;
this.aapi = aapi;
this.executor = executor;
this.returnNullOnAuthorizationException = returnNullOnAuthorizationException;
}
@ -89,12 +89,12 @@ public class VAppTemplatesForCatalogItems implements Function<Iterable<CatalogIt
@Override
public Future<? extends VAppTemplate> apply(CatalogItem from) {
return new ExceptionParsingListenableFuture<VAppTemplate>(Futures.makeListenable(VCloudDirectorAsyncClient.class
.cast(aclient).getVAppTemplateClient().getVAppTemplate(from.getEntity().getHref()), executor),
return new ExceptionParsingListenableFuture<VAppTemplate>(Futures.makeListenable(VCloudDirectorAsyncApi.class
.cast(aapi).getVAppTemplateApi().getVAppTemplate(from.getEntity().getHref()), executor),
returnNullOnAuthorizationException);
}
}, executor, null, logger, "vappTemplates in");
}
}
}

2
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/functions/VAppTemplatesInOrg.java
View File

@ -67,4 +67,4 @@ public class VAppTemplatesInOrg implements Function<Org, Iterable<VAppTemplate>>
}));
}
}
}

12
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
View File

@ -30,7 +30,7 @@ import org.jclouds.http.HttpResponse;
import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
import org.jclouds.vcloud.director.v1_5.login.SessionClient;
import org.jclouds.vcloud.director.v1_5.login.SessionApi;
import com.google.common.cache.LoadingCache;
import com.google.inject.Inject;
@ -39,7 +39,7 @@ import com.google.inject.Singleton;
/**
* If the credentials supplied in the authentication header are invalid, or if the token has
* expired, the server returns HTTP response code 401. The token expires after a configurable
* interval of client inactivity. The default is 30 minutes after the token is created. After the
* interval of api inactivity. The default is 30 minutes after the token is created. After the
* token expires, you must log in again to obtain a new token.
*
* @author Adrian Cole
@ -51,13 +51,13 @@ public class InvalidateSessionAndRetryOn401AndLogoutOnClose extends BackoffLimit
protected Logger logger = Logger.NULL;
private final LoadingCache<Credentials, SessionWithToken> authenticationResponseCache;
private final SessionClient sessionClient;
private final SessionApi sessionApi;
@Inject
protected InvalidateSessionAndRetryOn401AndLogoutOnClose(
LoadingCache<Credentials, SessionWithToken> authenticationResponseCache, SessionClient sessionClient) {
LoadingCache<Credentials, SessionWithToken> authenticationResponseCache, SessionApi sessionApi) {
this.authenticationResponseCache = authenticationResponseCache;
this.sessionClient = sessionClient;
this.sessionApi = sessionApi;
}
@Override
@ -83,7 +83,7 @@ public class InvalidateSessionAndRetryOn401AndLogoutOnClose extends BackoffLimit
public void logoutOnClose() {
for (SessionWithToken s : authenticationResponseCache.asMap().values()) {
try {
sessionClient.logoutSessionWithToken(s.getSession().getHref(), s.getToken());
sessionApi.logoutSessionWithToken(s.getSession().getHref(), s.getToken());
} catch (Exception e) {
logger.error(e, "error logging out session %s", s.getSession());
}

20
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/internal/VCloudDirectorContextImpl.java
View File

@ -28,10 +28,10 @@ import org.jclouds.rest.Utils;
import org.jclouds.rest.annotations.Identity;
import org.jclouds.rest.internal.RestContextImpl;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorContext;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncClient;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncClient;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorClient;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminAsyncApi;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorAsyncApi;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
import com.google.inject.Injector;
import com.google.inject.TypeLiteral;
@ -40,20 +40,20 @@ import com.google.inject.TypeLiteral;
* @author danikov
*/
@Singleton
public class VCloudDirectorContextImpl extends RestContextImpl<VCloudDirectorClient, VCloudDirectorAsyncClient> implements
public class VCloudDirectorContextImpl extends RestContextImpl<VCloudDirectorApi, VCloudDirectorAsyncApi> implements
VCloudDirectorContext {
private final RestContext<VCloudDirectorAdminClient, VCloudDirectorAdminAsyncClient> adminContext;
private final RestContext<VCloudDirectorAdminApi, VCloudDirectorAdminAsyncApi> adminContext;
@Inject
VCloudDirectorContextImpl(ProviderMetadata providerMetadata, @Identity String identity, Utils utils, Closer closer,
Injector injector, RestContext<VCloudDirectorAdminClient, VCloudDirectorAdminAsyncClient> adminContext) {
super(providerMetadata, identity, utils, closer, injector, TypeLiteral.get(VCloudDirectorClient.class),
TypeLiteral.get(VCloudDirectorAsyncClient.class));
Injector injector, RestContext<VCloudDirectorAdminApi, VCloudDirectorAdminAsyncApi> adminContext) {
super(providerMetadata, identity, utils, closer, injector, TypeLiteral.get(VCloudDirectorApi.class),
TypeLiteral.get(VCloudDirectorAsyncApi.class));
this.adminContext = adminContext;
}
@Override
public RestContext<VCloudDirectorAdminClient, VCloudDirectorAdminAsyncClient> getAdminContext() {
public RestContext<VCloudDirectorAdminApi, VCloudDirectorAdminAsyncApi> getAdminContext() {
return adminContext;
}
}

4
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionApi.java
View File

@ -29,11 +29,11 @@ import org.jclouds.vcloud.director.v1_5.domain.SessionWithToken;
* Provides synchronous access to Session.
* <p/>
*
* @see SessionAsyncClient
* @see SessionAsyncApi
* @author Adrian Cole
*/
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface SessionClient {
public interface SessionApi {
/**
* TODO

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionAsyncClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/login/SessionAsyncApi.java
View File

@ -42,13 +42,13 @@ import com.google.common.util.concurrent.ListenableFuture;
* Provides asynchronous access to Session via their REST API.
* <p/>
*
* @see SessionClient
* @see SessionApi
* @author Adrian Cole
*/
public interface SessionAsyncClient {
public interface SessionAsyncApi {
/**
* @see SessionClient#loginUserInOrgWithPassword
* @see SessionApi#loginUserInOrgWithPassword
*/
@POST
@Consumes
@ -59,7 +59,7 @@ public interface SessionAsyncClient {
@PayloadParam("password") String password);
/**
* @see SessionClient#getSessionWithToken
* @see SessionApi#getSessionWithToken
*/
@GET
@Consumes
@ -68,7 +68,7 @@ public interface SessionAsyncClient {
@HeaderParam("x-vcloud-authorization") String authenticationToken);
/**
* @see SessionClient#logoutSessionWithToken
* @see SessionApi#logoutSessionWithToken
*/
@DELETE
@Consumes

14
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskStatusEquals.java
View File

@ -30,7 +30,7 @@ import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
import org.jclouds.vcloud.director.v1_5.domain.Task;
import org.jclouds.vcloud.director.v1_5.domain.Task.Status;
import org.jclouds.vcloud.director.v1_5.features.TaskClient;
import org.jclouds.vcloud.director.v1_5.features.TaskApi;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@ -42,7 +42,7 @@ import com.google.common.collect.Iterables;
*/
public class TaskStatusEquals implements Predicate<Task> {
private final TaskClient taskClient;
private final TaskApi taskApi;
@Resource
protected Logger logger = Logger.NULL;
@ -50,12 +50,12 @@ public class TaskStatusEquals implements Predicate<Task> {
private Collection<Status> expectedStatuses;
private Collection<Status> failingStatuses;
public TaskStatusEquals(TaskClient taskClient, Status expectedStatus, Set<Status> failingStatuses) {
this(taskClient, Collections.singleton(expectedStatus), failingStatuses);
public TaskStatusEquals(TaskApi taskApi, Status expectedStatus, Set<Status> failingStatuses) {
this(taskApi, Collections.singleton(expectedStatus), failingStatuses);
}
public TaskStatusEquals(TaskClient taskClient, Set<Status> expectedStatuses, Set<Status> failingStatuses) {
this.taskClient = taskClient;
public TaskStatusEquals(TaskApi taskApi, Set<Status> expectedStatuses, Set<Status> failingStatuses) {
this.taskApi = taskApi;
this.expectedStatuses = expectedStatuses;
this.failingStatuses = failingStatuses;
}
@ -67,7 +67,7 @@ public class TaskStatusEquals implements Predicate<Task> {
logger.trace("looking for status on task %s", task);
// TODO shouldn't we see if it's already done before getting it from API server?
task = taskClient.getTask(task.getHref());
task = taskApi.getTask(task.getHref());
// perhaps task isn't available, yet
if (task == null) return false;

10
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/TaskSuccess.java
View File

@ -29,7 +29,7 @@ import javax.inject.Singleton;
import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorException;
import org.jclouds.vcloud.director.v1_5.domain.Task;
import org.jclouds.vcloud.director.v1_5.features.TaskClient;
import org.jclouds.vcloud.director.v1_5.features.TaskApi;
import com.google.common.base.Predicate;
@ -41,14 +41,14 @@ import com.google.common.base.Predicate;
@Singleton
public class TaskSuccess implements Predicate<Task> {
private final TaskClient taskClient;
private final TaskApi taskApi;
@Resource
protected Logger logger = Logger.NULL;
@Inject
public TaskSuccess(TaskClient taskClient) {
this.taskClient = taskClient;
public TaskSuccess(TaskApi taskApi) {
this.taskApi = taskApi;
}
/** @see Predicate#apply(Object) */
@ -58,7 +58,7 @@ public class TaskSuccess implements Predicate<Task> {
logger.trace("looking for status on task %s", task.getOperationName());
// TODO shouldn't we see if it's already done before getting it from API server?
task = taskClient.getTask(task.getHref());
task = taskApi.getTask(task.getHref());
// perhaps task isn't available, yet
if (task == null) return false;

48
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorClient.java → labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/user/VCloudDirectorApi.java
View File

@ -23,28 +23,28 @@ import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.rest.annotations.Delegate;
import org.jclouds.vcloud.director.v1_5.domain.Session;
import org.jclouds.vcloud.director.v1_5.features.CatalogClient;
import org.jclouds.vcloud.director.v1_5.features.MediaClient;
import org.jclouds.vcloud.director.v1_5.features.NetworkClient;
import org.jclouds.vcloud.director.v1_5.features.OrgClient;
import org.jclouds.vcloud.director.v1_5.features.QueryClient;
import org.jclouds.vcloud.director.v1_5.features.TaskClient;
import org.jclouds.vcloud.director.v1_5.features.UploadClient;
import org.jclouds.vcloud.director.v1_5.features.VAppClient;
import org.jclouds.vcloud.director.v1_5.features.VAppTemplateClient;
import org.jclouds.vcloud.director.v1_5.features.VdcClient;
import org.jclouds.vcloud.director.v1_5.features.VmClient;
import org.jclouds.vcloud.director.v1_5.features.CatalogApi;
import org.jclouds.vcloud.director.v1_5.features.MediaApi;
import org.jclouds.vcloud.director.v1_5.features.NetworkApi;
import org.jclouds.vcloud.director.v1_5.features.OrgApi;
import org.jclouds.vcloud.director.v1_5.features.QueryApi;
import org.jclouds.vcloud.director.v1_5.features.TaskApi;
import org.jclouds.vcloud.director.v1_5.features.UploadApi;
import org.jclouds.vcloud.director.v1_5.features.VAppApi;
import org.jclouds.vcloud.director.v1_5.features.VAppTemplateApi;
import org.jclouds.vcloud.director.v1_5.features.VdcApi;
import org.jclouds.vcloud.director.v1_5.features.VmApi;
import com.google.inject.Provides;
/**
* Provides synchronous access to VCloudDirector.
*
* @see VCloudDirectorAdminAsyncClient
* @see VCloudDirectorAdminAsyncApi
* @author danikov
*/
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface VCloudDirectorClient {
public interface VCloudDirectorApi {
/**
* @return the current login session
*/
@ -55,65 +55,65 @@ public interface VCloudDirectorClient {
* @return asynchronous access to query features
*/
@Delegate
QueryClient getQueryClient();
QueryApi getQueryApi();
/**
* @return synchronous access to {@link Org} features
*/
@Delegate
OrgClient getOrgClient();
OrgApi getOrgApi();
/**
* @return synchronous access to {@link Task} features
*/
@Delegate
TaskClient getTaskClient();
TaskApi getTaskApi();
/**
* @return synchronous access to {@link Network} features
*/
@Delegate
NetworkClient getNetworkClient();
NetworkApi getNetworkApi();
/**
* @return synchronous access to {@link Catalog} features
*/
@Delegate
CatalogClient getCatalogClient();
CatalogApi getCatalogApi();
/**
* @return synchronous access to {@link Media} features
*/
@Delegate
MediaClient getMediaClient();
MediaApi getMediaApi();
/**
* @return synchronous access to {@link Vdc} features
*/
@Delegate
VdcClient getVdcClient();
VdcApi getVdcApi();
/**
* @return synchronous access to upload features
*/
@Delegate
UploadClient getUploadClient();
UploadApi getUploadApi();
/**
* @return synchronous access to {@link VApp} features
*/
@Delegate
VAppClient getVAppClient();
VAppApi getVAppApi();
/**
* @return synchronous access to {@link VAppTemplate} features
*/
@Delegate
VAppTemplateClient getVAppTemplateClient();
VAppTemplateApi getVAppTemplateApi();
/**
* @return synchronous access to {@link Vm} features
*/
@Delegate
VmClient getVmClient();
VmApi getVmApi();
}

Some files were not shown because too many files have changed in this diff Show More