Skip to content

Commit f8737bb

Browse files
rojiroji
committed
C# 6
1 parent 9c917ae commit f8737bb

File tree

89 files changed

+674
-1011
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+674
-1011
lines changed

‎src/Npgsql/BackendMessages/AuthenticationMessages.cs‎

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,48 +31,37 @@ namespace Npgsql.BackendMessages
3131
{
3232
internal abstract class AuthenticationRequestMessage : IBackendMessage
3333
{
34-
public BackendMessageCode Code { get { return BackendMessageCode.AuthenticationRequest; } }
34+
public BackendMessageCode Code => BackendMessageCode.AuthenticationRequest;
3535
internal abstract AuthenticationRequestType AuthRequestType { get; }
3636
}
3737

3838
internal class AuthenticationOkMessage : AuthenticationRequestMessage
3939
{
40-
internal override AuthenticationRequestType AuthRequestType {
41-
get { return AuthenticationRequestType.AuthenticationOk; }
42-
}
40+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationOk;
4341

4442
internal static readonly AuthenticationOkMessage Instance = new AuthenticationOkMessage();
4543
AuthenticationOkMessage() { }
4644
}
4745

4846
internal class AuthenticationKerberosV5Message : AuthenticationRequestMessage
4947
{
50-
internal override AuthenticationRequestType AuthRequestType
51-
{
52-
get { return AuthenticationRequestType.AuthenticationKerberosV5; }
53-
}
48+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationKerberosV5;
5449

5550
internal static readonly AuthenticationKerberosV5Message Instance = new AuthenticationKerberosV5Message();
5651
AuthenticationKerberosV5Message() { }
5752
}
5853

5954
internal class AuthenticationCleartextPasswordMessage : AuthenticationRequestMessage
6055
{
61-
internal override AuthenticationRequestType AuthRequestType
62-
{
63-
get { return AuthenticationRequestType.AuthenticationCleartextPassword; }
64-
}
56+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationCleartextPassword;
6557

6658
internal static readonly AuthenticationCleartextPasswordMessage Instance = new AuthenticationCleartextPasswordMessage();
6759
AuthenticationCleartextPasswordMessage() { }
6860
}
6961

7062
internal class AuthenticationMD5PasswordMessage : AuthenticationRequestMessage
7163
{
72-
internal override AuthenticationRequestType AuthRequestType
73-
{
74-
get { return AuthenticationRequestType.AuthenticationMD5Password; }
75-
}
64+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationMD5Password;
7665

7766
internal byte[] Salt { get; private set; }
7867

@@ -91,32 +80,23 @@ internal static AuthenticationMD5PasswordMessage Load(NpgsqlBuffer buf)
9180

9281
internal class AuthenticationSCMCredentialMessage : AuthenticationRequestMessage
9382
{
94-
internal override AuthenticationRequestType AuthRequestType
95-
{
96-
get { return AuthenticationRequestType.AuthenticationSCMCredential; }
97-
}
83+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationSCMCredential;
9884

9985
internal static readonly AuthenticationSCMCredentialMessage Instance = new AuthenticationSCMCredentialMessage();
10086
AuthenticationSCMCredentialMessage() { }
10187
}
10288

10389
internal class AuthenticationGSSMessage : AuthenticationRequestMessage
10490
{
105-
internal override AuthenticationRequestType AuthRequestType
106-
{
107-
get { return AuthenticationRequestType.AuthenticationGSS; }
108-
}
91+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationGSS;
10992

11093
internal static readonly AuthenticationGSSMessage Instance = new AuthenticationGSSMessage();
11194
AuthenticationGSSMessage() { }
11295
}
11396

11497
internal class AuthenticationGSSContinueMessage : AuthenticationRequestMessage
11598
{
116-
internal override AuthenticationRequestType AuthRequestType
117-
{
118-
get { return AuthenticationRequestType.AuthenticationGSSContinue; }
119-
}
99+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationGSSContinue;
120100

121101
internal byte[] AuthenticationData { get; private set; }
122102

@@ -136,10 +116,7 @@ internal static AuthenticationGSSContinueMessage Load(NpgsqlBuffer buf, int len)
136116

137117
internal class AuthenticationSSPIMessage : AuthenticationRequestMessage
138118
{
139-
internal override AuthenticationRequestType AuthRequestType
140-
{
141-
get { return AuthenticationRequestType.AuthenticationSSPI; }
142-
}
119+
internal override AuthenticationRequestType AuthRequestType => AuthenticationRequestType.AuthenticationSSPI;
143120

144121
internal static readonly AuthenticationSSPIMessage Instance = new AuthenticationSSPIMessage();
145122
AuthenticationSSPIMessage() { }

‎src/Npgsql/BackendMessages/BackendKeyDataMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Npgsql.BackendMessages
3030
{
3131
internal class BackendKeyDataMessage : IBackendMessage
3232
{
33-
public BackendMessageCode Code { get { return BackendMessageCode.BackendKeyData; } }
33+
public BackendMessageCode Code => BackendMessageCode.BackendKeyData;
3434

3535
internal int BackendProcessId { get; private set; }
3636
internal int BackendSecretKey { get; private set; }

‎src/Npgsql/BackendMessages/BindCompleteMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Npgsql.BackendMessages
3030
{
3131
internal class BindCompleteMessage : IBackendMessage
3232
{
33-
public BackendMessageCode Code { get { return BackendMessageCode.BindComplete; } }
33+
public BackendMessageCode Code => BackendMessageCode.BindComplete;
3434
internal static readonly BindCompleteMessage Instance = new BindCompleteMessage();
3535
BindCompleteMessage() { }
3636
}

‎src/Npgsql/BackendMessages/CloseCompletedMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Npgsql.BackendMessages
2525
{
2626
internal class CloseCompletedMessage : IBackendMessage
2727
{
28-
public BackendMessageCode Code { get { return BackendMessageCode.CloseComplete; } }
28+
public BackendMessageCode Code => BackendMessageCode.CloseComplete;
2929
internal static readonly CloseCompletedMessage Instance = new CloseCompletedMessage();
3030
CloseCompletedMessage() { }
3131
}

‎src/Npgsql/BackendMessages/CommandCompleteMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ void ParseRows(string token)
126126
}
127127
}
128128

129-
public BackendMessageCode Code { get { return BackendMessageCode.CompletedResponse; } }
129+
public BackendMessageCode Code => BackendMessageCode.CompletedResponse;
130130
}
131131
}

‎src/Npgsql/BackendMessages/CopyMessages.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ internal void Load(NpgsqlBuffer buf)
6565

6666
class CopyInResponseMessage : CopyResponseMessageBase
6767
{
68-
public override BackendMessageCode Code { get { return BackendMessageCode.CopyInResponse; } }
68+
public override BackendMessageCode Code => BackendMessageCode.CopyInResponse;
6969

7070
internal new CopyInResponseMessage Load(NpgsqlBuffer buf)
7171
{
@@ -76,7 +76,7 @@ class CopyInResponseMessage : CopyResponseMessageBase
7676

7777
class CopyOutResponseMessage : CopyResponseMessageBase
7878
{
79-
public override BackendMessageCode Code { get { return BackendMessageCode.CopyOutResponse; } }
79+
public override BackendMessageCode Code => BackendMessageCode.CopyOutResponse;
8080

8181
internal new CopyOutResponseMessage Load(NpgsqlBuffer buf)
8282
{
@@ -87,7 +87,7 @@ class CopyOutResponseMessage : CopyResponseMessageBase
8787

8888
class CopyBothResponseMessage : CopyResponseMessageBase
8989
{
90-
public override BackendMessageCode Code { get { return BackendMessageCode.CopyBothResponse; } }
90+
public override BackendMessageCode Code => BackendMessageCode.CopyBothResponse;
9191

9292
internal new CopyBothResponseMessage Load(NpgsqlBuffer buf)
9393
{
@@ -102,7 +102,7 @@ class CopyBothResponseMessage : CopyResponseMessageBase
102102
/// </summary>
103103
class CopyDataMessage : IBackendMessage
104104
{
105-
public BackendMessageCode Code { get { return BackendMessageCode.CopyData; } }
105+
public BackendMessageCode Code => BackendMessageCode.CopyData;
106106

107107
public int Length { get; private set; }
108108

@@ -118,11 +118,11 @@ internal CopyDataMessage Load(int len)
118118
/// </remarks>
119119
class CopyDoneMessage : SimpleFrontendMessage, IBackendMessage
120120
{
121-
public BackendMessageCode Code { get { return BackendMessageCode.CopyDone; } }
121+
public BackendMessageCode Code => BackendMessageCode.CopyDone;
122122
internal static readonly CopyDoneMessage Instance = new CopyDoneMessage();
123123
CopyDoneMessage() { }
124124

125-
internal override int Length { get { return 5; } }
125+
internal override int Length => 5;
126126

127127
internal override void Write(NpgsqlBuffer buf)
128128
{

‎src/Npgsql/BackendMessages/DataRowMessage.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Npgsql.BackendMessages
3535
{
3636
abstract class DataRowMessage : IBackendMessage
3737
{
38-
public BackendMessageCode Code { get { return BackendMessageCode.DataRow; } }
38+
public BackendMessageCode Code => BackendMessageCode.DataRow;
3939

4040
protected internal NpgsqlBuffer Buffer { get; protected set; }
4141

@@ -62,7 +62,7 @@ abstract class DataRowMessage : IBackendMessage
6262
/// </summary>
6363
internal int ColumnLen;
6464

65-
internal bool IsColumnNull { get { return ColumnLen == -1; } }
65+
internal bool IsColumnNull => ColumnLen == -1;
6666

6767
internal abstract DataRowMessage Load(NpgsqlBuffer buf);
6868

@@ -99,6 +99,7 @@ internal void SeekToColumnStart(int column)
9999

100100
#region Checks
101101

102+
// ReSharper disable once UnusedParameter.Global
102103
protected void CheckColumnIndex(int column)
103104
{
104105
if (column < 0 || column >= NumColumns)

‎src/Npgsql/BackendMessages/DataRowNonSequentialMessage.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
using System.Collections.Generic;
2626
using System.Diagnostics.Contracts;
2727
using System.IO;
28-
using System.Linq;
29-
using System.Text;
3028
using System.Threading;
3129
using System.Threading.Tasks;
3230

‎src/Npgsql/BackendMessages/DataRowSequentialMessage.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ internal override void SeekToColumn(int column)
6363

6464
if (column < Column)
6565
{
66-
throw new InvalidOperationException(string.Format("Invalid attempt to read from column ordinal '{0}'. With CommandBehavior.SequentialAccess, you may only read from column ordinal '{1}' or greater.", column, Column));
66+
throw new InvalidOperationException(
67+
$"Invalid attempt to read from column ordinal '{column}'. With CommandBehavior.SequentialAccess, you may only read from column ordinal '{Column}' or greater.");
6768
}
6869

6970
if (column == Column)

‎src/Npgsql/BackendMessages/EmptyQueryMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Npgsql.BackendMessages
3030
{
3131
internal class EmptyQueryMessage : IBackendMessage
3232
{
33-
public BackendMessageCode Code { get { return BackendMessageCode.EmptyQueryResponse; } }
33+
public BackendMessageCode Code => BackendMessageCode.EmptyQueryResponse;
3434
internal static readonly EmptyQueryMessage Instance = new EmptyQueryMessage();
3535
EmptyQueryMessage() { }
3636
}

0 commit comments

Comments
 (0)