SDS-2020-0241 - TS-0004_allowed_serializations_R4

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

CDT-commonTypes.xsd

@@ -271,9 +271,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<!-- auxiliary data type required to define "serializations" below -->
 	<xs:simpleType name="permittedMediaTypes"> 
 		<xs:restriction base="m2m:typeOfContent">
-			<xs:enumeration value="application/xml" />
-			<xs:enumeration value="application/json" />
-			<xs:enumeration value="application/cbor" />
+			<xs:enumeration value="xml" />
+			<xs:enumeration value="json" />
+			<xs:enumeration value="cbor" />
 		</xs:restriction>
 	</xs:simpleType> 
 	

CDT-enumerationTypes.xsd

@@ -1464,30 +1464,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="4" />
 		</xs:restriction>
 	</xs:simpleType>
-	
-	
-	<xs:simpleType name="serializationType">
-		<xs:annotation>
-			<xs:documentation>Used for the triggerInfoSrializationType field of trigger requests on Mcn</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:integer">
-			<!-- XML -->
-			<xs:enumeration value="1" />
-			<!-- JSON -->
-			<xs:enumeration value="2" />
-			<!-- XML + JSON -->
-			<xs:enumeration value="3" />
-			<!-- CBOR -->
-			<xs:enumeration value="4" />
-			<!-- XML + CBOR -->
-			<xs:enumeration value="5" />
-			<!-- JSON + CBOR -->
-			<xs:enumeration value="6" />
-			<!-- XML + JSON + CBOR -->
-			<xs:enumeration value="7" />
-		</xs:restriction>
-	</xs:simpleType>
-	
+		
 	<xs:simpleType name="authorizationDecision">
 		<xs:annotation>
 			<xs:documentation>Used for the decision attribute of the of authorizationDecision resource</xs:documentation>				

CDT-triggerPayload.xsd

@@ -39,16 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0"/>
 				<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0"/>
 				<xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0"/>
-				<xs:element name="triggerInfoSerializationTypes" minOccurs="0">      
-					<xs:simpleType>
-						<xs:restriction> 
-							<xs:simpleType> 
-								<xs:list itemType="m2m:serializationType"/> 
-							</xs:simpleType> 				
-							<xs:minLength value="1"/> 
-						</xs:restriction> 
-					</xs:simpleType>
-				</xs:element>
+				<xs:element name="triggerInfoSerializationTypes" type="m2m:serializations" minOccurs="0"/>      
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>