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:30 UTC
[7/9] Dedupe vcloud api calls and instead expose helper to resolve
ids to hrefs. cleanup pass on javadoc.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
index 346d43d..955e21c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
@@ -31,33 +31,11 @@ import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-
-/**
- * Represents Static Routing network service.
- * <p/>
- * <p/>
- * <p>Java class for StaticRoutingService complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="StaticRoutingService">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}NetworkServiceType">
- * <sequence>
- * <element name="StaticRoute" type="{http://www.vmware.com/vcloud/v1.5}StaticRouteType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "StaticRoutingService")
@XmlType(propOrder = {
"staticRoutes"
})
-public class StaticRoutingService extends NetworkServiceType<StaticRoutingService> {
+public class StaticRoutingService extends NetworkService<StaticRoutingService> {
public static Builder builder() {
return new Builder();
@@ -68,7 +46,7 @@ public class StaticRoutingService extends NetworkServiceType<StaticRoutingServic
return new Builder().fromStaticRoutingService(this);
}
- public static class Builder extends NetworkServiceType.Builder<StaticRoutingService> {
+ public static class Builder extends NetworkService.Builder<StaticRoutingService> {
private List<StaticRoute> staticRoutes = ImmutableList.of();
@@ -88,7 +66,7 @@ public class StaticRoutingService extends NetworkServiceType<StaticRoutingServic
@Override
- public Builder fromNetworkServiceType(NetworkServiceType<StaticRoutingService> in) {
+ public Builder fromNetworkServiceType(NetworkService<StaticRoutingService> in) {
return Builder.class.cast(super.fromNetworkServiceType(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/network/VAppNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
index 371f286..cc9d083 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
@@ -24,13 +24,6 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents a vApp network.
- *
- * <pre>
- * <complexType name="VAppNetwork" />
- * </pre>
- */
@XmlType(name = "VAppNetwork")
public class VAppNetwork extends Network {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
index 5136573..3f89a58 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
@@ -29,13 +29,6 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-/**
- * Represents a VApp network configuration.
- *
- * <pre>
- * <complexType name="VAppNetworkConfiguration" />
- * </pre>
- */
@XmlRootElement(name = "NetworkConfiguration")
@XmlType(name = "VAppNetworkConfiguration")
public class VAppNetworkConfiguration 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/org/AdminOrg.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
index 008c1ef..bc48c59 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
@@ -37,24 +37,8 @@ import com.google.common.collect.Sets;
* The AdminOrg represents an administrative view of an organization.
* It includes all members of the Org element, and adds several
* elements that can be viewed and modified only by system administrators.
- *
- * <pre>
- * <complexType name="AdminOrg">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}OrgType">
- * <sequence>
- * <element name="Settings" type="{http://www.vmware.com/vcloud/v1.5}OrgSettingsType"/>
- * <element name="Users" type="{http://www.vmware.com/vcloud/v1.5}UsersListType" minOccurs="0"/>
- * <element name="Groups" type="{http://www.vmware.com/vcloud/v1.5}GroupsListType" minOccurs="0"/>
- * <element name="Catalogs" type="{http://www.vmware.com/vcloud/v1.5}CatalogsListType" minOccurs="0"/>
- * <element name="Vdcs" type="{http://www.vmware.com/vcloud/v1.5}VdcsType" minOccurs="0"/>
- * <element name="Networks" type="{http://www.vmware.com/vcloud/v1.5}NetworksType" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
+ * <p/> The organization might be enabled or disabled. If
+ * enabled, the organization allows login and all other operations.
*/
@XmlRootElement(name = "AdminOrg")
@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/org/CustomOrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
index 7ea1357..ba19768 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
@@ -38,32 +38,6 @@ import com.google.common.collect.Maps;
/**
* Used when OrgLdapMode=CUSTOM to define connection details for
* the organization's LDAP service.
- *
- * <pre>
- * <complexType name="CustomOrgLdapSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="HostName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Port" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="IsSsl" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="IsSslAcceptAll" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="Realm" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="SearchBase" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="UserName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Password" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="AuthenticationMechanism" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="GroupSearchBase" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="IsGroupSearchBaseEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="ConnectorType" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="UserAttributes" type="{http://www.vmware.com/vcloud/v1.5}OrgLdapUserAttributesType"/>
- * <element name="GroupAttributes" type="{http://www.vmware.com/vcloud/v1.5}OrgLdapGroupAttributesType"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "CustomOrgLdapSettings", propOrder = {
"hostName",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
index 9cd7323..f2238f2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
@@ -31,11 +31,7 @@ import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an organization.
*
- * Unit of multi-tenancy and a top-level container. Contain vDCs, TasksList, Catalogs and Shared Network entities.
- *
- * <pre>
- * <xs:complexType name="OrgType">
- * </pre>
+ * <p/>Unit of multi-tenancy and a top-level container. Contain vDCs, TasksList, Catalogs and Shared Network entities.
*/
@XmlRootElement(name = "Org")
@XmlSeeAlso({ AdminOrg.class })
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
index 275edf2..96aa5ee 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
@@ -32,28 +32,6 @@ import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
-/**
- * Defines the email settings for an organization.
- *
- * <pre>
- * <complexType name="OrgEmailSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="IsDefaultSmtpServer" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="IsDefaultOrgEmail" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="FromEmailAddress" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="DefaultSubjectPrefix" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="IsAlertEmailToAllAdmins" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="AlertEmailTo" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="SmtpServerSettings" type="{http://www.vmware.com/vcloud/v1.5}SmtpServerSettingsType" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "OrgEmailSettings")
@XmlType(propOrder = {
"isDefaultSmtpServer",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
index 0838796..ebf2ced 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
@@ -27,26 +27,6 @@ import org.jclouds.vcloud.director.v1_5.domain.Resource;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Defines general org settings.
- *
- * <pre>
- * <complexType name="OrgGeneralSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="CanPublishCatalogs" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="DeployedVMQuota" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <element name="StoredVmQuota" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <element name="UseServerBootSequence" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="DelayAfterPowerOnSeconds" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "GeneralOrgSettings")
@XmlType(propOrder = {
"canPublishCatalogs",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
index 038a721..f275976 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
@@ -27,24 +27,6 @@ import com.google.common.base.Objects;
/**
* Defines how a group is imported from LDAP.
- *
- * <pre>
- * <complexType name="OrgLdapGroupAttributes">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="ObjectClass" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="ObjectIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="GroupName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Membership" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="MembershipIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="BackLinkIdentifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "OrgLdapGroupAttributes", propOrder = {
"objectClass",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
index 6aef611..462215f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
@@ -27,28 +27,6 @@ import com.google.common.base.Objects;
/**
* Defines how LDAP attributes are used when importing a user.
- *
- * <pre>
- * <complexType name="OrgLdapUserAttributes">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="ObjectClass" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="ObjectIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="UserName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Email" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="FullName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Surname" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="Telephone" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="GroupMembershipIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="GroupBackLinkIdentifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "OrgLdapUserAttributes", propOrder = {
"objectClass",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
index 1f9ba9b..c86cc26 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
@@ -29,21 +29,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Defines default lease durations and policies for an organization.
- *
- * <pre>
- * <complexType name="OrgLeaseSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="DeleteOnStorageLeaseExpiration" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="DeploymentLeaseSeconds" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <element name="StorageLeaseSeconds" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlRootElement(name = "VAppLeaseSettings")
@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/org/OrgList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
index f89e8f3..d50e5c1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgList.java
@@ -31,9 +31,6 @@ import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-/**
- * A list of organizations.
- */
@XmlRootElement(name = "OrgList")
public class OrgList extends ForwardingSet<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/org/OrgPasswordPolicySettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
index 042f45f..0415eb5 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
@@ -27,13 +27,6 @@ import org.jclouds.vcloud.director.v1_5.domain.Resource;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Java class for OrgPasswordPolicySettings complex type.
- *
- * <pre>
- * <complexType name="OrgPasswordPolicySettings" />
- * </pre>
- */
@XmlRootElement(name = "OrgPasswordPolicySettings")
@XmlType(propOrder = {
"accountLockoutEnabled",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
index 8b096c0..9084ae1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
@@ -31,24 +31,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
* This type establishes quotas and policies for the organization.
* It also contains elements that specify the details of
* how the organization connects to LDAP and email services.
- *
- * <pre>
- * <complexType name="OrgSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="OrgGeneralSettings" type="{http://www.vmware.com/vcloud/v1.5}OrgGeneralSettingsType" minOccurs="0"/>
- * <element name="VAppLeaseSettings" type="{http://www.vmware.com/vcloud/v1.5}OrgLeaseSettingsType" minOccurs="0"/>
- * <element name="VAppTemplateLeaseSettings" type="{http://www.vmware.com/vcloud/v1.5}OrgVAppTemplateLeaseSettingsType" minOccurs="0"/>
- * <element name="OrgLdapSettings" type="{http://www.vmware.com/vcloud/v1.5}OrgLdapSettingsType" minOccurs="0"/>
- * <element name="OrgEmailSettings" type="{http://www.vmware.com/vcloud/v1.5}OrgEmailSettingsType" minOccurs="0"/>
- * <element name="OrgPasswordPolicySettings" type="{http://www.vmware.com/vcloud/v1.5}OrgPasswordPolicySettingsType" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlRootElement(name = "OrgSettings")
@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/org/OrgVAppTemplateLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
index 6f1627d..730ddb2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
@@ -28,21 +28,7 @@ import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
- * Defines default lease policies for vAppTemplate on organization level.
- *
- * <pre>
- * <complexType name="OrgVAppTemplateLeaseSettings">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ResourceType">
- * <sequence>
- * <element name="DeleteOnStorageLeaseExpiration" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="StorageLeaseSeconds" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
+ * Expiration and storage policy for vApp templates in an organization.
*/
@XmlRootElement(name = "OrgVAppTemplateLeaseSettings")
@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/params/CaptureVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
index 0033dea..93e515d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
@@ -51,20 +51,6 @@ import com.google.common.collect.Sets;
/**
* Represents the parameters for capturing a vApp to a vApp template.
- *
- * <pre>
- * <complexType name="CaptureVAppParams">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ParamsType">
- * <sequence>
- * <element name="Source" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType"/>
- * <element ref="{http://schemas.dmtf.org/ovf/envelope/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "CaptureVAppParams", propOrder = {
"source",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
index d0dbe16..df6c9b1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
@@ -30,25 +30,6 @@ import com.google.common.base.Objects;
/**
* Represents parameters for copying a media resource and optionally
* deleting the source.
- * <p/>
- * <p/>
- * <p>Java class for CloneMediaParams complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="CloneMediaParams">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ParamsType">
- * <sequence>
- * <element name="Source" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType"/>
- * <element name="IsSourceDelete" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlRootElement(name = "CloneMediaParams")
@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/params/CloneVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java
index 09abeb6..4e8cf3e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppParams.java
@@ -21,10 +21,6 @@ import javax.xml.bind.annotation.XmlType;
/**
* Represents parameters for copying a vApp and optionally deleting the source.
- *
- * <pre>
- * <complexType name="CloneVAppParams" />
- * </pre>
*/
@XmlType(name = "CloneVAppParams")
@XmlRootElement(name = "CloneVAppParams")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
index 9b25ad9..9effc1d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
@@ -33,20 +33,6 @@ import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents parameters for copying a vApp template and optionally
* deleting the source.
- *
- * <pre>
- * <complexType name="CloneVAppTemplateParams">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ParamsType">
- * <sequence>
- * <element name="Source" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType"/>
- * <element name="IsSourceDelete" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
*/
@XmlType(name = "CloneVAppTemplateParams", propOrder = {
"source",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
index 4d53545..60a8681 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
@@ -26,17 +26,33 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-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.Lists;
/**
- * Represents vApp composition parameters.
- *
- * <pre>
- * <complexType name="ComposeVAppParams" />
- * </pre>
+ * 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 api
+ * makes a compose vApp request whose body is a ComposeVAppParams element, includes the
+ * following information:
+ * <ul>
+ * <li>An InstantiationParams element that applies to the composed vApp itself and any vApp templates referenced in
+ * Item elements.
+ * <li>A SourcedItem element for each virtual machine, vApp, or vAppTemplate to include in the composition. Each
+ * SourcedItem can contain the following elements:
+ * <ul>
+ * <li>A required Source element whose href attribute value is a reference to a vApp template, vApp, or VM to include
+ * in the composition. If the Source element references a VM, the Item must also include an InstantiationParams
+ * element specific to that VM.
+ * <li>An optional NetworkAssignment element that specifies how the network connections of child VM elements are
+ * mapped to vApp networks in the parent.
+ * </ul>
+ * </ul>
+ * If any of the composition items is subject to a EULA, the ComposeVAppParams element must include an
+ * AllEULAsAccepted element that has a value of true, indicating that you accept the EULA. Otherwise, composition
+ * fails.
*/
@XmlRootElement(name = "ComposeVAppParams")
@XmlType(name = "ComposeVAppParamsType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
index eee4af2..c12357a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
@@ -35,15 +35,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
-/**
- * Used to control access to resources.
- *
- * <pre>
- * <complexType name="ControlAccessParams" />
- * </pre>
- *
- * @since 0.9
- */
@XmlRootElement(name = "ControlAccessParams")
@XmlType(name = "ControlAccessParamsType")
public class ControlAccessParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
index d85b719..2d0a63f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
@@ -27,12 +27,6 @@ import com.google.common.base.Objects;
/**
* Represents vApp/VM deployment parameters.
- *
- * <pre>
- * <complexType name="DeployVAppParams" />
- * </pre>
- *
- * @since 0.9
*/
@XmlRootElement(name = "DeployVAppParams")
@XmlType(name = "DeployVAppParamsType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
deleted file mode 100644
index b884fed..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
+++ /dev/null
@@ -1,146 +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.params;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-/**
- * Represents vApp instantiation from OVF parameters
- *
- * <pre>
- * <complexType name="InstantiateOvfParams" />
- * </pre>
- */
-@XmlType(name = "InstantiateOvfParams")
-public class InstantiateOvfParams extends VAppCreationParams {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromInstantiateOvfParams(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> extends VAppCreationParams.Builder<B> {
-
- private Boolean allEULAsAccepted;
- private String transferFormat;
-
- /**
- * @see InstantiateOvfParams#isAllEULAsAccepted()
- */
- public B isAllEULAsAccepted(Boolean allEULAsAccepted) {
- this.allEULAsAccepted = allEULAsAccepted;
- return self();
- }
-
- /**
- * @see InstantiateOvfParams#isAllEULAsAccepted()
- */
- public B allEULAsAccepted() {
- this.allEULAsAccepted = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see InstantiateOvfParams#isAllEULAsAccepted()
- */
- public B allEULAsNotAccepted() {
- this.allEULAsAccepted = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see InstantiateOvfParams#getTransferFormat()
- */
- public B transferFormat(String transferFormat) {
- this.transferFormat = transferFormat;
- return self();
- }
-
- @Override
- public InstantiateOvfParams build() {
- InstantiateOvfParams instantiateOvfParams = new InstantiateOvfParams(this);
- return instantiateOvfParams;
- }
-
- public B fromInstantiateOvfParams(InstantiateOvfParams in) {
- return fromVAppCreationParamsType(in).isAllEULAsAccepted(in.isAllEULAsAccepted()).transferFormat(in.getTransferFormat());
- }
- }
-
- protected InstantiateOvfParams() {
- // For JAXB and B use
- }
-
- public InstantiateOvfParams(Builder<?> builder) {
- super(builder);
- this.allEULAsAccepted = builder.allEULAsAccepted;
- this.transferFormat = builder.transferFormat;
- }
-
- @XmlElement(name = "AllEULAsAccepted")
- protected Boolean allEULAsAccepted;
- @XmlAttribute
- protected String transferFormat;
-
- /**
- * Gets the value of the allEULAsAccepted property.
- */
- public Boolean isAllEULAsAccepted() {
- return allEULAsAccepted;
- }
-
- /**
- * Gets the value of the transferFormat property.
- */
- public String getTransferFormat() {
- return transferFormat;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- InstantiateOvfParams that = InstantiateOvfParams.class.cast(o);
- return super.equals(that) && equal(this.allEULAsAccepted, that.allEULAsAccepted) && equal(this.transferFormat, that.transferFormat);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), allEULAsAccepted, transferFormat);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("allEULAsAccepted", allEULAsAccepted).add("transferFormat", transferFormat);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
index 39a4fcc..78b9ad2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
@@ -31,13 +31,6 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents vApp instantiation parameters.
- *
- * @see <a href="http://www.vmware.com/support/vcd/doc/rest-api-doc-1.5-html/types/InstantiateVAppParamsType.html">
- * vCloud REST API - InstantiateVAppParamsType</a>
- * @since 0.9
- */
@XmlRootElement(name = "InstantiateVAppParams")
@XmlType(name = "InstantiateVAppParamsType")
public class InstantiateVAppParams extends VAppCreationParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
index 142da40..9813b2f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
@@ -24,13 +24,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents vApp template instantiation parameters.
- *
- * <pre>
- * <complexType name="InstantiateVAppTemplateParams" />
- * </pre>
- */
@XmlRootElement(name = "InstantiateVAppTemplateParams")
public class InstantiateVAppTemplateParams extends InstantiateVAppParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
index 152825f..950c197 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
@@ -46,13 +46,6 @@ import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-/**
- * Represents a list of {@code ovf:Section} to configure for instantiating a VApp.
- *
- * @see <a href="http://www.vmware.com/support/vcd/doc/rest-api-doc-1.5-html/types/InstantiationParamsType.html">
- * vCloud REST API - InstantiationParamsType</a>
- * @since 0.9
- */
@XmlRootElement(name = "InstantiationParams")
@XmlType(name = "InstantiationParamsType")
public class InstantiationParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
index a99747a..49a7a92 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
@@ -27,13 +27,6 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-/**
- * Represents parameters for inserting/ejecting media to VM.
- *
- * <pre>
- * <complexType name="MediaInsertOrEjectParams" />
- * </pre>
- */
@XmlRootElement(name = "MediaInsertOrEjectParams")
@XmlType(name = "MediaInsertOrEjectParamsType")
public class MediaInsertOrEjectParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
index abc0aef..adfab4f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
@@ -28,10 +28,6 @@ import com.google.common.base.Objects;
/**
* A basic type used to specify parameters for operations.
- *
- * @see <a href="http://www.vmware.com/support/vcd/doc/rest-api-doc-1.5-html/types/ParamsType.html">
- * vCloud REST API - ParamsType</a>
- * @since 0.9
*/
@XmlType(name = "ParamsType")
public class ParamsType {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
index 48b0b45..b0fae85 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
@@ -25,27 +25,11 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-/**
- * Parameters used when publishing catalogs.
- *
- * <pre>
- * <complexType name="PublishCatalogParams">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="IsPublished" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * </sequence>
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "PublishCatalogParams")
@XmlType(propOrder = {
"isPublished"
})
-//TODO: this is ridiculous
+//TODO: this is ridiculously complex boolean wrapper.
public class PublishCatalogParams {
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/params/RecomposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
index f335765..aa8bc4d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
@@ -31,23 +31,6 @@ import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Lists;
-/**
- * Represents vApp re-composition parameters.
- *
- * <pre>
- * <complexType name="RecomposeVAppParams">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}ComposeVAppParamsType">
- * <sequence>
- * <element name="CreateItem" type="{http://www.vmware.com/vcloud/v1.5}VmType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="DeleteItem" 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 = "RecomposeVAppParams")
@XmlType(name = "RecomposeVAppParamsType")
public class RecomposeVAppParams extends ComposeVAppParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
index 83a459c..343d3a0 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
@@ -28,27 +28,6 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
-/**
- * Parameters to be used for vm relocation.
- * <p/>
- * <p/>
- * <p>Java class for RelocateParams complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="RelocateParams">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="Datastore" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlRootElement(name = "RelocateParams")
@XmlType(propOrder = {
"datastore"
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
index 7728512..186fc2d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
@@ -34,32 +34,6 @@ import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-
-/**
- * Represents a composition item.
- * <p/>
- * <p/>
- * <p>Java class for SourcedCompositionItemParam complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * <complexType name="SourcedCompositionItemParam">
- * <complexContent>
- * <extension base="{http://www.vmware.com/vcloud/v1.5}VCloudExtensibleType">
- * <sequence>
- * <element name="Source" type="{http://www.vmware.com/vcloud/v1.5}ReferenceType"/>
- * <element name="VAppScopedLocalId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="InstantiationParams" type="{http://www.vmware.com/vcloud/v1.5}InstantiationParamsType" minOccurs="0"/>
- * <element name="NetworkAssignment" type="{http://www.vmware.com/vcloud/v1.5}NetworkAssignmentType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="sourceDelete" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- * <anyAttribute processContents='lax' namespace='##other'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
@XmlType(name = "SourcedCompositionItemParam", propOrder = {
"source",
"vAppScopedLocalId",
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
index 72e2997..8045d59 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
@@ -37,13 +37,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-/**
- * Represents vApp/VM undeployment parameters.
- *
- * @see <a href="http://www.vmware.com/support/vcd/doc/rest-api-doc-1.5-html/types/UndeployVAppParamsType.html">
- * vCloud REST API - UndeployVAppParamsType</a>
- * @since 0.9
- */
@XmlRootElement(name = "UndeployVAppParams")
@XmlType(name = "UndeployVAppParamsType")
public class UndeployVAppParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
index 73d6bd5..6e4e861 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
@@ -25,15 +25,6 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-/**
- * Represents vApp Template upload parameters.
- *
- * <pre>
- * <complexType name="UploadVAppTemplateParamsType" />
- * </pre>
- *
- * @since 0.9
- */
@XmlRootElement(name = "UploadVAppTemplateParams")
@XmlType(name = "UploadVAppTemplateParamsType")
public class UploadVAppTemplateParams extends ParamsType {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
index 6a517a1..0c8b0ed 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
@@ -29,13 +29,6 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-/**
- * Represents vApp creation parameters.
- *
- * @see <a href="http://www.vmware.com/support/vcd/doc/rest-api-doc-1.5-html/types/VAppCreationParamsType.html">
- * vCloud REST API - VAppCreationParamsType</a>
- * @since 0.9
- */
@XmlRootElement(name = "VAppCreationParams")
@XmlType(name = "VAppCreationParamsType")
public class VAppCreationParams extends ParamsType {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
index 3770115..5fe4014 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java
@@ -18,13 +18,6 @@ package org.jclouds.vcloud.director.v1_5.domain.query;
import javax.xml.bind.annotation.XmlRootElement;
-/**
- * Represents the results from a vCloud query as references.
- *
- * <pre>
- * <complexType name="QueryResultReferences" />
- * </pre>
- */
@XmlRootElement(name = "CatalogReferences")
public class CatalogReferences 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/query/Container.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
new file mode 100644
index 0000000..7519117
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
@@ -0,0 +1,165 @@
+/*
+ * 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.query;
+
+import static com.google.common.base.Objects.equal;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import org.jclouds.vcloud.director.v1_5.domain.Resource;
+
+import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+
+/**
+ * Container for query result sets.
+ */
+public class Container extends Resource {
+
+ public static Builder<?> builder() {
+ return new ConcreteBuilder();
+ }
+
+ @Override
+ public Builder<?> toBuilder() {
+ return builder().fromContainerType(this);
+ }
+
+ public static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
+
+ private String name;
+ private Integer page;
+ private Integer pageSize;
+ private Long total;
+
+ /**
+ * @see Container#getName()
+ */
+ public B name(String name) {
+ this.name = name;
+ return self();
+ }
+
+ /**
+ * @see Container#getPage()
+ */
+ public B page(Integer page) {
+ this.page = page;
+ return self();
+ }
+
+ /**
+ * @see Container#getPageSize()
+ */
+ public B pageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ return self();
+ }
+
+ /**
+ * @see Container#getTotal()
+ */
+ public B total(Long total) {
+ this.total = total;
+ return self();
+ }
+
+ @Override
+ public Container build() {
+ return new Container(this);
+ }
+
+ public B fromContainerType(Container in) {
+ return fromResource(in).name(in.getName()).page(in.getPage()).pageSize(in.getPageSize()).total(in.getTotal());
+ }
+ }
+
+ private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
+ }
+
+ @XmlAttribute
+ private String name;
+ @XmlAttribute
+ private Integer page;
+ @XmlAttribute
+ private Integer pageSize;
+ @XmlAttribute
+ private Long total;
+
+ protected Container(Builder<?> builder) {
+ super(builder);
+ this.name = builder.name;
+ this.page = builder.page;
+ this.pageSize = builder.pageSize;
+ this.total = builder.total;
+ }
+
+ protected Container() {
+ // for JAXB
+ }
+
+ /**
+ * Query name that generated this result set.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Page of the result set that this container holds. The first page is page number 1.
+ */
+ public Integer getPage() {
+ return page;
+ }
+
+ /**
+ * Page size, as a number of records or references.
+ */
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ /**
+ * Total number of records or references in the container.
+ */
+ public Long getTotal() {
+ return total;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+ Container that = Container.class.cast(o);
+ return super.equals(that) &&
+ equal(this.name, that.name) && equal(this.page, that.page) &&
+ equal(this.pageSize, that.pageSize) && equal(this.total, that.total);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(super.hashCode(), name, page, pageSize, total);
+ }
+
+ @Override
+ public ToStringHelper string() {
+ return super.string().add("name", name).add("page", page).add("pageSize", pageSize).add("total", total);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java
deleted file mode 100644
index 60c3f5c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java
+++ /dev/null
@@ -1,169 +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.query;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlAttribute;
-
-import org.jclouds.vcloud.director.v1_5.domain.Resource;
-
-import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-
-/**
- * Container for query result sets.
- *
- * <pre>
- * <complexType name="Container" />
- * </pre>
- */
-public class ContainerType extends Resource {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromContainerType(this);
- }
-
- public static class Builder<B extends Builder<B>> extends Resource.Builder<B> {
-
- private String name;
- private Integer page;
- private Integer pageSize;
- private Long total;
-
- /**
- * @see ContainerType#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see ContainerType#getPage()
- */
- public B page(Integer page) {
- this.page = page;
- return self();
- }
-
- /**
- * @see ContainerType#getPageSize()
- */
- public B pageSize(Integer pageSize) {
- this.pageSize = pageSize;
- return self();
- }
-
- /**
- * @see ContainerType#getTotal()
- */
- public B total(Long total) {
- this.total = total;
- return self();
- }
-
- @Override
- public ContainerType build() {
- return new ContainerType(this);
- }
-
- public B fromContainerType(ContainerType in) {
- return fromResource(in).name(in.getName()).page(in.getPage()).pageSize(in.getPageSize()).total(in.getTotal());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- @XmlAttribute
- private String name;
- @XmlAttribute
- private Integer page;
- @XmlAttribute
- private Integer pageSize;
- @XmlAttribute
- private Long total;
-
- protected ContainerType(Builder<?> builder) {
- super(builder);
- this.name = builder.name;
- this.page = builder.page;
- this.pageSize = builder.pageSize;
- this.total = builder.total;
- }
-
- protected ContainerType() {
- // for JAXB
- }
-
- /**
- * Query name that generated this result set.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Page of the result set that this container holds. The first page is page number 1.
- */
- public Integer getPage() {
- return page;
- }
-
- /**
- * Page size, as a number of records or references.
- */
- public Integer getPageSize() {
- return pageSize;
- }
-
- /**
- * Total number of records or references in the container.
- */
- public Long getTotal() {
- return total;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ContainerType that = ContainerType.class.cast(o);
- return super.equals(that) &&
- equal(this.name, that.name) && equal(this.page, that.page) &&
- equal(this.pageSize, that.pageSize) && equal(this.total, that.total);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), name, page, pageSize, total);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("name", name).add("page", page).add("pageSize", pageSize).add("total", total);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
index 90c3062..7ab723a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
@@ -23,13 +23,9 @@ import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Container for the list of typed queries available to the
* requesting user.
- *
- * <pre>
- * <complexType name="QueryList" />
- * </pre>
*/
@XmlType(name = "QueryList")
-public class QueryList extends ContainerType {
+public class QueryList extends Container {
// FIXME Should this class have fields?!
@@ -42,7 +38,7 @@ public class QueryList extends ContainerType {
return builder().fromQueryList(this);
}
- public static class Builder<B extends Builder<B>> extends ContainerType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends Container.Builder<B> {
@Override
public QueryList build() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
index 27ea2d7..ba1315b 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
@@ -25,12 +25,9 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents the results from a AdminGroup vCloud query as a record.
- */
@XmlRootElement(name = "GroupRecord")
@XmlType(name = "QueryResultAdminGroupRecordType")
-public class QueryResultAdminGroupRecord extends QueryResultRecordType {
+public class QueryResultAdminGroupRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -44,7 +41,7 @@ public class QueryResultAdminGroupRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String name;
private String org;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
index 8f32c23..5b24511 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
@@ -25,12 +25,9 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents the results from a AdminUser vCloud query as a record.
- */
@XmlRootElement(name = "UserRecord")
@XmlType(name = "QueryResultAdminUserRecordType")
-public class QueryResultAdminUserRecord extends QueryResultRecordType {
+public class QueryResultAdminUserRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -44,7 +41,7 @@ public class QueryResultAdminUserRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String name;
private String org;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
index ef096a2..7a341e6 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
@@ -25,12 +25,9 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents the results from a AdminVdc vCloud query as a record.
- */
@XmlRootElement(name = "VdcRecord")
@XmlType(name = "QueryResultAdminVdcRecordType")
-public class QueryResultAdminVdcRecord extends QueryResultRecordType {
+public class QueryResultAdminVdcRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -44,7 +41,7 @@ public class QueryResultAdminVdcRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String name;
private Boolean isEnabled;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
index f91b9ca..54256e7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
@@ -29,16 +29,9 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents the results from a Catalog vCloud query as a record.
- *
- * <pre>
- * <complexType name="QueryResultCatalogRecordType" />
- * </pre>
- */
@XmlRootElement(name = "CatalogRecord")
@XmlType(name = "QueryResultCatalogRecordType")
-public class QueryResultCatalogRecord extends QueryResultRecordType {
+public class QueryResultCatalogRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -52,7 +45,7 @@ public class QueryResultCatalogRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String name;
private Boolean isPublished;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
index e9f2974..1b65102 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
@@ -25,16 +25,9 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents the results from a Datastore vCloud query as a record.
- *
- * <pre>
- * <complexType name="QueryResultDatastoreRecordType" />
- * </pre>
- */
@XmlRootElement(name = "DatastoreRecord")
@XmlType(name = "QueryResultDatastoreRecordType")
-public class QueryResultDatastoreRecord extends QueryResultRecordType {
+public class QueryResultDatastoreRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -48,7 +41,7 @@ public class QueryResultDatastoreRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String name;
private String datastoreType;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
index c5764d5..c759154 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
@@ -25,10 +25,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
-/**
- * Represents the results from a Media vCloud query as a record.
- */
-public class QueryResultMediaRecord extends QueryResultRecordType {
+public class QueryResultMediaRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -42,7 +39,7 @@ public class QueryResultMediaRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String ownerName;
private String catalogName;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/a58cf0c6/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
index 8b5170e..c17b2c3 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
@@ -26,16 +26,9 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-/**
- * Represents the results from a Network vCloud query as a record.
- *
- * <pre>
- * <complexType name="QueryResultNetworkRecordType" />
- * </pre>
- */
@XmlRootElement(name = "OrgNetworkRecord")
@XmlType(name = "QueryResultNetworkRecordType")
-public class QueryResultNetworkRecord extends QueryResultRecordType {
+public class QueryResultNetworkRecord extends QueryResultRecord {
public static Builder<?> builder() {
return new ConcreteBuilder();
@@ -49,7 +42,7 @@ public class QueryResultNetworkRecord extends QueryResultRecordType {
private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
}
- public static class Builder<B extends Builder<B>> extends QueryResultRecordType.Builder<B> {
+ public static class Builder<B extends Builder<B>> extends QueryResultRecord.Builder<B> {
private String name;
private String ipScopeId;