From 3ce6051e515727c76477a30666e7894cf519339e Mon Sep 17 00:00:00 2001 From: Adam Lowe Date: Tue, 6 Mar 2012 09:21:50 +0000 Subject: [PATCH] VCloud Director 1.5: Adjusting misleading comments and consistently using @XmlReference only for substitution groups --- .../director/v1_5/domain/CapacityType.java | 2 +- .../v1_5/domain/CapacityWithUsage.java | 2 +- .../v1_5/domain/CaptureVAppParams.java | 3 +- .../vcloud/director/v1_5/domain/Catalog.java | 9 ++++ .../director/v1_5/domain/CatalogItem.java | 2 +- .../director/v1_5/domain/CatalogsList.java | 2 +- .../v1_5/domain/CloneMediaParams.java | 2 +- .../director/v1_5/domain/CloneVAppParams.java | 44 +++++-------------- .../v1_5/domain/CloneVAppTemplateParams.java | 2 +- .../v1_5/domain/ComposeVAppParams.java | 2 +- .../director/v1_5/domain/ComputeCapacity.java | 2 +- .../director/v1_5/domain/FilesList.java | 2 +- .../director/v1_5/domain/FirewallService.java | 2 +- .../domain/GuestCustomizationSection.java | 2 +- .../v1_5/domain/InstantiateVAppParams.java | 2 +- .../domain/InstantiateVAppParamsType.java | 10 ++--- .../domain/InstantiateVAppTemplateParams.java | 2 +- .../v1_5/domain/InstantiationParams.java | 2 +- .../director/v1_5/domain/IpAddresses.java | 4 +- .../vcloud/director/v1_5/domain/IpRange.java | 2 +- .../vcloud/director/v1_5/domain/IpRanges.java | 8 ++-- .../vcloud/director/v1_5/domain/IpScope.java | 2 +- .../v1_5/domain/IpsecVpnRemotePeer.java | 2 +- .../director/v1_5/domain/IpsecVpnService.java | 17 ++++--- .../v1_5/domain/IpsecVpnThirdPartyPeer.java | 2 +- .../director/v1_5/domain/IpsecVpnTunnel.java | 44 +++---------------- .../director/v1_5/domain/MetadataEntry.java | 2 +- .../vcloud/director/v1_5/domain/NatRule.java | 2 +- .../director/v1_5/domain/NatVmRule.java | 2 +- .../v1_5/domain/NetworkAssignment.java | 2 +- .../v1_5/domain/NetworkConfiguration.java | 2 +- .../v1_5/domain/NetworkConnection.java | 2 +- .../v1_5/domain/NetworkConnectionSection.java | 3 +- .../director/v1_5/domain/NetworkFeatures.java | 16 +++---- .../v1_5/domain/NetworkServiceType.java | 20 +++------ .../director/v1_5/domain/NetworkType.java | 2 +- .../vcloud/director/v1_5/domain/Org.java | 2 +- .../vcloud/director/v1_5/domain/OrgList.java | 2 +- .../vcloud/director/v1_5/domain/Owner.java | 2 +- .../director/v1_5/domain/ParamsType.java | 2 +- .../v1_5/domain/ProductSectionList.java | 2 +- .../director/v1_5/domain/ReferenceType.java | 5 +++ .../v1_5/domain/ResourceEntities.java | 2 +- .../director/v1_5/domain/RouterInfo.java | 2 +- .../vcloud/director/v1_5/domain/Session.java | 2 +- .../domain/SourcedCompositionItemParam.java | 2 +- .../director/v1_5/domain/StaticRoute.java | 2 +- .../v1_5/domain/StaticRoutingService.java | 2 +- .../domain/SupportedHardwareVersions.java | 2 +- .../v1_5/domain/SyslogServerSettings.java | 2 +- .../vcloud/director/v1_5/domain/Task.java | 2 +- .../director/v1_5/domain/TasksInProgress.java | 2 +- .../director/v1_5/domain/TasksList.java | 2 +- .../v1_5/domain/VAppCreationParamsType.java | 2 +- .../director/v1_5/domain/VAppTemplate.java | 4 +- .../director/v1_5/domain/ovf/DiskSection.java | 5 ++- .../v1_5/domain/query/CatalogReferences.java | 16 +++---- .../v1_5/domain/query/ContainerType.java | 2 +- .../director/v1_5/domain/query/QueryList.java | 2 +- .../query/QueryResultCatalogRecord.java | 2 +- .../query/QueryResultNetworkRecord.java | 2 +- .../domain/query/QueryResultRecordType.java | 5 ++- .../domain/query/QueryResultReferences.java | 6 +-- .../VAppTemplateClientExpectTest.java | 2 +- 64 files changed, 138 insertions(+), 175 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java index 887410d52e..b5336f9370 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java @@ -119,7 +119,7 @@ public class CapacityType> { } protected CapacityType() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Units", required = true) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java index 2c4ad4dd91..75e7275981 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java @@ -135,7 +135,7 @@ public class CapacityWithUsage extends CapacityType } private CapacityWithUsage() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Used") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java index 0383672f43..da46e57c45 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java @@ -24,6 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; import java.util.Set; + import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; @@ -125,7 +126,7 @@ public class CaptureVAppParams } private CaptureVAppParams() { - // For JAXB and builder use + // for JAXB } private CaptureVAppParams(Set> sections) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java index 7454d952d1..d6abd466da 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java @@ -174,9 +174,18 @@ public class Catalog extends CatalogType { } } +<<<<<<< HEAD public Catalog(URI href, String type, Set links, String description, TasksInProgress tasksInProgress, String id, String name, Owner owner, CatalogItems catalogItems, Boolean published) { super(href, type, links, description, tasksInProgress, id, name, owner, catalogItems, published); +======= + private Catalog(URI href, String type, Set links, String description, TasksInProgress tasksInProgress, String id, + String name, Entity owner, CatalogItems catalogItems, Boolean published) { + super(href, type, links, description, tasksInProgress, id, name); + this.owner = owner; + this.catalogItems = catalogItems; + this.isPublished = published; +>>>>>>> VCloud Director 1.5: Adjusting misleading comments and consistently using @XmlReference only for substitution groups } @SuppressWarnings("unused") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java index db8be1d67a..7ec0a2ef28 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogItem.java @@ -178,7 +178,7 @@ public class CatalogItem extends EntityType { } private CatalogItem() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Entity", required = true) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogsList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogsList.java index bf023faf13..f15573de67 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogsList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CatalogsList.java @@ -78,7 +78,7 @@ public class CatalogsList { } private CatalogsList() { - // For JAXB and builder use + // for JAXB } private CatalogsList(Set tasks) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java index e96cc68b01..0baf82eafe 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneMediaParams.java @@ -129,7 +129,7 @@ public class CloneMediaParams } private CloneMediaParams() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java index 8ccfc0575a..7ec768d529 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppParams.java @@ -44,10 +44,8 @@ import com.google.common.base.Objects; */ @XmlType(name = "CloneVAppParams") public class CloneVAppParams - extends InstantiateVAppParamsType + extends InstantiateVAppParamsType { -{ - @SuppressWarnings("unchecked") public static Builder builder() { return new Builder(); } @@ -58,10 +56,8 @@ public class CloneVAppParams public static class Builder extends InstantiateVAppParamsType.Builder { - public CloneVAppParams build() { - CloneVAppParams cloneVAppParams = new CloneVAppParams(); - return cloneVAppParams; + return new CloneVAppParams(description, name, vAppParent, instantiationParams, deploy, powerOn, source, isSourceDelete, linkedClone); } /** @@ -97,7 +93,7 @@ public class CloneVAppParams } /** - * @see VAppCreationParamsType#getDeploy() + * @see VAppCreationParamsType#isDeploy() */ public Builder deploy(Boolean deploy) { super.deploy(deploy); @@ -105,7 +101,7 @@ public class CloneVAppParams } /** - * @see VAppCreationParamsType#getPowerOn() + * @see VAppCreationParamsType#isPowerOn() */ public Builder powerOn(Boolean powerOn) { super.powerOn(powerOn); @@ -121,7 +117,7 @@ public class CloneVAppParams } /** - * @see InstantiateVAppParamsType#getIsSourceDelete() + * @see InstantiateVAppParamsType#isSourceDelete() */ public Builder isSourceDelete(Boolean isSourceDelete) { super.isSourceDelete(isSourceDelete); @@ -129,7 +125,7 @@ public class CloneVAppParams } /** - * @see InstantiateVAppParamsType#getLinkedClone() + * @see InstantiateVAppParamsType#isLinkedClone() */ public Builder linkedClone(Boolean linkedClone) { super.linkedClone(linkedClone); @@ -146,28 +142,12 @@ public class CloneVAppParams } } + private CloneVAppParams(String description, String name, Reference vAppParent, InstantiationParams instantiationParams, Boolean deploy, Boolean powerOn, Reference source, Boolean sourceDelete, Boolean linkedClone) { + super(description, name, vAppParent, instantiationParams, deploy, powerOn, source, sourceDelete, linkedClone); + } + private CloneVAppParams() { - // For JAXB and builder use + // For JAXB } - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - CloneVAppParams that = CloneVAppParams.class.cast(o); - return super.equals(that); - } - - @Override - public int hashCode() { - return super.hashCode() + Objects.hashCode(""); - } - - @Override - public String toString() { - return Objects.toStringHelper("").toString(); - } - -} + } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java index 14a61345ab..44d77692a8 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CloneVAppTemplateParams.java @@ -111,7 +111,7 @@ public class CloneVAppTemplateParams } private CloneVAppTemplateParams() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java index ee3a4574fc..2d6b3ad154 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComposeVAppParams.java @@ -136,7 +136,7 @@ public class ComposeVAppParams } private ComposeVAppParams() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java index 5d0556740c..0415fa2509 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java @@ -99,7 +99,7 @@ public class ComputeCapacity { } private ComputeCapacity() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FilesList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FilesList.java index 4993ac68b6..6a46d59f97 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FilesList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FilesList.java @@ -98,7 +98,7 @@ public class FilesList { } private FilesList() { - // For JAXB and builder use + // for JAXB } private FilesList(List files) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java index 5e261c6633..6ed7c33c7b 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/FirewallService.java @@ -128,7 +128,7 @@ public class FirewallService extends NetworkServiceType { } private FirewallService() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "DefaultAction") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java index 4a355a029a..d1977f932b 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/GuestCustomizationSection.java @@ -341,7 +341,7 @@ public class GuestCustomizationSection extends SectionType> } } - public InstantiateVAppParamsType(String description, String name, Reference vAppParent, InstantiationParams instantiationParams, + protected InstantiateVAppParamsType(String description, String name, Reference vAppParent, InstantiationParams instantiationParams, Boolean deploy, Boolean powerOn, Reference source, Boolean sourceDelete, Boolean linkedClone) { super(description, name, vAppParent, instantiationParams, deploy, powerOn); this.source = source; @@ -180,16 +180,16 @@ public class InstantiateVAppParamsType> } protected InstantiateVAppParamsType() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Source", required = true) - protected Reference source; + private Reference source; @XmlElement(name = "IsSourceDelete") - protected Boolean isSourceDelete; + private Boolean isSourceDelete; @XmlAttribute - protected Boolean linkedClone; + private Boolean linkedClone; /** * Gets the value of the source property. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java index cedbfba1cc..f51ae78286 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiateVAppTemplateParams.java @@ -148,7 +148,7 @@ public class InstantiateVAppTemplateParams } private InstantiateVAppTemplateParams() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java index 53bb6755e6..0b98e78e39 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java @@ -98,7 +98,7 @@ public class InstantiationParams { } private InstantiationParams() { - // For JAXB and builder use + // for JAXB } private InstantiationParams(Set> sections) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java index c6b2314fd6..61343c8494 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpAddresses.java @@ -53,7 +53,7 @@ public class IpAddresses { * @see IpAddresses#getIpAddresses() */ public Builder ipAddresses(Set ipAddresses) { - this.ipAddresses.addAll(checkNotNull(ipAddresses, "ipAddresses")); + this.ipAddresses = Sets.newLinkedHashSet(checkNotNull(ipAddresses, "ipAddresses")); return this; } @@ -75,7 +75,7 @@ public class IpAddresses { } private IpAddresses() { - // For JAXB and builder use + // for JAXB } private IpAddresses(Set orgs) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java index 43941e6981..4d620b9ee3 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRange.java @@ -72,7 +72,7 @@ public class IpRange { } private IpRange() { - // For JAXB and builder use + // for JAXB } private IpRange(String startAddress, String endAddress) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java index 116873b042..1e074bb507 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpRanges.java @@ -22,9 +22,9 @@ import static com.google.common.base.Objects.equal; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.Set; -import javax.xml.bind.annotation.XmlElementRef; + +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import com.google.common.base.Objects; @@ -76,14 +76,14 @@ public class IpRanges { } private IpRanges() { - // For JAXB and builder use + // for JAXB } private IpRanges(Set ipRanges) { this.ipRanges = ImmutableSet.copyOf(ipRanges); } - @XmlElementRef + @XmlElement(name = "IpRange") private Set ipRanges = Sets.newLinkedHashSet(); public Set getIpRanges() { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java index c1acd7ff5b..109739dbdf 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpScope.java @@ -132,7 +132,7 @@ public class IpScope { } private IpScope() { - // For JAXB and builder use + // For JAXB } public IpScope(boolean inherited, String gateway, String netmask, String dns1, String dns2, String dnsSuffix, diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java index 46f7631792..652ed93981 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnRemotePeer.java @@ -133,7 +133,7 @@ public class IpsecVpnRemotePeer extends IpsecVpnManagedPeerType { - @SuppressWarnings("unchecked") + public static Builder builder() { return new Builder(); } @@ -128,7 +128,7 @@ public class IpsecVpnService extends NetworkServiceType { } private IpsecVpnService() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "ExternalIpAddress") @@ -172,24 +172,27 @@ public class IpsecVpnService extends NetworkServiceType { if (o == null || getClass() != o.getClass()) return false; IpsecVpnService that = IpsecVpnService.class.cast(o); - return equal(externalIpAddress, that.externalIpAddress) && + return super.equals(that) && + equal(externalIpAddress, that.externalIpAddress) && equal(publicIpAddress, that.publicIpAddress) && equal(ipsecVpnTunnels, that.ipsecVpnTunnels); } @Override public int hashCode() { - return Objects.hashCode(externalIpAddress, + return Objects.hashCode( + super.hashCode(), + externalIpAddress, publicIpAddress, ipsecVpnTunnels); } @Override - public String toString() { - return Objects.toStringHelper("") + protected Objects.ToStringHelper string() { + return super.string() .add("externalIpAddress", externalIpAddress) .add("publicIpAddress", publicIpAddress) - .add("ipsecVpnTunnels", ipsecVpnTunnels).toString(); + .add("ipsecVpnTunnels", ipsecVpnTunnels); } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java index d9ccd8d015..e4813a8aa6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/IpsecVpnThirdPartyPeer.java @@ -63,6 +63,6 @@ public class IpsecVpnThirdPartyPeer extends IpsecVpnUnmanagedPeerType ipsecVpnPeer; private String peerIpAddress; private String peerNetworkAddress; private String peerNetworkMask; @@ -121,7 +118,7 @@ public class IpsecVpnTunnel /** * @see IpsecVpnTunnel#getIpsecVpnPeer() */ - public Builder ipsecVpnPeer(IpsecVpnPeerType ipsecVpnPeer) { + public Builder ipsecVpnPeer(IpsecVpnPeerType ipsecVpnPeer) { this.ipsecVpnPeer = ipsecVpnPeer; return this; } @@ -221,7 +218,7 @@ public class IpsecVpnTunnel } } - private IpsecVpnTunnel(String name, String description, IpsecVpnPeerType ipsecVpnPeer, String peerIpAddress, + private IpsecVpnTunnel(String name, String description, IpsecVpnPeerType ipsecVpnPeer, String peerIpAddress, String peerNetworkAddress, String peerNetworkMask, String sharedSecret, String encryptionProtocol, int mtu, boolean enabled, Boolean operational, String errorDetails) { this.name = name; this.description = description; @@ -238,7 +235,7 @@ public class IpsecVpnTunnel } private IpsecVpnTunnel() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Name", required = true) @@ -246,7 +243,7 @@ public class IpsecVpnTunnel @XmlElement(name = "Description") protected String description; @XmlElementRef - protected IpsecVpnPeerType ipsecVpnPeer; + protected IpsecVpnPeerType ipsecVpnPeer; @XmlElement(name = "PeerIpAddress", required = true) protected String peerIpAddress; @XmlElement(name = "PeerNetworkAddress", required = true) @@ -268,9 +265,6 @@ public class IpsecVpnTunnel /** * Gets the value of the name property. - * - * @return possible object is - * {@link String } */ public String getName() { return name; @@ -278,9 +272,6 @@ public class IpsecVpnTunnel /** * Gets the value of the description property. - * - * @return possible object is - * {@link String } */ public String getDescription() { return description; @@ -289,15 +280,12 @@ public class IpsecVpnTunnel /** * Details about the peer network. */ - public IpsecVpnPeerType getIpsecVpnPeer() { + public IpsecVpnPeerType getIpsecVpnPeer() { return ipsecVpnPeer; } /** * Gets the value of the peerIpAddress property. - * - * @return possible object is - * {@link String } */ public String getPeerIpAddress() { return peerIpAddress; @@ -305,9 +293,6 @@ public class IpsecVpnTunnel /** * Gets the value of the peerNetworkAddress property. - * - * @return possible object is - * {@link String } */ public String getPeerNetworkAddress() { return peerNetworkAddress; @@ -315,9 +300,6 @@ public class IpsecVpnTunnel /** * Gets the value of the peerNetworkMask property. - * - * @return possible object is - * {@link String } */ public String getPeerNetworkMask() { return peerNetworkMask; @@ -325,9 +307,6 @@ public class IpsecVpnTunnel /** * Gets the value of the sharedSecret property. - * - * @return possible object is - * {@link String } */ public String getSharedSecret() { return sharedSecret; @@ -335,9 +314,6 @@ public class IpsecVpnTunnel /** * Gets the value of the encryptionProtocol property. - * - * @return possible object is - * {@link String } */ public String getEncryptionProtocol() { return encryptionProtocol; @@ -359,9 +335,6 @@ public class IpsecVpnTunnel /** * Gets the value of the isOperational property. - * - * @return possible object is - * {@link Boolean } */ public Boolean isOperational() { return isOperational; @@ -369,9 +342,6 @@ public class IpsecVpnTunnel /** * Gets the value of the errorDetails property. - * - * @return possible object is - * {@link String } */ public String getErrorDetails() { return errorDetails; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java index aa4193abd4..c9d08b7fe8 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java @@ -140,7 +140,7 @@ public class MetadataEntry extends ResourceType { } private MetadataEntry() { - // For JAXB and builder use + // for JAXB } public MetadataEntry(URI href, String type, Set links, String key, String value) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java index 11deef91a7..1fe1625f27 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatRule.java @@ -141,7 +141,7 @@ public class NatRule { } private NatRule() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Description") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java index 06695b48ed..8dae8887d1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NatVmRule.java @@ -154,7 +154,7 @@ public class NatVmRule { } private NatVmRule() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java index 9bee51fce8..43fe6924d7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkAssignment.java @@ -97,7 +97,7 @@ public class NetworkAssignment } private NetworkAssignment() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java index 5d7caedda8..869cc8ad59 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConfiguration.java @@ -132,7 +132,7 @@ public class NetworkConfiguration { } private NetworkConfiguration() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "IpScope") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java index 364b79ee34..d69ec2a571 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnection.java @@ -180,7 +180,7 @@ public class NetworkConnection { } private NetworkConnection() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java index 63431c526b..a852ceed2f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkConnectionSection.java @@ -260,7 +260,8 @@ public class NetworkConnectionSection extends SectionType services = Sets.newLinkedHashSet(); + private Set> services = Sets.newLinkedHashSet(); /** * @see NetworkFeatures#getNetworkServices() */ - public Builder services(Set services) { + public Builder services(Set> services) { this.services = Sets.newLinkedHashSet(checkNotNull(services, "services")); return this; } @@ -62,7 +62,7 @@ public class NetworkFeatures { /** * @see NetworkFeatures#getNetworkServices() */ - public Builder service(NetworkServiceType service) { + public Builder service(NetworkServiceType service) { services.add(checkNotNull(service, "service")); return this; } @@ -77,21 +77,21 @@ public class NetworkFeatures { } private NetworkFeatures() { - // For JAXB and builder use + // for JAXB } - public NetworkFeatures(Set services) { + public NetworkFeatures(Set> services) { this.services = ImmutableSet.copyOf(services); } @XmlElementRef - private Set services = Sets.newLinkedHashSet(); + private Set> services = Sets.newLinkedHashSet(); /** * @return a Network service. May be any of DhcpService, NatService, IpsecVpnService, * DhcpService, or StaticRoutingService. */ - public Set getNetworkServices() { + public Set> getNetworkServices() { return Collections.unmodifiableSet(services); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java index 58a814c506..79da3f27e9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkServiceType.java @@ -28,6 +28,7 @@ import com.google.common.base.Objects; /** * Represents a network service * + * @author danikov * @author Adam Lowe */ @XmlSeeAlso({ @@ -38,17 +39,10 @@ import com.google.common.base.Objects; StaticRoutingService.class, NatService.class }) -public class NetworkServiceType> { +public abstract class NetworkServiceType> { + public abstract Builder toBuilder(); - public static Builder builder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder().fromNetworkServiceType(this); - } - - public static class Builder> { + public static abstract class Builder> { protected boolean isEnabled; /** @@ -59,9 +53,7 @@ public class NetworkServiceType> { return this; } - public NetworkServiceType build() { - return new NetworkServiceType(isEnabled); - } + public abstract NetworkServiceType build(); public Builder fromNetworkServiceType(NetworkServiceType in) { return enabled(in.isEnabled()); @@ -73,7 +65,7 @@ public class NetworkServiceType> { } protected NetworkServiceType() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "IsEnabled") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkType.java index 54052b9b18..bd9a213c9c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/NetworkType.java @@ -152,7 +152,7 @@ public class NetworkType> extends EntityType { } protected NetworkType() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Configuration") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java index 6c2713d061..7e643bd648 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java @@ -183,7 +183,7 @@ public class Org extends EntityType { } private Org() { - // For JAXB and builder use + // for JAXB } public Org(URI href, String type, Set links, String description, TasksInProgress tasksInProgress, String id, String name, String fullName, Boolean enabled) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java index 5b107602e6..80f4cd1fa0 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/OrgList.java @@ -80,7 +80,7 @@ public class OrgList { } private OrgList() { - // For JAXB and builder use + // for JAXB } private OrgList(Set orgs) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java index 2736f5af3f..0fe6fc6662 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java @@ -136,7 +136,7 @@ public class Owner @SuppressWarnings("unused") private Owner() { - // For JAXB and builder use + // for JAXB } public Owner(URI href, String type, Set links, Reference user) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java index d2967ac6e8..a76364559d 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ParamsType.java @@ -111,7 +111,7 @@ public class ParamsType> { } protected ParamsType() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java index 7deb414781..f0d731c4e7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java @@ -139,7 +139,7 @@ public class ProductSectionList } private ProductSectionList() { - // For JAXB and builder use + // for JAXB } private ProductSectionList(Set productSections) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ReferenceType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ReferenceType.java index f6a340cdc3..314890c5fe 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ReferenceType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ReferenceType.java @@ -23,6 +23,7 @@ import static com.google.common.base.Objects.equal; import java.net.URI; import java.util.Map; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSeeAlso; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; @@ -38,6 +39,10 @@ import com.google.common.base.Objects.ToStringHelper; * * @author grkvlt@apache.org */ +@XmlSeeAlso({ + CatalogReference.class, + Reference.class +}) public class ReferenceType> implements URISupplier { public static > Builder builder() { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java index f45870831a..d4fc25c893 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java @@ -96,7 +96,7 @@ public class ResourceEntities { } private ResourceEntities() { - // For JAXB and builder use + // for JAXB } private ResourceEntities(Set resourceEntity) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java index 29b32fb9e3..ed474d92c9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RouterInfo.java @@ -62,7 +62,7 @@ public class RouterInfo { } private RouterInfo() { - // For JAXB and builder use + // for JAXB } private RouterInfo(String externalIp) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java index a03d3d58a9..db9ef9cbfc 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java @@ -110,7 +110,7 @@ public class Session { } private Session() { - // For JAXB and builder use + // for JAXB } private Session(String user, String org, URI href, Set links) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java index f1b7d41cbd..b92176f2f7 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SourcedCompositionItemParam.java @@ -144,7 +144,7 @@ public class SourcedCompositionItemParam { } private SourcedCompositionItemParam() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "Source", required = true) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java index 8429af77cc..0908cd99e9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoute.java @@ -126,7 +126,7 @@ public class StaticRoute { } private StaticRoute() { - // For JAXB and builder use + // for JAXB } private StaticRoute(String _interface) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java index a5648c2c82..dbb6b3dee1 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/StaticRoutingService.java @@ -104,7 +104,7 @@ public class StaticRoutingService extends NetworkServiceType supportedHardwareVersions) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java index ffbb8c536f..5ebac9170f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SyslogServerSettings.java @@ -76,7 +76,7 @@ public class SyslogServerSettings { } private SyslogServerSettings() { - // For JAXB and builder use + // for JAXB } @XmlElement(name = "SyslogServerIp1") diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java index a791f8dcd8..e571e84c46 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java @@ -295,7 +295,7 @@ public class Task extends EntityType { } private Task() { - // For JAXB and builder use + // for JAXB } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java index 6ac91c6d17..b0a002f81f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksInProgress.java @@ -75,7 +75,7 @@ public class TasksInProgress { } private TasksInProgress() { - // For JAXB and builder use + // for JAXB } private TasksInProgress(Collection tasks) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java index dc3069972a..3fc6620a06 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java @@ -161,7 +161,7 @@ public class TasksList extends EntityType { } protected TasksList() { - // For JAXB and builder use + // for JAXB } public TasksList(URI href, String type, Set links, String description, TasksInProgress tasksInProgress, String id, String name, Set tasks) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParamsType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParamsType.java index 8843b7d125..2b5c6d8923 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParamsType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppCreationParamsType.java @@ -172,7 +172,7 @@ public class VAppCreationParamsType> } protected VAppCreationParamsType() { - // For JAXB and builder use + // for JAXB } /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java index 3c6752862f..9c811c02ad 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java @@ -254,9 +254,9 @@ public class VAppTemplate extends ResourceEntityType { } } - @XmlElementRef + @XmlElement(name = "Owner") protected Owner owner; - @XmlElementRef + @XmlElement(name = "Children") protected VAppTemplateChildren children = VAppTemplateChildren.builder().build(); @XmlElementRef protected Set> sections = Sets.newLinkedHashSet(); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/DiskSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/DiskSection.java index 79805f9ecb..108bfdb505 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/DiskSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/DiskSection.java @@ -22,7 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; import java.util.Set; -import javax.xml.bind.annotation.XmlElementRef; + +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -116,7 +117,7 @@ public class DiskSection extends SectionType { } - @XmlElementRef + @XmlElement(name = "Disk") private Set disks; private DiskSection(@Nullable String info, @Nullable Boolean required, Iterable disks) { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java index dba4c37e9c..c5b0d54467 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/CatalogReferences.java @@ -77,7 +77,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getName() + * @see CatalogReferences#getName() */ @Override public Builder name(String name) { @@ -86,7 +86,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getPage() + * @see CatalogReferences#getPage() */ @Override public Builder page(Integer page) { @@ -95,7 +95,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getPageSize() + * @see CatalogReferences#getPageSize() */ @Override public Builder pageSize(Integer pageSize) { @@ -104,7 +104,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getTotal() + * @see CatalogReferences#getTotal() */ @Override public Builder total(Long total) { @@ -113,7 +113,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getHref() + * @see CatalogReferences#getHref() */ @Override public Builder href(URI href) { @@ -131,7 +131,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getLinks() + * @see CatalogReferences#getLinks() */ @Override public Builder links(Set links) { @@ -140,7 +140,7 @@ public class CatalogReferences extends QueryResultReferences { } /** - * @see CatalogReference#getLinks() + * @see CatalogReferences#getLinks() */ @Override public Builder link(Link link) { @@ -163,6 +163,6 @@ public class CatalogReferences extends QueryResultReferences { } protected CatalogReferences() { - // For JAXB and builder use + // for JAXB } } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java index 6ff53f823c..55d555be0c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java @@ -161,7 +161,7 @@ public class ContainerType> extends ResourceType { } protected ContainerType() { - // For JAXB and builder use + // for JAXB } /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java index 71e934ea95..7fcd8cc107 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java @@ -71,7 +71,7 @@ public class QueryList extends ContainerType { } private QueryList() { - // For JAXB and builder use + // for JAXB } @Override diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java index 2f134d5e8e..a83c2d68c8 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java @@ -252,7 +252,7 @@ public class QueryResultCatalogRecord extends QueryResultRecordType> { public static > Builder builder() { diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java index c557d0ca1b..0b46128f2c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java @@ -172,13 +172,11 @@ public class QueryResultReferences> extends Container } protected QueryResultReferences() { - // For JAXB and builder use + // for JAXB } // NOTE add other types as they are used. probably not the best way to do this. - @XmlElementRefs({ - @XmlElementRef(type = CatalogReference.class) - }) + @XmlElementRef private Set references = Sets.newLinkedHashSet(); /** diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java index 77ee717bb9..01e2eb1a18 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientExpectTest.java @@ -395,7 +395,7 @@ public class VAppTemplateClientExpectTest extends BaseVCloudDirectorRestClientEx .build()) .parentNetwork(Reference.builder().href(URI.create("http://vcloud.example.com/api/v1.0/network/54")).type("application/vnd.vmware.vcloud.network+xml").name("Internet").build()) .fenceMode("natRouted") - .features(NetworkFeatures.builder().services(ImmutableSet.of(firewallService, natService)).build()) + .features(NetworkFeatures.builder().services(ImmutableSet.of(firewallService, natService)).build()) .build(); return NetworkConfigSection.builder()