Use null coalescing operator.

Signed-off-by: Konstantina Chremmou <[email protected]>

Author: kc284

csharp/gen_csharp_binding.ml

@@ -711,7 +711,7 @@ and exposed_param p =
 and exposed_call_params message classname params =
   let exposedParams = List.map exposed_call_param params in
   let name = String.lowercase classname in
-  let refParam = sprintf "(_%s != null) ? _%s : \"\"" name name in
+  let refParam = sprintf "_%s ?? \"\"" name in
   let exposedParams = if is_method_static message then exposedParams else refParam::exposedParams in
   String.concat ", " ("session.uuid"::exposedParams)
 
@@ -1270,8 +1270,8 @@ and convert_to_proxy thing ty = (*function*)
   | Int                 -> sprintf "%s.ToString()" thing
   | Bool
   | Float               -> thing
-  | Ref _               -> sprintf "(%s != null) ? %s : \"\"" thing thing
-  | String              -> sprintf "(%s != null) ? %s : \"\"" thing thing
+  | Ref _               -> sprintf "%s ?? \"\"" thing
+  | String              -> sprintf "%s ?? \"\"" thing
   | Enum (name,_)       -> sprintf "%s_helper.ToString(%s)" name thing
   | Set (Ref name)         -> sprintf "(%s != null) ? Helper.RefListToStringArray(%s) : new string[] {}" thing thing
   | Set(String)         -> thing

csharp/src/Session.cs

@@ -1,30 +1,30 @@
 /*
- * Copyright (c) Citrix Systems, Inc.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- *   1) Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- * 
- *   2) Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials
- *      provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * Copyright (c) Citrix Systems, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   1) Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2) Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
@@ -387,7 +387,7 @@ public string get_this_host()
 
         public static string get_this_host(Session session, string _self)
         {
-            return (string)session.proxy.session_get_this_host(session.uuid, (_self != null) ? _self : "").parse();
+            return (string)session.proxy.session_get_this_host(session.uuid, _self ?? "").parse();
         }
 
         public string get_this_user()
@@ -397,7 +397,7 @@ public string get_this_user()
 
         public static string get_this_user(Session session, string _self)
         {
-            return (string)session.proxy.session_get_this_user(session.uuid, (_self != null) ? _self : "").parse();
+            return (string)session.proxy.session_get_this_user(session.uuid, _self ?? "").parse();
         }
 
         public bool get_is_local_superuser()
@@ -407,12 +407,12 @@ public bool get_is_local_superuser()
 
         public static bool get_is_local_superuser(Session session, string _self)
         {
-            return session.proxy.session_get_is_local_superuser(session.uuid, (_self != null) ? _self : "").parse();
+            return session.proxy.session_get_is_local_superuser(session.uuid, _self ?? "").parse();
         }
 
         public static string[] get_rbac_permissions(Session session, string _self)
         {
-            return session.proxy.session_get_rbac_permissions(session.uuid, (_self != null) ? _self : "").parse();
+            return session.proxy.session_get_rbac_permissions(session.uuid, _self ?? "").parse();
         }
 
         public DateTime get_last_active()
@@ -422,7 +422,7 @@ public DateTime get_last_active()
 
         public static DateTime get_last_active(Session session, string _self)
         {
-            return session.proxy.session_get_last_active(session.uuid, (_self != null) ? _self : "").parse();
+            return session.proxy.session_get_last_active(session.uuid, _self ?? "").parse();
         }
 
         public bool get_pool()
@@ -432,7 +432,7 @@ public bool get_pool()
 
         public static bool get_pool(Session session, string _self)
         {
-            return (bool)session.proxy.session_get_pool(session.uuid, (_self != null) ? _self : "").parse();
+            return (bool)session.proxy.session_get_pool(session.uuid, _self ?? "").parse();
         }
 
         public XenRef<Subject> get_subject()
@@ -442,7 +442,7 @@ public XenRef<Subject> get_subject()
 
         public static XenRef<Subject> get_subject(Session session, string _self)
         {
-            return new XenRef<Subject>(session.proxy.session_get_subject(session.uuid, (_self != null) ? _self : "").parse());
+            return new XenRef<Subject>(session.proxy.session_get_subject(session.uuid, _self ?? "").parse());
         }
 
         public string get_auth_user_sid()
@@ -452,7 +452,7 @@ public string get_auth_user_sid()
 
         public static string get_auth_user_sid(Session session, string _self)
         {
-            return (string)session.proxy.session_get_auth_user_sid(session.uuid, (_self != null) ? _self : "").parse();
+            return (string)session.proxy.session_get_auth_user_sid(session.uuid, _self ?? "").parse();
         }
 
         #region AD SID enumeration and bootout
@@ -508,7 +508,7 @@ public Dictionary<string, string> get_other_config()
 
         public static Dictionary<string, string> get_other_config(Session session, string _self)
         {
-            return Maps.convert_from_proxy_string_string(session.proxy.session_get_other_config(session.uuid, (_self != null) ? _self : "").parse());
+            return Maps.convert_from_proxy_string_string(session.proxy.session_get_other_config(session.uuid, _self ?? "").parse());
         }
 
         public void set_other_config(Dictionary<string, string> _other_config)
@@ -518,7 +518,7 @@ public void set_other_config(Dictionary<string, string> _other_config)
 
         public static void set_other_config(Session session, string _self, Dictionary<string, string> _other_config)
         {
-            session.proxy.session_set_other_config(session.uuid, (_self != null) ? _self : "", Maps.convert_to_proxy_string_string(_other_config)).parse();
+            session.proxy.session_set_other_config(session.uuid, _self ?? "", Maps.convert_to_proxy_string_string(_other_config)).parse();
         }
 
         public void add_to_other_config(string _key, string _value)
@@ -528,7 +528,7 @@ public void add_to_other_config(string _key, string _value)
 
         public static void add_to_other_config(Session session, string _self, string _key, string _value)
         {
-            session.proxy.session_add_to_other_config(session.uuid, (_self != null) ? _self : "", (_key != null) ? _key : "", (_value != null) ? _value : "").parse();
+            session.proxy.session_add_to_other_config(session.uuid, _self ?? "", _key ?? "", _value ?? "").parse();
         }
 
         public void remove_from_other_config(string _key)
@@ -538,7 +538,7 @@ public void remove_from_other_config(string _key)
 
         public static void remove_from_other_config(Session session, string _self, string _key)
         {
-            session.proxy.session_remove_from_other_config(session.uuid, (_self != null) ? _self : "", (_key != null) ? _key : "").parse();
+            session.proxy.session_remove_from_other_config(session.uuid, _self ?? "", _key ?? "").parse();
         }
 
         #endregion