mirror of https://github.com/apache/jclouds.git
wrapper -> view; typo undo
This commit is contained in:
parent
df7d2acbb4
commit
95347a5b96
|
@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
|
@ -106,7 +106,7 @@ public class Capabilities {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@XmlElementView(name = "SupportedHardwareVersions")
|
@XmlElementWrapper(name = "SupportedHardwareVersions")
|
||||||
@XmlElement(name = "SupportedHardwareVersion")
|
@XmlElement(name = "SupportedHardwareVersion")
|
||||||
protected Set<String> supportedHardwareVersions = Sets.newLinkedHashSet();
|
protected Set<String> supportedHardwareVersions = Sets.newLinkedHashSet();
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlSeeAlso;
|
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
@ -129,7 +129,7 @@ public class Catalog extends Entity {
|
||||||
|
|
||||||
@XmlElement(name = "Owner")
|
@XmlElement(name = "Owner")
|
||||||
private Owner owner;
|
private Owner owner;
|
||||||
@XmlElementView(name = "CatalogItems")
|
@XmlElementWrapper(name = "CatalogItems")
|
||||||
@XmlElement(name = "CatalogItem")
|
@XmlElement(name = "CatalogItem")
|
||||||
private Set<Reference> catalogItems;
|
private Set<Reference> catalogItems;
|
||||||
@XmlElement(name = "IsPublished")
|
@XmlElement(name = "IsPublished")
|
||||||
|
|
|
@ -25,7 +25,7 @@ import java.util.List;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlAttribute;
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ public class Entity extends Resource {
|
||||||
|
|
||||||
@XmlElement(name = "Description")
|
@XmlElement(name = "Description")
|
||||||
private String description;
|
private String description;
|
||||||
@XmlElementView(name = "Tasks")
|
@XmlElementWrapper(name = "Tasks")
|
||||||
@XmlElement(name = "Task")
|
@XmlElement(name = "Task")
|
||||||
private List<Task> tasks;
|
private List<Task> tasks;
|
||||||
@XmlAttribute
|
@XmlAttribute
|
||||||
|
|
|
@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
@ -135,7 +135,7 @@ public class Group extends Entity {
|
||||||
|
|
||||||
@XmlElement(name = "NameInSource")
|
@XmlElement(name = "NameInSource")
|
||||||
protected String nameInSource;
|
protected String nameInSource;
|
||||||
@XmlElementView(name = "UsersList")
|
@XmlElementWrapper(name = "UsersList")
|
||||||
@XmlElement(name = "UserReference")
|
@XmlElement(name = "UserReference")
|
||||||
protected Set<Reference> usersList = Sets.newLinkedHashSet();
|
protected Set<Reference> usersList = Sets.newLinkedHashSet();
|
||||||
@XmlElement(name = "Role")
|
@XmlElement(name = "Role")
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlAttribute;
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlEnum;
|
import javax.xml.bind.annotation.XmlEnum;
|
||||||
import javax.xml.bind.annotation.XmlEnumValue;
|
import javax.xml.bind.annotation.XmlEnumValue;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
@ -171,7 +171,7 @@ public abstract class ResourceEntity extends Entity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@XmlElementView(name = "Files")
|
@XmlElementWrapper(name = "Files")
|
||||||
@XmlElement(name = "File")
|
@XmlElement(name = "File")
|
||||||
private Set<File> files;
|
private Set<File> files;
|
||||||
@XmlAttribute
|
@XmlAttribute
|
||||||
|
|
|
@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
@ -348,7 +348,7 @@ public class User extends Entity {
|
||||||
private Reference role;
|
private Reference role;
|
||||||
@XmlElement(name = "Password")
|
@XmlElement(name = "Password")
|
||||||
private String password;
|
private String password;
|
||||||
@XmlElementView(name = "GroupReferences")
|
@XmlElementWrapper(name = "GroupReferences")
|
||||||
private List<Reference> groups;
|
private List<Reference> groups;
|
||||||
|
|
||||||
protected User(Builder<?> builder) {
|
protected User(Builder<?> builder) {
|
||||||
|
|
|
@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlAttribute;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementRef;
|
import javax.xml.bind.annotation.XmlElementRef;
|
||||||
import javax.xml.bind.annotation.XmlElementRefs;
|
import javax.xml.bind.annotation.XmlElementRefs;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
|
||||||
import org.jclouds.dmtf.ovf.DeploymentOptionSection;
|
import org.jclouds.dmtf.ovf.DeploymentOptionSection;
|
||||||
|
@ -146,7 +146,7 @@ public class VAppTemplate extends ResourceEntity {
|
||||||
|
|
||||||
@XmlElement(name = "Owner")
|
@XmlElement(name = "Owner")
|
||||||
private Owner owner;
|
private Owner owner;
|
||||||
@XmlElementView(name = "Children")
|
@XmlElementWrapper(name = "Children")
|
||||||
@XmlElement(name = "Vm")
|
@XmlElement(name = "Vm")
|
||||||
private Set<VAppTemplate> children = Sets.newLinkedHashSet();
|
private Set<VAppTemplate> children = Sets.newLinkedHashSet();
|
||||||
@XmlElementRefs({
|
@XmlElementRefs({
|
||||||
|
|
|
@ -25,7 +25,7 @@ import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlAttribute;
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlSeeAlso;
|
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
@ -223,10 +223,10 @@ public class Vdc extends Entity {
|
||||||
private CapacityWithUsage storageCapacity;
|
private CapacityWithUsage storageCapacity;
|
||||||
@XmlElement(name = "ComputeCapacity", required = true)
|
@XmlElement(name = "ComputeCapacity", required = true)
|
||||||
private ComputeCapacity computeCapacity;
|
private ComputeCapacity computeCapacity;
|
||||||
@XmlElementView(name = "ResourceEntities")
|
@XmlElementWrapper(name = "ResourceEntities")
|
||||||
@XmlElement(name = "ResourceEntity")
|
@XmlElement(name = "ResourceEntity")
|
||||||
private Set<Reference> resourceEntities = Sets.newLinkedHashSet();
|
private Set<Reference> resourceEntities = Sets.newLinkedHashSet();
|
||||||
@XmlElementView(name = "AvailableNetworks")
|
@XmlElementWrapper(name = "AvailableNetworks")
|
||||||
@XmlElement(name = "Network")
|
@XmlElement(name = "Network")
|
||||||
protected Set<Reference> availableNetworks = Sets.newLinkedHashSet();
|
protected Set<Reference> availableNetworks = Sets.newLinkedHashSet();
|
||||||
@XmlElement(name = "Capabilities")
|
@XmlElement(name = "Capabilities")
|
||||||
|
|
|
@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
@ -208,19 +208,19 @@ public class AdminOrg extends Org {
|
||||||
|
|
||||||
@XmlElement(name = "Settings", required = true)
|
@XmlElement(name = "Settings", required = true)
|
||||||
private OrgSettings settings;
|
private OrgSettings settings;
|
||||||
@XmlElementView(name = "Users")
|
@XmlElementWrapper(name = "Users")
|
||||||
@XmlElement(name = "UserReference")
|
@XmlElement(name = "UserReference")
|
||||||
protected Set<Reference> users = Sets.newLinkedHashSet();
|
protected Set<Reference> users = Sets.newLinkedHashSet();
|
||||||
@XmlElementView(name = "Groups")
|
@XmlElementWrapper(name = "Groups")
|
||||||
@XmlElement(name = "GroupReference")
|
@XmlElement(name = "GroupReference")
|
||||||
protected Set<Reference> groups = Sets.newLinkedHashSet();
|
protected Set<Reference> groups = Sets.newLinkedHashSet();
|
||||||
@XmlElementView(name = "Catalogs")
|
@XmlElementWrapper(name = "Catalogs")
|
||||||
@XmlElement(name = "CatalogReference")
|
@XmlElement(name = "CatalogReference")
|
||||||
private Set<Reference> catalogs = Sets.newLinkedHashSet();
|
private Set<Reference> catalogs = Sets.newLinkedHashSet();
|
||||||
@XmlElementView(name = "Vdcs")
|
@XmlElementWrapper(name = "Vdcs")
|
||||||
@XmlElement(name = "Vdc")
|
@XmlElement(name = "Vdc")
|
||||||
protected Set<Reference> vdcs = Sets.newLinkedHashSet();
|
protected Set<Reference> vdcs = Sets.newLinkedHashSet();
|
||||||
@XmlElementView(name = "Networks")
|
@XmlElementWrapper(name = "Networks")
|
||||||
@XmlElement(name = "Network")
|
@XmlElement(name = "Network")
|
||||||
protected Set<Reference> networks = Sets.newLinkedHashSet();
|
protected Set<Reference> networks = Sets.newLinkedHashSet();
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlElementView;
|
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ public class ControlAccessParams {
|
||||||
protected Boolean sharedToEveryone;
|
protected Boolean sharedToEveryone;
|
||||||
@XmlElement(name = "EveryoneAccessLevel")
|
@XmlElement(name = "EveryoneAccessLevel")
|
||||||
protected String everyoneAccessLevel;
|
protected String everyoneAccessLevel;
|
||||||
@XmlElementView(name = "AccessSettings")
|
@XmlElementWrapper(name = "AccessSettings")
|
||||||
@XmlElement(name = "AccessSetting")
|
@XmlElement(name = "AccessSetting")
|
||||||
protected List<AccessSetting> accessSettings;
|
protected List<AccessSetting> accessSettings;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue