commit fad7fd3e5a850c0f4bf57e7370fad359d575fdc6
author Jens Geyer <jensg@apache.org> Sat Nov 09 23:24:52 2019 +0100
committer Jens Geyer <jensg@apache.org> Wed Nov 13 09:34:58 2019 +0100
tree c92cb9fb6ad206d1a00a64236c331b80e812f06b
parent 9f11c1e545a9aa0db076e9b5be9b7e397e594f4a

THRIFT-5005 Refactoring of the Delphi libs [ci skip]
Client: Delphi
Patch: Jens Geyer

lib/delphi/src/Thrift.Transport.pas

diff --git a/lib/delphi/src/Thrift.Transport.pas b/lib/delphi/src/Thrift.Transport.pas
index df087a1..b6e3c99 100644
--- a/lib/delphi/src/Thrift.Transport.pas
+++ b/lib/delphi/src/Thrift.Transport.pas
@@ -64,7 +64,7 @@
   end;
 
   TTransportImpl = class( TInterfacedObject, ITransport)
-  protected
+  strict protected
     function GetIsOpen: Boolean; virtual; abstract;
     property IsOpen: Boolean read GetIsOpen;
     function Peek: Boolean; virtual;
@@ -93,7 +93,7 @@
         BadArgs,
         Interrupted
       );
-  protected
+  strict protected
     constructor HiddenCreate(const Msg: string);
     class function GetType: TExceptionType;  virtual; abstract;
   public
@@ -110,37 +110,37 @@
   end;
 
   TTransportExceptionUnknown = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
   TTransportExceptionNotOpen = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
   TTransportExceptionAlreadyOpen = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
   TTransportExceptionTimedOut = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
   TTransportExceptionEndOfFile = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
   TTransportExceptionBadArgs = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
   TTransportExceptionInterrupted = class (TTransportExceptionSpecialized)
-  protected
+  strict protected
     class function GetType: TTransportException.TExceptionType;  override;
   end;
 
@@ -182,7 +182,7 @@
   end;
 
   TServerTransportImpl = class( TInterfacedObject, IServerTransport)
-  protected
+  strict protected
     procedure Listen; virtual; abstract;
     procedure Close; virtual; abstract;
     function Accept( const fnAccepting: TProc): ITransport;  virtual; abstract;
@@ -199,9 +199,9 @@
 
   TTcpSocketStreamImpl = class( TThriftStreamImpl )
 {$IFDEF OLD_SOCKETS}
-  private type
+  strict private type
     TWaitForData = ( wfd_HaveData, wfd_Timeout, wfd_Error);
-  private
+  strict private
     FTcpClient : TCustomIpClient;
     FTimeout : Integer;
     function Select( ReadReady, WriteReady, ExceptFlag: PBoolean;
@@ -210,10 +210,10 @@
                           var wsaError, bytesReady : Integer): TWaitForData;
 {$ELSE}
     FTcpClient: TSocket;
-  protected const
+  strict protected const
     SLEEP_TIME = 200;
 {$ENDIF}
-  protected
+  strict protected
     procedure Write( const pBuf : Pointer; offset, count: Integer); override;
     function Read( const pBuf : Pointer; const buflen : Integer; offset: Integer; count: Integer): Integer; override;
     procedure Open; override;
@@ -239,10 +239,10 @@
   end;
 
   TStreamTransportImpl = class( TTransportImpl, IStreamTransport)
-  protected
+  strict protected
     FInputStream : IThriftStream;
     FOutputStream : IThriftStream;
-  protected
+  strict protected
     function GetIsOpen: Boolean; override;
 
     function GetInputStream: IThriftStream;
@@ -261,12 +261,12 @@
   end;
 
   TBufferedStreamImpl = class( TThriftStreamImpl)
-  private
+  strict private
     FStream : IThriftStream;
     FBufSize : Integer;
     FReadBuffer : TMemoryStream;
     FWriteBuffer : TMemoryStream;
-  protected
+  strict protected
     procedure Write( const pBuf : Pointer; offset: Integer; count: Integer); override;
     function Read( const pBuf : Pointer; const buflen : Integer; offset: Integer; count: Integer): Integer; override;
     procedure Open;  override;
@@ -280,7 +280,7 @@
   end;
 
   TServerSocketImpl = class( TServerTransportImpl)
-  private
+  strict private
 {$IFDEF OLD_SOCKETS}
     FServer : TTcpServer;
     FPort : Integer;
@@ -290,7 +290,7 @@
 {$ENDIF}
     FUseBufferedSocket : Boolean;
     FOwnsServer : Boolean;
-  protected
+  strict protected
     function Accept( const fnAccepting: TProc) : ITransport; override;
   public
 {$IFDEF OLD_SOCKETS}
@@ -306,7 +306,7 @@
   end;
 
   TBufferedTransportImpl = class( TTransportImpl )
-  private
+  strict private
     FInputBuffer : IThriftStream;
     FOutputBuffer : IThriftStream;
     FTransport : IStreamTransport;
@@ -314,7 +314,7 @@
 
     procedure InitBuffers;
     function GetUnderlyingTransport: ITransport;
-  protected
+  strict protected
     function GetIsOpen: Boolean; override;
     procedure Flush; override;
   public
@@ -329,7 +329,7 @@
   end;
 
   TSocketImpl = class(TStreamTransportImpl)
-  private
+  strict private
 {$IFDEF OLD_SOCKETS}
     FClient : TCustomIpClient;
 {$ELSE}
@@ -345,7 +345,7 @@
 {$ENDIF}
 
     procedure InitSocket;
-  protected
+  strict protected
     function GetIsOpen: Boolean; override;
   public
     procedure Open; override;
@@ -368,11 +368,11 @@
   end;
 
   TFramedTransportImpl = class( TTransportImpl)
-  private const
+  strict private const
     FHeaderSize : Integer = 4;
-  private class var
+  strict private class var
     FHeader_Dummy : array of Byte;
-  protected
+  strict protected
     FTransport : ITransport;
     FWriteBuffer : TMemoryStream;
     FReadBuffer : TMemoryStream;