Commit c1effa06 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Marked edited section in xjc auto-generated files; Added NodeTest

parent 1d8479c9

src/main/java/it/inaf/oats/vospace/datamodel/NodeTypeJsonResolver.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ public class NodeTypeJsonResolver extends TypeIdResolverBase { 
    @Override

    @Override

    public String idFromValue(Object o) {

    public String idFromValue(Object o) {

        Node node = (Node) o;

        Node node = (Node) o;

        return node.getType();

        return "vos:" + node.getClass().getSimpleName();

    }

    }





    @Override

    @Override

src/main/java/net/ivoa/xml/uws/v1/JobSummary.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -94,8 +94,10 @@ import org.w3c.dom.Element; 
    "errorSummary",

    "errorSummary",

    "jobInfo"

    "jobInfo"

})

})

// <edit>

@XmlSeeAlso({Transfer.class}) // Necessary for setting a Transfer inside the jobInfo property.

@XmlSeeAlso({Transfer.class}) // Necessary for setting a Transfer inside the jobInfo property.

@XmlRootElement(name = "job")

@XmlRootElement(name = "job")

// </edit>

public class JobSummary {

public class JobSummary {





    @XmlElement(required = true)

    @XmlElement(required = true)
@@ -510,8 +512,10 @@ public class JobSummary { 
    @XmlType(name = "", propOrder = {

    @XmlType(name = "", propOrder = {

        "any"

        "any"

    })

    })

    // <edit>

    @JsonSerialize(using = JobInfoSerializer.class)

    @JsonSerialize(using = JobInfoSerializer.class)

    @JsonDeserialize(using = JobInfoDeserializer.class)

    @JsonDeserialize(using = JobInfoDeserializer.class)

    // </edit>

    public static class JobInfo {

    public static class JobInfo {





        @XmlAnyElement(lax = true)

        @XmlAnyElement(lax = true)

src/main/java/net/ivoa/xml/uws/v1/package-info.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -8,13 +8,19 @@ 
@javax.xml.bind.annotation.XmlSchema(

@javax.xml.bind.annotation.XmlSchema(

        namespace = "http://www.ivoa.net/xml/UWS/v1.0",

        namespace = "http://www.ivoa.net/xml/UWS/v1.0",

        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,

        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,

        // <edit>

        // Defining the namespace prefix is necessary otherwise

        // Defining the namespace prefix is necessary otherwise

        // deserialized XML will have no prefixes

        // deserialized XML will have no prefixes

        xmlns = {

        xmlns = {

            @javax.xml.bind.annotation.XmlNs(

            @javax.xml.bind.annotation.XmlNs(

                    namespaceURI = "http://www.ivoa.net/xml/UWS/v1.0",

                    namespaceURI = "http://www.ivoa.net/xml/UWS/v1.0",

                    prefix = "uws"

                    prefix = "uws"

            ),

            @javax.xml.bind.annotation.XmlNs(

                    namespaceURI = "http://www.w3.org/2001/XMLSchema-instance",

                    prefix = "xsi"

            )

            )

        }

        }

        // </edit>

)

)

package net.ivoa.xml.uws.v1;
 
package net.ivoa.xml.uws.v1;

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -56,8 +56,10 @@ import javax.xml.bind.annotation.XmlType; 
@XmlType(name = "ContainerNode", propOrder = {

@XmlType(name = "ContainerNode", propOrder = {

    "nodes"

    "nodes"

})

})

// <edit>

@XmlRootElement(name = "node")

@XmlRootElement(name = "node")

@JsonDeserialize(converter = NodeTypeSetter.ContainerNode.class)

@JsonDeserialize(converter = NodeTypeSetter.ContainerNode.class)

// </edit>

public class ContainerNode

public class ContainerNode

    extends DataNode

    extends DataNode

{

{

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -45,8 +45,10 @@ import javax.xml.bind.annotation.XmlType; 
@XmlType(name = "LinkNode", propOrder = {

@XmlType(name = "LinkNode", propOrder = {

    "target"

    "target"

})

})

// <edit>

@XmlRootElement(name = "node")

@XmlRootElement(name = "node")

@JsonDeserialize(converter = NodeTypeSetter.LinkNode.class)

@JsonDeserialize(converter = NodeTypeSetter.LinkNode.class)

// </edit>

public class LinkNode

public class LinkNode

    extends Node

    extends Node

{

{