OneM2M_Types.ttcn

@@ -1769,11 +1769,11 @@ type record FilterCriteria
 	ResourceTypeList resourceType optional,
 	XSD.NonNegativeInteger sizeAbove optional,
 	XSD.PositiveInteger sizeBelow optional,
-	record of TypeOfContent contentType_list,
-	record of Attribute attribute_list,
+	record of TypeOfContent contentType_list optional,//TODO Make it optional
+	record of Attribute attribute_list optional,//TODO Make it optional
 	FilterUsage filterUsage optional,
 	XSD.NonNegativeInteger limit optional,
-	record of Sparql semanticsFilter_list,
+	record of Sparql semanticsFilter_list optional,//TODO Make it optional
 	XSD.Boolean filterOperation optional,
 	ContentFilterSyntax contentFilterSyntax optional,
 	XSD.String contentFilterQuery optional,
@@ -2034,7 +2034,7 @@ type record AccessControlRule
 }
 with {
   variant "name as uncapitalized";
-  //variant (accessControlContexts_list) "untagged";
+  variant (accessControlContexts_list) "untagged";
   variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
   variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
   variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
@@ -2042,7 +2042,7 @@ with {
   variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
   //variant (accessControlAuthenticationFlag) "text 'true' as '1'";
   //variant (accessControlAuthenticationFlag) "text 'false' as '0'";
-  //variant (accessControlObjectDetails_list) "untagged";
+  variant (accessControlObjectDetails_list) "untagged";
   variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
   variant (accessControlObjectDetails_list[-].childResourceType) "list";
 };
@@ -6143,9 +6143,9 @@ type record EventNotificationCriteria
 }
 with {
   variant "name as uncapitalized";
-//  variant (operationMonitor_list) "untagged";
+  variant (operationMonitor_list) "untagged";
   variant (operationMonitor_list[-]) "name as 'operationMonitor'";
-//  variant (notificationEventType_list) "untagged";
+  variant (notificationEventType_list) "untagged";
   variant (notificationEventType_list[-]) "name as 'notificationEventType'";
 };