Simplified JAXB classes structure (removed wrapper list classes) (71e8d1d3) · Commits · VOSpace INAF / vospace-datamodel

src/main/java/net/ivoa/xml/vospace/v2/CapabilityList.java

deleted100644 → 0

+0 −80

Original line number	Original line	Diff line number	Diff line
	//
	// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802
	// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
	// Any modifications to this file will be lost upon recompilation of the source schema.
	// Generated on: 2020.10.24 at 09:39:16 AM CEST
	//


	package net.ivoa.xml.vospace.v2;

	import java.util.ArrayList;
	import java.util.List;
	import javax.xml.bind.annotation.XmlAccessType;
	import javax.xml.bind.annotation.XmlAccessorType;
	import javax.xml.bind.annotation.XmlElement;
	import javax.xml.bind.annotation.XmlType;


	/**
	*
	* A container element for a list of capabilities.
	*
	*
	* <p>Java class for CapabilityList complex type.
	*
	* <p>The following schema fragment specifies the expected content contained within this class.
	*
	* <pre>
	* <complexType name="CapabilityList">
	* <complexContent>
	* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
	* <sequence>
	* <element name="capability" type="{http://www.ivoa.net/xml/VOSpace/v2.0}Capability" maxOccurs="unbounded" minOccurs="0"/>
	* </sequence>
	* </restriction>
	* </complexContent>
	* </complexType>
	* </pre>
	*
	*
	*/
	@XmlAccessorType(XmlAccessType.FIELD)
	@XmlType(name = "CapabilityList", propOrder = {
	"capability"
	})
	public class CapabilityList {

	@XmlElement(nillable = true)
	protected List<Capability> capability;

	/**
	* Gets the value of the capability property.
	*
	* <p>
	* This accessor method returns a reference to the live list,
	* not a snapshot. Therefore any modification you make to the
	* returned list will be present inside the JAXB object.
	* This is why there is not a <CODE>set</CODE> method for the capability property.
	*
	* <p>
	* For example, to add a new item, do as follows:
	* <pre>
	* getCapability().add(newItem);
	* </pre>
	*
	*
	* <p>
	* Objects of the following type(s) are allowed in the list
	* {@link Capability }
	*
	*
	*/
	public List<Capability> getCapability() {
	if (capability == null) {
	capability = new ArrayList<Capability>();
	}
	return this.capability;
	}

	}

src/main/java/net/ivoa/xml/vospace/v2/DataNode.java

+38 −59

Original line number	Original line	Diff line number	Diff line
	@@ -8,9 +8,13 @@

	package net.ivoa.xml.vospace.v2;		package net.ivoa.xml.vospace.v2;

			import java.util.ArrayList;
			import java.util.List;
	import javax.xml.bind.annotation.XmlAccessType;		import javax.xml.bind.annotation.XmlAccessType;
	import javax.xml.bind.annotation.XmlAccessorType;		import javax.xml.bind.annotation.XmlAccessorType;
	import javax.xml.bind.annotation.XmlAttribute;		import javax.xml.bind.annotation.XmlAttribute;
			import javax.xml.bind.annotation.XmlElement;
			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;
	@@ -60,83 +64,58 @@ public class DataNode
	extends Node		extends Node
	{		{

	protected ViewList accepts;		// <edit>: ViewList replaced with List<View>
	protected ViewList provides;		@XmlElement(name = "view")
	protected CapabilityList capabilities;		@XmlElementWrapper(name = "accepts")
			protected List<View> accepts;

			@XmlElement(name = "view")
			@XmlElementWrapper(name = "provides")
			protected List<View> provides;

			// CapabilityList replaced with List<Capability>
			@XmlElement(name = "capability")
			@XmlElementWrapper(name = "capabilities")
			protected List<Capability> capabilities;
			// </edit>

	@XmlAttribute(name = "busy")		@XmlAttribute(name = "busy")
	protected Boolean busy;		protected Boolean busy;

	/**		// <edit>
	* Gets the value of the accepts property.		public List<View> getAccepts() {
	*		if (accepts == null) {
	* @return		accepts = new ArrayList<>();
	* possible object is		}
	* {@link ViewList }
	*
	*/
	public ViewList getAccepts() {
	return accepts;		return accepts;
	}		}

	/**		public void setAccepts(List<View> value) {
	* Sets the value of the accepts property.
	*
	* @param value
	* allowed object is
	* {@link ViewList }
	*
	*/
	public void setAccepts(ViewList value) {
	this.accepts = value;		this.accepts = value;
	}		}

	/**		public List<View> getProvides() {
	* Gets the value of the provides property.		if (provides == null) {
	*		provides = new ArrayList<>();
	* @return		}
	* possible object is
	* {@link ViewList }
	*
	*/
	public ViewList getProvides() {
	return provides;		return provides;
	}		}

	/**		public void setProvides(List<View> value) {
	* Sets the value of the provides property.
	*
	* @param value
	* allowed object is
	* {@link ViewList }
	*
	*/
	public void setProvides(ViewList value) {
	this.provides = value;		this.provides = value;
	}		}

	/**		public List<Capability> getCapabilities() {
	* Gets the value of the capabilities property.		if (capabilities == null) {
	*		capabilities = new ArrayList<>();
	* @return		}
	* possible object is
	* {@link CapabilityList }
	*
	*/
	public CapabilityList getCapabilities() {
	return capabilities;		return capabilities;
	}		}

	/**		public void setCapabilities(List<Capability> value) {
	* Sets the value of the capabilities property.
	*
	* @param value
	* allowed object is
	* {@link CapabilityList }
	*
	*/
	public void setCapabilities(CapabilityList value) {
	this.capabilities = value;		this.capabilities = value;
	}		}
			// </edit>

	/**		/**
	* Gets the value of the busy property.		* Gets the value of the busy property.

src/main/java/net/ivoa/xml/vospace/v2/GetPropertiesResponse.java

+31 −61

Original line number	Original line	Diff line number	Diff line
	@@ -8,9 +8,12 @@

	package net.ivoa.xml.vospace.v2;		package net.ivoa.xml.vospace.v2;

			import java.util.ArrayList;
			import java.util.List;
	import javax.xml.bind.annotation.XmlAccessType;		import javax.xml.bind.annotation.XmlAccessType;
	import javax.xml.bind.annotation.XmlAccessorType;		import javax.xml.bind.annotation.XmlAccessorType;
	import javax.xml.bind.annotation.XmlElement;		import javax.xml.bind.annotation.XmlElement;
			import javax.xml.bind.annotation.XmlElementWrapper;
	import javax.xml.bind.annotation.XmlType;		import javax.xml.bind.annotation.XmlType;


	@@ -43,83 +46,50 @@ import javax.xml.bind.annotation.XmlType;
	})		})
	public class GetPropertiesResponse {		public class GetPropertiesResponse {

	@XmlElement(required = true)		// <edit>: PropertyReferenceList replaced with List<PropertyReference>
	protected PropertyReferenceList accepts;		@XmlElement(name = "property")
	@XmlElement(required = true)		@XmlElementWrapper(name = "accepts", required = true)
	protected PropertyReferenceList provides;		protected List<PropertyReference> accepts;
	@XmlElement(required = true)
	protected PropertyReferenceList contains;

	/**		@XmlElement(name = "property")
	* Gets the value of the accepts property.		@XmlElementWrapper(name = "provides", required = true)
	*		protected List<PropertyReference> provides;
	* @return
	* possible object is		@XmlElement(name = "property")
	* {@link PropertyReferenceList }		@XmlElementWrapper(name = "contains", required = true)
	*		protected List<PropertyReference> contains;
	*/
	public PropertyReferenceList getAccepts() {		public List<PropertyReference> getAccepts() {
			if (accepts == null) {
			accepts = new ArrayList<>();
			}
	return accepts;		return accepts;
	}		}

	/**		public void setAccepts(List<PropertyReference> value) {
	* Sets the value of the accepts property.
	*
	* @param value
	* allowed object is
	* {@link PropertyReferenceList }
	*
	*/
	public void setAccepts(PropertyReferenceList value) {
	this.accepts = value;		this.accepts = value;
	}		}

	/**		public List<PropertyReference> getProvides() {
	* Gets the value of the provides property.		if (provides == null) {
	*		provides = new ArrayList<>();
	* @return		}
	* possible object is
	* {@link PropertyReferenceList }
	*
	*/
	public PropertyReferenceList getProvides() {
	return provides;		return provides;
	}		}

	/**		public void setProvides(List<PropertyReference> value) {
	* Sets the value of the provides property.
	*
	* @param value
	* allowed object is
	* {@link PropertyReferenceList }
	*
	*/
	public void setProvides(PropertyReferenceList value) {
	this.provides = value;		this.provides = value;
	}		}

	/**		public List<PropertyReference> getContains() {
	* Gets the value of the contains property.		if (contains == null) {
	*		contains = new ArrayList<>();
	* @return		}
	* possible object is
	* {@link PropertyReferenceList }
	*
	*/
	public PropertyReferenceList getContains() {
	return contains;		return contains;
	}		}

	/**		public void setContains(List<PropertyReference> value) {
	* Sets the value of the contains property.
	*
	* @param value
	* allowed object is
	* {@link PropertyReferenceList }
	*
	*/
	public void setContains(PropertyReferenceList value) {
	this.contains = value;		this.contains = value;
	}		}
			// </edit>
	}		}

src/main/java/net/ivoa/xml/vospace/v2/GetProtocolsResponse.java

+15 −41

Original line number	Original line	Diff line number	Diff line
	@@ -8,9 +8,11 @@

	package net.ivoa.xml.vospace.v2;		package net.ivoa.xml.vospace.v2;

			import java.util.List;
	import javax.xml.bind.annotation.XmlAccessType;		import javax.xml.bind.annotation.XmlAccessType;
	import javax.xml.bind.annotation.XmlAccessorType;		import javax.xml.bind.annotation.XmlAccessorType;
	import javax.xml.bind.annotation.XmlElement;		import javax.xml.bind.annotation.XmlElement;
			import javax.xml.bind.annotation.XmlElementWrapper;
	import javax.xml.bind.annotation.XmlType;		import javax.xml.bind.annotation.XmlType;


	@@ -41,57 +43,29 @@ import javax.xml.bind.annotation.XmlType;
	})		})
	public class GetProtocolsResponse {		public class GetProtocolsResponse {

	@XmlElement(required = true)		// <edit>: ProtocolList replaced with List<Protocol>
	protected ProtocolList accepts;		@XmlElement(name = "protocol")
	@XmlElement(required = true)		@XmlElementWrapper(name = "accepts", required = true)
	protected ProtocolList provides;		protected List<Protocol> accepts;

	/**		@XmlElement(name = "protocol")
	* Gets the value of the accepts property.		@XmlElementWrapper(name = "provides", required = true)
	*		protected List<Protocol> provides;
	* @return
	* possible object is		public List<Protocol> getAccepts() {
	* {@link ProtocolList }
	*
	*/
	public ProtocolList getAccepts() {
	return accepts;		return accepts;
	}		}

	/**		public void setAccepts(List<Protocol> value) {
	* Sets the value of the accepts property.
	*
	* @param value
	* allowed object is
	* {@link ProtocolList }
	*
	*/
	public void setAccepts(ProtocolList value) {
	this.accepts = value;		this.accepts = value;
	}		}

	/**		public List<Protocol> getProvides() {
	* Gets the value of the provides property.
	*
	* @return
	* possible object is
	* {@link ProtocolList }
	*
	*/
	public ProtocolList getProvides() {
	return provides;		return provides;
	}		}

	/**		public void setProvides(List<Protocol> value) {
	* Sets the value of the provides property.
	*
	* @param value
	* allowed object is
	* {@link ProtocolList }
	*
	*/
	public void setProvides(ProtocolList value) {
	this.provides = value;		this.provides = value;
	}		}
			// </edit>
	}		}

src/main/java/net/ivoa/xml/vospace/v2/GetViewsResponse.java

+22 −41

Original line number	Original line	Diff line number	Diff line
	@@ -8,9 +8,12 @@

	package net.ivoa.xml.vospace.v2;		package net.ivoa.xml.vospace.v2;

			import java.util.ArrayList;
			import java.util.List;
	import javax.xml.bind.annotation.XmlAccessType;		import javax.xml.bind.annotation.XmlAccessType;
	import javax.xml.bind.annotation.XmlAccessorType;		import javax.xml.bind.annotation.XmlAccessorType;
	import javax.xml.bind.annotation.XmlElement;		import javax.xml.bind.annotation.XmlElement;
			import javax.xml.bind.annotation.XmlElementWrapper;
	import javax.xml.bind.annotation.XmlType;		import javax.xml.bind.annotation.XmlType;


	@@ -41,57 +44,35 @@ import javax.xml.bind.annotation.XmlType;
	})		})
	public class GetViewsResponse {		public class GetViewsResponse {

	@XmlElement(required = true)		// <edit>: ViewList replaced with List<View>
	protected ViewList accepts;		@XmlElement(name = "view")
	@XmlElement(required = true)		@XmlElementWrapper(name = "accepts", required = true)
	protected ViewList provides;		protected List<View> accepts;

	/**		@XmlElement(name = "view")
	* Gets the value of the accepts property.		@XmlElementWrapper(name = "provides", required = true)
	*		protected List<View> provides;
	* @return
	* possible object is		public List<View> getAccepts() {
	* {@link ViewList }		if (accepts == null) {
	*		accepts = new ArrayList<>();
	*/		}
	public ViewList getAccepts() {
	return accepts;		return accepts;
	}		}

	/**		public void setAccepts(List<View> value) {
	* Sets the value of the accepts property.
	*
	* @param value
	* allowed object is
	* {@link ViewList }
	*
	*/
	public void setAccepts(ViewList value) {
	this.accepts = value;		this.accepts = value;
	}		}

	/**		public List<View> getProvides() {
	* Gets the value of the provides property.
	*
	* @return
	* possible object is
	* {@link ViewList }
	*
	*/
	public ViewList getProvides() {
	return provides;		return provides;
	}		}

	/**		public void setProvides(List<View> value) {
	* Sets the value of the provides property.		if (provides == null) {
	*		provides = new ArrayList<>();
	* @param value		}
	* allowed object is
	* {@link ViewList }
	*
	*/
	public void setProvides(ViewList value) {
	this.provides = value;		this.provides = value;
	}		}
			// </edit>
	}		}