From 7cebe2beb581cb05f82105d5b4dfcb3a4818768a Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 23 Jan 2024 17:15:20 +0100
Subject: [PATCH] Improved profiles schemas

---
 CHANGELOG.md                                  |  8 +++-
 pom.xml                                       |  2 +-
 .../resources/profile_schemas/profile4.xsd    | 38 +++++++++----------
 .../resources/profile_schemas/profile5.xsd    | 18 +++++----
 4 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 228da9a..979c64b 100644
--- a/CHANGELOG.md
+++ b/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]
diff --git a/pom.xml b/pom.xml
index 93232a2..a96ba6e 100644
--- a/pom.xml
+++ b/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.
diff --git a/src/test/resources/profile_schemas/profile4.xsd b/src/test/resources/profile_schemas/profile4.xsd
index c5b34e7..1259400 100644
--- a/src/test/resources/profile_schemas/profile4.xsd
+++ b/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,22 +30,24 @@
 								minOccurs="0" maxOccurs="1" />
 							<xs:element type="xs:string" name="note" minOccurs="0"
 								maxOccurs="1" />
-							<xs:element name="vocabulary" minOccurs="0" maxOccurs="1">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element type="xs:string" name="vocabularyField"
-											minOccurs="1" maxOccurs="unbounded" />
-									</xs:sequence>
-									<xs:attribute type="xs:boolean" name="isMultiSelection" />
-								</xs:complexType>
-							</xs:element>
-							<xs:element name="validator" minOccurs="0" maxOccurs="1">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element type="xs:string" name="regularExpression" />
-									</xs:sequence>
-								</xs:complexType>
-							</xs:element>
+							<xs:choice>
+								<xs:element name="vocabulary" minOccurs="0" maxOccurs="1">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element type="xs:string" name="vocabularyField"
+												minOccurs="1" maxOccurs="unbounded" />
+										</xs:sequence>
+										<xs:attribute type="xs:boolean" name="isMultiSelection" />
+									</xs:complexType>
+								</xs:element>
+								<xs:element name="validator" minOccurs="0" maxOccurs="1">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element type="xs:string" name="regularExpression" />
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+							</xs:choice>
 							<xs:element name="tagging" type="TaggingType"
 								minOccurs="0" maxOccurs="1">
 							</xs:element>
@@ -92,4 +92,4 @@
 			<xs:minLength value="1" />
 		</xs:restriction>
 	</xs:simpleType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/src/test/resources/profile_schemas/profile5.xsd b/src/test/resources/profile_schemas/profile5.xsd
index a0f97a1..5b0a16b 100644
--- a/src/test/resources/profile_schemas/profile5.xsd
+++ b/src/test/resources/profile_schemas/profile5.xsd
@@ -128,14 +128,16 @@
 			<xs:element type="xs:string" name="defaultValue" minOccurs="0"
 				maxOccurs="1"/>
 			<xs:element type="xs:string" name="note" minOccurs="0" maxOccurs="1"/>
-			<xs:element type="VocabularyType" name="vocabulary" minOccurs="0" maxOccurs="1" />
-			<xs:element name="validator" minOccurs="0" maxOccurs="1">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element type="xs:string" name="regularExpression"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
+			<xs:choice>
+				<xs:element type="VocabularyType" name="vocabulary" minOccurs="0" maxOccurs="1" />
+				<xs:element name="validator" minOccurs="0" maxOccurs="1">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element type="xs:string" name="regularExpression"/>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:choice>
 			<xs:choice>
 				<xs:element name="tags" minOccurs="0" maxOccurs="1">
 					<xs:complexType>