diff --git a/nb-configuration.xml b/nb-configuration.xml new file mode 100644 index 0000000000000000000000000000000000000000..ccc57164f9f4cc8c219ddbb737ceb6c575bc5352 --- /dev/null +++ b/nb-configuration.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-shared-configuration> + <!-- +This file contains additional configuration written by modules in the NetBeans IDE. +The configuration is intended to be shared among all the users of project and +therefore it is assumed to be part of version control checkout. +Without this configuration present, some functionality in the IDE may be limited or fail altogether. +--> + <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1"> + <!-- +Properties that influence various parts of the IDE, especially code formatting and the like. +You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up. +That way multiple projects can share the same settings (useful for formatting rules for example). +Any value defined here will override the pom.xml file value but is only applicable to the current project. +--> + <netbeans.hint.jdkPlatform>JDK_14</netbeans.hint.jdkPlatform> + </properties> +</project-shared-configuration> diff --git a/src/main/java/net/ivoa/xml/uws/v1/ShortJobDescription.java b/src/main/java/net/ivoa/xml/uws/v1/ShortJobDescription.java index 882e3fea103e0e1e8864e27ba7dd63ba43832233..2f67b394c1c5cbfce8561b6d80d78e7534150674 100644 --- a/src/main/java/net/ivoa/xml/uws/v1/ShortJobDescription.java +++ b/src/main/java/net/ivoa/xml/uws/v1/ShortJobDescription.java @@ -58,8 +58,8 @@ public class ShortJobDescription { @XmlSchemaType(name = "string") protected ExecutionPhase phase; protected String runId; - @XmlElementRef(name = "ownerId", namespace = "http://www.ivoa.net/xml/UWS/v1.0", type = JAXBElement.class, required = false) - protected JAXBElement<String> ownerId; + @XmlElement(required = true, nillable = true) + protected String ownerId; @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar creationTime; @XmlAttribute(name = "id", required = true) @@ -127,7 +127,7 @@ public class ShortJobDescription { * {@link JAXBElement }{@code <}{@link String }{@code >} * */ - public JAXBElement<String> getOwnerId() { + public String getOwnerId() { return ownerId; } @@ -139,7 +139,7 @@ public class ShortJobDescription { * {@link JAXBElement }{@code <}{@link String }{@code >} * */ - public void setOwnerId(JAXBElement<String> value) { + public void setOwnerId(String value) { this.ownerId = value; }