From 70020b488d2b1479ec0a786b80f0f8873c5b80ac Mon Sep 17 00:00:00 2001
From: Nicola Fulvio Calabria <nicola.calabria@inaf.it>
Date: Thu, 21 Jan 2021 10:26:45 +0100
Subject: [PATCH] Switched ownerId field type in ShortJobDescription from
JAXBElement<String> to String for job list retrieval convenience.
---
nb-configuration.xml | 18 ++++++++++++++++++
.../ivoa/xml/uws/v1/ShortJobDescription.java | 8 ++++----
2 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 nb-configuration.xml
diff --git a/nb-configuration.xml b/nb-configuration.xml
new file mode 100644
index 0000000..ccc5716
--- /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 882e3fe..2f67b39 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;
}
--
GitLab