chore: Map time.Duration to TimeSpan everywhere

src/Docker.DotNet/ConsoleSizeConverter.cs → src/Docker.DotNet/JsonConsoleSizeConverter.cs

@@ -1,6 +1,6 @@
 namespace Docker.DotNet;
 
-internal sealed class ConsoleSizeConverter : JsonConverter<ConsoleSize?>
+internal sealed class JsonConsoleSizeConverter : JsonConverter<ConsoleSize?>
 {
     public override ConsoleSize? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {

src/Docker.DotNet/JsonSerializer.cs

@@ -19,7 +19,7 @@ private JsonSerializer()
         _options.Converters.Add(new JsonEnumMemberConverter<RestartPolicyKind>());
         _options.Converters.Add(new JsonEnumMemberConverter<TaskState>());
         _options.Converters.Add(new JsonDateTimeConverter());
-        _options.Converters.Add(new JsonNullableDateTimeConverter());
+        _options.Converters.Add(new JsonTimeSpanNanosecondsConverter());
     }
 
     public static JsonSerializer Instance { get; }

src/Docker.DotNet/JsonTimeSpanNanosecondsConverter.cs

@@ -0,0 +1,17 @@
+namespace Docker.DotNet;
+
+internal sealed class JsonTimeSpanNanosecondsConverter : JsonConverter<TimeSpan>
+{
+    private const int NanosecondsPerTick = 100;
+
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var valueInNanoseconds = reader.GetInt64();
+        return TimeSpan.FromTicks(valueInNanoseconds / NanosecondsPerTick);
+    }
+
+    public override void Write(Utf8JsonWriter writer, TimeSpan timeSpan, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(timeSpan.Ticks * NanosecondsPerTick);
+    }
+}

src/Docker.DotNet/JsonTimeSpanSecondsConverter.cs

@@ -0,0 +1,14 @@
+namespace Docker.DotNet;
+
+internal sealed class JsonTimeSpanSecondsConverter : JsonConverter<TimeSpan>
+{
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return TimeSpan.FromSeconds(reader.GetInt64());
+    }
+
+    public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue((long)value.TotalSeconds);
+    }
+}

src/Docker.DotNet/Models/CAConfig.Generated.cs

@@ -4,7 +4,7 @@ namespace Docker.DotNet.Models
     public class CAConfig // (swarm.CAConfig)
     {
         [JsonPropertyName("NodeCertExpiry")]
-        public long? NodeCertExpiry { get; set; }
+        public TimeSpan? NodeCertExpiry { get; set; }
 
         [JsonPropertyName("ExternalCAs")]
         public IList<ExternalCA>? ExternalCAs { get; set; }

src/Docker.DotNet/Models/CommitContainerChangesParameters.Generated.cs

@@ -53,10 +53,10 @@ public CommitContainerChangesParameters(ContainerConfig Config)
         [QueryStringParameter("author", false)]
         public string? Author { get; set; }
 
-        [QueryStringParameter("changes", false, typeof(EnumerableQueryStringConverter))]
+        [QueryStringParameter("changes", false, typeof(QueryStringEnumerableConverter))]
         public IList<string>? Changes { get; set; }
 
-        [QueryStringParameter("pause", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("pause", false, typeof(QueryStringBoolConverter))]
         public bool? Pause { get; set; }
 
         [JsonPropertyName("Hostname")]
@@ -126,7 +126,7 @@ public CommitContainerChangesParameters(ContainerConfig Config)
         public string? StopSignal { get; set; }
 
         [JsonPropertyName("StopTimeout")]
-        [JsonConverter(typeof(TimeSpanSecondsConverter))]
+        [JsonConverter(typeof(JsonTimeSpanSecondsConverter))]
         public TimeSpan? StopTimeout { get; set; }
 
         [JsonPropertyName("Shell")]

src/Docker.DotNet/Models/ContainerAttachParameters.Generated.cs

@@ -3,22 +3,22 @@ namespace Docker.DotNet.Models
 {
     public class ContainerAttachParameters // (main.ContainerAttachParameters)
     {
-        [QueryStringParameter("stream", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stream", false, typeof(QueryStringBoolConverter))]
         public bool? Stream { get; set; }
 
-        [QueryStringParameter("stdin", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stdin", false, typeof(QueryStringBoolConverter))]
         public bool? Stdin { get; set; }
 
-        [QueryStringParameter("stdout", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stdout", false, typeof(QueryStringBoolConverter))]
         public bool? Stdout { get; set; }
 
-        [QueryStringParameter("stderr", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stderr", false, typeof(QueryStringBoolConverter))]
         public bool? Stderr { get; set; }
 
         [QueryStringParameter("detachKeys", false)]
         public string? DetachKeys { get; set; }
 
-        [QueryStringParameter("logs", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("logs", false, typeof(QueryStringBoolConverter))]
         public bool? Logs { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainerConfig.Generated.cs

@@ -70,7 +70,7 @@ public class ContainerConfig // (container.Config)
         public string? StopSignal { get; set; }
 
         [JsonPropertyName("StopTimeout")]
-        [JsonConverter(typeof(TimeSpanSecondsConverter))]
+        [JsonConverter(typeof(JsonTimeSpanSecondsConverter))]
         public TimeSpan? StopTimeout { get; set; }
 
         [JsonPropertyName("Shell")]

src/Docker.DotNet/Models/ContainerEventsParameters.Generated.cs

@@ -9,7 +9,7 @@ public class ContainerEventsParameters // (main.ContainerEventsParameters)
         [QueryStringParameter("until", false)]
         public string? Until { get; set; }
 
-        [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))]
+        [QueryStringParameter("filters", false, typeof(QueryStringMapConverter))]
         public IDictionary<string, IDictionary<string, bool>>? Filters { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainerExecCreateParameters.Generated.cs

@@ -13,7 +13,7 @@ public class ContainerExecCreateParameters // (main.ContainerExecCreateParameter
         public bool TTY { get; set; } = default!;
 
         [JsonPropertyName("ConsoleSize")]
-        [JsonConverter(typeof(ConsoleSizeConverter))]
+        [JsonConverter(typeof(JsonConsoleSizeConverter))]
         public ConsoleSize ConsoleSize { get; set; } = default!;
 
         [JsonPropertyName("AttachStdin")]

src/Docker.DotNet/Models/ContainerExecStartParameters.Generated.cs

@@ -10,7 +10,7 @@ public class ContainerExecStartParameters // (main.ContainerExecStartParameters)
         public bool TTY { get; set; } = default!;
 
         [JsonPropertyName("ConsoleSize")]
-        [JsonConverter(typeof(ConsoleSizeConverter))]
+        [JsonConverter(typeof(JsonConsoleSizeConverter))]
         public ConsoleSize ConsoleSize { get; set; } = default!;
     }
 }

src/Docker.DotNet/Models/ContainerInspectParameters.Generated.cs

@@ -3,7 +3,7 @@ namespace Docker.DotNet.Models
 {
     public class ContainerInspectParameters // (main.ContainerInspectParameters)
     {
-        [QueryStringParameter("size", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("size", false, typeof(QueryStringBoolConverter))]
         public bool? IncludeSize { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs

@@ -3,10 +3,10 @@ namespace Docker.DotNet.Models
 {
     public class ContainerLogsParameters // (main.ContainerLogsParameters)
     {
-        [QueryStringParameter("stdout", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stdout", false, typeof(QueryStringBoolConverter))]
         public bool? ShowStdout { get; set; }
 
-        [QueryStringParameter("stderr", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stderr", false, typeof(QueryStringBoolConverter))]
         public bool? ShowStderr { get; set; }
 
         [QueryStringParameter("since", false)]
@@ -15,10 +15,10 @@ public class ContainerLogsParameters // (main.ContainerLogsParameters)
         [QueryStringParameter("until", false)]
         public string? Until { get; set; }
 
-        [QueryStringParameter("timestamps", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("timestamps", false, typeof(QueryStringBoolConverter))]
         public bool? Timestamps { get; set; }
 
-        [QueryStringParameter("follow", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("follow", false, typeof(QueryStringBoolConverter))]
         public bool? Follow { get; set; }
 
         [QueryStringParameter("tail", false)]

src/Docker.DotNet/Models/ContainerRemoveParameters.Generated.cs

@@ -3,13 +3,13 @@ namespace Docker.DotNet.Models
 {
     public class ContainerRemoveParameters // (main.ContainerRemoveParameters)
     {
-        [QueryStringParameter("v", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("v", false, typeof(QueryStringBoolConverter))]
         public bool? RemoveVolumes { get; set; }
 
-        [QueryStringParameter("link", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("link", false, typeof(QueryStringBoolConverter))]
         public bool? RemoveLinks { get; set; }
 
-        [QueryStringParameter("force", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("force", false, typeof(QueryStringBoolConverter))]
         public bool? Force { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainerSpec.Generated.cs

@@ -52,7 +52,7 @@ public class ContainerSpec // (swarm.ContainerSpec)
         public IList<Mount>? Mounts { get; set; }
 
         [JsonPropertyName("StopGracePeriod")]
-        public long? StopGracePeriod { get; set; }
+        public TimeSpan? StopGracePeriod { get; set; }
 
         [JsonPropertyName("Healthcheck")]
         public HealthcheckConfig? Healthcheck { get; set; }

src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs

@@ -3,10 +3,10 @@ namespace Docker.DotNet.Models
 {
     public class ContainerStatsParameters // (main.ContainerStatsParameters)
     {
-        [QueryStringParameter("stream", true, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("stream", true, typeof(QueryStringBoolConverter))]
         public bool Stream { get; set; } = true;
 
-        [QueryStringParameter("one-shot", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("one-shot", false, typeof(QueryStringBoolConverter))]
         public bool? OneShot { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainersListParameters.Generated.cs

@@ -3,16 +3,16 @@ namespace Docker.DotNet.Models
 {
     public class ContainersListParameters // (main.ContainersListParameters)
     {
-        [QueryStringParameter("all", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("all", false, typeof(QueryStringBoolConverter))]
         public bool? All { get; set; }
 
         [QueryStringParameter("limit", false)]
         public long? Limit { get; set; }
 
-        [QueryStringParameter("size", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("size", false, typeof(QueryStringBoolConverter))]
         public bool? Size { get; set; }
 
-        [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))]
+        [QueryStringParameter("filters", false, typeof(QueryStringMapConverter))]
         public IDictionary<string, IDictionary<string, bool>>? Filters { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainersPruneParameters.Generated.cs

@@ -3,7 +3,7 @@ namespace Docker.DotNet.Models
 {
     public class ContainersPruneParameters // (main.ContainersPruneParameters)
     {
-        [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))]
+        [QueryStringParameter("filters", false, typeof(QueryStringMapConverter))]
         public IDictionary<string, IDictionary<string, bool>>? Filters { get; set; }
     }
 }

src/Docker.DotNet/Models/CopyToContainerParameters.Generated.cs

@@ -6,10 +6,10 @@ public class CopyToContainerParameters // (main.CopyToContainerParameters)
         [QueryStringParameter("path", true)]
         public string Path { get; set; } = default!;
 
-        [QueryStringParameter("noOverwriteDirNonDir", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("noOverwriteDirNonDir", false, typeof(QueryStringBoolConverter))]
         public bool? AllowOverwriteDirWithFile { get; set; }
 
-        [QueryStringParameter("copyUIDGID", false, typeof(BoolQueryStringConverter))]
+        [QueryStringParameter("copyUIDGID", false, typeof(QueryStringBoolConverter))]
         public bool? CopyUIDGID { get; set; }
     }
 }

src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs

@@ -111,7 +111,7 @@ public CreateContainerParameters(ContainerConfig Config)
         public string? StopSignal { get; set; }
 
         [JsonPropertyName("StopTimeout")]
-        [JsonConverter(typeof(TimeSpanSecondsConverter))]
+        [JsonConverter(typeof(JsonTimeSpanSecondsConverter))]
         public TimeSpan? StopTimeout { get; set; }
 
         [JsonPropertyName("Shell")]

src/Docker.DotNet/Models/Descriptor.Generated.cs

@@ -19,8 +19,7 @@ public class Descriptor // (v1.Descriptor)
         public IDictionary<string, string>? Annotations { get; set; }
 
         [JsonPropertyName("data")]
-        [JsonConverter(typeof(Base64Converter))]
-        public IList<byte>? Data { get; set; }
+        public byte[]? Data { get; set; }
 
         [JsonPropertyName("platform")]
         public Platform? Platform { get; set; }

src/Docker.DotNet/Models/DispatcherConfig.Generated.cs

@@ -4,6 +4,6 @@ namespace Docker.DotNet.Models
     public class DispatcherConfig // (swarm.DispatcherConfig)
     {
         [JsonPropertyName("HeartbeatPeriod")]
-        public long? HeartbeatPeriod { get; set; }
+        public TimeSpan? HeartbeatPeriod { get; set; }
     }
 }

src/Docker.DotNet/Models/HealthcheckConfig.Generated.cs

@@ -7,18 +7,16 @@ public class HealthcheckConfig // (v1.HealthcheckConfig)
         public IList<string>? Test { get; set; }
 
         [JsonPropertyName("Interval")]
-        [JsonConverter(typeof(TimeSpanNanosecondsConverter))]
         public TimeSpan? Interval { get; set; }
 
         [JsonPropertyName("Timeout")]
-        [JsonConverter(typeof(TimeSpanNanosecondsConverter))]
         public TimeSpan? Timeout { get; set; }
 
         [JsonPropertyName("StartPeriod")]
-        public long? StartPeriod { get; set; }
+        public TimeSpan? StartPeriod { get; set; }
 
         [JsonPropertyName("StartInterval")]
-        public long? StartInterval { get; set; }
+        public TimeSpan? StartInterval { get; set; }
 
         [JsonPropertyName("Retries")]
         public long? Retries { get; set; }

src/Docker.DotNet/Models/HostConfig.Generated.cs

@@ -71,7 +71,7 @@ public HostConfig(Resources Resources)
         public IList<string> VolumesFrom { get; set; } = default!;
 
         [JsonPropertyName("ConsoleSize")]
-        [JsonConverter(typeof(ConsoleSizeConverter))]
+        [JsonConverter(typeof(JsonConsoleSizeConverter))]
         public ConsoleSize ConsoleSize { get; set; } = default!;
 
         [JsonPropertyName("Annotations")]