move nodeName="" to <nodeName>

NASA-PDS · Feb 20, 2024 · a993cd3 · a993cd3
1 parent 7d1b438
commit a993cd3
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 34 deletions.
diff --git a/src/main/java/gov/nasa/pds/harvest/cfg/HarvestConfigurationType.java b/src/main/java/gov/nasa/pds/harvest/cfg/HarvestConfigurationType.java
@@ -9,8 +9,8 @@
 
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 import jakarta.xml.bind.annotation.XmlType;
 
@@ -41,12 +41,12 @@
  *         <element name="autogenFields" type="{}autogen_fields_type" minOccurs="0"/>
  *         <element name="load" type="{}load_type"/>
  *         <element name="fileInfo" type="{}file_info_type" minOccurs="0"/>
+ *         <element name="nodeName" type="{}node_name_enum"/>
  *         <element name="productFilter" type="{}filter_type" minOccurs="0"/>
  *         <element name="references" type="{}references_type" minOccurs="0"/>
  *         <element name="registry" type="{}registry_type"/>
  *         <element name="xpathMaps" type="{}xpath_maps_type" minOccurs="0"/>
  *       </all>
- *       <attribute name="nodeName" use="required" type="{}node_name_enum" />
  *     </restriction>
  *   </complexContent>
  * </complexType>
@@ -67,13 +67,14 @@ public class HarvestConfigurationType {
     @XmlElement(required = true)
     protected LoadType load;
     protected FileInfoType fileInfo;
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "normalizedString")
+    protected NodeNameEnum nodeName;
     protected FilterType productFilter;
     protected ReferencesType references;
     @XmlElement(required = true)
     protected RegistryType registry;
     protected XpathMapsType xpathMaps;
-    @XmlAttribute(name = "nodeName", required = true)
-    protected NodeNameEnum nodeName;
 
     /**
      * Gets the value of the autogenFields property.
@@ -147,6 +148,30 @@ public void setFileInfo(FileInfoType value) {
         this.fileInfo = value;
     }
 
+    /**
+     * Gets the value of the nodeName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link NodeNameEnum }
+     *     
+     */
+    public NodeNameEnum getNodeName() {
+        return nodeName;
+    }
+
+    /**
+     * Sets the value of the nodeName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link NodeNameEnum }
+     *     
+     */
+    public void setNodeName(NodeNameEnum value) {
+        this.nodeName = value;
+    }
+
     /**
      * Gets the value of the productFilter property.
      * 
@@ -243,28 +268,4 @@ public void setXpathMaps(XpathMapsType value) {
         this.xpathMaps = value;
     }
 
-    /**
-     * Gets the value of the nodeName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NodeNameEnum }
-     *     
-     */
-    public NodeNameEnum getNodeName() {
-        return nodeName;
-    }
-
-    /**
-     * Sets the value of the nodeName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NodeNameEnum }
-     *     
-     */
-    public void setNodeName(NodeNameEnum value) {
-        this.nodeName = value;
-    }
-
 }
diff --git a/src/main/resources/conf/configuration.xsd b/src/main/resources/conf/configuration.xsd
@@ -192,12 +192,12 @@
                   name="autogenFields" type="autogen_fields_type"/>
       <xs:element name="load" type="load_type"/>
       <xs:element minOccurs="0" name="fileInfo" type="file_info_type"/>
+      <xs:element name="nodeName" type="node_name_enum"/>
       <xs:element minOccurs="0" name="productFilter" type="filter_type"/>
       <xs:element minOccurs="0" name="references" type="references_type"/>
       <xs:element name="registry" type="registry_type"/>
       <xs:element minOccurs="0" name="xpathMaps" type="xpath_maps_type"/>
     </xs:all>
-    <xs:attribute name="nodeName" type="node_name_enum" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="load_type">

diff --git a/src/main/resources/conf/examples/bundles.xml b/src/main/resources/conf/examples/bundles.xml
@@ -17,8 +17,8 @@
   *     PSA      - Planetary Science Archive
   *     JAXA     - Japan Aerospace Exploration Agency
 -->
-<harvest nodeName="CHANGE_ME">
-
+<harvest>
+  <nodeName>CHANGE_ME</nodeName>
   <!-- Registry configuration -->
   <!-- UPDATE with your registry information -->
   <registry auth="/path/to/auth/file">app://localhost.xml</registry>

diff --git a/src/main/resources/conf/examples/directories.xml b/src/main/resources/conf/examples/directories.xml
@@ -14,7 +14,8 @@
   *     PSA      - Planetary Science Archive
   *     JAXA     - Japan Aerospace Exploration Agency
 -->
-<harvest nodeName="CHANGE_ME">
+<harvest>
+  <nodeName>CHANGE_ME</nodeName>
 
   <!-- Registry configuration -->
   <!-- UPDATE with your registry information -->

diff --git a/src/main/resources/conf/examples/files.xml b/src/main/resources/conf/examples/files.xml
@@ -14,7 +14,8 @@
   *     PSA      - Planetary Science Archive
   *     JAXA     - Japan Aerospace Exploration Agency
 -->
-<harvest nodeName="CHANGE_ME">
+<harvest>
+  <nodeName>CHANGE_ME</nodeName>
 
   <!-- Registry configuration -->
   <!-- UPDATE with your registry information -->

diff --git a/src/main/resources/conf/examples/xpaths.xml b/src/main/resources/conf/examples/xpaths.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<harvest nodeName="CHANGE_ME">
+<harvest>
+  <nodeName>CHANGE_ME</nodeName>
   <load>
     <directories>
       <!-- Path to one or more folders with PDS4 labels -->