Skip to content

Commit

Permalink
Code Enhancements (#794)
Browse files Browse the repository at this point in the history
* Let private members readonly

* Use long.TryParse

* Sealed internal types

* Sealed private types
  • Loading branch information
WeihanLi authored Mar 8, 2022
1 parent 01b2aa8 commit f69bf83
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 19 deletions.
9 changes: 3 additions & 6 deletions src/KubernetesClient/Autorest/StringTokenProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ namespace k8s.Autorest
/// </summary>
public sealed class StringTokenProvider : ITokenProvider
{
private string _accessToken;
private string _type;
private readonly string _accessToken;
private readonly string _type;

/// <summary>
/// Initializes a new instance of the <see cref="StringTokenProvider"/> class.
Expand All @@ -31,10 +31,7 @@ public StringTokenProvider(string accessToken, string tokenType)
/// <summary>
/// Gets the token type of this access token.
/// </summary>
public string TokenType
{
get { return _type; }
}
public string TokenType => _type;

/// <summary>
/// Returns the static access token.
Expand Down
4 changes: 2 additions & 2 deletions src/KubernetesClient/IntOrStringConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace k8s.Models
{
internal class IntOrStringConverter : JsonConverter<IntstrIntOrString>
internal sealed class IntOrStringConverter : JsonConverter<IntstrIntOrString>
{
public override IntstrIntOrString Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Expand All @@ -21,7 +21,7 @@ public override void Write(Utf8JsonWriter writer, IntstrIntOrString value, JsonS
{
var s = value?.Value;

if (int.TryParse(s, out var intv))
if (long.TryParse(s, out var intv))
{
writer.WriteNumberValue(intv);
return;
Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/Kubernetes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private async Task<HttpOperationResponse<T>> CreateResultAsync<T>(HttpRequestMes
return result;
}

private class QueryBuilder
private sealed class QueryBuilder
{
private List<string> parameters = new List<string>();

Expand Down
6 changes: 3 additions & 3 deletions src/KubernetesClient/KubernetesJson.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal static class KubernetesJson
{
private static readonly JsonSerializerOptions JsonSerializerOptions = new JsonSerializerOptions();

private class Iso8601TimeSpanConverter : JsonConverter<TimeSpan>
private sealed class Iso8601TimeSpanConverter : JsonConverter<TimeSpan>
{
public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Expand All @@ -24,7 +24,7 @@ public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializer
}
}

private class KubernetesDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
private sealed class KubernetesDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
{
private const string SerializeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.ffffffK";
private const string Iso8601Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";
Expand All @@ -41,7 +41,7 @@ public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSeri
}
}

private class KubernetesDateTimeConverter : JsonConverter<DateTime>
private sealed class KubernetesDateTimeConverter : JsonConverter<DateTime>
{
private static readonly JsonConverter<DateTimeOffset> UtcConverter = new KubernetesDateTimeOffsetConverter();
public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
Expand Down
6 changes: 3 additions & 3 deletions src/KubernetesClient/LineSeparatedHttpContent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace k8s
{
internal class LineSeparatedHttpContent : HttpContent
internal sealed class LineSeparatedHttpContent : HttpContent
{
private readonly HttpContent _originContent;
private readonly CancellationToken _cancellationToken;
Expand Down Expand Up @@ -41,7 +41,7 @@ protected override bool TryComputeLength(out long length)
return false;
}

internal class CancelableStream : Stream
internal sealed class CancelableStream : Stream
{
private readonly Stream _innerStream;
private readonly CancellationToken _cancellationToken;
Expand Down Expand Up @@ -149,7 +149,7 @@ public void Dispose()
}
}

internal class PeekableStreamReader : TextReader
internal sealed class PeekableStreamReader : TextReader
{
private readonly Queue<string> _buffer;
private readonly StreamReader _inner;
Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/QuantityConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace k8s.Models
{
internal class QuantityConverter : JsonConverter<ResourceQuantity>
internal sealed class QuantityConverter : JsonConverter<ResourceQuantity>
{
public override ResourceQuantity Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/ResourceQuantity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public static implicit operator ResourceQuantity(decimal v)
return new ResourceQuantity(v, 0, SuffixFormat.DecimalExponent);
}

private class Suffixer
private sealed class Suffixer
{
private static readonly IReadOnlyDictionary<string, (int, int)> BinSuffixes =
new Dictionary<string, (int, int)>
Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/V1PatchJsonConverter.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace k8s.Models
{
internal class V1PatchJsonConverter : JsonConverter<V1Patch>
internal sealed class V1PatchJsonConverter : JsonConverter<V1Patch>
{
public override V1Patch Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Expand Down
2 changes: 1 addition & 1 deletion src/KubernetesClient/V1Status.ObjectView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace k8s.Models
{
public partial class V1Status
{
internal class V1StatusObjectViewConverter : JsonConverter<V1Status>
internal sealed class V1StatusObjectViewConverter : JsonConverter<V1Status>
{
public override V1Status Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Expand Down

0 comments on commit f69bf83

Please sign in to comment.