Improved profiles schemas

CHANGELOG.md

@@ -2,10 +2,16 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for gCube Catalogue (gCat) Service
 
+
+## [v2.5.3-SNAPSHOT] 
+
+- Improved profile schema #26471
+
+
 ## [v2.5.2] 
 
 - Enforce private to a rejected item to avoid issue #26391
-- Added profiel validation (i.e. regex validity and default value conformity) #26142
+- Added profile validation (i.e. regex validity and default value conformity) #26142
 
 
 ## [v2.5.1]

pom.xml

@@ -12,7 +12,7 @@
 	<groupId>org.gcube.data-catalogue</groupId>
 	<artifactId>gcat</artifactId>
 	<packaging>war</packaging>
-	<version>2.5.2</version>
+	<version>2.5.3-SNAPSHOT</version>
 	<name>gCube Catalogue (gCat) Service</name>
 	<description>
 		This service allows any client to publish on the gCube Catalogue.

src/test/resources/profile_schemas/profile4.xsd

@@ -7,7 +7,6 @@
 				<xs:element name="metadatafield" minOccurs="0" maxOccurs="unbounded">
 					<xs:complexType>
 						<xs:sequence>
-							<xs:element type="xs:string" name="fieldId" minOccurs="0"/>
 							<xs:element type="xs:string" name="fieldName" />
 							<xs:element type="xs:boolean" name="mandatory"
 								minOccurs="0" maxOccurs="1" />
@@ -22,7 +21,6 @@
 										<xs:enumeration value="Boolean" />
 										<xs:enumeration value="Number" />
 										<xs:enumeration value="GeoJSON" />
-										<xs:enumeration value="File" />
 									</xs:restriction>
 								</xs:simpleType>
 							</xs:element>
@@ -32,6 +30,7 @@
 								minOccurs="0" maxOccurs="1" />
 							<xs:element type="xs:string" name="note" minOccurs="0"
 								maxOccurs="1" />
+							<xs:choice>
 								<xs:element name="vocabulary" minOccurs="0" maxOccurs="1">
 									<xs:complexType>
 										<xs:sequence>
@@ -48,6 +47,7 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
+							</xs:choice>
 							<xs:element name="tagging" type="TaggingType"
 								minOccurs="0" maxOccurs="1">
 							</xs:element>

src/test/resources/profile_schemas/profile5.xsd

@@ -128,6 +128,7 @@
 			<xs:element type="xs:string" name="defaultValue" minOccurs="0"
 				maxOccurs="1"/>
 			<xs:element type="xs:string" name="note" minOccurs="0" maxOccurs="1"/>
+			<xs:choice>
 				<xs:element type="VocabularyType" name="vocabulary" minOccurs="0" maxOccurs="1" />
 				<xs:element name="validator" minOccurs="0" maxOccurs="1">
 					<xs:complexType>
@@ -136,6 +137,7 @@
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
+			</xs:choice>
 			<xs:choice>
 				<xs:element name="tags" minOccurs="0" maxOccurs="1">
 					<xs:complexType>