You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/12 05:38:32 UTC
[9/9] git commit: Dedupe vcloud api calls and instead expose helper
to resolve ids to hrefs. cleanup pass on javadoc.
Dedupe vcloud api calls and instead expose helper to resolve ids to hrefs. cleanup pass on javadoc.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/a58cf0c6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/a58cf0c6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/a58cf0c6
Branch: refs/heads/master
Commit: a58cf0c6aaafb105653dcd14de82b1870815b844
Parents: e5a1507
Author: Adrian Cole <ad...@gmail.com>
Authored: Sat Oct 11 13:50:13 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sat Oct 11 20:38:13 2014 -0700
----------------------------------------------------------------------
.../director/v1_5/VCloudDirectorContext.java | 16 +
.../v1_5/admin/VCloudDirectorAdminApi.java | 8 -
.../director/v1_5/domain/AbstractVApp.java | 227 +++++++
.../director/v1_5/domain/AbstractVAppType.java | 234 -------
.../director/v1_5/domain/AccessSetting.java | 8 +-
.../director/v1_5/domain/AdminCatalog.java | 10 -
.../vcloud/director/v1_5/domain/AdminVdc.java | 23 +-
.../director/v1_5/domain/Capabilities.java | 18 -
.../vcloud/director/v1_5/domain/Capacity.java | 163 +++++
.../director/v1_5/domain/CapacityType.java | 183 -----
.../director/v1_5/domain/CapacityWithUsage.java | 32 +-
.../vcloud/director/v1_5/domain/Catalog.java | 4 -
.../director/v1_5/domain/CatalogItem.java | 4 -
.../director/v1_5/domain/ComputeCapacity.java | 21 +-
.../vcloud/director/v1_5/domain/Entity.java | 4 -
.../vcloud/director/v1_5/domain/Error.java | 4 -
.../vcloud/director/v1_5/domain/File.java | 18 -
.../vcloud/director/v1_5/domain/Group.java | 15 -
.../vcloud/director/v1_5/domain/Link.java | 9 +-
.../vcloud/director/v1_5/domain/Media.java | 4 -
.../vcloud/director/v1_5/domain/Metadata.java | 8 -
.../director/v1_5/domain/MetadataEntry.java | 7 -
.../director/v1_5/domain/MetadataValue.java | 25 -
.../vcloud/director/v1_5/domain/Owner.java | 8 +-
.../v1_5/domain/ProductSectionList.java | 16 -
.../vcloud/director/v1_5/domain/Property.java | 4 -
.../director/v1_5/domain/RasdItemsList.java | 7 -
.../vcloud/director/v1_5/domain/Reference.java | 7 +-
.../vcloud/director/v1_5/domain/References.java | 22 +-
.../vcloud/director/v1_5/domain/Resource.java | 9 +-
.../director/v1_5/domain/ResourceEntity.java | 5 +-
.../director/v1_5/domain/RoleReferences.java | 17 -
.../director/v1_5/domain/ScreenTicket.java | 9 +-
.../director/v1_5/domain/SessionWithToken.java | 3 -
.../vcloud/director/v1_5/domain/Task.java | 11 +-
.../vcloud/director/v1_5/domain/TasksList.java | 3 -
.../vcloud/director/v1_5/domain/User.java | 38 --
.../vcloud/director/v1_5/domain/VApp.java | 41 +-
.../director/v1_5/domain/VAppChildren.java | 7 -
.../director/v1_5/domain/VAppTemplate.java | 27 +-
.../vcloud/director/v1_5/domain/Vdc.java | 4 -
.../jclouds/vcloud/director/v1_5/domain/Vm.java | 8 +-
.../director/v1_5/domain/VmPendingQuestion.java | 4 -
.../director/v1_5/domain/VmQuestionAnswer.java | 15 +-
.../v1_5/domain/VmQuestionAnswerChoice.java | 13 -
.../v1_5/domain/network/DhcpService.java | 28 +-
.../v1_5/domain/network/ExternalNetwork.java | 17 +-
.../v1_5/domain/network/FirewallRule.java | 45 --
.../domain/network/FirewallRuleProtocols.java | 22 -
.../v1_5/domain/network/FirewallService.java | 29 +-
.../v1_5/domain/network/IpAddresses.java | 3 -
.../director/v1_5/domain/network/IpRanges.java | 3 -
.../v1_5/domain/network/IpsecVpnLocalPeer.java | 28 +-
.../domain/network/IpsecVpnManagedPeer.java | 109 +++
.../domain/network/IpsecVpnManagedPeerType.java | 109 ---
.../v1_5/domain/network/IpsecVpnPeer.java | 27 +
.../v1_5/domain/network/IpsecVpnPeerType.java | 27 -
.../v1_5/domain/network/IpsecVpnRemotePeer.java | 29 +-
.../v1_5/domain/network/IpsecVpnService.java | 30 +-
.../domain/network/IpsecVpnThirdPartyPeer.java | 21 +-
.../v1_5/domain/network/IpsecVpnTunnel.java | 42 +-
.../domain/network/IpsecVpnUnmanagedPeer.java | 25 +
.../network/IpsecVpnUnmanagedPeerType.java | 25 -
.../domain/network/NatOneToOneBasicRule.java | 20 -
.../v1_5/domain/network/NatOneToOneVmRule.java | 21 -
.../domain/network/NatPortForwardingRule.java | 22 -
.../director/v1_5/domain/network/NatRule.java | 27 -
.../v1_5/domain/network/NatService.java | 29 +-
.../director/v1_5/domain/network/NatVmRule.java | 23 -
.../v1_5/domain/network/NetworkAssignment.java | 17 -
.../domain/network/NetworkConfiguration.java | 3 -
.../v1_5/domain/network/NetworkConnection.java | 23 -
.../v1_5/domain/network/NetworkFeatures.java | 16 +-
.../v1_5/domain/network/NetworkService.java | 97 +++
.../v1_5/domain/network/NetworkServiceType.java | 100 ---
.../v1_5/domain/network/RouterInfo.java | 3 -
.../v1_5/domain/network/SmtpServerSettings.java | 16 -
.../v1_5/domain/network/StaticRoute.java | 19 -
.../domain/network/StaticRoutingService.java | 28 +-
.../v1_5/domain/network/VAppNetwork.java | 7 -
.../network/VAppNetworkConfiguration.java | 7 -
.../director/v1_5/domain/org/AdminOrg.java | 20 +-
.../v1_5/domain/org/CustomOrgLdapSettings.java | 26 -
.../vcloud/director/v1_5/domain/org/Org.java | 6 +-
.../v1_5/domain/org/OrgEmailSettings.java | 22 -
.../v1_5/domain/org/OrgGeneralSettings.java | 20 -
.../v1_5/domain/org/OrgLdapGroupAttributes.java | 18 -
.../v1_5/domain/org/OrgLdapUserAttributes.java | 22 -
.../v1_5/domain/org/OrgLeaseSettings.java | 15 -
.../director/v1_5/domain/org/OrgList.java | 3 -
.../domain/org/OrgPasswordPolicySettings.java | 7 -
.../director/v1_5/domain/org/OrgSettings.java | 18 -
.../org/OrgVAppTemplateLeaseSettings.java | 16 +-
.../v1_5/domain/params/CaptureVAppParams.java | 14 -
.../v1_5/domain/params/CloneMediaParams.java | 19 -
.../v1_5/domain/params/CloneVAppParams.java | 4 -
.../domain/params/CloneVAppTemplateParams.java | 14 -
.../v1_5/domain/params/ComposeVAppParams.java | 28 +-
.../v1_5/domain/params/ControlAccessParams.java | 9 -
.../v1_5/domain/params/DeployVAppParams.java | 6 -
.../domain/params/InstantiateOvfParams.java | 146 ----
.../domain/params/InstantiateVAppParams.java | 7 -
.../params/InstantiateVAppTemplateParams.java | 7 -
.../v1_5/domain/params/InstantiationParams.java | 7 -
.../domain/params/MediaInsertOrEjectParams.java | 7 -
.../director/v1_5/domain/params/ParamsType.java | 4 -
.../domain/params/PublishCatalogParams.java | 18 +-
.../v1_5/domain/params/RecomposeVAppParams.java | 17 -
.../v1_5/domain/params/RelocateParams.java | 21 -
.../params/SourcedCompositionItemParam.java | 26 -
.../v1_5/domain/params/UndeployVAppParams.java | 7 -
.../domain/params/UploadVAppTemplateParams.java | 9 -
.../v1_5/domain/params/VAppCreationParams.java | 7 -
.../v1_5/domain/query/CatalogReferences.java | 7 -
.../director/v1_5/domain/query/Container.java | 165 +++++
.../v1_5/domain/query/ContainerType.java | 169 -----
.../director/v1_5/domain/query/QueryList.java | 8 +-
.../query/QueryResultAdminGroupRecord.java | 7 +-
.../query/QueryResultAdminUserRecord.java | 7 +-
.../domain/query/QueryResultAdminVdcRecord.java | 7 +-
.../domain/query/QueryResultCatalogRecord.java | 11 +-
.../query/QueryResultDatastoreRecord.java | 11 +-
.../domain/query/QueryResultMediaRecord.java | 7 +-
.../domain/query/QueryResultNetworkRecord.java | 11 +-
.../v1_5/domain/query/QueryResultRecord.java | 218 ++++++
.../domain/query/QueryResultRecordType.java | 225 ------
.../v1_5/domain/query/QueryResultRecords.java | 21 +-
.../domain/query/QueryResultReferences.java | 11 +-
.../domain/query/QueryResultRightRecord.java | 7 +-
.../domain/query/QueryResultRoleRecord.java | 7 +-
.../query/QueryResultStrandedUserRecord.java | 7 +-
.../domain/query/QueryResultVAppRecord.java | 11 +-
.../query/QueryResultVAppTemplateRecord.java | 11 +-
.../v1_5/domain/query/QueryResultVMRecord.java | 11 +-
.../v1_5/domain/query/VAppReferences.java | 7 -
.../domain/section/CustomizationSection.java | 20 -
.../section/GuestCustomizationSection.java | 33 -
.../domain/section/LeaseSettingsSection.java | 23 -
.../domain/section/NetworkConfigSection.java | 7 -
.../section/NetworkConnectionSection.java | 4 -
.../domain/section/OperatingSystemSection.java | 3 -
.../v1_5/domain/section/RuntimeInfoSection.java | 7 -
.../domain/section/VirtualHardwareSection.java | 3 -
.../vcloud/director/v1_5/endpoints/Catalog.java | 3 -
.../vcloud/director/v1_5/endpoints/Network.java | 3 -
.../vcloud/director/v1_5/endpoints/Org.java | 3 -
.../vcloud/director/v1_5/endpoints/OrgList.java | 3 -
.../director/v1_5/endpoints/TasksList.java | 3 -
.../director/v1_5/endpoints/VCloudLogin.java | 5 -
.../vcloud/director/v1_5/endpoints/Vdc.java | 3 -
.../director/v1_5/features/CatalogApi.java | 95 +--
.../vcloud/director/v1_5/features/MediaApi.java | 53 +-
.../director/v1_5/features/MetadataApi.java | 37 +-
.../director/v1_5/features/NetworkApi.java | 15 +-
.../vcloud/director/v1_5/features/OrgApi.java | 28 +-
.../vcloud/director/v1_5/features/QueryApi.java | 38 +-
.../vcloud/director/v1_5/features/TaskApi.java | 31 +-
.../vcloud/director/v1_5/features/VAppApi.java | 535 +--------------
.../director/v1_5/features/VAppTemplateApi.java | 301 +-------
.../vcloud/director/v1_5/features/VdcApi.java | 172 +----
.../vcloud/director/v1_5/features/VmApi.java | 679 +------------------
.../v1_5/features/admin/AdminCatalogApi.java | 156 +----
.../v1_5/features/admin/AdminNetworkApi.java | 59 +-
.../v1_5/features/admin/AdminOrgApi.java | 274 +-------
.../v1_5/features/admin/AdminVdcApi.java | 41 +-
.../director/v1_5/features/admin/GroupApi.java | 74 +-
.../director/v1_5/features/admin/UserApi.java | 89 +--
.../director/v1_5/functions/IdToAdminHref.java | 63 ++
.../director/v1_5/functions/IdToHref.java | 51 ++
.../director/v1_5/functions/SectionForVApp.java | 6 +-
.../director/v1_5/functions/URNToAdminHref.java | 64 --
.../director/v1_5/functions/URNToHref.java | 53 --
.../internal/VCloudDirectorContextImpl.java | 25 +-
.../director/v1_5/user/VCloudDirectorApi.java | 7 -
.../director/v1_5/AbstractVAppApiLiveTest.java | 103 ++-
.../vcloud/director/v1_5/domain/Checks.java | 24 +-
.../v1_5/features/CatalogApiExpectTest.java | 86 +--
.../v1_5/features/CatalogApiLiveTest.java | 59 +-
.../v1_5/features/KeyPairsApiLiveTest.java | 13 +-
.../v1_5/features/MediaApiExpectTest.java | 3 -
.../v1_5/features/MediaApiLiveTest.java | 72 +-
.../v1_5/features/MetadataApiExpectTest.java | 3 -
.../v1_5/features/NetworkApiExpectTest.java | 36 -
.../v1_5/features/NetworkApiLiveTest.java | 15 +-
.../v1_5/features/OrgApiExpectTest.java | 35 -
.../director/v1_5/features/OrgApiLiveTest.java | 29 +-
.../v1_5/features/QueryApiExpectTest.java | 3 -
.../v1_5/features/QueryApiLiveTest.java | 13 +-
.../v1_5/features/TaskApiExpectTest.java | 11 +-
.../director/v1_5/features/TaskApiLiveTest.java | 3 -
.../v1_5/features/UploadApiLiveTest.java | 3 -
.../v1_5/features/VAppApiExpectTest.java | 22 +-
.../director/v1_5/features/VAppApiLiveTest.java | 199 +++---
.../v1_5/features/VAppNetworksLiveTest.java | 37 +-
.../features/VAppTemplateApiExpectTest.java | 7 +-
.../v1_5/features/VAppTemplateApiLiveTest.java | 79 ++-
.../v1_5/features/VdcApiExpectTest.java | 9 +-
.../director/v1_5/features/VdcApiLiveTest.java | 31 +-
.../director/v1_5/features/VmApiExpectTest.java | 21 +-
.../director/v1_5/features/VmApiLiveTest.java | 248 ++++---
.../admin/AdminCatalogApiExpectTest.java | 104 +--
.../features/admin/AdminCatalogApiLiveTest.java | 41 +-
.../admin/AdminNetworkApiExpectTest.java | 51 +-
.../features/admin/AdminNetworkApiLiveTest.java | 19 +-
.../features/admin/AdminOrgApiExpectTest.java | 4 -
.../features/admin/AdminOrgApiLiveTest.java | 43 +-
.../features/admin/AdminQueryApiExpectTest.java | 3 -
.../features/admin/AdminQueryApiLiveTest.java | 20 +-
.../features/admin/AdminVdcApiExpectTest.java | 3 -
.../features/admin/AdminVdcApiLiveTest.java | 21 +-
.../v1_5/features/admin/GroupApiExpectTest.java | 3 -
.../v1_5/features/admin/GroupApiLiveTest.java | 15 +-
.../v1_5/features/admin/UserApiExpectTest.java | 85 +--
.../v1_5/features/admin/UserApiLiveTest.java | 13 +-
.../SystemAdminVAppApiExpectTest.java | 3 -
.../systemadmin/SystemAdminVAppApiLiveTest.java | 25 +-
.../systemadmin/SystemAdminVmApiExpectTest.java | 6 +-
.../systemadmin/SystemAdminVmApiLiveTest.java | 32 +-
.../internal/BaseVCloudDirectorApiLiveTest.java | 113 ++-
.../src/test/resources/vapp/vAppEntity.xml | 4 -
.../src/test/resources/vm/vmEntity.xml | 4 -
221 files changed, 2098 insertions(+), 6683 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
index 8718bd2..d77794e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorContext.java
@@ -16,6 +16,8 @@
*/
package org.jclouds.vcloud.director.v1_5;
+import java.net.URI;
+
import org.jclouds.rest.ApiContext;
import org.jclouds.vcloud.director.v1_5.admin.VCloudDirectorAdminApi;
import org.jclouds.vcloud.director.v1_5.internal.VCloudDirectorContextImpl;
@@ -27,4 +29,18 @@ import com.google.inject.ImplementedBy;
public interface VCloudDirectorContext extends ApiContext<VCloudDirectorApi> {
ApiContext<VCloudDirectorAdminApi> getAdminContext();
+
+ /**
+ * Resolves the {@link org.jclouds.vcloud.director.v1_5.domain.Entity#getId id} to an href used for
+ * {@linkplain VCloudDirectorApi} calls. This caches values to avoid duplicate network
+ * requests.
+ */
+ URI resolveIdToHref(String id);
+
+ /**
+ * Resolves the {@link org.jclouds.vcloud.director.v1_5.domain.Entity#getId id} to an href used for
+ * {@linkplain VCloudDirectorAdminApi} calls. This caches values to avoid duplicate network
+ * requests.
+ */
+ URI resolveIdToAdminHref(String id);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
index 96641cc..fad0474 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/admin/VCloudDirectorAdminApi.java
@@ -30,7 +30,6 @@ 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.filters.AddVCloudAuthorizationAndCookieToRequest;
-import org.jclouds.vcloud.director.v1_5.functions.URNToAdminHref;
import org.jclouds.vcloud.director.v1_5.user.VCloudDirectorApi;
@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
@@ -81,13 +80,6 @@ public interface VCloudDirectorAdminApi extends VCloudDirectorApi {
@Override
@Delegate
AdminNetworkApi getNetworkApi();
-
- /**
- * @return synchronous access to {@link Metadata} features
- */
- @Override
- @Delegate
- MetadataApi getMetadataApi(@EndpointParam(parser = URNToAdminHref.class) String urn);
@Override
@Delegate
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
new file mode 100644
index 0000000..db7c2c5
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
@@ -0,0 +1,227 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.vcloud.director.v1_5.domain;
+
+import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jclouds.dmtf.ovf.DeploymentOptionSection;
+import org.jclouds.dmtf.ovf.DiskSection;
+import org.jclouds.dmtf.ovf.NetworkSection;
+import org.jclouds.dmtf.ovf.ProductSection;
+import org.jclouds.dmtf.ovf.SectionType;
+import org.jclouds.dmtf.ovf.StartupSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
+import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
+
+import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+
+@XmlType(name = "AbstractVAppType")
+public abstract class AbstractVApp extends ResourceEntity {
+
+ public static Builder<?> builder() {
+ return new ConcreteBuilder();
+ }
+
+ @Override
+ public Builder<?> toBuilder() {
+ return builder().fromResourceEntityType(this);
+ }
+
+ private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
+ }
+
+ public abstract static class Builder<B extends Builder<B>> extends ResourceEntity.Builder<B> {
+
+ private Boolean deployed;
+ private Reference vAppParent;
+ private Set<SectionType> sections = Sets.newLinkedHashSet();
+
+ /**
+ * @see AbstractVApp#isDeployed()
+ */
+ public B isDeployed(Boolean deployed) {
+ this.deployed = deployed;
+ return self();
+ }
+
+ /**
+ * @see AbstractVApp#isDeployed()
+ */
+ public B deployed() {
+ this.deployed = Boolean.TRUE;
+ return self();
+ }
+
+ /**
+ * @see AbstractVApp#isDeployed()
+ */
+ public B notDeployed() {
+ this.deployed = Boolean.FALSE;
+ return self();
+ }
+
+ /**
+ * @see AbstractVApp#getVAppParent()
+ */
+ public B parent(Reference vAppParent) {
+ this.vAppParent = vAppParent;
+ return self();
+ }
+
+ /**
+ * @see AbstractVApp#getSections()
+ */
+ public B sections(Iterable<? extends SectionType> sections) {
+ this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
+ return self();
+ }
+
+ /**
+ * @see AbstractVApp#getSections()
+ */
+ public B section(SectionType section) {
+ this.sections.add(checkNotNull(section, "section"));
+ return self();
+ }
+
+ public B fromAbstractVAppType(AbstractVApp in) {
+ return fromResourceEntityType(in).parent(vAppParent).sections(sections).isDeployed(deployed);
+ }
+ }
+
+ @XmlElement(name = "VAppParent")
+ private Reference vAppParent;
+ @XmlElementRefs({
+ @XmlElementRef(type = VirtualHardwareSection.class),
+ @XmlElementRef(type = LeaseSettingsSection.class),
+// @XmlElementRef(type = EulaSection.class),
+ @XmlElementRef(type = RuntimeInfoSection.class),
+// @XmlElementRef(type = AnnotationSection.class),
+ @XmlElementRef(type = DeploymentOptionSection.class),
+ @XmlElementRef(type = StartupSection.class),
+// @XmlElementRef(type = ResourceAllocationSection.class),
+ @XmlElementRef(type = NetworkConnectionSection.class),
+ @XmlElementRef(type = CustomizationSection.class),
+ @XmlElementRef(type = ProductSection.class),
+ @XmlElementRef(type = GuestCustomizationSection.class),
+ @XmlElementRef(type = OperatingSystemSection.class),
+ @XmlElementRef(type = NetworkConfigSection.class),
+ @XmlElementRef(type = NetworkSection.class),
+// @XmlElementRef(type = InstallSection.class),
+ @XmlElementRef(type = DiskSection.class)
+ })
+ private Set<SectionType> sections = Sets.newLinkedHashSet();
+ @XmlAttribute
+ private Boolean deployed;
+
+ protected AbstractVApp() {
+ // for JAXB and Builders
+ }
+
+ protected AbstractVApp(Builder<?> builder) {
+ super(builder);
+ this.vAppParent = builder.vAppParent;
+ this.sections = builder.sections.isEmpty() ? null : ImmutableSet.copyOf(builder.sections);
+ this.deployed = builder.deployed;
+ }
+
+ /**
+ * Gets the value of the vAppParent property.
+ */
+ public Reference getVAppParent() {
+ return vAppParent;
+ }
+
+ /**
+ * Specific {@code ovf:Section} with additional information for the vApp.
+ *
+ * Objects of the following type(s) are allowed in the list:
+ * <ul>
+ * <li>{@link VirtualHardwareSectionType}
+ * <li>{@link LeaseSettingsSectionType}
+ * <li>{@link EulaSectionType}
+ * <li>{@link RuntimeInfoSectionType}
+ * <li>{@link AnnotationSectionType}
+ * <li>{@link DeploymentOptionSectionType}
+ * <li>{@link StartupSectionType}
+ * <li>{@link ResourceAllocationSectionType}
+ * <li>{@link NetworkConnectionSectionType}
+ * <li>{@link CustomizationSectionType}
+ * <li>{@link ProductSectionType}
+ * <li>{@link GuestCustomizationSectionType}
+ * <li>{@link OperatingSystemSectionType}
+ * <li>{@link NetworkConfigSectionType}
+ * <li>{@link NetworkSectionType}
+ * <li>{@link DiskSectionType}
+ * <li>{@link InstallSectionType}
+ * </ul>
+ */
+ public Set<SectionType> getSections() {
+ return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
+ }
+
+ /**
+ * Gets the value of the deployed property.
+ */
+ public Boolean isDeployed() {
+ return deployed;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ AbstractVApp that = AbstractVApp.class.cast(o);
+ return super.equals(that)
+ && equal(this.vAppParent, that.vAppParent)
+ && equal(this.sections, that.sections)
+ && equal(this.deployed, that.deployed);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(super.hashCode(), vAppParent, sections, deployed);
+ }
+
+ @Override
+ public ToStringHelper string() {
+ return super.string()
+ .add("vAppParent", vAppParent)
+ .add("sections", sections)
+ .add("deployed", deployed);
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
deleted file mode 100644
index 810eaaa..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.ovf.DeploymentOptionSection;
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.GuestCustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConnectionSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-
-import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * Represents a base type for VAppType and VmType.
- *
- * <pre>
- * <complexType name="AbstractVAppType" >
- * </pre>
- */
-@XmlType(name = "AbstractVAppType")
-public abstract class AbstractVAppType extends ResourceEntity {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromResourceEntityType(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends ResourceEntity.Builder<B> {
-
- private Boolean deployed;
- private Reference vAppParent;
- private Set<SectionType> sections = Sets.newLinkedHashSet();
-
- /**
- * @see AbstractVAppType#isDeployed()
- */
- public B isDeployed(Boolean deployed) {
- this.deployed = deployed;
- return self();
- }
-
- /**
- * @see AbstractVAppType#isDeployed()
- */
- public B deployed() {
- this.deployed = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see AbstractVAppType#isDeployed()
- */
- public B notDeployed() {
- this.deployed = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see AbstractVAppType#getVAppParent()
- */
- public B parent(Reference vAppParent) {
- this.vAppParent = vAppParent;
- return self();
- }
-
- /**
- * @see AbstractVAppType#getSections()
- */
- public B sections(Iterable<? extends SectionType> sections) {
- this.sections = Sets.newLinkedHashSet(checkNotNull(sections, "sections"));
- return self();
- }
-
- /**
- * @see AbstractVAppType#getSections()
- */
- public B section(SectionType section) {
- this.sections.add(checkNotNull(section, "section"));
- return self();
- }
-
- public B fromAbstractVAppType(AbstractVAppType in) {
- return fromResourceEntityType(in).parent(vAppParent).sections(sections).isDeployed(deployed);
- }
- }
-
- @XmlElement(name = "VAppParent")
- private Reference vAppParent;
- @XmlElementRefs({
- @XmlElementRef(type = VirtualHardwareSection.class),
- @XmlElementRef(type = LeaseSettingsSection.class),
-// @XmlElementRef(type = EulaSection.class),
- @XmlElementRef(type = RuntimeInfoSection.class),
-// @XmlElementRef(type = AnnotationSection.class),
- @XmlElementRef(type = DeploymentOptionSection.class),
- @XmlElementRef(type = StartupSection.class),
-// @XmlElementRef(type = ResourceAllocationSection.class),
- @XmlElementRef(type = NetworkConnectionSection.class),
- @XmlElementRef(type = CustomizationSection.class),
- @XmlElementRef(type = ProductSection.class),
- @XmlElementRef(type = GuestCustomizationSection.class),
- @XmlElementRef(type = OperatingSystemSection.class),
- @XmlElementRef(type = NetworkConfigSection.class),
- @XmlElementRef(type = NetworkSection.class),
-// @XmlElementRef(type = InstallSection.class),
- @XmlElementRef(type = DiskSection.class)
- })
- private Set<SectionType> sections = Sets.newLinkedHashSet();
- @XmlAttribute
- private Boolean deployed;
-
- protected AbstractVAppType() {
- // for JAXB and Builders
- }
-
- protected AbstractVAppType(Builder<?> builder) {
- super(builder);
- this.vAppParent = builder.vAppParent;
- this.sections = builder.sections.isEmpty() ? null : ImmutableSet.copyOf(builder.sections);
- this.deployed = builder.deployed;
- }
-
- /**
- * Gets the value of the vAppParent property.
- */
- public Reference getVAppParent() {
- return vAppParent;
- }
-
- /**
- * Specific {@code ovf:Section} with additional information for the vApp.
- *
- * Objects of the following type(s) are allowed in the list:
- * <ul>
- * <li>{@link VirtualHardwareSectionType}
- * <li>{@link LeaseSettingsSectionType}
- * <li>{@link EulaSectionType}
- * <li>{@link RuntimeInfoSectionType}
- * <li>{@link AnnotationSectionType}
- * <li>{@link DeploymentOptionSectionType}
- * <li>{@link StartupSectionType}
- * <li>{@link ResourceAllocationSectionType}
- * <li>{@link NetworkConnectionSectionType}
- * <li>{@link CustomizationSectionType}
- * <li>{@link ProductSectionType}
- * <li>{@link GuestCustomizationSectionType}
- * <li>{@link OperatingSystemSectionType}
- * <li>{@link NetworkConfigSectionType}
- * <li>{@link NetworkSectionType}
- * <li>{@link DiskSectionType}
- * <li>{@link InstallSectionType}
- * </ul>
- */
- public Set<SectionType> getSections() {
- return sections != null ? ImmutableSet.copyOf(sections) : ImmutableSet.<SectionType>of();
- }
-
- /**
- * Gets the value of the deployed property.
- */
- public Boolean isDeployed() {
- return deployed;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- AbstractVAppType that = AbstractVAppType.class.cast(o);
- return super.equals(that)
- && equal(this.vAppParent, that.vAppParent)
- && equal(this.sections, that.sections)
- && equal(this.deployed, that.deployed);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), vAppParent, sections, deployed);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("vAppParent", vAppParent)
- .add("sections", sections)
- .add("deployed", deployed);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
index a73b6b0..4f20593 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
@@ -26,13 +26,7 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
- * Specifies who can access the resource.
- *
- * <pre>
- * <complexType name="AccessSetting" />
- * </pre>
- *
- * @since 0.9
+ * Specifies who can access a resource.
*/
@XmlRootElement(name = "AccessSetting")
@XmlType(name = "AccessSettingType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
index 47f5e77..78e562a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminCatalog.java
@@ -23,16 +23,6 @@ import javax.xml.bind.annotation.XmlType;
/**
* Admin representation of the container for meta data (key-value pair) associated to different
* entities in the system.
- *
- * <pre>
- * <complexType name="AdminCatalog">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}CatalogType">
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlRootElement(name = "AdminCatalog")
@XmlType(name = "AdminCatalogType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
index eeadb66..0b15d55 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
@@ -30,24 +30,11 @@ import com.google.common.base.MoreObjects.ToStringHelper;
* of the Vdc element, and adds several elements that can be
* viewed and modified only by administrators.
*
- * <pre>
- * <complexType name="AdminVdc">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VdcType">
- * <sequence>
- * <element name="ResourceGuaranteedMemory" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- * <element name="ResourceGuaranteedCpu" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- * <element name="VCpuInMhz" type="{http://www.w3.org/2001/XMLSchema}long" minOccurs="0"/>
- * <element name="IsThinProvision" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="NetworkPoolReference" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType" minOccurs="0"/>
- * <element name="ProviderVdcReference" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType" minOccurs="0"/>
- * <element name="UsesFastProvisioning" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
+ * <p/> The redwood admin can disable an
+ * organization vDC. This will prevent any further allocation to be used by the organization.
+ * Changing the state will not affect allocations already used. For example, if an organization
+ * vDC is disabled, an organization user cannot deploy or add a new virtual machine in the
+ * vDC (deploy uses memory and cpu allocations, and add uses storage allocation).
*/
@XmlRootElement(name = "AdminVdc")
@XmlType(name = "AdminVdcType", propOrder = {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
index a252234..301e6ec 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
@@ -33,24 +33,6 @@ import com.google.common.collect.Sets;
/**
* Collection of supported hardware capabilities.
- * <p/>
- * <p/>
- * <p>Java class for Capabilities complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="Capabilities">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="SupportedHardwareVersions" type="{http://www.vmware.com/vcloud/v1.5}SupportedHardwareVersionsType" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "Capabilities", propOrder = {
"supportedHardwareVersions"
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
new file mode 100644
index 0000000..907b797
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.vcloud.director.v1_5.domain;
+
+import static com.google.common.base.Objects.equal;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+
+/**
+ * Represents a capacity of a given resource.
+ */
+@XmlType(name = "Capacity", propOrder = {
+ "units",
+ "allocated",
+ "limit"
+})
+@XmlSeeAlso({
+ CapacityWithUsage.class
+})
+public class Capacity<T extends Capacity<T>> {
+
+ public static <T extends Capacity<T>> Builder<T> builder() {
+ return new Builder<T>();
+ }
+
+ public Builder<T> toBuilder() {
+ return new Builder<T>().fromCapacityType(this);
+ }
+
+ public static class Builder<T extends Capacity<T>> {
+
+ protected String units;
+ protected Long allocated;
+ protected Long limit;
+
+ /**
+ * @see Capacity#getUnits()
+ */
+ public Builder<T> units(String units) {
+ this.units = units;
+ return this;
+ }
+
+ /**
+ * @see Capacity#getAllocated()
+ */
+ public Builder<T> allocated(Long allocated) {
+ this.allocated = allocated;
+ return this;
+ }
+
+ /**
+ * @see Capacity#getLimit()
+ */
+ public Builder<T> limit(Long limit) {
+ this.limit = limit;
+ return this;
+ }
+
+
+ public Capacity<T> build() {
+ return new Capacity<T>(units, allocated, limit);
+ }
+
+
+ public Builder<T> fromCapacityType(Capacity<T> in) {
+ return units(in.getUnits())
+ .allocated(in.getAllocated())
+ .limit(in.getLimit());
+ }
+ }
+
+ protected Capacity(String units, Long allocated, Long limit) {
+ this.units = units;
+ this.allocated = allocated;
+ this.limit = limit;
+ }
+
+ protected Capacity() {
+ // for JAXB
+ }
+
+ @XmlElement(name = "Units", required = true)
+ protected String units;
+ @XmlElement(name = "Allocated")
+ protected Long allocated;
+ @XmlElement(name = "Limit")
+ protected Long limit;
+
+ /**
+ * Gets the value of the units property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getUnits() {
+ return units;
+ }
+
+ /**
+ * Gets the value of the allocated property.
+ *
+ * @return possible object is
+ * {@link Long }
+ */
+ public Long getAllocated() {
+ return allocated;
+ }
+
+ /**
+ * Gets the value of the limit property.
+ */
+ public Long getLimit() {
+ return limit;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ Capacity<?> that = Capacity.class.cast(o);
+ return equal(units, that.units) &&
+ equal(allocated, that.allocated) &&
+ equal(limit, that.limit);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(units,
+ allocated,
+ limit);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper("")
+ .add("units", units)
+ .add("allocated", allocated)
+ .add("limit", limit).toString();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java
deleted file mode 100644
index 59a4f06..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Represents a capacity of a given resource.
- * <p/>
- * <p/>
- * <p>Java class for Capacity complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="Capacity">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="Units" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Allocated" type="{http://www.w3.org/2001/XMLSchema}Long" minOccurs="0"/>
- * <element name="Limit" type="{http://www.w3.org/2001/XMLSchema}Long"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Capacity", propOrder = {
- "units",
- "allocated",
- "limit"
-})
-@XmlSeeAlso({
- CapacityWithUsage.class
-})
-public class CapacityType<T extends CapacityType<T>> {
-
- public static <T extends CapacityType<T>> Builder<T> builder() {
- return new Builder<T>();
- }
-
- public Builder<T> toBuilder() {
- return new Builder<T>().fromCapacityType(this);
- }
-
- public static class Builder<T extends CapacityType<T>> {
-
- protected String units;
- protected Long allocated;
- protected Long limit;
-
- /**
- * @see CapacityType#getUnits()
- */
- public Builder<T> units(String units) {
- this.units = units;
- return this;
- }
-
- /**
- * @see CapacityType#getAllocated()
- */
- public Builder<T> allocated(Long allocated) {
- this.allocated = allocated;
- return this;
- }
-
- /**
- * @see CapacityType#getLimit()
- */
- public Builder<T> limit(Long limit) {
- this.limit = limit;
- return this;
- }
-
-
- public CapacityType<T> build() {
- return new CapacityType<T>(units, allocated, limit);
- }
-
-
- public Builder<T> fromCapacityType(CapacityType<T> in) {
- return units(in.getUnits())
- .allocated(in.getAllocated())
- .limit(in.getLimit());
- }
- }
-
- protected CapacityType(String units, Long allocated, Long limit) {
- this.units = units;
- this.allocated = allocated;
- this.limit = limit;
- }
-
- protected CapacityType() {
- // for JAXB
- }
-
- @XmlElement(name = "Units", required = true)
- protected String units;
- @XmlElement(name = "Allocated")
- protected Long allocated;
- @XmlElement(name = "Limit")
- protected Long limit;
-
- /**
- * Gets the value of the units property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getUnits() {
- return units;
- }
-
- /**
- * Gets the value of the allocated property.
- *
- * @return possible object is
- * {@link Long }
- */
- public Long getAllocated() {
- return allocated;
- }
-
- /**
- * Gets the value of the limit property.
- */
- public Long getLimit() {
- return limit;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- CapacityType<?> that = CapacityType.class.cast(o);
- return equal(units, that.units) &&
- equal(allocated, that.allocated) &&
- equal(limit, that.limit);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(units,
- allocated,
- limit);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper("")
- .add("units", units)
- .add("allocated", allocated)
- .add("limit", limit).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
index 86dbd46..0f8df74 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
@@ -26,33 +26,13 @@ import com.google.common.base.Objects;
/**
* Represents a capacity and usage of a given resource.
- * <p/>
- * <p/>
- * <p>Java class for CapacityWithUsage complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="CapacityWithUsage">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}CapacityType">
- * <sequence>
- * <element name="Used" type="{http://www.w3.org/2001/XMLSchema}Long" minOccurs="0"/>
- * <element name="Overhead" type="{http://www.w3.org/2001/XMLSchema}Long" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "CapacityWithUsage", propOrder = {
"used",
"overhead"
})
-public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
+public class CapacityWithUsage extends Capacity<CapacityWithUsage> {
-{
@SuppressWarnings("unchecked")
public static Builder builder() {
return new Builder();
@@ -63,7 +43,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
return new Builder().fromCapacityWithUsage(this);
}
- public static class Builder extends CapacityType.Builder<CapacityWithUsage> {
+ public static class Builder extends Capacity.Builder<CapacityWithUsage> {
private Long used;
private Long overhead;
@@ -91,7 +71,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
}
/**
- * @see CapacityType#getUnits()
+ * @see Capacity#getUnits()
*/
@Override
public Builder units(String units) {
@@ -100,7 +80,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
}
/**
- * @see CapacityType#getAllocated()
+ * @see Capacity#getAllocated()
*/
@Override
public Builder allocated(Long allocated) {
@@ -109,7 +89,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
}
/**
- * @see CapacityType#getLimit()
+ * @see Capacity#getLimit()
*/
@Override
public Builder limit(Long limit) {
@@ -119,7 +99,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
@Override
- public Builder fromCapacityType(CapacityType<CapacityWithUsage> in) {
+ public Builder fromCapacityType(Capacity<CapacityWithUsage> in) {
return Builder.class.cast(super.fromCapacityType(in));
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
index 37d7b61..c696435 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
@@ -34,10 +34,6 @@ import com.google.common.collect.Sets;
/**
* Container for references to {@link VAppTemplate} and {@link Media} objects.
- *
- * <pre>
- * <complexType name="CatalogType" />
- * </pre>
*/
@XmlSeeAlso({ AdminCatalog.class })
@XmlRootElement(name = "Catalog")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
index 8317308..e1d422f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java
@@ -31,10 +31,6 @@ import com.google.common.collect.Sets;
/**
* Contains a reference to a VappTemplate or Media object and related metadata.
- * <p/>
- * <pre>
- * <complexType name="CatalogItemType" />
- * </pre>
*/
@XmlRootElement(name = "CatalogItem")
public class CatalogItem extends Entity {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
index 3b7b970..fcb273c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
@@ -26,26 +26,7 @@ import com.google.common.base.Objects;
/**
- * Represents a compute capacity with units.
- * <p/>
- * <p/>
- * <p>Java class for ComputeCapacity complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="ComputeCapacity">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="Cpu" type="{http://www.vmware.com/vcloud/v1.5}CapacityWithUsageType"/>
- * <element name="Memory" type="{http://www.vmware.com/vcloud/v1.5}CapacityWithUsageType"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
+ * Represents a compute capacity with usage.
*/
@XmlType(name = "ComputeCapacity", propOrder = {
"cpu",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
index 44607a7..82cfd97 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
@@ -36,10 +36,6 @@ import com.google.common.collect.Lists;
* Basic entity type in the vCloud object model.
*
* Includes the entity name and an optional id, description, and set of running {@link Task}s.
- *
- * <pre>
- * <xs:complexType name="EntityType" />
- * </pre>
*/
@XmlRootElement(name = "Entity")
@XmlType(name = "EntityType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
index 34c7142..c0f077f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
@@ -39,10 +39,6 @@ import com.google.common.collect.Iterables;
/**
* The standard error message type used in the vCloud REST API.
- *
- * <pre>
- * <xs:complexType name="ErrorType" />
- * </pre>
*/
@XmlRootElement(name = "Error")
public class Error {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
index 8d88dbd..10d3685 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
@@ -30,24 +30,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a file to be transferred (uploaded or downloaded).
- * <p/>
- * <p/>
- * <p>Java class for File complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="File">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}EntityType">
- * <attribute name="size" type="{http://www.w3.org/2001/XMLSchema}long" />
- * <attribute name="bytesTransferred" type="{http://www.w3.org/2001/XMLSchema}long" />
- * <attribute name="checksum" type="{http://www.w3.org/2001/XMLSchema}normalizedString" />
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "File")
public class File extends Entity {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
index ea09b62..ea5feba 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Group.java
@@ -32,21 +32,6 @@ import com.google.common.collect.Sets;
/**
* Represents group in the system.
- *
- * <pre>
- * <complexType name="Group">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}EntityType">
- * <sequence>
- * <element name="NameInSource" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="UsersList" type="{http://www.vmware.com/vcloud/v1.5}UsersListType" minOccurs="0"/>
- * <element name="Role" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlRootElement(name = "Group")
@XmlType(propOrder = {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
index e30c6d0..0d8508a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
@@ -29,19 +29,12 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-/**
- * A link.
- * <p/>
- * <pre>
- * <xs:complexType name="LinkType">
- * </pre>
- */
@XmlRootElement(name = "Link")
public class Link extends Reference {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
index ba4d21c..0d6ba0e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
@@ -38,10 +38,6 @@ import com.google.common.collect.Maps;
/**
* Represents removable media, such as a CD-ROM, DVD or Floppy disk.
- *
- * <pre>
- * <complexType name="Media" />
- * </pre>
*/
@XmlRootElement(name = "Media")
public class Media extends ResourceEntity {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
index b1cfd96..7860c64 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
@@ -34,14 +34,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-/**
- * Represents a set of metadata
- * <p/>
- *
- * <pre>
- * <xs:complexType name="Metadata">
- * </pre>
- */
@XmlRootElement(name = "Metadata")
public class Metadata extends Resource implements Map<String, String> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
index 65c711c..945974c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
@@ -31,13 +31,6 @@ import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Sets;
-/**
- * Represents a metadata entry
- * <p/>
- * <pre>
- * <xs:complexType name="MetadataType">
- * </pre>
- */
//TODO: this is a ridiculously complicated way of representing Map<String, String>
@XmlRootElement(name = "MetadataEntry")
public class MetadataEntry extends Resource {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java
deleted file mode 100644
index be9abcf..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataValue.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain;
-
-/**
- * Represents a metadata entry
- * <p/>
- * <pre>
- * <xs:complexType name="MetadataType">
- * </pre>
- */
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
index d15382c..b826cb3 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
@@ -26,13 +26,7 @@ import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
- * Represents the owner of this entity.
- *
- * <pre>
- * <complexType name="Owner" /&;
- * </pre>
- *
- * @since 1.5
+ * Represents the owner of an entity.
*/
@XmlRootElement(name = "Owner")
@XmlType(name = "OwnerType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
index 717fbcc..e301c05 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
@@ -35,22 +35,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-/**
- * Essentially a container with a list of product sections.
- *
- * <pre>
- * <complexType name="ProductSectionList">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element ref="{http://schemas.dmtf.org/ovf/envelope/1}ProductSection" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "ProductSectionList")
@XmlType(name = "ProductSectionListType")
public class ProductSectionList extends Resource implements Set<ProductSection> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
index c0843d7..15b37f1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Property.java
@@ -24,10 +24,6 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
/**
* Contains key/value pair as property.
- * <p/>
- * <pre>
- * <complexType name="PropertyType" />
- * </pre>
*/
@XmlRootElement(name = "Property")
public class Property {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
index f965850..376a81d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
@@ -33,13 +33,6 @@ import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Sets;
-/**
- * Represents a list of RASD items.
- *
- * <pre>
- * <complexType name="RasdItemsList" />
- * </pre>
- */
@XmlRootElement(name = "RasdItemsList")
@XmlType(name = "RasdItemsList")
public class RasdItemsList extends Resource implements Set<RasdItem> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
index e2bc31d..906e8d5 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
@@ -35,12 +35,7 @@ import com.google.common.base.Objects;
/**
* A reference to a resource.
*
- * Contains an href attribute and optional name and type attributes.
- * <p>
- *
- * <pre>
- * <xs:complexType name="ReferenceType">
- * </pre>
+ * <p/> Contains an href attribute and optional name and type attributes.
*/
@XmlSeeAlso({ VAppReference.class, CatalogReference.class, RoleReference.class })
@XmlRootElement(name = "Reference")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
index e5030f1..cf34731 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
@@ -24,33 +24,17 @@ import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.jclouds.vcloud.director.v1_5.domain.query.ContainerType;
+import org.jclouds.vcloud.director.v1_5.domain.query.Container;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Sets;
-/**
- * This is the container for returned elements in referenceView
- *
- * <pre>
- * <complexType name="References">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ContainerType">
- * <sequence>
- * <element ref="{http://www.vmware.com/vcloud/v1.5}Reference" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "References")
@XmlType(propOrder = {
"references"
})
-public class References extends ContainerType {
+public class References extends Container {
public static Builder<?> builder() {
return new ConcreteBuilder();
}
@@ -67,7 +51,7 @@ public class References extends ContainerType {
}
}
- public abstract static class Builder<T extends Builder<T>> extends ContainerType.Builder<T> {
+ public abstract static class Builder<T extends Builder<T>> extends Container.Builder<T> {
private Set<Reference> references;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
index 5f262c0..32c3f10 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
@@ -39,14 +39,7 @@ import com.google.common.collect.Sets;
/**
* The base type for all objects in the vCloud model.
*
- * Has an optional list of links and href and type attributes.
- *
- * <pre>
- * <xs:complexType name="ResourceType" />
- * </pre>
- *
- *
- * @since 0.9
+ * <p/> Has an optional list of links and href and type attributes.
*/
@XmlRootElement(name = "Resource")
@XmlType(name = "ResourceType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
index b025475..bf9614a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
@@ -36,10 +36,6 @@ import com.google.common.collect.Iterables;
/**
* Base type that represents a resource entity such as a vApp template or virtual media.
- *
- * <pre>
- * <complexType name="ResourceEntity" />
- * </pre>
*/
@XmlType(name = "ResourceEntityType")
public abstract class ResourceEntity extends Entity {
@@ -49,6 +45,7 @@ public abstract class ResourceEntity extends Entity {
public static enum Status {
@XmlEnumValue("-1") FAILED_CREATION(-1, "The object could not be created.", true, true, true),
+ /** The unresolved status typically means a task is in process. */
@XmlEnumValue("0") UNRESOLVED(0, "The object is unresolved or not ready.", true, true, true),
@XmlEnumValue("1") RESOLVED(1, "The object is resolved.", true, true, true),
@XmlEnumValue("2") DEPLOYED(2, "The object is deployed.", false, false, false),
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
index fafe33a..1522184 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RoleReferences.java
@@ -20,23 +20,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultReferences;
-
-/**
- * Container for ReferenceType elements that reference RoleType objects.
- *
- * <pre>
- * <complexType name="RoleReferences">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="RoleReference" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "RoleReferences")
public class RoleReferences extends QueryResultReferences {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
index e6624cd..6f46aca 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
@@ -28,9 +28,12 @@ import com.google.common.base.Objects;
/**
* The ticket for accessing the console of a VM.
*
- * <pre>
- * <complexType name="ScreenTicket" />
- * </pre>
+ * <p /> A screen ticket is a string that includes the virtual machine's IP address, its managed object
+ * reference, and a string that has been encoded as described in RFC 2396. Each VM element in a
+ * vApp includes a link where rel="screen:acquireTicket". You can use that link to request a
+ * screen ticket that you can use with the vmware-vmrc utility to open a VMware Remote Console
+ * for the virtual machine represented by that VM element. The vApp should be running to get a
+ * valid screen ticket.
*/
@XmlRootElement(name = "ScreenTicket")
@XmlType(name = "ScreenTicketType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
index 7a233cd..cb142fc 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
@@ -21,9 +21,6 @@ import static com.google.common.base.Objects.equal;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-/**
- * Session and its corresponding token
- */
public class SessionWithToken {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
index d14ee79..0e1afba 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
@@ -33,21 +33,20 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
/**
* Represents an asynchronous or long-running task in the vCloud environment.
- * <p/>
- * <pre>
- * <xs:complexType name="TaskType">
- * </pre>
*
- * TODO: this object and the hierarchy is wrong. it is literally a Task with a Task container. please review class diagram
+ * <p/>When a return value, the operation is asynchronous and the user should
+ * {@link org.jclouds.vcloud.director.v1_5.features.TaskApi#get monitor the returned task status}
+ * in order to check when it is completed.
*/
+// TODO: this object and the hierarchy is wrong. it is literally a Task with a Task container. please review class diagram
@XmlRootElement(name = "Task")
public class Task extends Entity {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
index 8d25878..aa593cb 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
@@ -33,9 +33,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-/**
- * Task List
- */
@XmlRootElement(name = "TasksList")
public class TasksList extends Resource implements Set<Task> {
public static Builder<?> builder() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
index 391106e..e84204c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
@@ -31,44 +31,6 @@ import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-/**
- * Represents users in the vCloud system.
- * <p/>
- * <p/>
- * <p>Java class for User complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="User">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}EntityType">
- * <sequence>
- * <element name="FullName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="EmailAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Telephone" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="IsEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="IsLocked" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="IM" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="NameInSource" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="IsAlertEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="AlertEmailPrefix" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="AlertEmail" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="IsExternal" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="IsDefaultCached" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="IsGroupRole" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="StoredVmQuota" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <element name="DeployedVmQuota" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <element name="Role" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType" minOccurs="0"/>
- * <element name="Password" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="GroupReferences" type="{http://www.vmware.com/vcloud/v1.5}GroupsListType" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "User")
@XmlType(propOrder = {
"fullName",