Skip to content

Commit b69450f

Browse files
committed
fix: Adjust Base64 converter
1 parent 243fc4b commit b69450f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/Docker.DotNet/Base64Converter.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ internal class Base64Converter : JsonConverter<IList<byte>>
44
{
55
public override IList<byte> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
66
{
7-
var base64 = reader.GetString();
8-
return base64 == null ? null : Encoding.UTF8.GetBytes(base64);
7+
var base64String = reader.GetString();
8+
return base64String == null ? null : Convert.FromBase64String(base64String);
99
}
1010

1111
public override void Write(Utf8JsonWriter writer, IList<byte> value, JsonSerializerOptions options)
1212
{
13-
// TODO: This seams not correct, it breaks: 'SwarmConfig_CanCreateAndRead'.
14-
var base64 = Encoding.UTF8.GetString(value.ToArray());
15-
writer.WriteStringValue(base64);
13+
var base64String = Convert.ToBase64String(value.ToArray());
14+
writer.WriteStringValue(base64String);
1615
}
1716
}

src/Docker.DotNet/TimeSpanNanoSecondsConverter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ internal class TimeSpanNanosecondsConverter : JsonConverter<TimeSpan>
66

77
public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
88
{
9-
var valueInNanoSeconds = reader.GetInt64();
10-
var milliSecondValue = valueInNanoSeconds / MilliSecondToNanoSecond;
11-
return TimeSpan.FromMilliseconds(milliSecondValue);
9+
var valueInNanoseconds = reader.GetInt64();
10+
var valueInMilliseconds = valueInNanoseconds / MilliSecondToNanoSecond;
11+
return TimeSpan.FromMilliseconds(valueInMilliseconds);
1212
}
1313

1414
public override void Write(Utf8JsonWriter writer, TimeSpan timeSpan, JsonSerializerOptions options)

0 commit comments

Comments
 (0)