Skip to content

Commit b363a7c

Browse files
bgraingerbgrainger
committed
Use more expression-bodied members.
1 parent 8d0d348 commit b363a7c

File tree

9 files changed

+34
-126
lines changed

9 files changed

+34
-126
lines changed

‎src/MySqlConnector/MySqlClient/MySqlCommand.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,7 @@ private void VerifyValid()
181181
throw new MySqlException("There is already an open DataReader associated with this Connection which must be closed first.");
182182
}
183183

184-
internal void ReaderClosed()
185-
{
186-
var executor = m_commandExecutor as StoredProcedureCommandExecutor;
187-
executor?.SetParams();
188-
}
184+
internal void ReaderClosed() => (m_commandExecutor as StoredProcedureCommandExecutor)?.SetParams();
189185

190186
MySqlParameterCollection m_parameterCollection;
191187
CommandType m_commandType;

‎src/MySqlConnector/MySqlClient/MySqlConnection.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ namespace MySql.Data.MySqlClient
1414
public sealed class MySqlConnection : DbConnection
1515
{
1616
public MySqlConnection()
17+
: this("")
1718
{
18-
ConnectionString = "";
1919
}
2020

21-
public MySqlConnection(string connectionString)
22-
: this()
23-
{
24-
ConnectionString = connectionString;
25-
}
21+
public MySqlConnection(string connectionString) => ConnectionString = connectionString;
2622

2723
public new MySqlTransaction BeginTransaction() => (MySqlTransaction) base.BeginTransaction();
2824

@@ -143,10 +139,7 @@ private async Task OpenAsync(IOBehavior ioBehavior, CancellationToken cancellati
143139

144140
public override string ConnectionString
145141
{
146-
get
147-
{
148-
return m_connectionStringBuilder.GetConnectionString(!m_hasBeenOpened || m_connectionSettings.PersistSecurityInfo);
149-
}
142+
get => m_connectionStringBuilder.GetConnectionString(!m_hasBeenOpened || m_connectionSettings.PersistSecurityInfo);
150143
set
151144
{
152145
if (m_hasBeenOpened)

‎src/MySqlConnector/MySqlClient/MySqlParameterCollection.cs

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -49,41 +49,23 @@ public MySqlParameter AddWithValue(string parameterName, object value)
4949
return parameter;
5050
}
5151

52-
public override bool Contains(object value)
53-
{
54-
return m_parameters.Contains((MySqlParameter) value);
55-
}
52+
public override bool Contains(object value) => m_parameters.Contains((MySqlParameter) value);
5653

57-
public override bool Contains(string value)
58-
{
59-
return IndexOf(value) != -1;
60-
}
54+
public override bool Contains(string value) => IndexOf(value) != -1;
6155

62-
public override void CopyTo(Array array, int index)
63-
{
64-
throw new NotSupportedException();
65-
}
56+
public override void CopyTo(Array array, int index) => throw new NotSupportedException();
6657

6758
public override void Clear()
6859
{
6960
m_parameters.Clear();
7061
m_nameToIndex.Clear();
7162
}
7263

73-
public override IEnumerator GetEnumerator()
74-
{
75-
return m_parameters.GetEnumerator();
76-
}
64+
public override IEnumerator GetEnumerator() => m_parameters.GetEnumerator();
7765

78-
IEnumerator<MySqlParameter> IEnumerable<MySqlParameter>.GetEnumerator()
79-
{
80-
return m_parameters.GetEnumerator();
81-
}
66+
IEnumerator<MySqlParameter> IEnumerable<MySqlParameter>.GetEnumerator() => m_parameters.GetEnumerator();
8267

83-
protected override DbParameter GetParameter(int index)
84-
{
85-
return m_parameters[index];
86-
}
68+
protected override DbParameter GetParameter(int index) => m_parameters[index];
8769

8870
protected override DbParameter GetParameter(string parameterName)
8971
{
@@ -93,10 +75,7 @@ protected override DbParameter GetParameter(string parameterName)
9375
return m_parameters[index];
9476
}
9577

96-
public override int IndexOf(object value)
97-
{
98-
return m_parameters.IndexOf((MySqlParameter) value);
99-
}
78+
public override int IndexOf(object value) => m_parameters.IndexOf((MySqlParameter) value);
10079

10180
public override int IndexOf(string parameterName)
10281
{
@@ -113,21 +92,15 @@ internal int NormalizedIndexOf(string parameterName)
11392
return m_nameToIndex.TryGetValue(MySqlParameter.NormalizeParameterName(parameterName), out var index) ? index : -1;
11493
}
11594

116-
public override void Insert(int index, object value)
117-
{
118-
m_parameters.Insert(index, (MySqlParameter) value);
119-
}
95+
public override void Insert(int index, object value) => m_parameters.Insert(index, (MySqlParameter) value);
12096

12197
#if !NETSTANDARD1_3
12298
public override bool IsFixedSize => false;
12399
public override bool IsReadOnly => false;
124100
public override bool IsSynchronized => false;
125101
#endif
126102

127-
public override void Remove(object value)
128-
{
129-
RemoveAt(IndexOf(value));
130-
}
103+
public override void Remove(object value) => RemoveAt(IndexOf(value));
131104

132105
public override void RemoveAt(int index)
133106
{
@@ -143,10 +116,7 @@ public override void RemoveAt(int index)
143116
}
144117
}
145118

146-
public override void RemoveAt(string parameterName)
147-
{
148-
RemoveAt(IndexOf(parameterName));
149-
}
119+
public override void RemoveAt(string parameterName) => RemoveAt(IndexOf(parameterName));
150120

151121
protected override void SetParameter(int index, DbParameter value)
152122
{
@@ -159,10 +129,7 @@ protected override void SetParameter(int index, DbParameter value)
159129
m_nameToIndex.Add(newParameter.NormalizedParameterName, index);
160130
}
161131

162-
protected override void SetParameter(string parameterName, DbParameter value)
163-
{
164-
SetParameter(IndexOf(parameterName), value);
165-
}
132+
protected override void SetParameter(string parameterName, DbParameter value) => SetParameter(IndexOf(parameterName), value);
166133

167134
public override int Count => m_parameters.Count;
168135

‎src/MySqlConnector/MySqlClient/Results/Row.cs

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ namespace MySql.Data.MySqlClient.Results
88
{
99
internal class Row : IDisposable
1010
{
11-
public Row(ResultSet resultSet)
12-
{
13-
ResultSet = resultSet;
14-
}
11+
public Row(ResultSet resultSet) => ResultSet = resultSet;
1512

1613
public void SetData(int[] dataLengths, int[] dataOffsets, byte[] payload)
1714
{
@@ -40,10 +37,7 @@ public void BufferData()
4037
m_buffered = true;
4138
}
4239

43-
public void Dispose()
44-
{
45-
ClearData();
46-
}
40+
public void Dispose() => ClearData();
4741

4842
public void ClearData()
4943
{
@@ -84,15 +78,9 @@ public bool GetBoolean(int ordinal)
8478
return (bool) value;
8579
}
8680

87-
public sbyte GetSByte(int ordinal)
88-
{
89-
return (sbyte) GetValue(ordinal);
90-
}
81+
public sbyte GetSByte(int ordinal) => (sbyte) GetValue(ordinal);
9182

92-
public byte GetByte(int ordinal)
93-
{
94-
return (byte) GetValue(ordinal);
95-
}
83+
public byte GetByte(int ordinal) => (byte) GetValue(ordinal);
9684

9785
public long GetBytes(int ordinal, long dataOffset, byte[] buffer, int bufferOffset, int length)
9886
{
@@ -123,10 +111,7 @@ public long GetBytes(int ordinal, long dataOffset, byte[] buffer, int bufferOffs
123111
return lengthToCopy;
124112
}
125113

126-
public char GetChar(int ordinal)
127-
{
128-
return (char) GetValue(ordinal);
129-
}
114+
public char GetChar(int ordinal) => (char) GetValue(ordinal);
130115

131116
public long GetChars(int ordinal, long dataOffset, char[] buffer, int bufferOffset, int length) => throw new NotImplementedException();
132117

@@ -220,36 +205,21 @@ public long GetInt64(int ordinal)
220205
return (long) value;
221206
}
222207

223-
public DateTime GetDateTime(int ordinal)
224-
{
225-
return (DateTime) GetValue(ordinal);
226-
}
208+
public DateTime GetDateTime(int ordinal) => (DateTime) GetValue(ordinal);
227209

228-
public DateTimeOffset GetDateTimeOffset(int ordinal)
229-
{
230-
return new DateTimeOffset(DateTime.SpecifyKind(GetDateTime(ordinal), DateTimeKind.Utc));
231-
}
210+
public DateTimeOffset GetDateTimeOffset(int ordinal) => new DateTimeOffset(DateTime.SpecifyKind(GetDateTime(ordinal), DateTimeKind.Utc));
232211

233-
public string GetString(int ordinal)
234-
{
235-
return (string) GetValue(ordinal);
236-
}
212+
public string GetString(int ordinal) => (string) GetValue(ordinal);
237213

238-
public decimal GetDecimal(int ordinal)
239-
{
240-
return (decimal) GetValue(ordinal);
241-
}
214+
public decimal GetDecimal(int ordinal) => (decimal) GetValue(ordinal);
242215

243216
public double GetDouble(int ordinal)
244217
{
245218
object value = GetValue(ordinal);
246219
return value is float floatValue ? floatValue : (double) value;
247220
}
248221

249-
public float GetFloat(int ordinal)
250-
{
251-
return (float) GetValue(ordinal);
252-
}
222+
public float GetFloat(int ordinal) => (float) GetValue(ordinal);
253223

254224
public int GetValues(object[] values)
255225
{
@@ -259,11 +229,7 @@ public int GetValues(object[] values)
259229
return count;
260230
}
261231

262-
public bool IsDBNull(int ordinal)
263-
{
264-
// TODO: Correct exception for invalid ordinal?
265-
return m_dataOffsets[ordinal] == -1;
266-
}
232+
public bool IsDBNull(int ordinal) => m_dataOffsets[ordinal] == -1;
267233

268234
public object this[int ordinal] => GetValue(ordinal);
269235

‎src/MySqlConnector/Serialization/ErrorPayload.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ internal class ErrorPayload
1010
public string State { get; }
1111
public string Message { get; }
1212

13-
public MySqlException ToException()
14-
{
15-
return new MySqlException(ErrorCode, State, Message);
16-
}
13+
public MySqlException ToException() => new MySqlException(ErrorCode, State, Message);
1714

1815
public static ErrorPayload Create(PayloadData payload)
1916
{

‎src/MySqlConnector/Serialization/PingPayload.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ namespace MySql.Data.Serialization
44
{
55
internal class PingPayload
66
{
7-
public static PayloadData Create()
8-
{
9-
return new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.Ping }));
10-
}
7+
public static PayloadData Create() => new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.Ping }));
118
}
129
}

‎src/MySqlConnector/Serialization/QuitPayload.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ namespace MySql.Data.Serialization
44
{
55
internal class QuitPayload
66
{
7-
public static ArraySegment<byte> Create()
8-
{
9-
return new ArraySegment<byte>(new[] { (byte) CommandKind.Quit });
10-
}
7+
public static ArraySegment<byte> Create() => new ArraySegment<byte>(new[] { (byte) CommandKind.Quit });
118
}
129
}

‎src/MySqlConnector/Serialization/ResetConnectionPayload.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ namespace MySql.Data.Serialization
44
{
55
internal class ResetConnectionPayload
66
{
7-
public static PayloadData Create()
8-
{
9-
return new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.ResetConnection }));
10-
}
7+
public static PayloadData Create() => new PayloadData(new ArraySegment<byte>(new[] { (byte) CommandKind.ResetConnection }));
118
}
129
}

‎src/MySqlConnector/Utility.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ public static void Dispose<T>(ref T disposable)
1818
}
1919
}
2020

21-
public static string FormatInvariant(this string format, params object[] args)
22-
{
23-
return string.Format(CultureInfo.InvariantCulture, format, args);
24-
}
21+
public static string FormatInvariant(this string format, params object[] args) =>
22+
string.Format(CultureInfo.InvariantCulture, format, args);
2523

26-
public static string GetString(this Encoding encoding, ArraySegment<byte> arraySegment)
27-
=> encoding.GetString(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
24+
public static string GetString(this Encoding encoding, ArraySegment<byte> arraySegment) =>
25+
encoding.GetString(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
2826

2927
/// <summary>
3028
/// Returns a new <see cref="ArraySegment{T}"/> that starts at index <paramref name="index"/> into <paramref name="arraySegment"/>.

0 commit comments

Comments
 (0)