Remove DefaultFormat, use null for unspecified class format

zeroc-ice · Jul 31, 2024 · 10c57a6 · 10c57a6
1 parent 8204de3
commit 10c57a6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 35 deletions.
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
@@ -59,7 +59,7 @@ namespace
         {
             case DefaultFormat:
             {
-                return "Ice.FormatType.DefaultFormat";
+                return "null";
             }
             case CompactFormat:
             {

diff --git a/csharp/src/Ice/CurrentExtensions.cs b/csharp/src/Ice/CurrentExtensions.cs
@@ -25,7 +25,7 @@ public static OutgoingResponse createOutgoingResponse<TResult>(
         this Current current,
         TResult result,
         Action<OutputStream, TResult> marshal,
-        FormatType formatType = FormatType.DefaultFormat)
+        FormatType? formatType = null)
     {
         OutputStream ostr = current.startReplyStream();
         if (current.requestId != 0)

diff --git a/csharp/src/Ice/FormatType.cs b/csharp/src/Ice/FormatType.cs
@@ -9,7 +9,6 @@ namespace Ice;
 /// </summary>
 public enum FormatType
 {
-    DefaultFormat,
     CompactFormat,
     SlicedFormat
 }
diff --git a/csharp/src/Ice/Internal/OpaqueEndpointI.cs b/csharp/src/Ice/Internal/OpaqueEndpointI.cs
@@ -40,7 +40,7 @@ public OpaqueEndpointI(short type, Ice.InputStream s)
     //
     public override void streamWrite(Ice.OutputStream s)
     {
-        s.startEncapsulation(_rawEncoding, Ice.FormatType.DefaultFormat);
+        s.startEncapsulation(_rawEncoding);
         s.writeBlob(_rawBytes);
         s.endEncapsulation();
     }

diff --git a/csharp/src/Ice/Internal/OutgoingAsync.cs b/csharp/src/Ice/Internal/OutgoingAsync.cs
@@ -1058,7 +1058,7 @@ protected void invoke(string operation, bool synchronous)
 
     public void invoke(string operation,
                        Ice.OperationMode mode,
-                       Ice.FormatType format,
+                       Ice.FormatType? format,
                        Dictionary<string, string> context,
                        bool synchronous,
                        System.Action<Ice.OutputStream> write)
@@ -1144,7 +1144,7 @@ public OutgoingAsyncT(Ice.ObjectPrxHelperBase prx,
 
     public void invoke(string operation,
                        Ice.OperationMode mode,
-                       Ice.FormatType format,
+                       Ice.FormatType? format,
                        Dictionary<string, string> context,
                        bool synchronous,
                        System.Action<Ice.OutputStream> write = null,

diff --git a/csharp/src/Ice/OutputStream.cs b/csharp/src/Ice/OutputStream.cs
@@ -3,8 +3,7 @@
 #nullable enable
 
 using System.Diagnostics;
-using System.Net.Http.Headers;
-using System.Text;
+
 using Protocol = Ice.Internal.Protocol;
 
 namespace Ice;
@@ -22,8 +21,6 @@ public sealed class OutputStream
     /// <param name="format">The class format.</param>
     public OutputStream(EncodingVersion? encoding = null, FormatType format = FormatType.CompactFormat)
     {
-        Debug.Assert(format != FormatType.DefaultFormat); // TODO: remove default format from enum
-
         _buf = new Internal.Buffer();
         _encoding = encoding ?? Util.currentEncoding;
         _format = format;
@@ -68,15 +65,6 @@ public void clear()
         }
     }
 
-    /// <summary>
-    /// Sets the encoding format for class and exception instances.
-    /// </summary>
-    /// <param name="fmt">The encoding format.</param>
-    public void setFormat(FormatType fmt)
-    {
-        _format = fmt;
-    }
-
     /// <summary>
     /// Retrieves the closure object associated with this stream.
     /// </summary>
@@ -225,16 +213,17 @@ public void startEncapsulation()
         }
         else
         {
-            startEncapsulation(_encoding, FormatType.DefaultFormat);
+            startEncapsulation(_encoding, format: null);
         }
     }
 
     /// <summary>
     /// Writes the start of an encapsulation to the stream.
     /// </summary>
     /// <param name="encoding">The encoding version of the encapsulation.</param>
-    /// <param name="format">Specify the compact or sliced format.</param>
-    public void startEncapsulation(EncodingVersion encoding, FormatType format)
+    /// <param name="format">Specify the compact or sliced format. When null, use the OutputStream's class format.
+    /// </param>
+    public void startEncapsulation(EncodingVersion encoding, FormatType? format = null)
     {
         Protocol.checkSupportedEncoding(encoding);
 
@@ -251,7 +240,7 @@ public void startEncapsulation(EncodingVersion encoding, FormatType format)
         curr.next = _encapsStack;
         _encapsStack = curr;
 
-        _encapsStack.format = format;
+        _encapsStack.format = format ?? _format;
         _encapsStack.setEncoding(encoding);
         _encapsStack.start = _buf.b.position();
 
@@ -1771,7 +1760,7 @@ public void expand(int n)
 
     private Ice.Internal.Buffer _buf;
     private object? _closure;
-    private FormatType _format;
+    private readonly FormatType _format;
 
     private enum SliceType { NoSlice, ValueSlice, ExceptionSlice }
 
@@ -2341,7 +2330,7 @@ internal void setEncoding(EncodingVersion encoding)
         internal int start;
         internal EncodingVersion encoding;
         internal bool encoding_1_0;
-        internal FormatType format = FormatType.DefaultFormat;
+        internal FormatType format;
 
         internal EncapsEncoder? encoder;
 
@@ -2380,11 +2369,6 @@ private void initEncaps()
             _encapsStack.setEncoding(_encoding);
         }
 
-        if (_encapsStack.format == FormatType.DefaultFormat)
-        {
-            _encapsStack.format = _format;
-        }
-
         if (_encapsStack.encoder == null) // Lazy initialization.
         {
             if (_encapsStack.encoding_1_0)

diff --git a/csharp/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs
@@ -594,7 +594,7 @@ private void iceI_ice_isA(string id,
         iceCheckAsyncTwowayOnly(_ice_isA_name);
         getOutgoingAsync<bool>(completed).invoke(_ice_isA_name,
                                                  OperationMode.Idempotent,
-                                                 FormatType.DefaultFormat,
+                                                 FormatType.CompactFormat,
                                                  context,
                                                  synchronous,
                                                  (OutputStream os) => { os.writeString(id); },
@@ -647,7 +647,7 @@ private void iceI_ice_ping(Dictionary<string, string>? context, OutgoingAsyncCom
     {
         getOutgoingAsync<object>(completed).invoke(_ice_ping_name,
                                                    OperationMode.Idempotent,
-                                                   FormatType.DefaultFormat,
+                                                   FormatType.CompactFormat,
                                                    context,
                                                    synchronous);
     }
@@ -702,7 +702,7 @@ private void iceI_ice_ids(Dictionary<string, string>? context, OutgoingAsyncComp
         iceCheckAsyncTwowayOnly(_ice_ids_name);
         getOutgoingAsync<string[]>(completed).invoke(_ice_ids_name,
                                                      OperationMode.Idempotent,
-                                                     FormatType.DefaultFormat,
+                                                     FormatType.CompactFormat,
                                                      context,
                                                      synchronous,
                                                      read: (InputStream iss) => { return iss.readStringSeq(); });
@@ -755,7 +755,7 @@ private void iceI_ice_id(Dictionary<string, string>? context,
     {
         getOutgoingAsync<string>(completed).invoke(_ice_id_name,
                                                    OperationMode.Idempotent,
-                                                   FormatType.DefaultFormat,
+                                                   FormatType.CompactFormat,
                                                    context,
                                                    synchronous,
                                                    read: (InputStream iss) => { return iss.readString(); });

diff --git a/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs b/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs
@@ -10,7 +10,7 @@ public override bool ice_invoke(byte[] inParams, out byte[] outParams, Ice.Curre
             {
                 var communicator = current.adapter.getCommunicator();
                 var @out = new Ice.OutputStream(communicator);
-                @out.startEncapsulation(current.encoding, Ice.FormatType.DefaultFormat);
+                @out.startEncapsulation(current.encoding, FormatType.SlicedFormat);
                 var ae = new Test.AlsoEmpty();
                 @out.writeValue(ae);
                 @out.writePendingValues();