Disallow empty and space-only item names (#9)

findologic · Apr 24, 2019 · 35f2185 · 35f2185
1 parent 2669d68
commit 35f2185
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.findologic</groupId>
   <artifactId>xml-export</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.1-SNAPSHOT</version>
   <name>xml-export</name>
   <url>http://maven.apache.org</url>
   <dependencies>

diff --git a/src/main/resources/findologic.xsd b/src/main/resources/findologic.xsd
@@ -109,7 +109,7 @@
     <!-- Names -->
     <xs:complexType name="namesType">
         <xs:sequence>
-            <xs:element type="stringWithUsergroup" name="name" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element type="nameWithUsergroup" name="name" minOccurs="1" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
 
@@ -200,7 +200,7 @@
     <xs:simpleType name="usergroupHash">
         <xs:restriction base="xs:string">
             <xs:minLength value="1"/>
-        </xs:restriction>
+        </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="stringWithUsergroup">
         <xs:simpleContent>
@@ -209,6 +209,19 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
+    <xs:simpleType name="nonEmptyString">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:whiteSpace value="collapse"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="nameWithUsergroup">
+        <xs:simpleContent>
+            <xs:extension base="nonEmptyString">
+                <xs:attribute type="usergroupHash" name="usergroup" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
     <xs:complexType name="moneyWithUsergroup">
         <xs:simpleContent>
             <xs:extension base="money">
@@ -280,7 +293,7 @@
 
     <xs:complexType name="usergroupsType">
         <xs:sequence>
-            <xs:element type="usergroupHash" name="usergroup" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element type="usergroupHash" name="usergroup" minOccurs="0" maxOccurs="unbounded" />
         </xs:sequence>
     </xs:complexType>