From d24b87515662402eada378e1c34d5c60fe66d3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Thu, 7 Mar 2024 16:40:37 +0100 Subject: [PATCH 1/6] Update specgen to produce attributes for System.Text.Json instead of Newtonsoft.Json --- tools/specgen/csharptype.go | 2 -- tools/specgen/specgen.go | 13 ++++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/specgen/csharptype.go b/tools/specgen/csharptype.go index 8e879ef4..5843bc84 100644 --- a/tools/specgen/csharptype.go +++ b/tools/specgen/csharptype.go @@ -161,8 +161,6 @@ func NewModel(name, sourceName string) *CSModelType { SourceName: sourceName, } - s.Attributes = append(s.Attributes, CSAttribute{Type: CSType{"System.Runtime.Serialization", "DataContract", false}}) - return &s } diff --git a/tools/specgen/specgen.go b/tools/specgen/specgen.go index 79e61f3e..86714794 100644 --- a/tools/specgen/specgen.go +++ b/tools/specgen/specgen.go @@ -34,7 +34,7 @@ var typesToDisambiguate = map[string]*CSModelType{ CSProperty{ Name: "StopTimeout", Type: CSType{"System", "TimeSpan", true}, - Attributes: []CSAttribute{CSAttribute{Type: CSType{"Newtonsoft.Json", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanSecondsConverter)"}}}}, + Attributes: []CSAttribute{CSAttribute{Type: CSType{"System.Text.Json.Serialization", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanSecondsConverter)"}}}}, }, }, }, @@ -44,12 +44,12 @@ var typesToDisambiguate = map[string]*CSModelType{ CSProperty{ Name: "Interval", Type: CSType{"System", "TimeSpan", true}, - Attributes: []CSAttribute{CSAttribute{Type: CSType{"Newtonsoft.Json", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanNanosecondsConverter)"}}}}, + Attributes: []CSAttribute{CSAttribute{Type: CSType{"System.Text.Json.Serialization", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanNanosecondsConverter)"}}}}, }, CSProperty{ Name: "Timeout", Type: CSType{"System", "TimeSpan", true}, - Attributes: []CSAttribute{CSAttribute{Type: CSType{"Newtonsoft.Json", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanNanosecondsConverter)"}}}}, + Attributes: []CSAttribute{CSAttribute{Type: CSType{"System.Text.Json.Serialization", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanNanosecondsConverter)"}}}}, }, }, }, @@ -67,7 +67,7 @@ var typesToDisambiguate = map[string]*CSModelType{ CSProperty{ Name: "StopTimeout", Type: CSType{"System", "TimeSpan", true}, - Attributes: []CSAttribute{CSAttribute{Type: CSType{"Newtonsoft.Json", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanSecondsConverter)"}}}}, + Attributes: []CSAttribute{CSAttribute{Type: CSType{"System.Text.Json.Serialization", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanSecondsConverter)"}}}}, }, }, }, @@ -629,9 +629,8 @@ func reflectTypeMembers(t reflect.Type, m *CSModelType) { csProp.Attributes = append(csProp.Attributes, a) csProp.DefaultValue = restTag.Default } else { - a := CSAttribute{Type: CSType{"", "DataMember", false}} - a.NamedArguments = append(a.NamedArguments, CSNamedArgument{"Name", CSArgument{jsonName, CSInboxTypesMap[reflect.String]}}) - a.NamedArguments = append(a.NamedArguments, CSNamedArgument{"EmitDefaultValue", CSArgument{strconv.FormatBool(false), CSInboxTypesMap[reflect.Bool]}}) + a := CSAttribute{Type: CSType{"System.Text.Json.Serialization", "JsonPropertyName", false}} + a.Arguments = append(a.Arguments, CSArgument{jsonName, CSInboxTypesMap[reflect.String]}) csProp.IsOpt = f.Type.Kind() == reflect.Ptr csProp.Attributes = append(csProp.Attributes, a) } From 70d73ba3ef4039b877aa442179fa1463703c7894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Thu, 7 Mar 2024 16:40:52 +0100 Subject: [PATCH 2/6] Regenerate all models with System.Text.Json.Serialization.JsonPropertyName --- .../Models/AccessMode.Generated.cs | 11 +- src/Docker.DotNet/Models/Actor.Generated.cs | 7 +- src/Docker.DotNet/Models/Address.Generated.cs | 7 +- .../Models/Annotations.Generated.cs | 7 +- .../Models/AuthConfig.Generated.cs | 17 +- .../Models/AuthResponse.Generated.cs | 7 +- .../Models/BindOptions.Generated.cs | 9 +- .../Models/BlkioStatEntry.Generated.cs | 11 +- .../Models/BlkioStats.Generated.cs | 19 ++- .../Models/CAConfig.Generated.cs | 13 +- .../Models/CPUStats.Generated.cs | 11 +- .../Models/CPUUsage.Generated.cs | 11 +- .../Models/CapacityRange.Generated.cs | 7 +- .../Models/ClusterInfo.Generated.cs | 23 ++- .../Models/ClusterOptions.Generated.cs | 2 - .../Models/ClusterVolume.Generated.cs | 17 +- .../Models/ClusterVolumeSpec.Generated.cs | 15 +- src/Docker.DotNet/Models/Commit.Generated.cs | 7 +- ...mitContainerChangesParameters.Generated.cs | 54 ++++--- ...ommitContainerChangesResponse.Generated.cs | 5 +- .../Models/ComponentVersion.Generated.cs | 9 +- src/Docker.DotNet/Models/Config.Generated.cs | 54 ++++--- .../Models/ConfigReference.Generated.cs | 5 +- .../ConfigReferenceFileTarget.Generated.cs | 11 +- .../ConfigReferenceRuntimeTarget.Generated.cs | 2 - .../ContainerAttachParameters.Generated.cs | 2 - .../ContainerEventsParameters.Generated.cs | 2 - ...ContainerExecCreateParameters.Generated.cs | 27 ++-- .../ContainerExecCreateResponse.Generated.cs | 5 +- .../ContainerExecInspectResponse.Generated.cs | 13 +- .../ContainerExecStartParameters.Generated.cs | 27 ++-- ...ainerFileSystemChangeResponse.Generated.cs | 7 +- .../ContainerInspectParameters.Generated.cs | 2 - .../ContainerInspectResponse.Generated.cs | 55 ++++--- .../Models/ContainerJSONBase.Generated.cs | 49 +++--- .../ContainerKillParameters.Generated.cs | 2 - ...tainerListProcessesParameters.Generated.cs | 2 - .../Models/ContainerListResponse.Generated.cs | 31 ++-- .../ContainerLogsParameters.Generated.cs | 2 - .../Models/ContainerNode.Generated.cs | 17 +- .../ContainerPathStatParameters.Generated.cs | 2 - .../ContainerPathStatResponse.Generated.cs | 13 +- .../ContainerProcessesResponse.Generated.cs | 7 +- .../ContainerRemoveParameters.Generated.cs | 2 - .../ContainerRenameParameters.Generated.cs | 2 - .../ContainerResizeParameters.Generated.cs | 2 - .../ContainerRestartParameters.Generated.cs | 2 - .../Models/ContainerSpec.Generated.cs | 57 ++++--- .../ContainerStartParameters.Generated.cs | 2 - .../Models/ContainerState.Generated.cs | 27 ++-- .../ContainerStatsParameters.Generated.cs | 2 - .../ContainerStatsResponse.Generated.cs | 27 ++-- .../Models/ContainerStatus.Generated.cs | 9 +- .../ContainerStopParameters.Generated.cs | 2 - .../ContainerUpdateParameters.Generated.cs | 67 ++++---- .../ContainerUpdateResponse.Generated.cs | 5 +- .../Models/ContainerWaitResponse.Generated.cs | 7 +- .../ContainersListParameters.Generated.cs | 2 - .../ContainersPruneParameters.Generated.cs | 2 - .../ContainersPruneResponse.Generated.cs | 7 +- .../CreateContainerParameters.Generated.cs | 58 ++++--- .../CreateContainerResponse.Generated.cs | 7 +- .../Models/CredentialSpec.Generated.cs | 9 +- .../Models/DNSConfig.Generated.cs | 9 +- .../DefaultNetworkSettings.Generated.cs | 19 ++- .../Models/DeviceMapping.Generated.cs | 9 +- .../Models/DeviceRequest.Generated.cs | 13 +- .../DiscreteGenericResource.Generated.cs | 7 +- .../Models/DispatcherConfig.Generated.cs | 5 +- src/Docker.DotNet/Models/Driver.Generated.cs | 7 +- .../Models/EncryptionConfig.Generated.cs | 5 +- .../Models/Endpoint.Generated.cs | 9 +- .../Models/EndpointIPAMConfig.Generated.cs | 9 +- .../Models/EndpointResource.Generated.cs | 13 +- .../Models/EndpointSettings.Generated.cs | 29 ++-- .../Models/EndpointSpec.Generated.cs | 7 +- .../Models/EndpointVirtualIP.Generated.cs | 7 +- .../Models/EngineDescription.Generated.cs | 9 +- .../Models/ExternalCA.Generated.cs | 11 +- .../Models/GenericResource.Generated.cs | 7 +- .../Models/GlobalJob.Generated.cs | 2 - .../Models/GlobalService.Generated.cs | 2 - .../Models/GraphDriverData.Generated.cs | 7 +- src/Docker.DotNet/Models/Health.Generated.cs | 9 +- .../Models/HealthConfig.Generated.cs | 14 +- .../Models/HealthcheckResult.Generated.cs | 11 +- .../Models/HostConfig.Generated.cs | 145 +++++++++--------- src/Docker.DotNet/Models/IPAM.Generated.cs | 9 +- .../Models/IPAMConfig.Generated.cs | 11 +- .../Models/IPAMOptions.Generated.cs | 7 +- .../Models/ImageBuildParameters.Generated.cs | 5 +- .../Models/ImageBuildResponse.Generated.cs | 7 +- .../Models/ImageDeleteParameters.Generated.cs | 2 - .../Models/ImageDeleteResponse.Generated.cs | 7 +- .../Models/ImageHistoryResponse.Generated.cs | 15 +- .../ImageInspectParameters.Generated.cs | 2 - .../Models/ImageInspectResponse.Generated.cs | 43 +++--- .../Models/ImageLoadParameters.Generated.cs | 2 - .../Models/ImageMetadata.Generated.cs | 5 +- .../Models/ImagePushParameters.Generated.cs | 5 +- .../Models/ImageSearchResponse.Generated.cs | 13 +- .../Models/ImageTagParameters.Generated.cs | 2 - .../ImagesCreateParameters.Generated.cs | 5 +- .../Models/ImagesListParameters.Generated.cs | 2 - .../Models/ImagesListResponse.Generated.cs | 23 ++- .../Models/ImagesLoadResponse.Generated.cs | 7 +- .../Models/ImagesPruneParameters.Generated.cs | 2 - .../Models/ImagesPruneResponse.Generated.cs | 7 +- .../ImagesSearchParameters.Generated.cs | 5 +- .../Models/IndexInfo.Generated.cs | 11 +- src/Docker.DotNet/Models/Info.Generated.cs | 23 ++- .../Models/JSONError.Generated.cs | 7 +- .../Models/JSONMessage.Generated.cs | 25 ++- .../Models/JSONProgress.Generated.cs | 15 +- .../Models/JobStatus.Generated.cs | 7 +- .../Models/JoinTokens.Generated.cs | 7 +- .../Models/LogConfig.Generated.cs | 7 +- .../Models/ManagerStatus.Generated.cs | 9 +- .../Models/MemoryStats.Generated.cs | 19 ++- src/Docker.DotNet/Models/Message.Generated.cs | 21 ++- src/Docker.DotNet/Models/Meta.Generated.cs | 9 +- src/Docker.DotNet/Models/Mount.Generated.cs | 21 ++- .../Models/MountPoint.Generated.cs | 19 ++- .../Models/NamedGenericResource.Generated.cs | 7 +- src/Docker.DotNet/Models/Network.Generated.cs | 17 +- .../Models/NetworkAddressPool.Generated.cs | 7 +- .../Models/NetworkAttachment.Generated.cs | 7 +- .../NetworkAttachmentConfig.Generated.cs | 9 +- .../Models/NetworkAttachmentSpec.Generated.cs | 5 +- .../NetworkConnectParameters.Generated.cs | 7 +- .../Models/NetworkCreate.Generated.cs | 27 ++-- .../NetworkDisconnectParameters.Generated.cs | 7 +- .../Models/NetworkResponse.Generated.cs | 37 +++-- .../Models/NetworkSettings.Generated.cs | 39 +++-- .../Models/NetworkSettingsBase.Generated.cs | 21 ++- .../Models/NetworkSpec.Generated.cs | 23 ++- .../Models/NetworkStats.Generated.cs | 23 ++- .../Models/NetworkTask.Generated.cs | 11 +- .../Models/NetworkingConfig.Generated.cs | 5 +- .../NetworksCreateParameters.Generated.cs | 29 ++-- .../NetworksCreateResponse.Generated.cs | 7 +- ...etworksDeleteUnusedParameters.Generated.cs | 2 - .../NetworksListParameters.Generated.cs | 2 - .../Models/NetworksPruneResponse.Generated.cs | 5 +- .../Models/NodeCSIInfo.Generated.cs | 11 +- .../Models/NodeDescription.Generated.cs | 15 +- .../Models/NodeListResponse.Generated.cs | 19 ++- .../Models/NodeStatus.Generated.cs | 9 +- .../Models/NodeUpdateParameters.Generated.cs | 11 +- .../Models/OrchestrationConfig.Generated.cs | 5 +- src/Docker.DotNet/Models/Peer.Generated.cs | 7 +- .../Models/PeerInfo.Generated.cs | 7 +- .../Models/PidsStats.Generated.cs | 7 +- .../Models/Placement.Generated.cs | 11 +- .../Models/PlacementPreference.Generated.cs | 5 +- .../Models/Platform.Generated.cs | 7 +- src/Docker.DotNet/Models/Plugin.Generated.cs | 15 +- .../Models/PluginConfig.Generated.cs | 35 ++--- .../Models/PluginConfigArgs.Generated.cs | 11 +- .../Models/PluginConfigInterface.Generated.cs | 9 +- .../Models/PluginConfigLinux.Generated.cs | 9 +- .../Models/PluginConfigNetwork.Generated.cs | 5 +- .../Models/PluginConfigRootfs.Generated.cs | 7 +- .../Models/PluginConfigUser.Generated.cs | 7 +- .../PluginConfigureParameters.Generated.cs | 5 +- .../PluginCreateParameters.Generated.cs | 2 - .../Models/PluginDescription.Generated.cs | 7 +- .../Models/PluginDevice.Generated.cs | 11 +- .../PluginDisableParameters.Generated.cs | 2 - .../PluginEnableParameters.Generated.cs | 2 - .../Models/PluginEnv.Generated.cs | 11 +- .../PluginGetPrivilegeParameters.Generated.cs | 5 +- .../PluginInstallParameters.Generated.cs | 7 +- .../Models/PluginInterfaceType.Generated.cs | 9 +- .../Models/PluginListParameters.Generated.cs | 2 - .../Models/PluginMount.Generated.cs | 17 +- .../Models/PluginPrivilege.Generated.cs | 9 +- .../PluginRemoveParameters.Generated.cs | 2 - .../Models/PluginSettings.Generated.cs | 11 +- .../Models/PluginSpec.Generated.cs | 13 +- .../PluginUpgradeParameters.Generated.cs | 7 +- .../Models/PluginsInfo.Generated.cs | 11 +- src/Docker.DotNet/Models/Port.Generated.cs | 11 +- .../Models/PortBinding.Generated.cs | 7 +- .../Models/PortConfig.Generated.cs | 13 +- .../Models/PortStatus.Generated.cs | 5 +- .../Models/Privileges.Generated.cs | 7 +- .../Models/PublishStatus.Generated.cs | 9 +- .../Models/RaftConfig.Generated.cs | 13 +- .../Models/ReplicatedJob.Generated.cs | 7 +- .../Models/ReplicatedService.Generated.cs | 5 +- .../Models/ResourceRequirements.Generated.cs | 7 +- .../Models/Resources.Generated.cs | 65 ++++---- .../Models/RestartPolicy.Generated.cs | 7 +- src/Docker.DotNet/Models/RootFS.Generated.cs | 7 +- src/Docker.DotNet/Models/Runtime.Generated.cs | 11 +- .../RuntimePluginPrivilege.Generated.cs | 9 +- .../Models/SELinuxContext.Generated.cs | 13 +- src/Docker.DotNet/Models/Secret.Generated.cs | 13 +- .../Models/SecretCreateResponse.Generated.cs | 5 +- .../Models/SecretReference.Generated.cs | 9 +- .../SecretReferenceFileTarget.Generated.cs | 11 +- .../Models/SecretSpec.Generated.cs | 13 +- .../Models/ServiceConfig.Generated.cs | 13 +- .../ServiceCreateParameters.Generated.cs | 7 +- .../Models/ServiceCreateResponse.Generated.cs | 7 +- .../Models/ServiceInfo.Generated.cs | 11 +- .../Models/ServiceListParameters.Generated.cs | 2 - .../Models/ServiceLogsParameters.Generated.cs | 2 - .../Models/ServiceMode.Generated.cs | 11 +- .../Models/ServiceSpec.Generated.cs | 19 ++- .../Models/ServiceStatus.Generated.cs | 9 +- .../ServiceUpdateParameters.Generated.cs | 7 +- .../Models/ServiceUpdateResponse.Generated.cs | 5 +- .../Models/ShimConfig.Generated.cs | 7 +- src/Docker.DotNet/Models/Spec.Generated.cs | 19 ++- .../Models/SpreadOver.Generated.cs | 5 +- src/Docker.DotNet/Models/Stats.Generated.cs | 21 ++- .../Models/StorageStats.Generated.cs | 11 +- .../SummaryNetworkSettings.Generated.cs | 5 +- .../Models/SwarmConfig.Generated.cs | 13 +- .../Models/SwarmConfigReference.Generated.cs | 11 +- .../Models/SwarmConfigSpec.Generated.cs | 11 +- .../SwarmCreateConfigParameters.Generated.cs | 5 +- .../SwarmCreateConfigResponse.Generated.cs | 5 +- .../Models/SwarmDriver.Generated.cs | 7 +- .../Models/SwarmIPAMConfig.Generated.cs | 9 +- .../Models/SwarmInitParameters.Generated.cs | 23 ++- .../Models/SwarmInspectResponse.Generated.cs | 25 ++- .../Models/SwarmJoinParameters.Generated.cs | 15 +- .../Models/SwarmLeaveParameters.Generated.cs | 2 - .../Models/SwarmLimit.Generated.cs | 9 +- .../Models/SwarmResources.Generated.cs | 9 +- .../Models/SwarmRestartPolicy.Generated.cs | 11 +- .../Models/SwarmService.Generated.cs | 23 ++- .../Models/SwarmUnlockParameters.Generated.cs | 5 +- .../Models/SwarmUnlockResponse.Generated.cs | 5 +- .../Models/SwarmUpdateConfig.Generated.cs | 15 +- .../SwarmUpdateConfigParameters.Generated.cs | 5 +- .../Models/SwarmUpdateParameters.Generated.cs | 5 +- .../Models/SystemInfoResponse.Generated.cs | 127 ++++++++------- src/Docker.DotNet/Models/TLSInfo.Generated.cs | 9 +- .../Models/TaskDefaults.Generated.cs | 5 +- .../Models/TaskResponse.Generated.cs | 35 ++--- .../Models/TaskSpec.Generated.cs | 23 ++- .../Models/TaskStatus.Generated.cs | 15 +- .../Models/TasksListParameters.Generated.cs | 2 - .../Models/ThrottleDevice.Generated.cs | 7 +- .../Models/ThrottlingData.Generated.cs | 9 +- .../Models/TmpfsOptions.Generated.cs | 7 +- .../Models/Topology.Generated.cs | 5 +- .../Models/TopologyRequirement.Generated.cs | 7 +- .../Models/TypeBlock.Generated.cs | 2 - .../Models/TypeMount.Generated.cs | 7 +- src/Docker.DotNet/Models/Ulimit.Generated.cs | 9 +- .../Models/UpdateConfig.Generated.cs | 67 ++++---- .../Models/UpdateStatus.Generated.cs | 11 +- .../Models/UsageData.Generated.cs | 7 +- src/Docker.DotNet/Models/Version.Generated.cs | 5 +- .../Models/VersionResponse.Generated.cs | 25 ++- .../Models/VolumeAttachment.Generated.cs | 9 +- .../Models/VolumeInfo.Generated.cs | 11 +- .../Models/VolumeOptions.Generated.cs | 9 +- .../Models/VolumeResponse.Generated.cs | 23 ++- .../Models/VolumeSecret.Generated.cs | 7 +- .../Models/VolumeTopology.Generated.cs | 5 +- .../VolumesCreateParameters.Generated.cs | 11 +- .../Models/VolumesListParameters.Generated.cs | 2 - .../Models/VolumesListResponse.Generated.cs | 7 +- .../VolumesPruneParameters.Generated.cs | 2 - .../Models/VolumesPruneResponse.Generated.cs | 7 +- .../Models/WaitExitError.Generated.cs | 5 +- .../Models/WeightDevice.Generated.cs | 7 +- 273 files changed, 1545 insertions(+), 1862 deletions(-) diff --git a/src/Docker.DotNet/Models/AccessMode.Generated.cs b/src/Docker.DotNet/Models/AccessMode.Generated.cs index bf5c6a6e..205cf9d5 100644 --- a/src/Docker.DotNet/Models/AccessMode.Generated.cs +++ b/src/Docker.DotNet/Models/AccessMode.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class AccessMode // (volume.AccessMode) { - [DataMember(Name = "Scope", EmitDefaultValue = false)] + [JsonPropertyName("Scope")] public string Scope { get; set; } - [DataMember(Name = "Sharing", EmitDefaultValue = false)] + [JsonPropertyName("Sharing")] public string Sharing { get; set; } - [DataMember(Name = "MountVolume", EmitDefaultValue = false)] + [JsonPropertyName("MountVolume")] public TypeMount MountVolume { get; set; } - [DataMember(Name = "BlockVolume", EmitDefaultValue = false)] + [JsonPropertyName("BlockVolume")] public TypeBlock BlockVolume { get; set; } } } diff --git a/src/Docker.DotNet/Models/Actor.Generated.cs b/src/Docker.DotNet/Models/Actor.Generated.cs index 91f82097..7dfa73e6 100644 --- a/src/Docker.DotNet/Models/Actor.Generated.cs +++ b/src/Docker.DotNet/Models/Actor.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Actor // (events.Actor) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Attributes", EmitDefaultValue = false)] + [JsonPropertyName("Attributes")] public IDictionary Attributes { get; set; } } } diff --git a/src/Docker.DotNet/Models/Address.Generated.cs b/src/Docker.DotNet/Models/Address.Generated.cs index 6cc41d79..a09f127f 100644 --- a/src/Docker.DotNet/Models/Address.Generated.cs +++ b/src/Docker.DotNet/Models/Address.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Address // (network.Address) { - [DataMember(Name = "Addr", EmitDefaultValue = false)] + [JsonPropertyName("Addr")] public string Addr { get; set; } - [DataMember(Name = "PrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("PrefixLen")] public long PrefixLen { get; set; } } } diff --git a/src/Docker.DotNet/Models/Annotations.Generated.cs b/src/Docker.DotNet/Models/Annotations.Generated.cs index b71db7c8..4f2fd247 100644 --- a/src/Docker.DotNet/Models/Annotations.Generated.cs +++ b/src/Docker.DotNet/Models/Annotations.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Annotations // (swarm.Annotations) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } } } diff --git a/src/Docker.DotNet/Models/AuthConfig.Generated.cs b/src/Docker.DotNet/Models/AuthConfig.Generated.cs index c8f2f94c..8cdff7b0 100644 --- a/src/Docker.DotNet/Models/AuthConfig.Generated.cs +++ b/src/Docker.DotNet/Models/AuthConfig.Generated.cs @@ -1,29 +1,28 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class AuthConfig // (registry.AuthConfig) { - [DataMember(Name = "username", EmitDefaultValue = false)] + [JsonPropertyName("username")] public string Username { get; set; } - [DataMember(Name = "password", EmitDefaultValue = false)] + [JsonPropertyName("password")] public string Password { get; set; } - [DataMember(Name = "auth", EmitDefaultValue = false)] + [JsonPropertyName("auth")] public string Auth { get; set; } - [DataMember(Name = "email", EmitDefaultValue = false)] + [JsonPropertyName("email")] public string Email { get; set; } - [DataMember(Name = "serveraddress", EmitDefaultValue = false)] + [JsonPropertyName("serveraddress")] public string ServerAddress { get; set; } - [DataMember(Name = "identitytoken", EmitDefaultValue = false)] + [JsonPropertyName("identitytoken")] public string IdentityToken { get; set; } - [DataMember(Name = "registrytoken", EmitDefaultValue = false)] + [JsonPropertyName("registrytoken")] public string RegistryToken { get; set; } } } diff --git a/src/Docker.DotNet/Models/AuthResponse.Generated.cs b/src/Docker.DotNet/Models/AuthResponse.Generated.cs index b6001d68..ade23ece 100644 --- a/src/Docker.DotNet/Models/AuthResponse.Generated.cs +++ b/src/Docker.DotNet/Models/AuthResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class AuthResponse // (registry.AuthenticateOKBody) { - [DataMember(Name = "IdentityToken", EmitDefaultValue = false)] + [JsonPropertyName("IdentityToken")] public string IdentityToken { get; set; } - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public string Status { get; set; } } } diff --git a/src/Docker.DotNet/Models/BindOptions.Generated.cs b/src/Docker.DotNet/Models/BindOptions.Generated.cs index 16147f56..dde1a1d8 100644 --- a/src/Docker.DotNet/Models/BindOptions.Generated.cs +++ b/src/Docker.DotNet/Models/BindOptions.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class BindOptions // (mount.BindOptions) { - [DataMember(Name = "Propagation", EmitDefaultValue = false)] + [JsonPropertyName("Propagation")] public string Propagation { get; set; } - [DataMember(Name = "NonRecursive", EmitDefaultValue = false)] + [JsonPropertyName("NonRecursive")] public bool NonRecursive { get; set; } - [DataMember(Name = "CreateMountpoint", EmitDefaultValue = false)] + [JsonPropertyName("CreateMountpoint")] public bool CreateMountpoint { get; set; } } } diff --git a/src/Docker.DotNet/Models/BlkioStatEntry.Generated.cs b/src/Docker.DotNet/Models/BlkioStatEntry.Generated.cs index 1410b57a..950891cb 100644 --- a/src/Docker.DotNet/Models/BlkioStatEntry.Generated.cs +++ b/src/Docker.DotNet/Models/BlkioStatEntry.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class BlkioStatEntry // (types.BlkioStatEntry) { - [DataMember(Name = "major", EmitDefaultValue = false)] + [JsonPropertyName("major")] public ulong Major { get; set; } - [DataMember(Name = "minor", EmitDefaultValue = false)] + [JsonPropertyName("minor")] public ulong Minor { get; set; } - [DataMember(Name = "op", EmitDefaultValue = false)] + [JsonPropertyName("op")] public string Op { get; set; } - [DataMember(Name = "value", EmitDefaultValue = false)] + [JsonPropertyName("value")] public ulong Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/BlkioStats.Generated.cs b/src/Docker.DotNet/Models/BlkioStats.Generated.cs index 0f48fe40..2b8ebe63 100644 --- a/src/Docker.DotNet/Models/BlkioStats.Generated.cs +++ b/src/Docker.DotNet/Models/BlkioStats.Generated.cs @@ -1,33 +1,32 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class BlkioStats // (types.BlkioStats) { - [DataMember(Name = "io_service_bytes_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_service_bytes_recursive")] public IList IoServiceBytesRecursive { get; set; } - [DataMember(Name = "io_serviced_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_serviced_recursive")] public IList IoServicedRecursive { get; set; } - [DataMember(Name = "io_queue_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_queue_recursive")] public IList IoQueuedRecursive { get; set; } - [DataMember(Name = "io_service_time_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_service_time_recursive")] public IList IoServiceTimeRecursive { get; set; } - [DataMember(Name = "io_wait_time_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_wait_time_recursive")] public IList IoWaitTimeRecursive { get; set; } - [DataMember(Name = "io_merged_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_merged_recursive")] public IList IoMergedRecursive { get; set; } - [DataMember(Name = "io_time_recursive", EmitDefaultValue = false)] + [JsonPropertyName("io_time_recursive")] public IList IoTimeRecursive { get; set; } - [DataMember(Name = "sectors_recursive", EmitDefaultValue = false)] + [JsonPropertyName("sectors_recursive")] public IList SectorsRecursive { get; set; } } } diff --git a/src/Docker.DotNet/Models/CAConfig.Generated.cs b/src/Docker.DotNet/Models/CAConfig.Generated.cs index cdfebd76..df7d45cc 100644 --- a/src/Docker.DotNet/Models/CAConfig.Generated.cs +++ b/src/Docker.DotNet/Models/CAConfig.Generated.cs @@ -1,24 +1,23 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CAConfig // (swarm.CAConfig) { - [DataMember(Name = "NodeCertExpiry", EmitDefaultValue = false)] + [JsonPropertyName("NodeCertExpiry")] public long NodeCertExpiry { get; set; } - [DataMember(Name = "ExternalCAs", EmitDefaultValue = false)] + [JsonPropertyName("ExternalCAs")] public IList ExternalCAs { get; set; } - [DataMember(Name = "SigningCACert", EmitDefaultValue = false)] + [JsonPropertyName("SigningCACert")] public string SigningCACert { get; set; } - [DataMember(Name = "SigningCAKey", EmitDefaultValue = false)] + [JsonPropertyName("SigningCAKey")] public string SigningCAKey { get; set; } - [DataMember(Name = "ForceRotate", EmitDefaultValue = false)] + [JsonPropertyName("ForceRotate")] public ulong ForceRotate { get; set; } } } diff --git a/src/Docker.DotNet/Models/CPUStats.Generated.cs b/src/Docker.DotNet/Models/CPUStats.Generated.cs index 5f9bb45b..2756a9c0 100644 --- a/src/Docker.DotNet/Models/CPUStats.Generated.cs +++ b/src/Docker.DotNet/Models/CPUStats.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CPUStats // (types.CPUStats) { - [DataMember(Name = "cpu_usage", EmitDefaultValue = false)] + [JsonPropertyName("cpu_usage")] public CPUUsage CPUUsage { get; set; } - [DataMember(Name = "system_cpu_usage", EmitDefaultValue = false)] + [JsonPropertyName("system_cpu_usage")] public ulong SystemUsage { get; set; } - [DataMember(Name = "online_cpus", EmitDefaultValue = false)] + [JsonPropertyName("online_cpus")] public uint OnlineCPUs { get; set; } - [DataMember(Name = "throttling_data", EmitDefaultValue = false)] + [JsonPropertyName("throttling_data")] public ThrottlingData ThrottlingData { get; set; } } } diff --git a/src/Docker.DotNet/Models/CPUUsage.Generated.cs b/src/Docker.DotNet/Models/CPUUsage.Generated.cs index 474afe41..bd310f44 100644 --- a/src/Docker.DotNet/Models/CPUUsage.Generated.cs +++ b/src/Docker.DotNet/Models/CPUUsage.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CPUUsage // (types.CPUUsage) { - [DataMember(Name = "total_usage", EmitDefaultValue = false)] + [JsonPropertyName("total_usage")] public ulong TotalUsage { get; set; } - [DataMember(Name = "percpu_usage", EmitDefaultValue = false)] + [JsonPropertyName("percpu_usage")] public IList PercpuUsage { get; set; } - [DataMember(Name = "usage_in_kernelmode", EmitDefaultValue = false)] + [JsonPropertyName("usage_in_kernelmode")] public ulong UsageInKernelmode { get; set; } - [DataMember(Name = "usage_in_usermode", EmitDefaultValue = false)] + [JsonPropertyName("usage_in_usermode")] public ulong UsageInUsermode { get; set; } } } diff --git a/src/Docker.DotNet/Models/CapacityRange.Generated.cs b/src/Docker.DotNet/Models/CapacityRange.Generated.cs index ee62c103..e51d6ecd 100644 --- a/src/Docker.DotNet/Models/CapacityRange.Generated.cs +++ b/src/Docker.DotNet/Models/CapacityRange.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CapacityRange // (volume.CapacityRange) { - [DataMember(Name = "RequiredBytes", EmitDefaultValue = false)] + [JsonPropertyName("RequiredBytes")] public long RequiredBytes { get; set; } - [DataMember(Name = "LimitBytes", EmitDefaultValue = false)] + [JsonPropertyName("LimitBytes")] public long LimitBytes { get; set; } } } diff --git a/src/Docker.DotNet/Models/ClusterInfo.Generated.cs b/src/Docker.DotNet/Models/ClusterInfo.Generated.cs index 7bec4af9..fe0a3629 100644 --- a/src/Docker.DotNet/Models/ClusterInfo.Generated.cs +++ b/src/Docker.DotNet/Models/ClusterInfo.Generated.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ClusterInfo // (swarm.ClusterInfo) { public ClusterInfo() @@ -21,34 +20,34 @@ public ClusterInfo(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public Spec Spec { get; set; } - [DataMember(Name = "TLSInfo", EmitDefaultValue = false)] + [JsonPropertyName("TLSInfo")] public TLSInfo TLSInfo { get; set; } - [DataMember(Name = "RootRotationInProgress", EmitDefaultValue = false)] + [JsonPropertyName("RootRotationInProgress")] public bool RootRotationInProgress { get; set; } - [DataMember(Name = "DefaultAddrPool", EmitDefaultValue = false)] + [JsonPropertyName("DefaultAddrPool")] public IList DefaultAddrPool { get; set; } - [DataMember(Name = "SubnetSize", EmitDefaultValue = false)] + [JsonPropertyName("SubnetSize")] public uint SubnetSize { get; set; } - [DataMember(Name = "DataPathPort", EmitDefaultValue = false)] + [JsonPropertyName("DataPathPort")] public uint DataPathPort { get; set; } } } diff --git a/src/Docker.DotNet/Models/ClusterOptions.Generated.cs b/src/Docker.DotNet/Models/ClusterOptions.Generated.cs index f26176aa..01cfe710 100644 --- a/src/Docker.DotNet/Models/ClusterOptions.Generated.cs +++ b/src/Docker.DotNet/Models/ClusterOptions.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ClusterOptions // (mount.ClusterOptions) { } diff --git a/src/Docker.DotNet/Models/ClusterVolume.Generated.cs b/src/Docker.DotNet/Models/ClusterVolume.Generated.cs index b4cb6613..bc412838 100644 --- a/src/Docker.DotNet/Models/ClusterVolume.Generated.cs +++ b/src/Docker.DotNet/Models/ClusterVolume.Generated.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ClusterVolume // (volume.ClusterVolume) { public ClusterVolume() @@ -21,25 +20,25 @@ public ClusterVolume(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public ClusterVolumeSpec Spec { get; set; } - [DataMember(Name = "PublishStatus", EmitDefaultValue = false)] + [JsonPropertyName("PublishStatus")] public IList PublishStatus { get; set; } - [DataMember(Name = "Info", EmitDefaultValue = false)] + [JsonPropertyName("Info")] public VolumeInfo Info { get; set; } } } diff --git a/src/Docker.DotNet/Models/ClusterVolumeSpec.Generated.cs b/src/Docker.DotNet/Models/ClusterVolumeSpec.Generated.cs index 06c000ab..917988bb 100644 --- a/src/Docker.DotNet/Models/ClusterVolumeSpec.Generated.cs +++ b/src/Docker.DotNet/Models/ClusterVolumeSpec.Generated.cs @@ -1,27 +1,26 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ClusterVolumeSpec // (volume.ClusterVolumeSpec) { - [DataMember(Name = "Group", EmitDefaultValue = false)] + [JsonPropertyName("Group")] public string Group { get; set; } - [DataMember(Name = "AccessMode", EmitDefaultValue = false)] + [JsonPropertyName("AccessMode")] public AccessMode AccessMode { get; set; } - [DataMember(Name = "AccessibilityRequirements", EmitDefaultValue = false)] + [JsonPropertyName("AccessibilityRequirements")] public TopologyRequirement AccessibilityRequirements { get; set; } - [DataMember(Name = "CapacityRange", EmitDefaultValue = false)] + [JsonPropertyName("CapacityRange")] public CapacityRange CapacityRange { get; set; } - [DataMember(Name = "Secrets", EmitDefaultValue = false)] + [JsonPropertyName("Secrets")] public IList Secrets { get; set; } - [DataMember(Name = "Availability", EmitDefaultValue = false)] + [JsonPropertyName("Availability")] public string Availability { get; set; } } } diff --git a/src/Docker.DotNet/Models/Commit.Generated.cs b/src/Docker.DotNet/Models/Commit.Generated.cs index b58fdae5..66293bff 100644 --- a/src/Docker.DotNet/Models/Commit.Generated.cs +++ b/src/Docker.DotNet/Models/Commit.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Commit // (types.Commit) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Expected", EmitDefaultValue = false)] + [JsonPropertyName("Expected")] public string Expected { get; set; } } } diff --git a/src/Docker.DotNet/Models/CommitContainerChangesParameters.Generated.cs b/src/Docker.DotNet/Models/CommitContainerChangesParameters.Generated.cs index 0136f77f..9aecaacb 100644 --- a/src/Docker.DotNet/Models/CommitContainerChangesParameters.Generated.cs +++ b/src/Docker.DotNet/Models/CommitContainerChangesParameters.Generated.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CommitContainerChangesParameters // (main.CommitContainerChangesParameters) { public CommitContainerChangesParameters() @@ -65,80 +63,80 @@ public CommitContainerChangesParameters(Config Config) [QueryStringParameter("pause", false, typeof(BoolQueryStringConverter))] public bool? Pause { get; set; } - [DataMember(Name = "Hostname", EmitDefaultValue = false)] + [JsonPropertyName("Hostname")] public string Hostname { get; set; } - [DataMember(Name = "Domainname", EmitDefaultValue = false)] + [JsonPropertyName("Domainname")] public string Domainname { get; set; } - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "AttachStdin", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdin")] public bool AttachStdin { get; set; } - [DataMember(Name = "AttachStdout", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdout")] public bool AttachStdout { get; set; } - [DataMember(Name = "AttachStderr", EmitDefaultValue = false)] + [JsonPropertyName("AttachStderr")] public bool AttachStderr { get; set; } - [DataMember(Name = "ExposedPorts", EmitDefaultValue = false)] + [JsonPropertyName("ExposedPorts")] public IDictionary ExposedPorts { get; set; } - [DataMember(Name = "Tty", EmitDefaultValue = false)] + [JsonPropertyName("Tty")] public bool Tty { get; set; } - [DataMember(Name = "OpenStdin", EmitDefaultValue = false)] + [JsonPropertyName("OpenStdin")] public bool OpenStdin { get; set; } - [DataMember(Name = "StdinOnce", EmitDefaultValue = false)] + [JsonPropertyName("StdinOnce")] public bool StdinOnce { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "Cmd", EmitDefaultValue = false)] + [JsonPropertyName("Cmd")] public IList Cmd { get; set; } - [DataMember(Name = "Healthcheck", EmitDefaultValue = false)] + [JsonPropertyName("Healthcheck")] public HealthConfig Healthcheck { get; set; } - [DataMember(Name = "ArgsEscaped", EmitDefaultValue = false)] + [JsonPropertyName("ArgsEscaped")] public bool ArgsEscaped { get; set; } - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "Volumes", EmitDefaultValue = false)] + [JsonPropertyName("Volumes")] public IDictionary Volumes { get; set; } - [DataMember(Name = "WorkingDir", EmitDefaultValue = false)] + [JsonPropertyName("WorkingDir")] public string WorkingDir { get; set; } - [DataMember(Name = "Entrypoint", EmitDefaultValue = false)] + [JsonPropertyName("Entrypoint")] public IList Entrypoint { get; set; } - [DataMember(Name = "NetworkDisabled", EmitDefaultValue = false)] + [JsonPropertyName("NetworkDisabled")] public bool NetworkDisabled { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } - [DataMember(Name = "OnBuild", EmitDefaultValue = false)] + [JsonPropertyName("OnBuild")] public IList OnBuild { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "StopSignal", EmitDefaultValue = false)] + [JsonPropertyName("StopSignal")] public string StopSignal { get; set; } - [DataMember(Name = "StopTimeout", EmitDefaultValue = false)] + [JsonPropertyName("StopTimeout")] [JsonConverter(typeof(TimeSpanSecondsConverter))] public TimeSpan? StopTimeout { get; set; } - [DataMember(Name = "Shell", EmitDefaultValue = false)] + [JsonPropertyName("Shell")] public IList Shell { get; set; } } } diff --git a/src/Docker.DotNet/Models/CommitContainerChangesResponse.Generated.cs b/src/Docker.DotNet/Models/CommitContainerChangesResponse.Generated.cs index fda334c0..6333322a 100644 --- a/src/Docker.DotNet/Models/CommitContainerChangesResponse.Generated.cs +++ b/src/Docker.DotNet/Models/CommitContainerChangesResponse.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CommitContainerChangesResponse // (main.CommitContainerChangesResponse) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } } } diff --git a/src/Docker.DotNet/Models/ComponentVersion.Generated.cs b/src/Docker.DotNet/Models/ComponentVersion.Generated.cs index e04f766a..3eb72fa3 100644 --- a/src/Docker.DotNet/Models/ComponentVersion.Generated.cs +++ b/src/Docker.DotNet/Models/ComponentVersion.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ComponentVersion // (types.ComponentVersion) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public string Version { get; set; } - [DataMember(Name = "Details", EmitDefaultValue = false)] + [JsonPropertyName("Details")] public IDictionary Details { get; set; } } } diff --git a/src/Docker.DotNet/Models/Config.Generated.cs b/src/Docker.DotNet/Models/Config.Generated.cs index e3430df4..6b06f9f6 100644 --- a/src/Docker.DotNet/Models/Config.Generated.cs +++ b/src/Docker.DotNet/Models/Config.Generated.cs @@ -1,87 +1,85 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Config // (container.Config) { - [DataMember(Name = "Hostname", EmitDefaultValue = false)] + [JsonPropertyName("Hostname")] public string Hostname { get; set; } - [DataMember(Name = "Domainname", EmitDefaultValue = false)] + [JsonPropertyName("Domainname")] public string Domainname { get; set; } - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "AttachStdin", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdin")] public bool AttachStdin { get; set; } - [DataMember(Name = "AttachStdout", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdout")] public bool AttachStdout { get; set; } - [DataMember(Name = "AttachStderr", EmitDefaultValue = false)] + [JsonPropertyName("AttachStderr")] public bool AttachStderr { get; set; } - [DataMember(Name = "ExposedPorts", EmitDefaultValue = false)] + [JsonPropertyName("ExposedPorts")] public IDictionary ExposedPorts { get; set; } - [DataMember(Name = "Tty", EmitDefaultValue = false)] + [JsonPropertyName("Tty")] public bool Tty { get; set; } - [DataMember(Name = "OpenStdin", EmitDefaultValue = false)] + [JsonPropertyName("OpenStdin")] public bool OpenStdin { get; set; } - [DataMember(Name = "StdinOnce", EmitDefaultValue = false)] + [JsonPropertyName("StdinOnce")] public bool StdinOnce { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "Cmd", EmitDefaultValue = false)] + [JsonPropertyName("Cmd")] public IList Cmd { get; set; } - [DataMember(Name = "Healthcheck", EmitDefaultValue = false)] + [JsonPropertyName("Healthcheck")] public HealthConfig Healthcheck { get; set; } - [DataMember(Name = "ArgsEscaped", EmitDefaultValue = false)] + [JsonPropertyName("ArgsEscaped")] public bool ArgsEscaped { get; set; } - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "Volumes", EmitDefaultValue = false)] + [JsonPropertyName("Volumes")] public IDictionary Volumes { get; set; } - [DataMember(Name = "WorkingDir", EmitDefaultValue = false)] + [JsonPropertyName("WorkingDir")] public string WorkingDir { get; set; } - [DataMember(Name = "Entrypoint", EmitDefaultValue = false)] + [JsonPropertyName("Entrypoint")] public IList Entrypoint { get; set; } - [DataMember(Name = "NetworkDisabled", EmitDefaultValue = false)] + [JsonPropertyName("NetworkDisabled")] public bool NetworkDisabled { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } - [DataMember(Name = "OnBuild", EmitDefaultValue = false)] + [JsonPropertyName("OnBuild")] public IList OnBuild { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "StopSignal", EmitDefaultValue = false)] + [JsonPropertyName("StopSignal")] public string StopSignal { get; set; } - [DataMember(Name = "StopTimeout", EmitDefaultValue = false)] + [JsonPropertyName("StopTimeout")] [JsonConverter(typeof(TimeSpanSecondsConverter))] public TimeSpan? StopTimeout { get; set; } - [DataMember(Name = "Shell", EmitDefaultValue = false)] + [JsonPropertyName("Shell")] public IList Shell { get; set; } } } diff --git a/src/Docker.DotNet/Models/ConfigReference.Generated.cs b/src/Docker.DotNet/Models/ConfigReference.Generated.cs index 2e13cc8e..0730bda8 100644 --- a/src/Docker.DotNet/Models/ConfigReference.Generated.cs +++ b/src/Docker.DotNet/Models/ConfigReference.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ConfigReference // (network.ConfigReference) { - [DataMember(Name = "Network", EmitDefaultValue = false)] + [JsonPropertyName("Network")] public string Network { get; set; } } } diff --git a/src/Docker.DotNet/Models/ConfigReferenceFileTarget.Generated.cs b/src/Docker.DotNet/Models/ConfigReferenceFileTarget.Generated.cs index b5514f46..0f43e3f2 100644 --- a/src/Docker.DotNet/Models/ConfigReferenceFileTarget.Generated.cs +++ b/src/Docker.DotNet/Models/ConfigReferenceFileTarget.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ConfigReferenceFileTarget // (swarm.ConfigReferenceFileTarget) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "UID", EmitDefaultValue = false)] + [JsonPropertyName("UID")] public string UID { get; set; } - [DataMember(Name = "GID", EmitDefaultValue = false)] + [JsonPropertyName("GID")] public string GID { get; set; } - [DataMember(Name = "Mode", EmitDefaultValue = false)] + [JsonPropertyName("Mode")] public uint Mode { get; set; } } } diff --git a/src/Docker.DotNet/Models/ConfigReferenceRuntimeTarget.Generated.cs b/src/Docker.DotNet/Models/ConfigReferenceRuntimeTarget.Generated.cs index 49296626..37876adf 100644 --- a/src/Docker.DotNet/Models/ConfigReferenceRuntimeTarget.Generated.cs +++ b/src/Docker.DotNet/Models/ConfigReferenceRuntimeTarget.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ConfigReferenceRuntimeTarget // (swarm.ConfigReferenceRuntimeTarget) { } diff --git a/src/Docker.DotNet/Models/ContainerAttachParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerAttachParameters.Generated.cs index 14e2746f..00f3e433 100644 --- a/src/Docker.DotNet/Models/ContainerAttachParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerAttachParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerAttachParameters // (main.ContainerAttachParameters) { [QueryStringParameter("stream", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainerEventsParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerEventsParameters.Generated.cs index 275a78bf..0261b716 100644 --- a/src/Docker.DotNet/Models/ContainerEventsParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerEventsParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerEventsParameters // (main.ContainerEventsParameters) { [QueryStringParameter("since", false)] diff --git a/src/Docker.DotNet/Models/ContainerExecCreateParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerExecCreateParameters.Generated.cs index 215b5823..f34bb1aa 100644 --- a/src/Docker.DotNet/Models/ContainerExecCreateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerExecCreateParameters.Generated.cs @@ -1,45 +1,44 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerExecCreateParameters // (main.ContainerExecCreateParameters) { - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "Privileged", EmitDefaultValue = false)] + [JsonPropertyName("Privileged")] public bool Privileged { get; set; } - [DataMember(Name = "Tty", EmitDefaultValue = false)] + [JsonPropertyName("Tty")] public bool Tty { get; set; } - [DataMember(Name = "ConsoleSize", EmitDefaultValue = false)] + [JsonPropertyName("ConsoleSize")] public ulong[] ConsoleSize { get; set; } - [DataMember(Name = "AttachStdin", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdin")] public bool AttachStdin { get; set; } - [DataMember(Name = "AttachStderr", EmitDefaultValue = false)] + [JsonPropertyName("AttachStderr")] public bool AttachStderr { get; set; } - [DataMember(Name = "AttachStdout", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdout")] public bool AttachStdout { get; set; } - [DataMember(Name = "Detach", EmitDefaultValue = false)] + [JsonPropertyName("Detach")] public bool Detach { get; set; } - [DataMember(Name = "DetachKeys", EmitDefaultValue = false)] + [JsonPropertyName("DetachKeys")] public string DetachKeys { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "WorkingDir", EmitDefaultValue = false)] + [JsonPropertyName("WorkingDir")] public string WorkingDir { get; set; } - [DataMember(Name = "Cmd", EmitDefaultValue = false)] + [JsonPropertyName("Cmd")] public IList Cmd { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerExecCreateResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerExecCreateResponse.Generated.cs index 92fb2ef2..9a06d0fc 100644 --- a/src/Docker.DotNet/Models/ContainerExecCreateResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerExecCreateResponse.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerExecCreateResponse // (main.ContainerExecCreateResponse) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerExecInspectResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerExecInspectResponse.Generated.cs index 8ac3c8e3..17f38827 100644 --- a/src/Docker.DotNet/Models/ContainerExecInspectResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerExecInspectResponse.Generated.cs @@ -1,23 +1,22 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerExecInspectResponse // (types.ContainerExecInspect) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ExecID { get; set; } - [DataMember(Name = "ContainerID", EmitDefaultValue = false)] + [JsonPropertyName("ContainerID")] public string ContainerID { get; set; } - [DataMember(Name = "Running", EmitDefaultValue = false)] + [JsonPropertyName("Running")] public bool Running { get; set; } - [DataMember(Name = "ExitCode", EmitDefaultValue = false)] + [JsonPropertyName("ExitCode")] public long ExitCode { get; set; } - [DataMember(Name = "Pid", EmitDefaultValue = false)] + [JsonPropertyName("Pid")] public long Pid { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerExecStartParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerExecStartParameters.Generated.cs index 93f030ac..3e048a87 100644 --- a/src/Docker.DotNet/Models/ContainerExecStartParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerExecStartParameters.Generated.cs @@ -1,45 +1,44 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerExecStartParameters // (main.ContainerExecStartParameters) { - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "Privileged", EmitDefaultValue = false)] + [JsonPropertyName("Privileged")] public bool Privileged { get; set; } - [DataMember(Name = "Tty", EmitDefaultValue = false)] + [JsonPropertyName("Tty")] public bool Tty { get; set; } - [DataMember(Name = "ConsoleSize", EmitDefaultValue = false)] + [JsonPropertyName("ConsoleSize")] public ulong[] ConsoleSize { get; set; } - [DataMember(Name = "AttachStdin", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdin")] public bool AttachStdin { get; set; } - [DataMember(Name = "AttachStderr", EmitDefaultValue = false)] + [JsonPropertyName("AttachStderr")] public bool AttachStderr { get; set; } - [DataMember(Name = "AttachStdout", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdout")] public bool AttachStdout { get; set; } - [DataMember(Name = "Detach", EmitDefaultValue = false)] + [JsonPropertyName("Detach")] public bool Detach { get; set; } - [DataMember(Name = "DetachKeys", EmitDefaultValue = false)] + [JsonPropertyName("DetachKeys")] public string DetachKeys { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "WorkingDir", EmitDefaultValue = false)] + [JsonPropertyName("WorkingDir")] public string WorkingDir { get; set; } - [DataMember(Name = "Cmd", EmitDefaultValue = false)] + [JsonPropertyName("Cmd")] public IList Cmd { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerFileSystemChangeResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerFileSystemChangeResponse.Generated.cs index c5196482..f7f5496b 100644 --- a/src/Docker.DotNet/Models/ContainerFileSystemChangeResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerFileSystemChangeResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerFileSystemChangeResponse // (container.FilesystemChange) { - [DataMember(Name = "Kind", EmitDefaultValue = false)] + [JsonPropertyName("Kind")] public FileSystemChangeKind Kind { get; set; } - [DataMember(Name = "Path", EmitDefaultValue = false)] + [JsonPropertyName("Path")] public string Path { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerInspectParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerInspectParameters.Generated.cs index b2d7d372..53892ee7 100644 --- a/src/Docker.DotNet/Models/ContainerInspectParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerInspectParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerInspectParameters // (main.ContainerInspectParameters) { [QueryStringParameter("size", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainerInspectResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerInspectResponse.Generated.cs index 73375c52..56734b82 100644 --- a/src/Docker.DotNet/Models/ContainerInspectResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerInspectResponse.Generated.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerInspectResponse // (types.ContainerJSON) { public ContainerInspectResponse() @@ -41,82 +40,82 @@ public ContainerInspectResponse(ContainerJSONBase ContainerJSONBase) } } - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "Path", EmitDefaultValue = false)] + [JsonPropertyName("Path")] public string Path { get; set; } - [DataMember(Name = "Args", EmitDefaultValue = false)] + [JsonPropertyName("Args")] public IList Args { get; set; } - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public ContainerState State { get; set; } - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "ResolvConfPath", EmitDefaultValue = false)] + [JsonPropertyName("ResolvConfPath")] public string ResolvConfPath { get; set; } - [DataMember(Name = "HostnamePath", EmitDefaultValue = false)] + [JsonPropertyName("HostnamePath")] public string HostnamePath { get; set; } - [DataMember(Name = "HostsPath", EmitDefaultValue = false)] + [JsonPropertyName("HostsPath")] public string HostsPath { get; set; } - [DataMember(Name = "LogPath", EmitDefaultValue = false)] + [JsonPropertyName("LogPath")] public string LogPath { get; set; } - [DataMember(Name = "Node", EmitDefaultValue = false)] + [JsonPropertyName("Node")] public ContainerNode Node { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "RestartCount", EmitDefaultValue = false)] + [JsonPropertyName("RestartCount")] public long RestartCount { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Platform", EmitDefaultValue = false)] + [JsonPropertyName("Platform")] public string Platform { get; set; } - [DataMember(Name = "MountLabel", EmitDefaultValue = false)] + [JsonPropertyName("MountLabel")] public string MountLabel { get; set; } - [DataMember(Name = "ProcessLabel", EmitDefaultValue = false)] + [JsonPropertyName("ProcessLabel")] public string ProcessLabel { get; set; } - [DataMember(Name = "AppArmorProfile", EmitDefaultValue = false)] + [JsonPropertyName("AppArmorProfile")] public string AppArmorProfile { get; set; } - [DataMember(Name = "ExecIDs", EmitDefaultValue = false)] + [JsonPropertyName("ExecIDs")] public IList ExecIDs { get; set; } - [DataMember(Name = "HostConfig", EmitDefaultValue = false)] + [JsonPropertyName("HostConfig")] public HostConfig HostConfig { get; set; } - [DataMember(Name = "GraphDriver", EmitDefaultValue = false)] + [JsonPropertyName("GraphDriver")] public GraphDriverData GraphDriver { get; set; } - [DataMember(Name = "SizeRw", EmitDefaultValue = false)] + [JsonPropertyName("SizeRw")] public long? SizeRw { get; set; } - [DataMember(Name = "SizeRootFs", EmitDefaultValue = false)] + [JsonPropertyName("SizeRootFs")] public long? SizeRootFs { get; set; } - [DataMember(Name = "Mounts", EmitDefaultValue = false)] + [JsonPropertyName("Mounts")] public IList Mounts { get; set; } - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public Config Config { get; set; } - [DataMember(Name = "NetworkSettings", EmitDefaultValue = false)] + [JsonPropertyName("NetworkSettings")] public NetworkSettings NetworkSettings { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerJSONBase.Generated.cs b/src/Docker.DotNet/Models/ContainerJSONBase.Generated.cs index 9eef0fbb..798747db 100644 --- a/src/Docker.DotNet/Models/ContainerJSONBase.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerJSONBase.Generated.cs @@ -1,79 +1,78 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerJSONBase // (types.ContainerJSONBase) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "Path", EmitDefaultValue = false)] + [JsonPropertyName("Path")] public string Path { get; set; } - [DataMember(Name = "Args", EmitDefaultValue = false)] + [JsonPropertyName("Args")] public IList Args { get; set; } - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public ContainerState State { get; set; } - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "ResolvConfPath", EmitDefaultValue = false)] + [JsonPropertyName("ResolvConfPath")] public string ResolvConfPath { get; set; } - [DataMember(Name = "HostnamePath", EmitDefaultValue = false)] + [JsonPropertyName("HostnamePath")] public string HostnamePath { get; set; } - [DataMember(Name = "HostsPath", EmitDefaultValue = false)] + [JsonPropertyName("HostsPath")] public string HostsPath { get; set; } - [DataMember(Name = "LogPath", EmitDefaultValue = false)] + [JsonPropertyName("LogPath")] public string LogPath { get; set; } - [DataMember(Name = "Node", EmitDefaultValue = false)] + [JsonPropertyName("Node")] public ContainerNode Node { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "RestartCount", EmitDefaultValue = false)] + [JsonPropertyName("RestartCount")] public long RestartCount { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Platform", EmitDefaultValue = false)] + [JsonPropertyName("Platform")] public string Platform { get; set; } - [DataMember(Name = "MountLabel", EmitDefaultValue = false)] + [JsonPropertyName("MountLabel")] public string MountLabel { get; set; } - [DataMember(Name = "ProcessLabel", EmitDefaultValue = false)] + [JsonPropertyName("ProcessLabel")] public string ProcessLabel { get; set; } - [DataMember(Name = "AppArmorProfile", EmitDefaultValue = false)] + [JsonPropertyName("AppArmorProfile")] public string AppArmorProfile { get; set; } - [DataMember(Name = "ExecIDs", EmitDefaultValue = false)] + [JsonPropertyName("ExecIDs")] public IList ExecIDs { get; set; } - [DataMember(Name = "HostConfig", EmitDefaultValue = false)] + [JsonPropertyName("HostConfig")] public HostConfig HostConfig { get; set; } - [DataMember(Name = "GraphDriver", EmitDefaultValue = false)] + [JsonPropertyName("GraphDriver")] public GraphDriverData GraphDriver { get; set; } - [DataMember(Name = "SizeRw", EmitDefaultValue = false)] + [JsonPropertyName("SizeRw")] public long? SizeRw { get; set; } - [DataMember(Name = "SizeRootFs", EmitDefaultValue = false)] + [JsonPropertyName("SizeRootFs")] public long? SizeRootFs { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerKillParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerKillParameters.Generated.cs index ef697f56..8a411c2c 100644 --- a/src/Docker.DotNet/Models/ContainerKillParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerKillParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerKillParameters // (main.ContainerKillParameters) { [QueryStringParameter("signal", false)] diff --git a/src/Docker.DotNet/Models/ContainerListProcessesParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerListProcessesParameters.Generated.cs index ed11dff2..28a0a31b 100644 --- a/src/Docker.DotNet/Models/ContainerListProcessesParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerListProcessesParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerListProcessesParameters // (main.ContainerListProcessesParameters) { [QueryStringParameter("ps_args", false)] diff --git a/src/Docker.DotNet/Models/ContainerListResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerListResponse.Generated.cs index 0b308b84..e907e517 100644 --- a/src/Docker.DotNet/Models/ContainerListResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerListResponse.Generated.cs @@ -1,52 +1,51 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerListResponse // (types.Container) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Names", EmitDefaultValue = false)] + [JsonPropertyName("Names")] public IList Names { get; set; } - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "ImageID", EmitDefaultValue = false)] + [JsonPropertyName("ImageID")] public string ImageID { get; set; } - [DataMember(Name = "Command", EmitDefaultValue = false)] + [JsonPropertyName("Command")] public string Command { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IList Ports { get; set; } - [DataMember(Name = "SizeRw", EmitDefaultValue = false)] + [JsonPropertyName("SizeRw")] public long SizeRw { get; set; } - [DataMember(Name = "SizeRootFs", EmitDefaultValue = false)] + [JsonPropertyName("SizeRootFs")] public long SizeRootFs { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public string State { get; set; } - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public string Status { get; set; } - [DataMember(Name = "NetworkSettings", EmitDefaultValue = false)] + [JsonPropertyName("NetworkSettings")] public SummaryNetworkSettings NetworkSettings { get; set; } - [DataMember(Name = "Mounts", EmitDefaultValue = false)] + [JsonPropertyName("Mounts")] public IList Mounts { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs index 38207b8c..165358c4 100644 --- a/src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerLogsParameters // (main.ContainerLogsParameters) { [QueryStringParameter("stdout", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainerNode.Generated.cs b/src/Docker.DotNet/Models/ContainerNode.Generated.cs index 6846bb20..0b3c33c5 100644 --- a/src/Docker.DotNet/Models/ContainerNode.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerNode.Generated.cs @@ -1,30 +1,29 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerNode // (types.ContainerNode) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "IP", EmitDefaultValue = false)] + [JsonPropertyName("IP")] public string IPAddress { get; set; } - [DataMember(Name = "Addr", EmitDefaultValue = false)] + [JsonPropertyName("Addr")] public string Addr { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Cpus", EmitDefaultValue = false)] + [JsonPropertyName("Cpus")] public long Cpus { get; set; } - [DataMember(Name = "Memory", EmitDefaultValue = false)] + [JsonPropertyName("Memory")] public long Memory { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerPathStatParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerPathStatParameters.Generated.cs index ba367a3b..59250369 100644 --- a/src/Docker.DotNet/Models/ContainerPathStatParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerPathStatParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerPathStatParameters // (main.ContainerPathStatParameters) { [QueryStringParameter("path", true)] diff --git a/src/Docker.DotNet/Models/ContainerPathStatResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerPathStatResponse.Generated.cs index 485d5126..c62c400a 100644 --- a/src/Docker.DotNet/Models/ContainerPathStatResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerPathStatResponse.Generated.cs @@ -1,24 +1,23 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerPathStatResponse // (types.ContainerPathStat) { - [DataMember(Name = "name", EmitDefaultValue = false)] + [JsonPropertyName("name")] public string Name { get; set; } - [DataMember(Name = "size", EmitDefaultValue = false)] + [JsonPropertyName("size")] public long Size { get; set; } - [DataMember(Name = "mode", EmitDefaultValue = false)] + [JsonPropertyName("mode")] public uint Mode { get; set; } - [DataMember(Name = "mtime", EmitDefaultValue = false)] + [JsonPropertyName("mtime")] public DateTime Mtime { get; set; } - [DataMember(Name = "linkTarget", EmitDefaultValue = false)] + [JsonPropertyName("linkTarget")] public string LinkTarget { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerProcessesResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerProcessesResponse.Generated.cs index 18fcd671..2d266716 100644 --- a/src/Docker.DotNet/Models/ContainerProcessesResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerProcessesResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerProcessesResponse // (container.ContainerTopOKBody) { - [DataMember(Name = "Processes", EmitDefaultValue = false)] + [JsonPropertyName("Processes")] public IList> Processes { get; set; } - [DataMember(Name = "Titles", EmitDefaultValue = false)] + [JsonPropertyName("Titles")] public IList Titles { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerRemoveParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerRemoveParameters.Generated.cs index d910f9ba..a7e1b520 100644 --- a/src/Docker.DotNet/Models/ContainerRemoveParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerRemoveParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerRemoveParameters // (main.ContainerRemoveParameters) { [QueryStringParameter("v", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainerRenameParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerRenameParameters.Generated.cs index 48e3456c..af644d24 100644 --- a/src/Docker.DotNet/Models/ContainerRenameParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerRenameParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerRenameParameters // (main.ContainerRenameParameters) { [QueryStringParameter("name", false)] diff --git a/src/Docker.DotNet/Models/ContainerResizeParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerResizeParameters.Generated.cs index adc5880b..8453d687 100644 --- a/src/Docker.DotNet/Models/ContainerResizeParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerResizeParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerResizeParameters // (main.ContainerResizeParameters) { [QueryStringParameter("h", false)] diff --git a/src/Docker.DotNet/Models/ContainerRestartParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerRestartParameters.Generated.cs index 02a1bd75..9894f129 100644 --- a/src/Docker.DotNet/Models/ContainerRestartParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerRestartParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerRestartParameters // (main.ContainerRestartParameters) { [QueryStringParameter("t", false)] diff --git a/src/Docker.DotNet/Models/ContainerSpec.Generated.cs b/src/Docker.DotNet/Models/ContainerSpec.Generated.cs index d3244e19..7d08efd4 100644 --- a/src/Docker.DotNet/Models/ContainerSpec.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerSpec.Generated.cs @@ -1,90 +1,89 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerSpec // (swarm.ContainerSpec) { - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Command", EmitDefaultValue = false)] + [JsonPropertyName("Command")] public IList Command { get; set; } - [DataMember(Name = "Args", EmitDefaultValue = false)] + [JsonPropertyName("Args")] public IList Args { get; set; } - [DataMember(Name = "Hostname", EmitDefaultValue = false)] + [JsonPropertyName("Hostname")] public string Hostname { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "Dir", EmitDefaultValue = false)] + [JsonPropertyName("Dir")] public string Dir { get; set; } - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "Groups", EmitDefaultValue = false)] + [JsonPropertyName("Groups")] public IList Groups { get; set; } - [DataMember(Name = "Privileges", EmitDefaultValue = false)] + [JsonPropertyName("Privileges")] public Privileges Privileges { get; set; } - [DataMember(Name = "Init", EmitDefaultValue = false)] + [JsonPropertyName("Init")] public bool? Init { get; set; } - [DataMember(Name = "StopSignal", EmitDefaultValue = false)] + [JsonPropertyName("StopSignal")] public string StopSignal { get; set; } - [DataMember(Name = "TTY", EmitDefaultValue = false)] + [JsonPropertyName("TTY")] public bool TTY { get; set; } - [DataMember(Name = "OpenStdin", EmitDefaultValue = false)] + [JsonPropertyName("OpenStdin")] public bool OpenStdin { get; set; } - [DataMember(Name = "ReadOnly", EmitDefaultValue = false)] + [JsonPropertyName("ReadOnly")] public bool ReadOnly { get; set; } - [DataMember(Name = "Mounts", EmitDefaultValue = false)] + [JsonPropertyName("Mounts")] public IList Mounts { get; set; } - [DataMember(Name = "StopGracePeriod", EmitDefaultValue = false)] + [JsonPropertyName("StopGracePeriod")] public long? StopGracePeriod { get; set; } - [DataMember(Name = "Healthcheck", EmitDefaultValue = false)] + [JsonPropertyName("Healthcheck")] public HealthConfig Healthcheck { get; set; } - [DataMember(Name = "Hosts", EmitDefaultValue = false)] + [JsonPropertyName("Hosts")] public IList Hosts { get; set; } - [DataMember(Name = "DNSConfig", EmitDefaultValue = false)] + [JsonPropertyName("DNSConfig")] public DNSConfig DNSConfig { get; set; } - [DataMember(Name = "Secrets", EmitDefaultValue = false)] + [JsonPropertyName("Secrets")] public IList Secrets { get; set; } - [DataMember(Name = "Configs", EmitDefaultValue = false)] + [JsonPropertyName("Configs")] public IList Configs { get; set; } - [DataMember(Name = "Isolation", EmitDefaultValue = false)] + [JsonPropertyName("Isolation")] public string Isolation { get; set; } - [DataMember(Name = "Sysctls", EmitDefaultValue = false)] + [JsonPropertyName("Sysctls")] public IDictionary Sysctls { get; set; } - [DataMember(Name = "CapabilityAdd", EmitDefaultValue = false)] + [JsonPropertyName("CapabilityAdd")] public IList CapabilityAdd { get; set; } - [DataMember(Name = "CapabilityDrop", EmitDefaultValue = false)] + [JsonPropertyName("CapabilityDrop")] public IList CapabilityDrop { get; set; } - [DataMember(Name = "Ulimits", EmitDefaultValue = false)] + [JsonPropertyName("Ulimits")] public IList Ulimits { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerStartParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerStartParameters.Generated.cs index d9303d31..7cd3f8ff 100644 --- a/src/Docker.DotNet/Models/ContainerStartParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerStartParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerStartParameters // (main.ContainerStartParameters) { [QueryStringParameter("detachKeys", false)] diff --git a/src/Docker.DotNet/Models/ContainerState.Generated.cs b/src/Docker.DotNet/Models/ContainerState.Generated.cs index 2b15c553..2a848b58 100644 --- a/src/Docker.DotNet/Models/ContainerState.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerState.Generated.cs @@ -1,44 +1,43 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerState // (types.ContainerState) { - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public string Status { get; set; } - [DataMember(Name = "Running", EmitDefaultValue = false)] + [JsonPropertyName("Running")] public bool Running { get; set; } - [DataMember(Name = "Paused", EmitDefaultValue = false)] + [JsonPropertyName("Paused")] public bool Paused { get; set; } - [DataMember(Name = "Restarting", EmitDefaultValue = false)] + [JsonPropertyName("Restarting")] public bool Restarting { get; set; } - [DataMember(Name = "OOMKilled", EmitDefaultValue = false)] + [JsonPropertyName("OOMKilled")] public bool OOMKilled { get; set; } - [DataMember(Name = "Dead", EmitDefaultValue = false)] + [JsonPropertyName("Dead")] public bool Dead { get; set; } - [DataMember(Name = "Pid", EmitDefaultValue = false)] + [JsonPropertyName("Pid")] public long Pid { get; set; } - [DataMember(Name = "ExitCode", EmitDefaultValue = false)] + [JsonPropertyName("ExitCode")] public long ExitCode { get; set; } - [DataMember(Name = "Error", EmitDefaultValue = false)] + [JsonPropertyName("Error")] public string Error { get; set; } - [DataMember(Name = "StartedAt", EmitDefaultValue = false)] + [JsonPropertyName("StartedAt")] public string StartedAt { get; set; } - [DataMember(Name = "FinishedAt", EmitDefaultValue = false)] + [JsonPropertyName("FinishedAt")] public string FinishedAt { get; set; } - [DataMember(Name = "Health", EmitDefaultValue = false)] + [JsonPropertyName("Health")] public Health Health { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs index f5a9ca9b..a3fc9d73 100644 --- a/src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerStatsParameters // (main.ContainerStatsParameters) { [QueryStringParameter("stream", true, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainerStatsResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerStatsResponse.Generated.cs index 4cdb6691..ecb6bb20 100644 --- a/src/Docker.DotNet/Models/ContainerStatsResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerStatsResponse.Generated.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerStatsResponse // (types.StatsJSON) { public ContainerStatsResponse() @@ -27,40 +26,40 @@ public ContainerStatsResponse(Stats Stats) } } - [DataMember(Name = "read", EmitDefaultValue = false)] + [JsonPropertyName("read")] public DateTime Read { get; set; } - [DataMember(Name = "preread", EmitDefaultValue = false)] + [JsonPropertyName("preread")] public DateTime PreRead { get; set; } - [DataMember(Name = "pids_stats", EmitDefaultValue = false)] + [JsonPropertyName("pids_stats")] public PidsStats PidsStats { get; set; } - [DataMember(Name = "blkio_stats", EmitDefaultValue = false)] + [JsonPropertyName("blkio_stats")] public BlkioStats BlkioStats { get; set; } - [DataMember(Name = "num_procs", EmitDefaultValue = false)] + [JsonPropertyName("num_procs")] public uint NumProcs { get; set; } - [DataMember(Name = "storage_stats", EmitDefaultValue = false)] + [JsonPropertyName("storage_stats")] public StorageStats StorageStats { get; set; } - [DataMember(Name = "cpu_stats", EmitDefaultValue = false)] + [JsonPropertyName("cpu_stats")] public CPUStats CPUStats { get; set; } - [DataMember(Name = "precpu_stats", EmitDefaultValue = false)] + [JsonPropertyName("precpu_stats")] public CPUStats PreCPUStats { get; set; } - [DataMember(Name = "memory_stats", EmitDefaultValue = false)] + [JsonPropertyName("memory_stats")] public MemoryStats MemoryStats { get; set; } - [DataMember(Name = "name", EmitDefaultValue = false)] + [JsonPropertyName("name")] public string Name { get; set; } - [DataMember(Name = "id", EmitDefaultValue = false)] + [JsonPropertyName("id")] public string ID { get; set; } - [DataMember(Name = "networks", EmitDefaultValue = false)] + [JsonPropertyName("networks")] public IDictionary Networks { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerStatus.Generated.cs b/src/Docker.DotNet/Models/ContainerStatus.Generated.cs index fe3ac7f7..f7c8a808 100644 --- a/src/Docker.DotNet/Models/ContainerStatus.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerStatus.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerStatus // (swarm.ContainerStatus) { - [DataMember(Name = "ContainerID", EmitDefaultValue = false)] + [JsonPropertyName("ContainerID")] public string ContainerID { get; set; } - [DataMember(Name = "PID", EmitDefaultValue = false)] + [JsonPropertyName("PID")] public long PID { get; set; } - [DataMember(Name = "ExitCode", EmitDefaultValue = false)] + [JsonPropertyName("ExitCode")] public long ExitCode { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerStopParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerStopParameters.Generated.cs index 0493f236..113793a5 100644 --- a/src/Docker.DotNet/Models/ContainerStopParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerStopParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerStopParameters // (main.ContainerStopParameters) { [QueryStringParameter("t", false)] diff --git a/src/Docker.DotNet/Models/ContainerUpdateParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerUpdateParameters.Generated.cs index 428886fd..8ba059e6 100644 --- a/src/Docker.DotNet/Models/ContainerUpdateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerUpdateParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerUpdateParameters // (main.ContainerUpdateParameters) { public ContainerUpdateParameters() @@ -49,100 +48,100 @@ public ContainerUpdateParameters(UpdateConfig UpdateConfig) } } - [DataMember(Name = "CpuShares", EmitDefaultValue = false)] + [JsonPropertyName("CpuShares")] public long CPUShares { get; set; } - [DataMember(Name = "Memory", EmitDefaultValue = false)] + [JsonPropertyName("Memory")] public long Memory { get; set; } - [DataMember(Name = "NanoCpus", EmitDefaultValue = false)] + [JsonPropertyName("NanoCpus")] public long NanoCPUs { get; set; } - [DataMember(Name = "CgroupParent", EmitDefaultValue = false)] + [JsonPropertyName("CgroupParent")] public string CgroupParent { get; set; } - [DataMember(Name = "BlkioWeight", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeight")] public ushort BlkioWeight { get; set; } - [DataMember(Name = "BlkioWeightDevice", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeightDevice")] public IList BlkioWeightDevice { get; set; } - [DataMember(Name = "BlkioDeviceReadBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadBps")] public IList BlkioDeviceReadBps { get; set; } - [DataMember(Name = "BlkioDeviceWriteBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteBps")] public IList BlkioDeviceWriteBps { get; set; } - [DataMember(Name = "BlkioDeviceReadIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadIOps")] public IList BlkioDeviceReadIOps { get; set; } - [DataMember(Name = "BlkioDeviceWriteIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteIOps")] public IList BlkioDeviceWriteIOps { get; set; } - [DataMember(Name = "CpuPeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuPeriod")] public long CPUPeriod { get; set; } - [DataMember(Name = "CpuQuota", EmitDefaultValue = false)] + [JsonPropertyName("CpuQuota")] public long CPUQuota { get; set; } - [DataMember(Name = "CpuRealtimePeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimePeriod")] public long CPURealtimePeriod { get; set; } - [DataMember(Name = "CpuRealtimeRuntime", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimeRuntime")] public long CPURealtimeRuntime { get; set; } - [DataMember(Name = "CpusetCpus", EmitDefaultValue = false)] + [JsonPropertyName("CpusetCpus")] public string CpusetCpus { get; set; } - [DataMember(Name = "CpusetMems", EmitDefaultValue = false)] + [JsonPropertyName("CpusetMems")] public string CpusetMems { get; set; } - [DataMember(Name = "Devices", EmitDefaultValue = false)] + [JsonPropertyName("Devices")] public IList Devices { get; set; } - [DataMember(Name = "DeviceCgroupRules", EmitDefaultValue = false)] + [JsonPropertyName("DeviceCgroupRules")] public IList DeviceCgroupRules { get; set; } - [DataMember(Name = "DeviceRequests", EmitDefaultValue = false)] + [JsonPropertyName("DeviceRequests")] public IList DeviceRequests { get; set; } - [DataMember(Name = "KernelMemory", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemory")] public long KernelMemory { get; set; } - [DataMember(Name = "KernelMemoryTCP", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemoryTCP")] public long KernelMemoryTCP { get; set; } - [DataMember(Name = "MemoryReservation", EmitDefaultValue = false)] + [JsonPropertyName("MemoryReservation")] public long MemoryReservation { get; set; } - [DataMember(Name = "MemorySwap", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwap")] public long MemorySwap { get; set; } - [DataMember(Name = "MemorySwappiness", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwappiness")] public long? MemorySwappiness { get; set; } - [DataMember(Name = "OomKillDisable", EmitDefaultValue = false)] + [JsonPropertyName("OomKillDisable")] public bool? OomKillDisable { get; set; } - [DataMember(Name = "PidsLimit", EmitDefaultValue = false)] + [JsonPropertyName("PidsLimit")] public long? PidsLimit { get; set; } - [DataMember(Name = "Ulimits", EmitDefaultValue = false)] + [JsonPropertyName("Ulimits")] public IList Ulimits { get; set; } - [DataMember(Name = "CpuCount", EmitDefaultValue = false)] + [JsonPropertyName("CpuCount")] public long CPUCount { get; set; } - [DataMember(Name = "CpuPercent", EmitDefaultValue = false)] + [JsonPropertyName("CpuPercent")] public long CPUPercent { get; set; } - [DataMember(Name = "IOMaximumIOps", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumIOps")] public ulong IOMaximumIOps { get; set; } - [DataMember(Name = "IOMaximumBandwidth", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumBandwidth")] public ulong IOMaximumBandwidth { get; set; } - [DataMember(Name = "RestartPolicy", EmitDefaultValue = false)] + [JsonPropertyName("RestartPolicy")] public RestartPolicy RestartPolicy { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerUpdateResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerUpdateResponse.Generated.cs index fe7a4371..0ae6182b 100644 --- a/src/Docker.DotNet/Models/ContainerUpdateResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerUpdateResponse.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerUpdateResponse // (main.ContainerUpdateResponse) { - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs index 6f786eec..465227ff 100644 --- a/src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainerWaitResponse // (main.ContainerWaitResponse) { - [DataMember(Name = "Error", EmitDefaultValue = false)] + [JsonPropertyName("Error")] public WaitExitError Error { get; set; } - [DataMember(Name = "StatusCode", EmitDefaultValue = false)] + [JsonPropertyName("StatusCode")] public long StatusCode { get; set; } } } diff --git a/src/Docker.DotNet/Models/ContainersListParameters.Generated.cs b/src/Docker.DotNet/Models/ContainersListParameters.Generated.cs index 64478107..e04a891b 100644 --- a/src/Docker.DotNet/Models/ContainersListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainersListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainersListParameters // (main.ContainersListParameters) { [QueryStringParameter("size", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainersPruneParameters.Generated.cs b/src/Docker.DotNet/Models/ContainersPruneParameters.Generated.cs index 9efa48cf..f0a1ed7e 100644 --- a/src/Docker.DotNet/Models/ContainersPruneParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ContainersPruneParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainersPruneParameters // (main.ContainersPruneParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ContainersPruneResponse.Generated.cs b/src/Docker.DotNet/Models/ContainersPruneResponse.Generated.cs index 9ed03189..8bcef470 100644 --- a/src/Docker.DotNet/Models/ContainersPruneResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ContainersPruneResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ContainersPruneResponse // (types.ContainersPruneReport) { - [DataMember(Name = "ContainersDeleted", EmitDefaultValue = false)] + [JsonPropertyName("ContainersDeleted")] public IList ContainersDeleted { get; set; } - [DataMember(Name = "SpaceReclaimed", EmitDefaultValue = false)] + [JsonPropertyName("SpaceReclaimed")] public ulong SpaceReclaimed { get; set; } } } diff --git a/src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs b/src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs index daf64a73..0b3dd3fd 100644 --- a/src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs +++ b/src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CreateContainerParameters // (main.CreateContainerParameters) { public CreateContainerParameters() @@ -50,86 +48,86 @@ public CreateContainerParameters(Config Config) [QueryStringParameter("platform", false)] public string Platform { get; set; } - [DataMember(Name = "Hostname", EmitDefaultValue = false)] + [JsonPropertyName("Hostname")] public string Hostname { get; set; } - [DataMember(Name = "Domainname", EmitDefaultValue = false)] + [JsonPropertyName("Domainname")] public string Domainname { get; set; } - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "AttachStdin", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdin")] public bool AttachStdin { get; set; } - [DataMember(Name = "AttachStdout", EmitDefaultValue = false)] + [JsonPropertyName("AttachStdout")] public bool AttachStdout { get; set; } - [DataMember(Name = "AttachStderr", EmitDefaultValue = false)] + [JsonPropertyName("AttachStderr")] public bool AttachStderr { get; set; } - [DataMember(Name = "ExposedPorts", EmitDefaultValue = false)] + [JsonPropertyName("ExposedPorts")] public IDictionary ExposedPorts { get; set; } - [DataMember(Name = "Tty", EmitDefaultValue = false)] + [JsonPropertyName("Tty")] public bool Tty { get; set; } - [DataMember(Name = "OpenStdin", EmitDefaultValue = false)] + [JsonPropertyName("OpenStdin")] public bool OpenStdin { get; set; } - [DataMember(Name = "StdinOnce", EmitDefaultValue = false)] + [JsonPropertyName("StdinOnce")] public bool StdinOnce { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "Cmd", EmitDefaultValue = false)] + [JsonPropertyName("Cmd")] public IList Cmd { get; set; } - [DataMember(Name = "Healthcheck", EmitDefaultValue = false)] + [JsonPropertyName("Healthcheck")] public HealthConfig Healthcheck { get; set; } - [DataMember(Name = "ArgsEscaped", EmitDefaultValue = false)] + [JsonPropertyName("ArgsEscaped")] public bool ArgsEscaped { get; set; } - [DataMember(Name = "Image", EmitDefaultValue = false)] + [JsonPropertyName("Image")] public string Image { get; set; } - [DataMember(Name = "Volumes", EmitDefaultValue = false)] + [JsonPropertyName("Volumes")] public IDictionary Volumes { get; set; } - [DataMember(Name = "WorkingDir", EmitDefaultValue = false)] + [JsonPropertyName("WorkingDir")] public string WorkingDir { get; set; } - [DataMember(Name = "Entrypoint", EmitDefaultValue = false)] + [JsonPropertyName("Entrypoint")] public IList Entrypoint { get; set; } - [DataMember(Name = "NetworkDisabled", EmitDefaultValue = false)] + [JsonPropertyName("NetworkDisabled")] public bool NetworkDisabled { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } - [DataMember(Name = "OnBuild", EmitDefaultValue = false)] + [JsonPropertyName("OnBuild")] public IList OnBuild { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "StopSignal", EmitDefaultValue = false)] + [JsonPropertyName("StopSignal")] public string StopSignal { get; set; } - [DataMember(Name = "StopTimeout", EmitDefaultValue = false)] + [JsonPropertyName("StopTimeout")] [JsonConverter(typeof(TimeSpanSecondsConverter))] public TimeSpan? StopTimeout { get; set; } - [DataMember(Name = "Shell", EmitDefaultValue = false)] + [JsonPropertyName("Shell")] public IList Shell { get; set; } - [DataMember(Name = "HostConfig", EmitDefaultValue = false)] + [JsonPropertyName("HostConfig")] public HostConfig HostConfig { get; set; } - [DataMember(Name = "NetworkingConfig", EmitDefaultValue = false)] + [JsonPropertyName("NetworkingConfig")] public NetworkingConfig NetworkingConfig { get; set; } } } diff --git a/src/Docker.DotNet/Models/CreateContainerResponse.Generated.cs b/src/Docker.DotNet/Models/CreateContainerResponse.Generated.cs index eef2cd75..71caf2ad 100644 --- a/src/Docker.DotNet/Models/CreateContainerResponse.Generated.cs +++ b/src/Docker.DotNet/Models/CreateContainerResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CreateContainerResponse // (container.CreateResponse) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/CredentialSpec.Generated.cs b/src/Docker.DotNet/Models/CredentialSpec.Generated.cs index ef35fbfd..550feceb 100644 --- a/src/Docker.DotNet/Models/CredentialSpec.Generated.cs +++ b/src/Docker.DotNet/Models/CredentialSpec.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class CredentialSpec // (swarm.CredentialSpec) { - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public string Config { get; set; } - [DataMember(Name = "File", EmitDefaultValue = false)] + [JsonPropertyName("File")] public string File { get; set; } - [DataMember(Name = "Registry", EmitDefaultValue = false)] + [JsonPropertyName("Registry")] public string Registry { get; set; } } } diff --git a/src/Docker.DotNet/Models/DNSConfig.Generated.cs b/src/Docker.DotNet/Models/DNSConfig.Generated.cs index 4b977e41..e52167a6 100644 --- a/src/Docker.DotNet/Models/DNSConfig.Generated.cs +++ b/src/Docker.DotNet/Models/DNSConfig.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class DNSConfig // (swarm.DNSConfig) { - [DataMember(Name = "Nameservers", EmitDefaultValue = false)] + [JsonPropertyName("Nameservers")] public IList Nameservers { get; set; } - [DataMember(Name = "Search", EmitDefaultValue = false)] + [JsonPropertyName("Search")] public IList Search { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IList Options { get; set; } } } diff --git a/src/Docker.DotNet/Models/DefaultNetworkSettings.Generated.cs b/src/Docker.DotNet/Models/DefaultNetworkSettings.Generated.cs index 88ee811e..92e78172 100644 --- a/src/Docker.DotNet/Models/DefaultNetworkSettings.Generated.cs +++ b/src/Docker.DotNet/Models/DefaultNetworkSettings.Generated.cs @@ -1,32 +1,31 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class DefaultNetworkSettings // (types.DefaultNetworkSettings) { - [DataMember(Name = "EndpointID", EmitDefaultValue = false)] + [JsonPropertyName("EndpointID")] public string EndpointID { get; set; } - [DataMember(Name = "Gateway", EmitDefaultValue = false)] + [JsonPropertyName("Gateway")] public string Gateway { get; set; } - [DataMember(Name = "GlobalIPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("GlobalIPv6Address")] public string GlobalIPv6Address { get; set; } - [DataMember(Name = "GlobalIPv6PrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("GlobalIPv6PrefixLen")] public long GlobalIPv6PrefixLen { get; set; } - [DataMember(Name = "IPAddress", EmitDefaultValue = false)] + [JsonPropertyName("IPAddress")] public string IPAddress { get; set; } - [DataMember(Name = "IPPrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("IPPrefixLen")] public long IPPrefixLen { get; set; } - [DataMember(Name = "IPv6Gateway", EmitDefaultValue = false)] + [JsonPropertyName("IPv6Gateway")] public string IPv6Gateway { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } } } diff --git a/src/Docker.DotNet/Models/DeviceMapping.Generated.cs b/src/Docker.DotNet/Models/DeviceMapping.Generated.cs index e199dd75..73c8ea52 100644 --- a/src/Docker.DotNet/Models/DeviceMapping.Generated.cs +++ b/src/Docker.DotNet/Models/DeviceMapping.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class DeviceMapping // (container.DeviceMapping) { - [DataMember(Name = "PathOnHost", EmitDefaultValue = false)] + [JsonPropertyName("PathOnHost")] public string PathOnHost { get; set; } - [DataMember(Name = "PathInContainer", EmitDefaultValue = false)] + [JsonPropertyName("PathInContainer")] public string PathInContainer { get; set; } - [DataMember(Name = "CgroupPermissions", EmitDefaultValue = false)] + [JsonPropertyName("CgroupPermissions")] public string CgroupPermissions { get; set; } } } diff --git a/src/Docker.DotNet/Models/DeviceRequest.Generated.cs b/src/Docker.DotNet/Models/DeviceRequest.Generated.cs index 2e6c136f..c6e0c8a9 100644 --- a/src/Docker.DotNet/Models/DeviceRequest.Generated.cs +++ b/src/Docker.DotNet/Models/DeviceRequest.Generated.cs @@ -1,24 +1,23 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class DeviceRequest // (container.DeviceRequest) { - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Count", EmitDefaultValue = false)] + [JsonPropertyName("Count")] public long Count { get; set; } - [DataMember(Name = "DeviceIDs", EmitDefaultValue = false)] + [JsonPropertyName("DeviceIDs")] public IList DeviceIDs { get; set; } - [DataMember(Name = "Capabilities", EmitDefaultValue = false)] + [JsonPropertyName("Capabilities")] public IList> Capabilities { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } } } diff --git a/src/Docker.DotNet/Models/DiscreteGenericResource.Generated.cs b/src/Docker.DotNet/Models/DiscreteGenericResource.Generated.cs index 7fdd4198..3fe0b51d 100644 --- a/src/Docker.DotNet/Models/DiscreteGenericResource.Generated.cs +++ b/src/Docker.DotNet/Models/DiscreteGenericResource.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class DiscreteGenericResource // (swarm.DiscreteGenericResource) { - [DataMember(Name = "Kind", EmitDefaultValue = false)] + [JsonPropertyName("Kind")] public string Kind { get; set; } - [DataMember(Name = "Value", EmitDefaultValue = false)] + [JsonPropertyName("Value")] public long Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/DispatcherConfig.Generated.cs b/src/Docker.DotNet/Models/DispatcherConfig.Generated.cs index b114555d..6647d018 100644 --- a/src/Docker.DotNet/Models/DispatcherConfig.Generated.cs +++ b/src/Docker.DotNet/Models/DispatcherConfig.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class DispatcherConfig // (swarm.DispatcherConfig) { - [DataMember(Name = "HeartbeatPeriod", EmitDefaultValue = false)] + [JsonPropertyName("HeartbeatPeriod")] public long HeartbeatPeriod { get; set; } } } diff --git a/src/Docker.DotNet/Models/Driver.Generated.cs b/src/Docker.DotNet/Models/Driver.Generated.cs index 0f82e15a..7cb9b81c 100644 --- a/src/Docker.DotNet/Models/Driver.Generated.cs +++ b/src/Docker.DotNet/Models/Driver.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Driver // (mount.Driver) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } } } diff --git a/src/Docker.DotNet/Models/EncryptionConfig.Generated.cs b/src/Docker.DotNet/Models/EncryptionConfig.Generated.cs index b90ca7ca..c0129b5b 100644 --- a/src/Docker.DotNet/Models/EncryptionConfig.Generated.cs +++ b/src/Docker.DotNet/Models/EncryptionConfig.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EncryptionConfig // (swarm.EncryptionConfig) { - [DataMember(Name = "AutoLockManagers", EmitDefaultValue = false)] + [JsonPropertyName("AutoLockManagers")] public bool AutoLockManagers { get; set; } } } diff --git a/src/Docker.DotNet/Models/Endpoint.Generated.cs b/src/Docker.DotNet/Models/Endpoint.Generated.cs index 684ffde4..13dddb9b 100644 --- a/src/Docker.DotNet/Models/Endpoint.Generated.cs +++ b/src/Docker.DotNet/Models/Endpoint.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Endpoint // (swarm.Endpoint) { - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public EndpointSpec Spec { get; set; } - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IList Ports { get; set; } - [DataMember(Name = "VirtualIPs", EmitDefaultValue = false)] + [JsonPropertyName("VirtualIPs")] public IList VirtualIPs { get; set; } } } diff --git a/src/Docker.DotNet/Models/EndpointIPAMConfig.Generated.cs b/src/Docker.DotNet/Models/EndpointIPAMConfig.Generated.cs index 4d6376b3..b6ed6f79 100644 --- a/src/Docker.DotNet/Models/EndpointIPAMConfig.Generated.cs +++ b/src/Docker.DotNet/Models/EndpointIPAMConfig.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EndpointIPAMConfig // (network.EndpointIPAMConfig) { - [DataMember(Name = "IPv4Address", EmitDefaultValue = false)] + [JsonPropertyName("IPv4Address")] public string IPv4Address { get; set; } - [DataMember(Name = "IPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("IPv6Address")] public string IPv6Address { get; set; } - [DataMember(Name = "LinkLocalIPs", EmitDefaultValue = false)] + [JsonPropertyName("LinkLocalIPs")] public IList LinkLocalIPs { get; set; } } } diff --git a/src/Docker.DotNet/Models/EndpointResource.Generated.cs b/src/Docker.DotNet/Models/EndpointResource.Generated.cs index c16c4682..508dcc79 100644 --- a/src/Docker.DotNet/Models/EndpointResource.Generated.cs +++ b/src/Docker.DotNet/Models/EndpointResource.Generated.cs @@ -1,23 +1,22 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EndpointResource // (types.EndpointResource) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "EndpointID", EmitDefaultValue = false)] + [JsonPropertyName("EndpointID")] public string EndpointID { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } - [DataMember(Name = "IPv4Address", EmitDefaultValue = false)] + [JsonPropertyName("IPv4Address")] public string IPv4Address { get; set; } - [DataMember(Name = "IPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("IPv6Address")] public string IPv6Address { get; set; } } } diff --git a/src/Docker.DotNet/Models/EndpointSettings.Generated.cs b/src/Docker.DotNet/Models/EndpointSettings.Generated.cs index f98e5d7e..61c67af1 100644 --- a/src/Docker.DotNet/Models/EndpointSettings.Generated.cs +++ b/src/Docker.DotNet/Models/EndpointSettings.Generated.cs @@ -1,48 +1,47 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EndpointSettings // (network.EndpointSettings) { - [DataMember(Name = "IPAMConfig", EmitDefaultValue = false)] + [JsonPropertyName("IPAMConfig")] public EndpointIPAMConfig IPAMConfig { get; set; } - [DataMember(Name = "Links", EmitDefaultValue = false)] + [JsonPropertyName("Links")] public IList Links { get; set; } - [DataMember(Name = "Aliases", EmitDefaultValue = false)] + [JsonPropertyName("Aliases")] public IList Aliases { get; set; } - [DataMember(Name = "NetworkID", EmitDefaultValue = false)] + [JsonPropertyName("NetworkID")] public string NetworkID { get; set; } - [DataMember(Name = "EndpointID", EmitDefaultValue = false)] + [JsonPropertyName("EndpointID")] public string EndpointID { get; set; } - [DataMember(Name = "Gateway", EmitDefaultValue = false)] + [JsonPropertyName("Gateway")] public string Gateway { get; set; } - [DataMember(Name = "IPAddress", EmitDefaultValue = false)] + [JsonPropertyName("IPAddress")] public string IPAddress { get; set; } - [DataMember(Name = "IPPrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("IPPrefixLen")] public long IPPrefixLen { get; set; } - [DataMember(Name = "IPv6Gateway", EmitDefaultValue = false)] + [JsonPropertyName("IPv6Gateway")] public string IPv6Gateway { get; set; } - [DataMember(Name = "GlobalIPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("GlobalIPv6Address")] public string GlobalIPv6Address { get; set; } - [DataMember(Name = "GlobalIPv6PrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("GlobalIPv6PrefixLen")] public long GlobalIPv6PrefixLen { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } - [DataMember(Name = "DriverOpts", EmitDefaultValue = false)] + [JsonPropertyName("DriverOpts")] public IDictionary DriverOpts { get; set; } } } diff --git a/src/Docker.DotNet/Models/EndpointSpec.Generated.cs b/src/Docker.DotNet/Models/EndpointSpec.Generated.cs index 1af3a29c..4437ffc4 100644 --- a/src/Docker.DotNet/Models/EndpointSpec.Generated.cs +++ b/src/Docker.DotNet/Models/EndpointSpec.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EndpointSpec // (swarm.EndpointSpec) { - [DataMember(Name = "Mode", EmitDefaultValue = false)] + [JsonPropertyName("Mode")] public string Mode { get; set; } - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IList Ports { get; set; } } } diff --git a/src/Docker.DotNet/Models/EndpointVirtualIP.Generated.cs b/src/Docker.DotNet/Models/EndpointVirtualIP.Generated.cs index e31fe8cb..4d971960 100644 --- a/src/Docker.DotNet/Models/EndpointVirtualIP.Generated.cs +++ b/src/Docker.DotNet/Models/EndpointVirtualIP.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EndpointVirtualIP // (swarm.EndpointVirtualIP) { - [DataMember(Name = "NetworkID", EmitDefaultValue = false)] + [JsonPropertyName("NetworkID")] public string NetworkID { get; set; } - [DataMember(Name = "Addr", EmitDefaultValue = false)] + [JsonPropertyName("Addr")] public string Addr { get; set; } } } diff --git a/src/Docker.DotNet/Models/EngineDescription.Generated.cs b/src/Docker.DotNet/Models/EngineDescription.Generated.cs index 34e0c4d7..73c1c5ac 100644 --- a/src/Docker.DotNet/Models/EngineDescription.Generated.cs +++ b/src/Docker.DotNet/Models/EngineDescription.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class EngineDescription // (swarm.EngineDescription) { - [DataMember(Name = "EngineVersion", EmitDefaultValue = false)] + [JsonPropertyName("EngineVersion")] public string EngineVersion { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Plugins", EmitDefaultValue = false)] + [JsonPropertyName("Plugins")] public IList Plugins { get; set; } } } diff --git a/src/Docker.DotNet/Models/ExternalCA.Generated.cs b/src/Docker.DotNet/Models/ExternalCA.Generated.cs index a156dd1a..f0b2ac52 100644 --- a/src/Docker.DotNet/Models/ExternalCA.Generated.cs +++ b/src/Docker.DotNet/Models/ExternalCA.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ExternalCA // (swarm.ExternalCA) { - [DataMember(Name = "Protocol", EmitDefaultValue = false)] + [JsonPropertyName("Protocol")] public string Protocol { get; set; } - [DataMember(Name = "URL", EmitDefaultValue = false)] + [JsonPropertyName("URL")] public string URL { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } - [DataMember(Name = "CACert", EmitDefaultValue = false)] + [JsonPropertyName("CACert")] public string CACert { get; set; } } } diff --git a/src/Docker.DotNet/Models/GenericResource.Generated.cs b/src/Docker.DotNet/Models/GenericResource.Generated.cs index 5b3bc1f9..49dcdd52 100644 --- a/src/Docker.DotNet/Models/GenericResource.Generated.cs +++ b/src/Docker.DotNet/Models/GenericResource.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class GenericResource // (swarm.GenericResource) { - [DataMember(Name = "NamedResourceSpec", EmitDefaultValue = false)] + [JsonPropertyName("NamedResourceSpec")] public NamedGenericResource NamedResourceSpec { get; set; } - [DataMember(Name = "DiscreteResourceSpec", EmitDefaultValue = false)] + [JsonPropertyName("DiscreteResourceSpec")] public DiscreteGenericResource DiscreteResourceSpec { get; set; } } } diff --git a/src/Docker.DotNet/Models/GlobalJob.Generated.cs b/src/Docker.DotNet/Models/GlobalJob.Generated.cs index ec8ed7d2..7aea0799 100644 --- a/src/Docker.DotNet/Models/GlobalJob.Generated.cs +++ b/src/Docker.DotNet/Models/GlobalJob.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class GlobalJob // (swarm.GlobalJob) { } diff --git a/src/Docker.DotNet/Models/GlobalService.Generated.cs b/src/Docker.DotNet/Models/GlobalService.Generated.cs index 3a7cc5ed..78c45624 100644 --- a/src/Docker.DotNet/Models/GlobalService.Generated.cs +++ b/src/Docker.DotNet/Models/GlobalService.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class GlobalService // (swarm.GlobalService) { } diff --git a/src/Docker.DotNet/Models/GraphDriverData.Generated.cs b/src/Docker.DotNet/Models/GraphDriverData.Generated.cs index ab06c95b..ace12ddd 100644 --- a/src/Docker.DotNet/Models/GraphDriverData.Generated.cs +++ b/src/Docker.DotNet/Models/GraphDriverData.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class GraphDriverData // (types.GraphDriverData) { - [DataMember(Name = "Data", EmitDefaultValue = false)] + [JsonPropertyName("Data")] public IDictionary Data { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } } } diff --git a/src/Docker.DotNet/Models/Health.Generated.cs b/src/Docker.DotNet/Models/Health.Generated.cs index edd90fb3..8bc02f8e 100644 --- a/src/Docker.DotNet/Models/Health.Generated.cs +++ b/src/Docker.DotNet/Models/Health.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Health // (types.Health) { - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public string Status { get; set; } - [DataMember(Name = "FailingStreak", EmitDefaultValue = false)] + [JsonPropertyName("FailingStreak")] public long FailingStreak { get; set; } - [DataMember(Name = "Log", EmitDefaultValue = false)] + [JsonPropertyName("Log")] public IList Log { get; set; } } } diff --git a/src/Docker.DotNet/Models/HealthConfig.Generated.cs b/src/Docker.DotNet/Models/HealthConfig.Generated.cs index 86f18df6..3430a099 100644 --- a/src/Docker.DotNet/Models/HealthConfig.Generated.cs +++ b/src/Docker.DotNet/Models/HealthConfig.Generated.cs @@ -1,28 +1,26 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class HealthConfig // (container.HealthConfig) { - [DataMember(Name = "Test", EmitDefaultValue = false)] + [JsonPropertyName("Test")] public IList Test { get; set; } - [DataMember(Name = "Interval", EmitDefaultValue = false)] + [JsonPropertyName("Interval")] [JsonConverter(typeof(TimeSpanNanosecondsConverter))] public TimeSpan Interval { get; set; } - [DataMember(Name = "Timeout", EmitDefaultValue = false)] + [JsonPropertyName("Timeout")] [JsonConverter(typeof(TimeSpanNanosecondsConverter))] public TimeSpan Timeout { get; set; } - [DataMember(Name = "StartPeriod", EmitDefaultValue = false)] + [JsonPropertyName("StartPeriod")] public long StartPeriod { get; set; } - [DataMember(Name = "Retries", EmitDefaultValue = false)] + [JsonPropertyName("Retries")] public long Retries { get; set; } } } diff --git a/src/Docker.DotNet/Models/HealthcheckResult.Generated.cs b/src/Docker.DotNet/Models/HealthcheckResult.Generated.cs index 98534a48..4ba07c70 100644 --- a/src/Docker.DotNet/Models/HealthcheckResult.Generated.cs +++ b/src/Docker.DotNet/Models/HealthcheckResult.Generated.cs @@ -1,21 +1,20 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class HealthcheckResult // (types.HealthcheckResult) { - [DataMember(Name = "Start", EmitDefaultValue = false)] + [JsonPropertyName("Start")] public DateTime Start { get; set; } - [DataMember(Name = "End", EmitDefaultValue = false)] + [JsonPropertyName("End")] public DateTime End { get; set; } - [DataMember(Name = "ExitCode", EmitDefaultValue = false)] + [JsonPropertyName("ExitCode")] public long ExitCode { get; set; } - [DataMember(Name = "Output", EmitDefaultValue = false)] + [JsonPropertyName("Output")] public string Output { get; set; } } } diff --git a/src/Docker.DotNet/Models/HostConfig.Generated.cs b/src/Docker.DotNet/Models/HostConfig.Generated.cs index 6b4f1cec..372d7500 100644 --- a/src/Docker.DotNet/Models/HostConfig.Generated.cs +++ b/src/Docker.DotNet/Models/HostConfig.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class HostConfig // (container.HostConfig) { public HostConfig() @@ -48,217 +47,217 @@ public HostConfig(Resources Resources) } } - [DataMember(Name = "Binds", EmitDefaultValue = false)] + [JsonPropertyName("Binds")] public IList Binds { get; set; } - [DataMember(Name = "ContainerIDFile", EmitDefaultValue = false)] + [JsonPropertyName("ContainerIDFile")] public string ContainerIDFile { get; set; } - [DataMember(Name = "LogConfig", EmitDefaultValue = false)] + [JsonPropertyName("LogConfig")] public LogConfig LogConfig { get; set; } - [DataMember(Name = "NetworkMode", EmitDefaultValue = false)] + [JsonPropertyName("NetworkMode")] public string NetworkMode { get; set; } - [DataMember(Name = "PortBindings", EmitDefaultValue = false)] + [JsonPropertyName("PortBindings")] public IDictionary> PortBindings { get; set; } - [DataMember(Name = "RestartPolicy", EmitDefaultValue = false)] + [JsonPropertyName("RestartPolicy")] public RestartPolicy RestartPolicy { get; set; } - [DataMember(Name = "AutoRemove", EmitDefaultValue = false)] + [JsonPropertyName("AutoRemove")] public bool AutoRemove { get; set; } - [DataMember(Name = "VolumeDriver", EmitDefaultValue = false)] + [JsonPropertyName("VolumeDriver")] public string VolumeDriver { get; set; } - [DataMember(Name = "VolumesFrom", EmitDefaultValue = false)] + [JsonPropertyName("VolumesFrom")] public IList VolumesFrom { get; set; } - [DataMember(Name = "ConsoleSize", EmitDefaultValue = false)] + [JsonPropertyName("ConsoleSize")] public ulong[] ConsoleSize { get; set; } - [DataMember(Name = "Annotations", EmitDefaultValue = false)] + [JsonPropertyName("Annotations")] public IDictionary Annotations { get; set; } - [DataMember(Name = "CapAdd", EmitDefaultValue = false)] + [JsonPropertyName("CapAdd")] public IList CapAdd { get; set; } - [DataMember(Name = "CapDrop", EmitDefaultValue = false)] + [JsonPropertyName("CapDrop")] public IList CapDrop { get; set; } - [DataMember(Name = "CgroupnsMode", EmitDefaultValue = false)] + [JsonPropertyName("CgroupnsMode")] public string CgroupnsMode { get; set; } - [DataMember(Name = "Dns", EmitDefaultValue = false)] + [JsonPropertyName("Dns")] public IList DNS { get; set; } - [DataMember(Name = "DnsOptions", EmitDefaultValue = false)] + [JsonPropertyName("DnsOptions")] public IList DNSOptions { get; set; } - [DataMember(Name = "DnsSearch", EmitDefaultValue = false)] + [JsonPropertyName("DnsSearch")] public IList DNSSearch { get; set; } - [DataMember(Name = "ExtraHosts", EmitDefaultValue = false)] + [JsonPropertyName("ExtraHosts")] public IList ExtraHosts { get; set; } - [DataMember(Name = "GroupAdd", EmitDefaultValue = false)] + [JsonPropertyName("GroupAdd")] public IList GroupAdd { get; set; } - [DataMember(Name = "IpcMode", EmitDefaultValue = false)] + [JsonPropertyName("IpcMode")] public string IpcMode { get; set; } - [DataMember(Name = "Cgroup", EmitDefaultValue = false)] + [JsonPropertyName("Cgroup")] public string Cgroup { get; set; } - [DataMember(Name = "Links", EmitDefaultValue = false)] + [JsonPropertyName("Links")] public IList Links { get; set; } - [DataMember(Name = "OomScoreAdj", EmitDefaultValue = false)] + [JsonPropertyName("OomScoreAdj")] public long OomScoreAdj { get; set; } - [DataMember(Name = "PidMode", EmitDefaultValue = false)] + [JsonPropertyName("PidMode")] public string PidMode { get; set; } - [DataMember(Name = "Privileged", EmitDefaultValue = false)] + [JsonPropertyName("Privileged")] public bool Privileged { get; set; } - [DataMember(Name = "PublishAllPorts", EmitDefaultValue = false)] + [JsonPropertyName("PublishAllPorts")] public bool PublishAllPorts { get; set; } - [DataMember(Name = "ReadonlyRootfs", EmitDefaultValue = false)] + [JsonPropertyName("ReadonlyRootfs")] public bool ReadonlyRootfs { get; set; } - [DataMember(Name = "SecurityOpt", EmitDefaultValue = false)] + [JsonPropertyName("SecurityOpt")] public IList SecurityOpt { get; set; } - [DataMember(Name = "StorageOpt", EmitDefaultValue = false)] + [JsonPropertyName("StorageOpt")] public IDictionary StorageOpt { get; set; } - [DataMember(Name = "Tmpfs", EmitDefaultValue = false)] + [JsonPropertyName("Tmpfs")] public IDictionary Tmpfs { get; set; } - [DataMember(Name = "UTSMode", EmitDefaultValue = false)] + [JsonPropertyName("UTSMode")] public string UTSMode { get; set; } - [DataMember(Name = "UsernsMode", EmitDefaultValue = false)] + [JsonPropertyName("UsernsMode")] public string UsernsMode { get; set; } - [DataMember(Name = "ShmSize", EmitDefaultValue = false)] + [JsonPropertyName("ShmSize")] public long ShmSize { get; set; } - [DataMember(Name = "Sysctls", EmitDefaultValue = false)] + [JsonPropertyName("Sysctls")] public IDictionary Sysctls { get; set; } - [DataMember(Name = "Runtime", EmitDefaultValue = false)] + [JsonPropertyName("Runtime")] public string Runtime { get; set; } - [DataMember(Name = "Isolation", EmitDefaultValue = false)] + [JsonPropertyName("Isolation")] public string Isolation { get; set; } - [DataMember(Name = "CpuShares", EmitDefaultValue = false)] + [JsonPropertyName("CpuShares")] public long CPUShares { get; set; } - [DataMember(Name = "Memory", EmitDefaultValue = false)] + [JsonPropertyName("Memory")] public long Memory { get; set; } - [DataMember(Name = "NanoCpus", EmitDefaultValue = false)] + [JsonPropertyName("NanoCpus")] public long NanoCPUs { get; set; } - [DataMember(Name = "CgroupParent", EmitDefaultValue = false)] + [JsonPropertyName("CgroupParent")] public string CgroupParent { get; set; } - [DataMember(Name = "BlkioWeight", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeight")] public ushort BlkioWeight { get; set; } - [DataMember(Name = "BlkioWeightDevice", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeightDevice")] public IList BlkioWeightDevice { get; set; } - [DataMember(Name = "BlkioDeviceReadBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadBps")] public IList BlkioDeviceReadBps { get; set; } - [DataMember(Name = "BlkioDeviceWriteBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteBps")] public IList BlkioDeviceWriteBps { get; set; } - [DataMember(Name = "BlkioDeviceReadIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadIOps")] public IList BlkioDeviceReadIOps { get; set; } - [DataMember(Name = "BlkioDeviceWriteIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteIOps")] public IList BlkioDeviceWriteIOps { get; set; } - [DataMember(Name = "CpuPeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuPeriod")] public long CPUPeriod { get; set; } - [DataMember(Name = "CpuQuota", EmitDefaultValue = false)] + [JsonPropertyName("CpuQuota")] public long CPUQuota { get; set; } - [DataMember(Name = "CpuRealtimePeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimePeriod")] public long CPURealtimePeriod { get; set; } - [DataMember(Name = "CpuRealtimeRuntime", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimeRuntime")] public long CPURealtimeRuntime { get; set; } - [DataMember(Name = "CpusetCpus", EmitDefaultValue = false)] + [JsonPropertyName("CpusetCpus")] public string CpusetCpus { get; set; } - [DataMember(Name = "CpusetMems", EmitDefaultValue = false)] + [JsonPropertyName("CpusetMems")] public string CpusetMems { get; set; } - [DataMember(Name = "Devices", EmitDefaultValue = false)] + [JsonPropertyName("Devices")] public IList Devices { get; set; } - [DataMember(Name = "DeviceCgroupRules", EmitDefaultValue = false)] + [JsonPropertyName("DeviceCgroupRules")] public IList DeviceCgroupRules { get; set; } - [DataMember(Name = "DeviceRequests", EmitDefaultValue = false)] + [JsonPropertyName("DeviceRequests")] public IList DeviceRequests { get; set; } - [DataMember(Name = "KernelMemory", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemory")] public long KernelMemory { get; set; } - [DataMember(Name = "KernelMemoryTCP", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemoryTCP")] public long KernelMemoryTCP { get; set; } - [DataMember(Name = "MemoryReservation", EmitDefaultValue = false)] + [JsonPropertyName("MemoryReservation")] public long MemoryReservation { get; set; } - [DataMember(Name = "MemorySwap", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwap")] public long MemorySwap { get; set; } - [DataMember(Name = "MemorySwappiness", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwappiness")] public long? MemorySwappiness { get; set; } - [DataMember(Name = "OomKillDisable", EmitDefaultValue = false)] + [JsonPropertyName("OomKillDisable")] public bool? OomKillDisable { get; set; } - [DataMember(Name = "PidsLimit", EmitDefaultValue = false)] + [JsonPropertyName("PidsLimit")] public long? PidsLimit { get; set; } - [DataMember(Name = "Ulimits", EmitDefaultValue = false)] + [JsonPropertyName("Ulimits")] public IList Ulimits { get; set; } - [DataMember(Name = "CpuCount", EmitDefaultValue = false)] + [JsonPropertyName("CpuCount")] public long CPUCount { get; set; } - [DataMember(Name = "CpuPercent", EmitDefaultValue = false)] + [JsonPropertyName("CpuPercent")] public long CPUPercent { get; set; } - [DataMember(Name = "IOMaximumIOps", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumIOps")] public ulong IOMaximumIOps { get; set; } - [DataMember(Name = "IOMaximumBandwidth", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumBandwidth")] public ulong IOMaximumBandwidth { get; set; } - [DataMember(Name = "Mounts", EmitDefaultValue = false)] + [JsonPropertyName("Mounts")] public IList Mounts { get; set; } - [DataMember(Name = "MaskedPaths", EmitDefaultValue = false)] + [JsonPropertyName("MaskedPaths")] public IList MaskedPaths { get; set; } - [DataMember(Name = "ReadonlyPaths", EmitDefaultValue = false)] + [JsonPropertyName("ReadonlyPaths")] public IList ReadonlyPaths { get; set; } - [DataMember(Name = "Init", EmitDefaultValue = false)] + [JsonPropertyName("Init")] public bool? Init { get; set; } } } diff --git a/src/Docker.DotNet/Models/IPAM.Generated.cs b/src/Docker.DotNet/Models/IPAM.Generated.cs index 012c33f3..f3f2c2a0 100644 --- a/src/Docker.DotNet/Models/IPAM.Generated.cs +++ b/src/Docker.DotNet/Models/IPAM.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class IPAM // (network.IPAM) { - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public IList Config { get; set; } } } diff --git a/src/Docker.DotNet/Models/IPAMConfig.Generated.cs b/src/Docker.DotNet/Models/IPAMConfig.Generated.cs index 0437c427..73194ca9 100644 --- a/src/Docker.DotNet/Models/IPAMConfig.Generated.cs +++ b/src/Docker.DotNet/Models/IPAMConfig.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class IPAMConfig // (network.IPAMConfig) { - [DataMember(Name = "Subnet", EmitDefaultValue = false)] + [JsonPropertyName("Subnet")] public string Subnet { get; set; } - [DataMember(Name = "IPRange", EmitDefaultValue = false)] + [JsonPropertyName("IPRange")] public string IPRange { get; set; } - [DataMember(Name = "Gateway", EmitDefaultValue = false)] + [JsonPropertyName("Gateway")] public string Gateway { get; set; } - [DataMember(Name = "AuxiliaryAddresses", EmitDefaultValue = false)] + [JsonPropertyName("AuxiliaryAddresses")] public IDictionary AuxAddress { get; set; } } } diff --git a/src/Docker.DotNet/Models/IPAMOptions.Generated.cs b/src/Docker.DotNet/Models/IPAMOptions.Generated.cs index 3b8084af..4402e552 100644 --- a/src/Docker.DotNet/Models/IPAMOptions.Generated.cs +++ b/src/Docker.DotNet/Models/IPAMOptions.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class IPAMOptions // (swarm.IPAMOptions) { - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public SwarmDriver Driver { get; set; } - [DataMember(Name = "Configs", EmitDefaultValue = false)] + [JsonPropertyName("Configs")] public IList Configs { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs b/src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs index de0c4711..ef6ed5a9 100644 --- a/src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageBuildParameters // (main.ImageBuildParameters) { [QueryStringParameter("t", false, typeof(EnumerableQueryStringConverter))] @@ -78,7 +77,7 @@ public class ImageBuildParameters // (main.ImageBuildParameters) [QueryStringParameter("outputs", false)] public string Outputs { get; set; } - [DataMember(Name = "AuthConfigs", EmitDefaultValue = false)] + [JsonPropertyName("AuthConfigs")] public IDictionary AuthConfigs { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageBuildResponse.Generated.cs b/src/Docker.DotNet/Models/ImageBuildResponse.Generated.cs index 15f9d453..7f914d97 100644 --- a/src/Docker.DotNet/Models/ImageBuildResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImageBuildResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageBuildResponse // (types.ImageBuildResponse) { - [DataMember(Name = "Body", EmitDefaultValue = false)] + [JsonPropertyName("Body")] public object Body { get; set; } - [DataMember(Name = "OSType", EmitDefaultValue = false)] + [JsonPropertyName("OSType")] public string OSType { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageDeleteParameters.Generated.cs b/src/Docker.DotNet/Models/ImageDeleteParameters.Generated.cs index 51125bee..dcfbac61 100644 --- a/src/Docker.DotNet/Models/ImageDeleteParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImageDeleteParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageDeleteParameters // (main.ImageDeleteParameters) { [QueryStringParameter("force", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ImageDeleteResponse.Generated.cs b/src/Docker.DotNet/Models/ImageDeleteResponse.Generated.cs index 61a1b193..f6f3a83a 100644 --- a/src/Docker.DotNet/Models/ImageDeleteResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImageDeleteResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageDeleteResponse // (types.ImageDeleteResponseItem) { - [DataMember(Name = "Deleted", EmitDefaultValue = false)] + [JsonPropertyName("Deleted")] public string Deleted { get; set; } - [DataMember(Name = "Untagged", EmitDefaultValue = false)] + [JsonPropertyName("Untagged")] public string Untagged { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageHistoryResponse.Generated.cs b/src/Docker.DotNet/Models/ImageHistoryResponse.Generated.cs index 70ef825f..72a60929 100644 --- a/src/Docker.DotNet/Models/ImageHistoryResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImageHistoryResponse.Generated.cs @@ -1,28 +1,27 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageHistoryResponse // (image.HistoryResponseItem) { - [DataMember(Name = "Comment", EmitDefaultValue = false)] + [JsonPropertyName("Comment")] public string Comment { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "CreatedBy", EmitDefaultValue = false)] + [JsonPropertyName("CreatedBy")] public string CreatedBy { get; set; } - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Size", EmitDefaultValue = false)] + [JsonPropertyName("Size")] public long Size { get; set; } - [DataMember(Name = "Tags", EmitDefaultValue = false)] + [JsonPropertyName("Tags")] public IList Tags { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageInspectParameters.Generated.cs b/src/Docker.DotNet/Models/ImageInspectParameters.Generated.cs index fd42655e..b12cb21b 100644 --- a/src/Docker.DotNet/Models/ImageInspectParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImageInspectParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageInspectParameters // (main.ImageInspectParameters) { [QueryStringParameter("size", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ImageInspectResponse.Generated.cs b/src/Docker.DotNet/Models/ImageInspectResponse.Generated.cs index a029838c..532c45e7 100644 --- a/src/Docker.DotNet/Models/ImageInspectResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImageInspectResponse.Generated.cs @@ -1,70 +1,69 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageInspectResponse // (types.ImageInspect) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "RepoTags", EmitDefaultValue = false)] + [JsonPropertyName("RepoTags")] public IList RepoTags { get; set; } - [DataMember(Name = "RepoDigests", EmitDefaultValue = false)] + [JsonPropertyName("RepoDigests")] public IList RepoDigests { get; set; } - [DataMember(Name = "Parent", EmitDefaultValue = false)] + [JsonPropertyName("Parent")] public string Parent { get; set; } - [DataMember(Name = "Comment", EmitDefaultValue = false)] + [JsonPropertyName("Comment")] public string Comment { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "Container", EmitDefaultValue = false)] + [JsonPropertyName("Container")] public string Container { get; set; } - [DataMember(Name = "ContainerConfig", EmitDefaultValue = false)] + [JsonPropertyName("ContainerConfig")] public Config ContainerConfig { get; set; } - [DataMember(Name = "DockerVersion", EmitDefaultValue = false)] + [JsonPropertyName("DockerVersion")] public string DockerVersion { get; set; } - [DataMember(Name = "Author", EmitDefaultValue = false)] + [JsonPropertyName("Author")] public string Author { get; set; } - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public Config Config { get; set; } - [DataMember(Name = "Architecture", EmitDefaultValue = false)] + [JsonPropertyName("Architecture")] public string Architecture { get; set; } - [DataMember(Name = "Variant", EmitDefaultValue = false)] + [JsonPropertyName("Variant")] public string Variant { get; set; } - [DataMember(Name = "Os", EmitDefaultValue = false)] + [JsonPropertyName("Os")] public string Os { get; set; } - [DataMember(Name = "OsVersion", EmitDefaultValue = false)] + [JsonPropertyName("OsVersion")] public string OsVersion { get; set; } - [DataMember(Name = "Size", EmitDefaultValue = false)] + [JsonPropertyName("Size")] public long Size { get; set; } - [DataMember(Name = "VirtualSize", EmitDefaultValue = false)] + [JsonPropertyName("VirtualSize")] public long VirtualSize { get; set; } - [DataMember(Name = "GraphDriver", EmitDefaultValue = false)] + [JsonPropertyName("GraphDriver")] public GraphDriverData GraphDriver { get; set; } - [DataMember(Name = "RootFS", EmitDefaultValue = false)] + [JsonPropertyName("RootFS")] public RootFS RootFS { get; set; } - [DataMember(Name = "Metadata", EmitDefaultValue = false)] + [JsonPropertyName("Metadata")] public ImageMetadata Metadata { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageLoadParameters.Generated.cs b/src/Docker.DotNet/Models/ImageLoadParameters.Generated.cs index cce37e95..9b13b176 100644 --- a/src/Docker.DotNet/Models/ImageLoadParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImageLoadParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageLoadParameters // (main.ImageLoadParameters) { [QueryStringParameter("quiet", true, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ImageMetadata.Generated.cs b/src/Docker.DotNet/Models/ImageMetadata.Generated.cs index 63d8602e..fa5bb1d6 100644 --- a/src/Docker.DotNet/Models/ImageMetadata.Generated.cs +++ b/src/Docker.DotNet/Models/ImageMetadata.Generated.cs @@ -1,12 +1,11 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageMetadata // (types.ImageMetadata) { - [DataMember(Name = "LastTagTime", EmitDefaultValue = false)] + [JsonPropertyName("LastTagTime")] public DateTime LastTagTime { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImagePushParameters.Generated.cs b/src/Docker.DotNet/Models/ImagePushParameters.Generated.cs index 8a20c6a1..4060677e 100644 --- a/src/Docker.DotNet/Models/ImagePushParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImagePushParameters.Generated.cs @@ -1,8 +1,7 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagePushParameters // (main.ImagePushParameters) { [QueryStringParameter("fromImage", false)] @@ -11,7 +10,7 @@ public class ImagePushParameters // (main.ImagePushParameters) [QueryStringParameter("tag", false)] public string Tag { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageSearchResponse.Generated.cs b/src/Docker.DotNet/Models/ImageSearchResponse.Generated.cs index c375437e..2fdd515c 100644 --- a/src/Docker.DotNet/Models/ImageSearchResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImageSearchResponse.Generated.cs @@ -1,23 +1,22 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageSearchResponse // (registry.SearchResult) { - [DataMember(Name = "star_count", EmitDefaultValue = false)] + [JsonPropertyName("star_count")] public long StarCount { get; set; } - [DataMember(Name = "is_official", EmitDefaultValue = false)] + [JsonPropertyName("is_official")] public bool IsOfficial { get; set; } - [DataMember(Name = "name", EmitDefaultValue = false)] + [JsonPropertyName("name")] public string Name { get; set; } - [DataMember(Name = "is_automated", EmitDefaultValue = false)] + [JsonPropertyName("is_automated")] public bool IsAutomated { get; set; } - [DataMember(Name = "description", EmitDefaultValue = false)] + [JsonPropertyName("description")] public string Description { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImageTagParameters.Generated.cs b/src/Docker.DotNet/Models/ImageTagParameters.Generated.cs index 98c6fce6..caf01f4c 100644 --- a/src/Docker.DotNet/Models/ImageTagParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImageTagParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImageTagParameters // (main.ImageTagParameters) { [QueryStringParameter("repo", false)] diff --git a/src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs b/src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs index 350562e7..54b8a3b7 100644 --- a/src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesCreateParameters // (main.ImagesCreateParameters) { [QueryStringParameter("fromImage", false)] @@ -27,7 +26,7 @@ public class ImagesCreateParameters // (main.ImagesCreateParameters) [QueryStringParameter("platform", false)] public string Platform { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImagesListParameters.Generated.cs b/src/Docker.DotNet/Models/ImagesListParameters.Generated.cs index 2e710f04..dcf8d6d4 100644 --- a/src/Docker.DotNet/Models/ImagesListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesListParameters // (main.ImagesListParameters) { [QueryStringParameter("all", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ImagesListResponse.Generated.cs b/src/Docker.DotNet/Models/ImagesListResponse.Generated.cs index 29bef4fb..c0fe0964 100644 --- a/src/Docker.DotNet/Models/ImagesListResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesListResponse.Generated.cs @@ -1,40 +1,39 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesListResponse // (types.ImageSummary) { - [DataMember(Name = "Containers", EmitDefaultValue = false)] + [JsonPropertyName("Containers")] public long Containers { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "ParentId", EmitDefaultValue = false)] + [JsonPropertyName("ParentId")] public string ParentID { get; set; } - [DataMember(Name = "RepoDigests", EmitDefaultValue = false)] + [JsonPropertyName("RepoDigests")] public IList RepoDigests { get; set; } - [DataMember(Name = "RepoTags", EmitDefaultValue = false)] + [JsonPropertyName("RepoTags")] public IList RepoTags { get; set; } - [DataMember(Name = "SharedSize", EmitDefaultValue = false)] + [JsonPropertyName("SharedSize")] public long SharedSize { get; set; } - [DataMember(Name = "Size", EmitDefaultValue = false)] + [JsonPropertyName("Size")] public long Size { get; set; } - [DataMember(Name = "VirtualSize", EmitDefaultValue = false)] + [JsonPropertyName("VirtualSize")] public long VirtualSize { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImagesLoadResponse.Generated.cs b/src/Docker.DotNet/Models/ImagesLoadResponse.Generated.cs index ef2a9f30..2c19e531 100644 --- a/src/Docker.DotNet/Models/ImagesLoadResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesLoadResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesLoadResponse // (types.ImageLoadResponse) { - [DataMember(Name = "Body", EmitDefaultValue = false)] + [JsonPropertyName("Body")] public object Body { get; set; } - [DataMember(Name = "JSON", EmitDefaultValue = false)] + [JsonPropertyName("JSON")] public bool JSON { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImagesPruneParameters.Generated.cs b/src/Docker.DotNet/Models/ImagesPruneParameters.Generated.cs index a8263a56..8eb0d862 100644 --- a/src/Docker.DotNet/Models/ImagesPruneParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesPruneParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesPruneParameters // (main.ImagesPruneParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ImagesPruneResponse.Generated.cs b/src/Docker.DotNet/Models/ImagesPruneResponse.Generated.cs index a9296d32..fbdf922d 100644 --- a/src/Docker.DotNet/Models/ImagesPruneResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesPruneResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesPruneResponse // (types.ImagesPruneReport) { - [DataMember(Name = "ImagesDeleted", EmitDefaultValue = false)] + [JsonPropertyName("ImagesDeleted")] public IList ImagesDeleted { get; set; } - [DataMember(Name = "SpaceReclaimed", EmitDefaultValue = false)] + [JsonPropertyName("SpaceReclaimed")] public ulong SpaceReclaimed { get; set; } } } diff --git a/src/Docker.DotNet/Models/ImagesSearchParameters.Generated.cs b/src/Docker.DotNet/Models/ImagesSearchParameters.Generated.cs index 32e2170f..12c82d25 100644 --- a/src/Docker.DotNet/Models/ImagesSearchParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ImagesSearchParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ImagesSearchParameters // (main.ImagesSearchParameters) { [QueryStringParameter("term", false)] @@ -15,7 +14,7 @@ public class ImagesSearchParameters // (main.ImagesSearchParameters) [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] public IDictionary> Filters { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } } } diff --git a/src/Docker.DotNet/Models/IndexInfo.Generated.cs b/src/Docker.DotNet/Models/IndexInfo.Generated.cs index db2cc9d2..613537bb 100644 --- a/src/Docker.DotNet/Models/IndexInfo.Generated.cs +++ b/src/Docker.DotNet/Models/IndexInfo.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class IndexInfo // (registry.IndexInfo) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Mirrors", EmitDefaultValue = false)] + [JsonPropertyName("Mirrors")] public IList Mirrors { get; set; } - [DataMember(Name = "Secure", EmitDefaultValue = false)] + [JsonPropertyName("Secure")] public bool Secure { get; set; } - [DataMember(Name = "Official", EmitDefaultValue = false)] + [JsonPropertyName("Official")] public bool Official { get; set; } } } diff --git a/src/Docker.DotNet/Models/Info.Generated.cs b/src/Docker.DotNet/Models/Info.Generated.cs index 50edebc3..6c8d8ee8 100644 --- a/src/Docker.DotNet/Models/Info.Generated.cs +++ b/src/Docker.DotNet/Models/Info.Generated.cs @@ -1,39 +1,38 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Info // (swarm.Info) { - [DataMember(Name = "NodeID", EmitDefaultValue = false)] + [JsonPropertyName("NodeID")] public string NodeID { get; set; } - [DataMember(Name = "NodeAddr", EmitDefaultValue = false)] + [JsonPropertyName("NodeAddr")] public string NodeAddr { get; set; } - [DataMember(Name = "LocalNodeState", EmitDefaultValue = false)] + [JsonPropertyName("LocalNodeState")] public string LocalNodeState { get; set; } - [DataMember(Name = "ControlAvailable", EmitDefaultValue = false)] + [JsonPropertyName("ControlAvailable")] public bool ControlAvailable { get; set; } - [DataMember(Name = "Error", EmitDefaultValue = false)] + [JsonPropertyName("Error")] public string Error { get; set; } - [DataMember(Name = "RemoteManagers", EmitDefaultValue = false)] + [JsonPropertyName("RemoteManagers")] public IList RemoteManagers { get; set; } - [DataMember(Name = "Nodes", EmitDefaultValue = false)] + [JsonPropertyName("Nodes")] public long Nodes { get; set; } - [DataMember(Name = "Managers", EmitDefaultValue = false)] + [JsonPropertyName("Managers")] public long Managers { get; set; } - [DataMember(Name = "Cluster", EmitDefaultValue = false)] + [JsonPropertyName("Cluster")] public ClusterInfo Cluster { get; set; } - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/JSONError.Generated.cs b/src/Docker.DotNet/Models/JSONError.Generated.cs index d940381b..d5aa441e 100644 --- a/src/Docker.DotNet/Models/JSONError.Generated.cs +++ b/src/Docker.DotNet/Models/JSONError.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class JSONError // (jsonmessage.JSONError) { - [DataMember(Name = "code", EmitDefaultValue = false)] + [JsonPropertyName("code")] public long Code { get; set; } - [DataMember(Name = "message", EmitDefaultValue = false)] + [JsonPropertyName("message")] public string Message { get; set; } } } diff --git a/src/Docker.DotNet/Models/JSONMessage.Generated.cs b/src/Docker.DotNet/Models/JSONMessage.Generated.cs index a5951b9a..a6adfdaf 100644 --- a/src/Docker.DotNet/Models/JSONMessage.Generated.cs +++ b/src/Docker.DotNet/Models/JSONMessage.Generated.cs @@ -1,42 +1,41 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class JSONMessage // (jsonmessage.JSONMessage) { - [DataMember(Name = "stream", EmitDefaultValue = false)] + [JsonPropertyName("stream")] public string Stream { get; set; } - [DataMember(Name = "status", EmitDefaultValue = false)] + [JsonPropertyName("status")] public string Status { get; set; } - [DataMember(Name = "progressDetail", EmitDefaultValue = false)] + [JsonPropertyName("progressDetail")] public JSONProgress Progress { get; set; } - [DataMember(Name = "progress", EmitDefaultValue = false)] + [JsonPropertyName("progress")] public string ProgressMessage { get; set; } - [DataMember(Name = "id", EmitDefaultValue = false)] + [JsonPropertyName("id")] public string ID { get; set; } - [DataMember(Name = "from", EmitDefaultValue = false)] + [JsonPropertyName("from")] public string From { get; set; } - [DataMember(Name = "time", EmitDefaultValue = false)] + [JsonPropertyName("time")] public DateTime Time { get; set; } - [DataMember(Name = "timeNano", EmitDefaultValue = false)] + [JsonPropertyName("timeNano")] public long TimeNano { get; set; } - [DataMember(Name = "errorDetail", EmitDefaultValue = false)] + [JsonPropertyName("errorDetail")] public JSONError Error { get; set; } - [DataMember(Name = "error", EmitDefaultValue = false)] + [JsonPropertyName("error")] public string ErrorMessage { get; set; } - [DataMember(Name = "aux", EmitDefaultValue = false)] + [JsonPropertyName("aux")] public ObjectExtensionData Aux { get; set; } } } diff --git a/src/Docker.DotNet/Models/JSONProgress.Generated.cs b/src/Docker.DotNet/Models/JSONProgress.Generated.cs index 80415874..cd532036 100644 --- a/src/Docker.DotNet/Models/JSONProgress.Generated.cs +++ b/src/Docker.DotNet/Models/JSONProgress.Generated.cs @@ -1,26 +1,25 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class JSONProgress // (jsonmessage.JSONProgress) { - [DataMember(Name = "current", EmitDefaultValue = false)] + [JsonPropertyName("current")] public long Current { get; set; } - [DataMember(Name = "total", EmitDefaultValue = false)] + [JsonPropertyName("total")] public long Total { get; set; } - [DataMember(Name = "start", EmitDefaultValue = false)] + [JsonPropertyName("start")] public long Start { get; set; } - [DataMember(Name = "hidecounts", EmitDefaultValue = false)] + [JsonPropertyName("hidecounts")] public bool HideCounts { get; set; } - [DataMember(Name = "units", EmitDefaultValue = false)] + [JsonPropertyName("units")] public string Units { get; set; } - [DataMember(Name = "winSize", EmitDefaultValue = false)] + [JsonPropertyName("winSize")] public long winSize { get; set; } } } diff --git a/src/Docker.DotNet/Models/JobStatus.Generated.cs b/src/Docker.DotNet/Models/JobStatus.Generated.cs index c1a961e2..f81ce9a0 100644 --- a/src/Docker.DotNet/Models/JobStatus.Generated.cs +++ b/src/Docker.DotNet/Models/JobStatus.Generated.cs @@ -1,15 +1,14 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class JobStatus // (swarm.JobStatus) { - [DataMember(Name = "JobIteration", EmitDefaultValue = false)] + [JsonPropertyName("JobIteration")] public Version JobIteration { get; set; } - [DataMember(Name = "LastExecution", EmitDefaultValue = false)] + [JsonPropertyName("LastExecution")] public DateTime LastExecution { get; set; } } } diff --git a/src/Docker.DotNet/Models/JoinTokens.Generated.cs b/src/Docker.DotNet/Models/JoinTokens.Generated.cs index 62133dee..9374ed8a 100644 --- a/src/Docker.DotNet/Models/JoinTokens.Generated.cs +++ b/src/Docker.DotNet/Models/JoinTokens.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class JoinTokens // (swarm.JoinTokens) { - [DataMember(Name = "Worker", EmitDefaultValue = false)] + [JsonPropertyName("Worker")] public string Worker { get; set; } - [DataMember(Name = "Manager", EmitDefaultValue = false)] + [JsonPropertyName("Manager")] public string Manager { get; set; } } } diff --git a/src/Docker.DotNet/Models/LogConfig.Generated.cs b/src/Docker.DotNet/Models/LogConfig.Generated.cs index 0441e3b6..060917a7 100644 --- a/src/Docker.DotNet/Models/LogConfig.Generated.cs +++ b/src/Docker.DotNet/Models/LogConfig.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class LogConfig // (container.LogConfig) { - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public IDictionary Config { get; set; } } } diff --git a/src/Docker.DotNet/Models/ManagerStatus.Generated.cs b/src/Docker.DotNet/Models/ManagerStatus.Generated.cs index 2a52fbf5..43d14f94 100644 --- a/src/Docker.DotNet/Models/ManagerStatus.Generated.cs +++ b/src/Docker.DotNet/Models/ManagerStatus.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ManagerStatus // (swarm.ManagerStatus) { - [DataMember(Name = "Leader", EmitDefaultValue = false)] + [JsonPropertyName("Leader")] public bool Leader { get; set; } - [DataMember(Name = "Reachability", EmitDefaultValue = false)] + [JsonPropertyName("Reachability")] public string Reachability { get; set; } - [DataMember(Name = "Addr", EmitDefaultValue = false)] + [JsonPropertyName("Addr")] public string Addr { get; set; } } } diff --git a/src/Docker.DotNet/Models/MemoryStats.Generated.cs b/src/Docker.DotNet/Models/MemoryStats.Generated.cs index cf4f5f39..2e045ff2 100644 --- a/src/Docker.DotNet/Models/MemoryStats.Generated.cs +++ b/src/Docker.DotNet/Models/MemoryStats.Generated.cs @@ -1,33 +1,32 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class MemoryStats // (types.MemoryStats) { - [DataMember(Name = "usage", EmitDefaultValue = false)] + [JsonPropertyName("usage")] public ulong Usage { get; set; } - [DataMember(Name = "max_usage", EmitDefaultValue = false)] + [JsonPropertyName("max_usage")] public ulong MaxUsage { get; set; } - [DataMember(Name = "stats", EmitDefaultValue = false)] + [JsonPropertyName("stats")] public IDictionary Stats { get; set; } - [DataMember(Name = "failcnt", EmitDefaultValue = false)] + [JsonPropertyName("failcnt")] public ulong Failcnt { get; set; } - [DataMember(Name = "limit", EmitDefaultValue = false)] + [JsonPropertyName("limit")] public ulong Limit { get; set; } - [DataMember(Name = "commitbytes", EmitDefaultValue = false)] + [JsonPropertyName("commitbytes")] public ulong Commit { get; set; } - [DataMember(Name = "commitpeakbytes", EmitDefaultValue = false)] + [JsonPropertyName("commitpeakbytes")] public ulong CommitPeak { get; set; } - [DataMember(Name = "privateworkingset", EmitDefaultValue = false)] + [JsonPropertyName("privateworkingset")] public ulong PrivateWorkingSet { get; set; } } } diff --git a/src/Docker.DotNet/Models/Message.Generated.cs b/src/Docker.DotNet/Models/Message.Generated.cs index 6514c21c..136c6966 100644 --- a/src/Docker.DotNet/Models/Message.Generated.cs +++ b/src/Docker.DotNet/Models/Message.Generated.cs @@ -1,35 +1,34 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Message // (events.Message) { - [DataMember(Name = "status", EmitDefaultValue = false)] + [JsonPropertyName("status")] public string Status { get; set; } - [DataMember(Name = "id", EmitDefaultValue = false)] + [JsonPropertyName("id")] public string ID { get; set; } - [DataMember(Name = "from", EmitDefaultValue = false)] + [JsonPropertyName("from")] public string From { get; set; } - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Action", EmitDefaultValue = false)] + [JsonPropertyName("Action")] public string Action { get; set; } - [DataMember(Name = "Actor", EmitDefaultValue = false)] + [JsonPropertyName("Actor")] public Actor Actor { get; set; } - [DataMember(Name = "scope", EmitDefaultValue = false)] + [JsonPropertyName("scope")] public string Scope { get; set; } - [DataMember(Name = "time", EmitDefaultValue = false)] + [JsonPropertyName("time")] public long Time { get; set; } - [DataMember(Name = "timeNano", EmitDefaultValue = false)] + [JsonPropertyName("timeNano")] public long TimeNano { get; set; } } } diff --git a/src/Docker.DotNet/Models/Meta.Generated.cs b/src/Docker.DotNet/Models/Meta.Generated.cs index 1c20a885..11b9e868 100644 --- a/src/Docker.DotNet/Models/Meta.Generated.cs +++ b/src/Docker.DotNet/Models/Meta.Generated.cs @@ -1,18 +1,17 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Meta // (swarm.Meta) { - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } } } diff --git a/src/Docker.DotNet/Models/Mount.Generated.cs b/src/Docker.DotNet/Models/Mount.Generated.cs index 659e76bf..bb654eea 100644 --- a/src/Docker.DotNet/Models/Mount.Generated.cs +++ b/src/Docker.DotNet/Models/Mount.Generated.cs @@ -1,35 +1,34 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Mount // (mount.Mount) { - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Source", EmitDefaultValue = false)] + [JsonPropertyName("Source")] public string Source { get; set; } - [DataMember(Name = "Target", EmitDefaultValue = false)] + [JsonPropertyName("Target")] public string Target { get; set; } - [DataMember(Name = "ReadOnly", EmitDefaultValue = false)] + [JsonPropertyName("ReadOnly")] public bool ReadOnly { get; set; } - [DataMember(Name = "Consistency", EmitDefaultValue = false)] + [JsonPropertyName("Consistency")] public string Consistency { get; set; } - [DataMember(Name = "BindOptions", EmitDefaultValue = false)] + [JsonPropertyName("BindOptions")] public BindOptions BindOptions { get; set; } - [DataMember(Name = "VolumeOptions", EmitDefaultValue = false)] + [JsonPropertyName("VolumeOptions")] public VolumeOptions VolumeOptions { get; set; } - [DataMember(Name = "TmpfsOptions", EmitDefaultValue = false)] + [JsonPropertyName("TmpfsOptions")] public TmpfsOptions TmpfsOptions { get; set; } - [DataMember(Name = "ClusterOptions", EmitDefaultValue = false)] + [JsonPropertyName("ClusterOptions")] public ClusterOptions ClusterOptions { get; set; } } } diff --git a/src/Docker.DotNet/Models/MountPoint.Generated.cs b/src/Docker.DotNet/Models/MountPoint.Generated.cs index 6ac3c36a..f349b9b3 100644 --- a/src/Docker.DotNet/Models/MountPoint.Generated.cs +++ b/src/Docker.DotNet/Models/MountPoint.Generated.cs @@ -1,32 +1,31 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class MountPoint // (types.MountPoint) { - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Source", EmitDefaultValue = false)] + [JsonPropertyName("Source")] public string Source { get; set; } - [DataMember(Name = "Destination", EmitDefaultValue = false)] + [JsonPropertyName("Destination")] public string Destination { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Mode", EmitDefaultValue = false)] + [JsonPropertyName("Mode")] public string Mode { get; set; } - [DataMember(Name = "RW", EmitDefaultValue = false)] + [JsonPropertyName("RW")] public bool RW { get; set; } - [DataMember(Name = "Propagation", EmitDefaultValue = false)] + [JsonPropertyName("Propagation")] public string Propagation { get; set; } } } diff --git a/src/Docker.DotNet/Models/NamedGenericResource.Generated.cs b/src/Docker.DotNet/Models/NamedGenericResource.Generated.cs index 1d4e5a91..6321e84b 100644 --- a/src/Docker.DotNet/Models/NamedGenericResource.Generated.cs +++ b/src/Docker.DotNet/Models/NamedGenericResource.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NamedGenericResource // (swarm.NamedGenericResource) { - [DataMember(Name = "Kind", EmitDefaultValue = false)] + [JsonPropertyName("Kind")] public string Kind { get; set; } - [DataMember(Name = "Value", EmitDefaultValue = false)] + [JsonPropertyName("Value")] public string Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/Network.Generated.cs b/src/Docker.DotNet/Models/Network.Generated.cs index c00e35b4..db9e3be3 100644 --- a/src/Docker.DotNet/Models/Network.Generated.cs +++ b/src/Docker.DotNet/Models/Network.Generated.cs @@ -1,9 +1,8 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Network // (swarm.Network) { public Network() @@ -20,25 +19,25 @@ public Network(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public NetworkSpec Spec { get; set; } - [DataMember(Name = "DriverState", EmitDefaultValue = false)] + [JsonPropertyName("DriverState")] public SwarmDriver DriverState { get; set; } - [DataMember(Name = "IPAMOptions", EmitDefaultValue = false)] + [JsonPropertyName("IPAMOptions")] public IPAMOptions IPAMOptions { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkAddressPool.Generated.cs b/src/Docker.DotNet/Models/NetworkAddressPool.Generated.cs index 5bc4e73a..ff114cda 100644 --- a/src/Docker.DotNet/Models/NetworkAddressPool.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkAddressPool.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkAddressPool // (types.NetworkAddressPool) { - [DataMember(Name = "Base", EmitDefaultValue = false)] + [JsonPropertyName("Base")] public string Base { get; set; } - [DataMember(Name = "Size", EmitDefaultValue = false)] + [JsonPropertyName("Size")] public long Size { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkAttachment.Generated.cs b/src/Docker.DotNet/Models/NetworkAttachment.Generated.cs index 2581022b..5e1df485 100644 --- a/src/Docker.DotNet/Models/NetworkAttachment.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkAttachment.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkAttachment // (swarm.NetworkAttachment) { - [DataMember(Name = "Network", EmitDefaultValue = false)] + [JsonPropertyName("Network")] public Network Network { get; set; } - [DataMember(Name = "Addresses", EmitDefaultValue = false)] + [JsonPropertyName("Addresses")] public IList Addresses { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkAttachmentConfig.Generated.cs b/src/Docker.DotNet/Models/NetworkAttachmentConfig.Generated.cs index 2856926b..0b4475e9 100644 --- a/src/Docker.DotNet/Models/NetworkAttachmentConfig.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkAttachmentConfig.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkAttachmentConfig // (swarm.NetworkAttachmentConfig) { - [DataMember(Name = "Target", EmitDefaultValue = false)] + [JsonPropertyName("Target")] public string Target { get; set; } - [DataMember(Name = "Aliases", EmitDefaultValue = false)] + [JsonPropertyName("Aliases")] public IList Aliases { get; set; } - [DataMember(Name = "DriverOpts", EmitDefaultValue = false)] + [JsonPropertyName("DriverOpts")] public IDictionary DriverOpts { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkAttachmentSpec.Generated.cs b/src/Docker.DotNet/Models/NetworkAttachmentSpec.Generated.cs index 4c4ccf24..f624dc54 100644 --- a/src/Docker.DotNet/Models/NetworkAttachmentSpec.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkAttachmentSpec.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkAttachmentSpec // (swarm.NetworkAttachmentSpec) { - [DataMember(Name = "ContainerID", EmitDefaultValue = false)] + [JsonPropertyName("ContainerID")] public string ContainerID { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkConnectParameters.Generated.cs b/src/Docker.DotNet/Models/NetworkConnectParameters.Generated.cs index 1d606dec..62de2b8f 100644 --- a/src/Docker.DotNet/Models/NetworkConnectParameters.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkConnectParameters.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkConnectParameters // (types.NetworkConnect) { - [DataMember(Name = "Container", EmitDefaultValue = false)] + [JsonPropertyName("Container")] public string Container { get; set; } - [DataMember(Name = "EndpointConfig", EmitDefaultValue = false)] + [JsonPropertyName("EndpointConfig")] public EndpointSettings EndpointConfig { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkCreate.Generated.cs b/src/Docker.DotNet/Models/NetworkCreate.Generated.cs index 4f93ef41..0b151a26 100644 --- a/src/Docker.DotNet/Models/NetworkCreate.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkCreate.Generated.cs @@ -1,45 +1,44 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkCreate // (types.NetworkCreate) { - [DataMember(Name = "CheckDuplicate", EmitDefaultValue = false)] + [JsonPropertyName("CheckDuplicate")] public bool CheckDuplicate { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Scope", EmitDefaultValue = false)] + [JsonPropertyName("Scope")] public string Scope { get; set; } - [DataMember(Name = "EnableIPv6", EmitDefaultValue = false)] + [JsonPropertyName("EnableIPv6")] public bool EnableIPv6 { get; set; } - [DataMember(Name = "IPAM", EmitDefaultValue = false)] + [JsonPropertyName("IPAM")] public IPAM IPAM { get; set; } - [DataMember(Name = "Internal", EmitDefaultValue = false)] + [JsonPropertyName("Internal")] public bool Internal { get; set; } - [DataMember(Name = "Attachable", EmitDefaultValue = false)] + [JsonPropertyName("Attachable")] public bool Attachable { get; set; } - [DataMember(Name = "Ingress", EmitDefaultValue = false)] + [JsonPropertyName("Ingress")] public bool Ingress { get; set; } - [DataMember(Name = "ConfigOnly", EmitDefaultValue = false)] + [JsonPropertyName("ConfigOnly")] public bool ConfigOnly { get; set; } - [DataMember(Name = "ConfigFrom", EmitDefaultValue = false)] + [JsonPropertyName("ConfigFrom")] public ConfigReference ConfigFrom { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkDisconnectParameters.Generated.cs b/src/Docker.DotNet/Models/NetworkDisconnectParameters.Generated.cs index 9a682677..9843196b 100644 --- a/src/Docker.DotNet/Models/NetworkDisconnectParameters.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkDisconnectParameters.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkDisconnectParameters // (types.NetworkDisconnect) { - [DataMember(Name = "Container", EmitDefaultValue = false)] + [JsonPropertyName("Container")] public string Container { get; set; } - [DataMember(Name = "Force", EmitDefaultValue = false)] + [JsonPropertyName("Force")] public bool Force { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkResponse.Generated.cs b/src/Docker.DotNet/Models/NetworkResponse.Generated.cs index 972c5e2c..ae0ca369 100644 --- a/src/Docker.DotNet/Models/NetworkResponse.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkResponse.Generated.cs @@ -1,61 +1,60 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkResponse // (types.NetworkResource) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Created", EmitDefaultValue = false)] + [JsonPropertyName("Created")] public DateTime Created { get; set; } - [DataMember(Name = "Scope", EmitDefaultValue = false)] + [JsonPropertyName("Scope")] public string Scope { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "EnableIPv6", EmitDefaultValue = false)] + [JsonPropertyName("EnableIPv6")] public bool EnableIPv6 { get; set; } - [DataMember(Name = "IPAM", EmitDefaultValue = false)] + [JsonPropertyName("IPAM")] public IPAM IPAM { get; set; } - [DataMember(Name = "Internal", EmitDefaultValue = false)] + [JsonPropertyName("Internal")] public bool Internal { get; set; } - [DataMember(Name = "Attachable", EmitDefaultValue = false)] + [JsonPropertyName("Attachable")] public bool Attachable { get; set; } - [DataMember(Name = "Ingress", EmitDefaultValue = false)] + [JsonPropertyName("Ingress")] public bool Ingress { get; set; } - [DataMember(Name = "ConfigFrom", EmitDefaultValue = false)] + [JsonPropertyName("ConfigFrom")] public ConfigReference ConfigFrom { get; set; } - [DataMember(Name = "ConfigOnly", EmitDefaultValue = false)] + [JsonPropertyName("ConfigOnly")] public bool ConfigOnly { get; set; } - [DataMember(Name = "Containers", EmitDefaultValue = false)] + [JsonPropertyName("Containers")] public IDictionary Containers { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Peers", EmitDefaultValue = false)] + [JsonPropertyName("Peers")] public IList Peers { get; set; } - [DataMember(Name = "Services", EmitDefaultValue = false)] + [JsonPropertyName("Services")] public IDictionary Services { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkSettings.Generated.cs b/src/Docker.DotNet/Models/NetworkSettings.Generated.cs index eaadbdf5..f98dde79 100644 --- a/src/Docker.DotNet/Models/NetworkSettings.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkSettings.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkSettings // (types.NetworkSettings) { public NetworkSettings() @@ -38,58 +37,58 @@ public NetworkSettings(NetworkSettingsBase NetworkSettingsBase, DefaultNetworkSe } } - [DataMember(Name = "Bridge", EmitDefaultValue = false)] + [JsonPropertyName("Bridge")] public string Bridge { get; set; } - [DataMember(Name = "SandboxID", EmitDefaultValue = false)] + [JsonPropertyName("SandboxID")] public string SandboxID { get; set; } - [DataMember(Name = "HairpinMode", EmitDefaultValue = false)] + [JsonPropertyName("HairpinMode")] public bool HairpinMode { get; set; } - [DataMember(Name = "LinkLocalIPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("LinkLocalIPv6Address")] public string LinkLocalIPv6Address { get; set; } - [DataMember(Name = "LinkLocalIPv6PrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("LinkLocalIPv6PrefixLen")] public long LinkLocalIPv6PrefixLen { get; set; } - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IDictionary> Ports { get; set; } - [DataMember(Name = "SandboxKey", EmitDefaultValue = false)] + [JsonPropertyName("SandboxKey")] public string SandboxKey { get; set; } - [DataMember(Name = "SecondaryIPAddresses", EmitDefaultValue = false)] + [JsonPropertyName("SecondaryIPAddresses")] public IList
SecondaryIPAddresses { get; set; } - [DataMember(Name = "SecondaryIPv6Addresses", EmitDefaultValue = false)] + [JsonPropertyName("SecondaryIPv6Addresses")] public IList
SecondaryIPv6Addresses { get; set; } - [DataMember(Name = "EndpointID", EmitDefaultValue = false)] + [JsonPropertyName("EndpointID")] public string EndpointID { get; set; } - [DataMember(Name = "Gateway", EmitDefaultValue = false)] + [JsonPropertyName("Gateway")] public string Gateway { get; set; } - [DataMember(Name = "GlobalIPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("GlobalIPv6Address")] public string GlobalIPv6Address { get; set; } - [DataMember(Name = "GlobalIPv6PrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("GlobalIPv6PrefixLen")] public long GlobalIPv6PrefixLen { get; set; } - [DataMember(Name = "IPAddress", EmitDefaultValue = false)] + [JsonPropertyName("IPAddress")] public string IPAddress { get; set; } - [DataMember(Name = "IPPrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("IPPrefixLen")] public long IPPrefixLen { get; set; } - [DataMember(Name = "IPv6Gateway", EmitDefaultValue = false)] + [JsonPropertyName("IPv6Gateway")] public string IPv6Gateway { get; set; } - [DataMember(Name = "MacAddress", EmitDefaultValue = false)] + [JsonPropertyName("MacAddress")] public string MacAddress { get; set; } - [DataMember(Name = "Networks", EmitDefaultValue = false)] + [JsonPropertyName("Networks")] public IDictionary Networks { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkSettingsBase.Generated.cs b/src/Docker.DotNet/Models/NetworkSettingsBase.Generated.cs index 997f8618..edc3f801 100644 --- a/src/Docker.DotNet/Models/NetworkSettingsBase.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkSettingsBase.Generated.cs @@ -1,36 +1,35 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkSettingsBase // (types.NetworkSettingsBase) { - [DataMember(Name = "Bridge", EmitDefaultValue = false)] + [JsonPropertyName("Bridge")] public string Bridge { get; set; } - [DataMember(Name = "SandboxID", EmitDefaultValue = false)] + [JsonPropertyName("SandboxID")] public string SandboxID { get; set; } - [DataMember(Name = "HairpinMode", EmitDefaultValue = false)] + [JsonPropertyName("HairpinMode")] public bool HairpinMode { get; set; } - [DataMember(Name = "LinkLocalIPv6Address", EmitDefaultValue = false)] + [JsonPropertyName("LinkLocalIPv6Address")] public string LinkLocalIPv6Address { get; set; } - [DataMember(Name = "LinkLocalIPv6PrefixLen", EmitDefaultValue = false)] + [JsonPropertyName("LinkLocalIPv6PrefixLen")] public long LinkLocalIPv6PrefixLen { get; set; } - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IDictionary> Ports { get; set; } - [DataMember(Name = "SandboxKey", EmitDefaultValue = false)] + [JsonPropertyName("SandboxKey")] public string SandboxKey { get; set; } - [DataMember(Name = "SecondaryIPAddresses", EmitDefaultValue = false)] + [JsonPropertyName("SecondaryIPAddresses")] public IList
SecondaryIPAddresses { get; set; } - [DataMember(Name = "SecondaryIPv6Addresses", EmitDefaultValue = false)] + [JsonPropertyName("SecondaryIPv6Addresses")] public IList
SecondaryIPv6Addresses { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkSpec.Generated.cs b/src/Docker.DotNet/Models/NetworkSpec.Generated.cs index 5711890b..0590c92a 100644 --- a/src/Docker.DotNet/Models/NetworkSpec.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkSpec.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkSpec // (swarm.NetworkSpec) { public NetworkSpec() @@ -19,34 +18,34 @@ public NetworkSpec(Annotations Annotations) } } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "DriverConfiguration", EmitDefaultValue = false)] + [JsonPropertyName("DriverConfiguration")] public SwarmDriver DriverConfiguration { get; set; } - [DataMember(Name = "IPv6Enabled", EmitDefaultValue = false)] + [JsonPropertyName("IPv6Enabled")] public bool IPv6Enabled { get; set; } - [DataMember(Name = "Internal", EmitDefaultValue = false)] + [JsonPropertyName("Internal")] public bool Internal { get; set; } - [DataMember(Name = "Attachable", EmitDefaultValue = false)] + [JsonPropertyName("Attachable")] public bool Attachable { get; set; } - [DataMember(Name = "Ingress", EmitDefaultValue = false)] + [JsonPropertyName("Ingress")] public bool Ingress { get; set; } - [DataMember(Name = "IPAMOptions", EmitDefaultValue = false)] + [JsonPropertyName("IPAMOptions")] public IPAMOptions IPAMOptions { get; set; } - [DataMember(Name = "ConfigFrom", EmitDefaultValue = false)] + [JsonPropertyName("ConfigFrom")] public ConfigReference ConfigFrom { get; set; } - [DataMember(Name = "Scope", EmitDefaultValue = false)] + [JsonPropertyName("Scope")] public string Scope { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkStats.Generated.cs b/src/Docker.DotNet/Models/NetworkStats.Generated.cs index 441b313d..0220ca21 100644 --- a/src/Docker.DotNet/Models/NetworkStats.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkStats.Generated.cs @@ -1,38 +1,37 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkStats // (types.NetworkStats) { - [DataMember(Name = "rx_bytes", EmitDefaultValue = false)] + [JsonPropertyName("rx_bytes")] public ulong RxBytes { get; set; } - [DataMember(Name = "rx_packets", EmitDefaultValue = false)] + [JsonPropertyName("rx_packets")] public ulong RxPackets { get; set; } - [DataMember(Name = "rx_errors", EmitDefaultValue = false)] + [JsonPropertyName("rx_errors")] public ulong RxErrors { get; set; } - [DataMember(Name = "rx_dropped", EmitDefaultValue = false)] + [JsonPropertyName("rx_dropped")] public ulong RxDropped { get; set; } - [DataMember(Name = "tx_bytes", EmitDefaultValue = false)] + [JsonPropertyName("tx_bytes")] public ulong TxBytes { get; set; } - [DataMember(Name = "tx_packets", EmitDefaultValue = false)] + [JsonPropertyName("tx_packets")] public ulong TxPackets { get; set; } - [DataMember(Name = "tx_errors", EmitDefaultValue = false)] + [JsonPropertyName("tx_errors")] public ulong TxErrors { get; set; } - [DataMember(Name = "tx_dropped", EmitDefaultValue = false)] + [JsonPropertyName("tx_dropped")] public ulong TxDropped { get; set; } - [DataMember(Name = "endpoint_id", EmitDefaultValue = false)] + [JsonPropertyName("endpoint_id")] public string EndpointID { get; set; } - [DataMember(Name = "instance_id", EmitDefaultValue = false)] + [JsonPropertyName("instance_id")] public string InstanceID { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkTask.Generated.cs b/src/Docker.DotNet/Models/NetworkTask.Generated.cs index 1ca997a1..ccc6f24b 100644 --- a/src/Docker.DotNet/Models/NetworkTask.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkTask.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkTask // (network.Task) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "EndpointID", EmitDefaultValue = false)] + [JsonPropertyName("EndpointID")] public string EndpointID { get; set; } - [DataMember(Name = "EndpointIP", EmitDefaultValue = false)] + [JsonPropertyName("EndpointIP")] public string EndpointIP { get; set; } - [DataMember(Name = "Info", EmitDefaultValue = false)] + [JsonPropertyName("Info")] public IDictionary Info { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworkingConfig.Generated.cs b/src/Docker.DotNet/Models/NetworkingConfig.Generated.cs index e132cd48..637152b7 100644 --- a/src/Docker.DotNet/Models/NetworkingConfig.Generated.cs +++ b/src/Docker.DotNet/Models/NetworkingConfig.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworkingConfig // (network.NetworkingConfig) { - [DataMember(Name = "EndpointsConfig", EmitDefaultValue = false)] + [JsonPropertyName("EndpointsConfig")] public IDictionary EndpointsConfig { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworksCreateParameters.Generated.cs b/src/Docker.DotNet/Models/NetworksCreateParameters.Generated.cs index cfe9901d..143ebb9d 100644 --- a/src/Docker.DotNet/Models/NetworksCreateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/NetworksCreateParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworksCreateParameters // (types.NetworkCreateRequest) { public NetworksCreateParameters() @@ -29,43 +28,43 @@ public NetworksCreateParameters(NetworkCreate NetworkCreate) } } - [DataMember(Name = "CheckDuplicate", EmitDefaultValue = false)] + [JsonPropertyName("CheckDuplicate")] public bool CheckDuplicate { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Scope", EmitDefaultValue = false)] + [JsonPropertyName("Scope")] public string Scope { get; set; } - [DataMember(Name = "EnableIPv6", EmitDefaultValue = false)] + [JsonPropertyName("EnableIPv6")] public bool EnableIPv6 { get; set; } - [DataMember(Name = "IPAM", EmitDefaultValue = false)] + [JsonPropertyName("IPAM")] public IPAM IPAM { get; set; } - [DataMember(Name = "Internal", EmitDefaultValue = false)] + [JsonPropertyName("Internal")] public bool Internal { get; set; } - [DataMember(Name = "Attachable", EmitDefaultValue = false)] + [JsonPropertyName("Attachable")] public bool Attachable { get; set; } - [DataMember(Name = "Ingress", EmitDefaultValue = false)] + [JsonPropertyName("Ingress")] public bool Ingress { get; set; } - [DataMember(Name = "ConfigOnly", EmitDefaultValue = false)] + [JsonPropertyName("ConfigOnly")] public bool ConfigOnly { get; set; } - [DataMember(Name = "ConfigFrom", EmitDefaultValue = false)] + [JsonPropertyName("ConfigFrom")] public ConfigReference ConfigFrom { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworksCreateResponse.Generated.cs b/src/Docker.DotNet/Models/NetworksCreateResponse.Generated.cs index 82f087bb..93a15e4f 100644 --- a/src/Docker.DotNet/Models/NetworksCreateResponse.Generated.cs +++ b/src/Docker.DotNet/Models/NetworksCreateResponse.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworksCreateResponse // (types.NetworkCreateResponse) { - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Warning", EmitDefaultValue = false)] + [JsonPropertyName("Warning")] public string Warning { get; set; } } } diff --git a/src/Docker.DotNet/Models/NetworksDeleteUnusedParameters.Generated.cs b/src/Docker.DotNet/Models/NetworksDeleteUnusedParameters.Generated.cs index 5af47b3a..b52c1470 100644 --- a/src/Docker.DotNet/Models/NetworksDeleteUnusedParameters.Generated.cs +++ b/src/Docker.DotNet/Models/NetworksDeleteUnusedParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworksDeleteUnusedParameters // (main.NetworksDeleteUnusedParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/NetworksListParameters.Generated.cs b/src/Docker.DotNet/Models/NetworksListParameters.Generated.cs index 0a0737b7..3ba3b47b 100644 --- a/src/Docker.DotNet/Models/NetworksListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/NetworksListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworksListParameters // (main.NetworksListParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/NetworksPruneResponse.Generated.cs b/src/Docker.DotNet/Models/NetworksPruneResponse.Generated.cs index 5bcb8164..8160a7cf 100644 --- a/src/Docker.DotNet/Models/NetworksPruneResponse.Generated.cs +++ b/src/Docker.DotNet/Models/NetworksPruneResponse.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NetworksPruneResponse // (types.NetworksPruneReport) { - [DataMember(Name = "NetworksDeleted", EmitDefaultValue = false)] + [JsonPropertyName("NetworksDeleted")] public IList NetworksDeleted { get; set; } } } diff --git a/src/Docker.DotNet/Models/NodeCSIInfo.Generated.cs b/src/Docker.DotNet/Models/NodeCSIInfo.Generated.cs index bf6e997f..f4264eef 100644 --- a/src/Docker.DotNet/Models/NodeCSIInfo.Generated.cs +++ b/src/Docker.DotNet/Models/NodeCSIInfo.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NodeCSIInfo // (swarm.NodeCSIInfo) { - [DataMember(Name = "PluginName", EmitDefaultValue = false)] + [JsonPropertyName("PluginName")] public string PluginName { get; set; } - [DataMember(Name = "NodeID", EmitDefaultValue = false)] + [JsonPropertyName("NodeID")] public string NodeID { get; set; } - [DataMember(Name = "MaxVolumesPerNode", EmitDefaultValue = false)] + [JsonPropertyName("MaxVolumesPerNode")] public long MaxVolumesPerNode { get; set; } - [DataMember(Name = "AccessibleTopology", EmitDefaultValue = false)] + [JsonPropertyName("AccessibleTopology")] public Topology AccessibleTopology { get; set; } } } diff --git a/src/Docker.DotNet/Models/NodeDescription.Generated.cs b/src/Docker.DotNet/Models/NodeDescription.Generated.cs index d699f7ea..b24e3c57 100644 --- a/src/Docker.DotNet/Models/NodeDescription.Generated.cs +++ b/src/Docker.DotNet/Models/NodeDescription.Generated.cs @@ -1,27 +1,26 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NodeDescription // (swarm.NodeDescription) { - [DataMember(Name = "Hostname", EmitDefaultValue = false)] + [JsonPropertyName("Hostname")] public string Hostname { get; set; } - [DataMember(Name = "Platform", EmitDefaultValue = false)] + [JsonPropertyName("Platform")] public Platform Platform { get; set; } - [DataMember(Name = "Resources", EmitDefaultValue = false)] + [JsonPropertyName("Resources")] public SwarmResources Resources { get; set; } - [DataMember(Name = "Engine", EmitDefaultValue = false)] + [JsonPropertyName("Engine")] public EngineDescription Engine { get; set; } - [DataMember(Name = "TLSInfo", EmitDefaultValue = false)] + [JsonPropertyName("TLSInfo")] public TLSInfo TLSInfo { get; set; } - [DataMember(Name = "CSIInfo", EmitDefaultValue = false)] + [JsonPropertyName("CSIInfo")] public IList CSIInfo { get; set; } } } diff --git a/src/Docker.DotNet/Models/NodeListResponse.Generated.cs b/src/Docker.DotNet/Models/NodeListResponse.Generated.cs index fe52f92b..5f5a5fb1 100644 --- a/src/Docker.DotNet/Models/NodeListResponse.Generated.cs +++ b/src/Docker.DotNet/Models/NodeListResponse.Generated.cs @@ -1,9 +1,8 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NodeListResponse // (swarm.Node) { public NodeListResponse() @@ -20,28 +19,28 @@ public NodeListResponse(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public NodeUpdateParameters Spec { get; set; } - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public NodeDescription Description { get; set; } - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public NodeStatus Status { get; set; } - [DataMember(Name = "ManagerStatus", EmitDefaultValue = false)] + [JsonPropertyName("ManagerStatus")] public ManagerStatus ManagerStatus { get; set; } } } diff --git a/src/Docker.DotNet/Models/NodeStatus.Generated.cs b/src/Docker.DotNet/Models/NodeStatus.Generated.cs index d51ab7f2..190d9b22 100644 --- a/src/Docker.DotNet/Models/NodeStatus.Generated.cs +++ b/src/Docker.DotNet/Models/NodeStatus.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NodeStatus // (swarm.NodeStatus) { - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public string State { get; set; } - [DataMember(Name = "Message", EmitDefaultValue = false)] + [JsonPropertyName("Message")] public string Message { get; set; } - [DataMember(Name = "Addr", EmitDefaultValue = false)] + [JsonPropertyName("Addr")] public string Addr { get; set; } } } diff --git a/src/Docker.DotNet/Models/NodeUpdateParameters.Generated.cs b/src/Docker.DotNet/Models/NodeUpdateParameters.Generated.cs index 2d976af0..8489361b 100644 --- a/src/Docker.DotNet/Models/NodeUpdateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/NodeUpdateParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class NodeUpdateParameters // (swarm.NodeSpec) { public NodeUpdateParameters() @@ -19,16 +18,16 @@ public NodeUpdateParameters(Annotations Annotations) } } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Role", EmitDefaultValue = false)] + [JsonPropertyName("Role")] public string Role { get; set; } - [DataMember(Name = "Availability", EmitDefaultValue = false)] + [JsonPropertyName("Availability")] public string Availability { get; set; } } } diff --git a/src/Docker.DotNet/Models/OrchestrationConfig.Generated.cs b/src/Docker.DotNet/Models/OrchestrationConfig.Generated.cs index b02ba193..005eb3cd 100644 --- a/src/Docker.DotNet/Models/OrchestrationConfig.Generated.cs +++ b/src/Docker.DotNet/Models/OrchestrationConfig.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class OrchestrationConfig // (swarm.OrchestrationConfig) { - [DataMember(Name = "TaskHistoryRetentionLimit", EmitDefaultValue = false)] + [JsonPropertyName("TaskHistoryRetentionLimit")] public long? TaskHistoryRetentionLimit { get; set; } } } diff --git a/src/Docker.DotNet/Models/Peer.Generated.cs b/src/Docker.DotNet/Models/Peer.Generated.cs index a00cd984..0782d130 100644 --- a/src/Docker.DotNet/Models/Peer.Generated.cs +++ b/src/Docker.DotNet/Models/Peer.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Peer // (swarm.Peer) { - [DataMember(Name = "NodeID", EmitDefaultValue = false)] + [JsonPropertyName("NodeID")] public string NodeID { get; set; } - [DataMember(Name = "Addr", EmitDefaultValue = false)] + [JsonPropertyName("Addr")] public string Addr { get; set; } } } diff --git a/src/Docker.DotNet/Models/PeerInfo.Generated.cs b/src/Docker.DotNet/Models/PeerInfo.Generated.cs index 877785d9..67ee46df 100644 --- a/src/Docker.DotNet/Models/PeerInfo.Generated.cs +++ b/src/Docker.DotNet/Models/PeerInfo.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PeerInfo // (network.PeerInfo) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "IP", EmitDefaultValue = false)] + [JsonPropertyName("IP")] public string IP { get; set; } } } diff --git a/src/Docker.DotNet/Models/PidsStats.Generated.cs b/src/Docker.DotNet/Models/PidsStats.Generated.cs index 30250a1e..90486df7 100644 --- a/src/Docker.DotNet/Models/PidsStats.Generated.cs +++ b/src/Docker.DotNet/Models/PidsStats.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PidsStats // (types.PidsStats) { - [DataMember(Name = "current", EmitDefaultValue = false)] + [JsonPropertyName("current")] public ulong Current { get; set; } - [DataMember(Name = "limit", EmitDefaultValue = false)] + [JsonPropertyName("limit")] public ulong Limit { get; set; } } } diff --git a/src/Docker.DotNet/Models/Placement.Generated.cs b/src/Docker.DotNet/Models/Placement.Generated.cs index 5046c6e7..0b4e10b0 100644 --- a/src/Docker.DotNet/Models/Placement.Generated.cs +++ b/src/Docker.DotNet/Models/Placement.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Placement // (swarm.Placement) { - [DataMember(Name = "Constraints", EmitDefaultValue = false)] + [JsonPropertyName("Constraints")] public IList Constraints { get; set; } - [DataMember(Name = "Preferences", EmitDefaultValue = false)] + [JsonPropertyName("Preferences")] public IList Preferences { get; set; } - [DataMember(Name = "MaxReplicas", EmitDefaultValue = false)] + [JsonPropertyName("MaxReplicas")] public ulong MaxReplicas { get; set; } - [DataMember(Name = "Platforms", EmitDefaultValue = false)] + [JsonPropertyName("Platforms")] public IList Platforms { get; set; } } } diff --git a/src/Docker.DotNet/Models/PlacementPreference.Generated.cs b/src/Docker.DotNet/Models/PlacementPreference.Generated.cs index f59e30e8..df7c3fc0 100644 --- a/src/Docker.DotNet/Models/PlacementPreference.Generated.cs +++ b/src/Docker.DotNet/Models/PlacementPreference.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PlacementPreference // (swarm.PlacementPreference) { - [DataMember(Name = "Spread", EmitDefaultValue = false)] + [JsonPropertyName("Spread")] public SpreadOver Spread { get; set; } } } diff --git a/src/Docker.DotNet/Models/Platform.Generated.cs b/src/Docker.DotNet/Models/Platform.Generated.cs index eaf67fbb..56b6014e 100644 --- a/src/Docker.DotNet/Models/Platform.Generated.cs +++ b/src/Docker.DotNet/Models/Platform.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Platform // (swarm.Platform) { - [DataMember(Name = "Architecture", EmitDefaultValue = false)] + [JsonPropertyName("Architecture")] public string Architecture { get; set; } - [DataMember(Name = "OS", EmitDefaultValue = false)] + [JsonPropertyName("OS")] public string OS { get; set; } } } diff --git a/src/Docker.DotNet/Models/Plugin.Generated.cs b/src/Docker.DotNet/Models/Plugin.Generated.cs index fd4949b8..b7fc8db5 100644 --- a/src/Docker.DotNet/Models/Plugin.Generated.cs +++ b/src/Docker.DotNet/Models/Plugin.Generated.cs @@ -1,26 +1,25 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Plugin // (types.Plugin) { - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public PluginConfig Config { get; set; } - [DataMember(Name = "Enabled", EmitDefaultValue = false)] + [JsonPropertyName("Enabled")] public bool Enabled { get; set; } - [DataMember(Name = "Id", EmitDefaultValue = false)] + [JsonPropertyName("Id")] public string ID { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "PluginReference", EmitDefaultValue = false)] + [JsonPropertyName("PluginReference")] public string PluginReference { get; set; } - [DataMember(Name = "Settings", EmitDefaultValue = false)] + [JsonPropertyName("Settings")] public PluginSettings Settings { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfig.Generated.cs b/src/Docker.DotNet/Models/PluginConfig.Generated.cs index 7c014203..c34d4a68 100644 --- a/src/Docker.DotNet/Models/PluginConfig.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfig.Generated.cs @@ -1,57 +1,56 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfig // (types.PluginConfig) { - [DataMember(Name = "Args", EmitDefaultValue = false)] + [JsonPropertyName("Args")] public PluginConfigArgs Args { get; set; } - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public string Description { get; set; } - [DataMember(Name = "DockerVersion", EmitDefaultValue = false)] + [JsonPropertyName("DockerVersion")] public string DockerVersion { get; set; } - [DataMember(Name = "Documentation", EmitDefaultValue = false)] + [JsonPropertyName("Documentation")] public string Documentation { get; set; } - [DataMember(Name = "Entrypoint", EmitDefaultValue = false)] + [JsonPropertyName("Entrypoint")] public IList Entrypoint { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "Interface", EmitDefaultValue = false)] + [JsonPropertyName("Interface")] public PluginConfigInterface Interface { get; set; } - [DataMember(Name = "IpcHost", EmitDefaultValue = false)] + [JsonPropertyName("IpcHost")] public bool IpcHost { get; set; } - [DataMember(Name = "Linux", EmitDefaultValue = false)] + [JsonPropertyName("Linux")] public PluginConfigLinux Linux { get; set; } - [DataMember(Name = "Mounts", EmitDefaultValue = false)] + [JsonPropertyName("Mounts")] public IList Mounts { get; set; } - [DataMember(Name = "Network", EmitDefaultValue = false)] + [JsonPropertyName("Network")] public PluginConfigNetwork Network { get; set; } - [DataMember(Name = "PidHost", EmitDefaultValue = false)] + [JsonPropertyName("PidHost")] public bool PidHost { get; set; } - [DataMember(Name = "PropagatedMount", EmitDefaultValue = false)] + [JsonPropertyName("PropagatedMount")] public string PropagatedMount { get; set; } - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public PluginConfigUser User { get; set; } - [DataMember(Name = "WorkDir", EmitDefaultValue = false)] + [JsonPropertyName("WorkDir")] public string WorkDir { get; set; } - [DataMember(Name = "rootfs", EmitDefaultValue = false)] + [JsonPropertyName("rootfs")] public PluginConfigRootfs Rootfs { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigArgs.Generated.cs b/src/Docker.DotNet/Models/PluginConfigArgs.Generated.cs index f12bf17d..57a976da 100644 --- a/src/Docker.DotNet/Models/PluginConfigArgs.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigArgs.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigArgs // (types.PluginConfigArgs) { - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public string Description { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Settable", EmitDefaultValue = false)] + [JsonPropertyName("Settable")] public IList Settable { get; set; } - [DataMember(Name = "Value", EmitDefaultValue = false)] + [JsonPropertyName("Value")] public IList Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigInterface.Generated.cs b/src/Docker.DotNet/Models/PluginConfigInterface.Generated.cs index a6188b2f..b311fc17 100644 --- a/src/Docker.DotNet/Models/PluginConfigInterface.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigInterface.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigInterface // (types.PluginConfigInterface) { - [DataMember(Name = "ProtocolScheme", EmitDefaultValue = false)] + [JsonPropertyName("ProtocolScheme")] public string ProtocolScheme { get; set; } - [DataMember(Name = "Socket", EmitDefaultValue = false)] + [JsonPropertyName("Socket")] public string Socket { get; set; } - [DataMember(Name = "Types", EmitDefaultValue = false)] + [JsonPropertyName("Types")] public IList Types { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigLinux.Generated.cs b/src/Docker.DotNet/Models/PluginConfigLinux.Generated.cs index 5503f4d2..443376e0 100644 --- a/src/Docker.DotNet/Models/PluginConfigLinux.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigLinux.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigLinux // (types.PluginConfigLinux) { - [DataMember(Name = "AllowAllDevices", EmitDefaultValue = false)] + [JsonPropertyName("AllowAllDevices")] public bool AllowAllDevices { get; set; } - [DataMember(Name = "Capabilities", EmitDefaultValue = false)] + [JsonPropertyName("Capabilities")] public IList Capabilities { get; set; } - [DataMember(Name = "Devices", EmitDefaultValue = false)] + [JsonPropertyName("Devices")] public IList Devices { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigNetwork.Generated.cs b/src/Docker.DotNet/Models/PluginConfigNetwork.Generated.cs index cefb4646..dc208999 100644 --- a/src/Docker.DotNet/Models/PluginConfigNetwork.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigNetwork.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigNetwork // (types.PluginConfigNetwork) { - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigRootfs.Generated.cs b/src/Docker.DotNet/Models/PluginConfigRootfs.Generated.cs index d8409e8b..35c29a6f 100644 --- a/src/Docker.DotNet/Models/PluginConfigRootfs.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigRootfs.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigRootfs // (types.PluginConfigRootfs) { - [DataMember(Name = "diff_ids", EmitDefaultValue = false)] + [JsonPropertyName("diff_ids")] public IList DiffIds { get; set; } - [DataMember(Name = "type", EmitDefaultValue = false)] + [JsonPropertyName("type")] public string Type { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigUser.Generated.cs b/src/Docker.DotNet/Models/PluginConfigUser.Generated.cs index e137d200..0dea2595 100644 --- a/src/Docker.DotNet/Models/PluginConfigUser.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigUser.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigUser // (types.PluginConfigUser) { - [DataMember(Name = "GID", EmitDefaultValue = false)] + [JsonPropertyName("GID")] public uint GID { get; set; } - [DataMember(Name = "UID", EmitDefaultValue = false)] + [JsonPropertyName("UID")] public uint UID { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginConfigureParameters.Generated.cs b/src/Docker.DotNet/Models/PluginConfigureParameters.Generated.cs index d51f469b..053c389f 100644 --- a/src/Docker.DotNet/Models/PluginConfigureParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginConfigureParameters.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginConfigureParameters // (main.PluginConfigureParameters) { - [DataMember(Name = "Args", EmitDefaultValue = false)] + [JsonPropertyName("Args")] public IList Args { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginCreateParameters.Generated.cs b/src/Docker.DotNet/Models/PluginCreateParameters.Generated.cs index db17597b..a969a556 100644 --- a/src/Docker.DotNet/Models/PluginCreateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginCreateParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginCreateParameters // (main.PluginCreateParameters) { [QueryStringParameter("name", true)] diff --git a/src/Docker.DotNet/Models/PluginDescription.Generated.cs b/src/Docker.DotNet/Models/PluginDescription.Generated.cs index 63ba3d8d..cb865355 100644 --- a/src/Docker.DotNet/Models/PluginDescription.Generated.cs +++ b/src/Docker.DotNet/Models/PluginDescription.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginDescription // (swarm.PluginDescription) { - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginDevice.Generated.cs b/src/Docker.DotNet/Models/PluginDevice.Generated.cs index 588804b3..3f723e56 100644 --- a/src/Docker.DotNet/Models/PluginDevice.Generated.cs +++ b/src/Docker.DotNet/Models/PluginDevice.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginDevice // (types.PluginDevice) { - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public string Description { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Path", EmitDefaultValue = false)] + [JsonPropertyName("Path")] public string Path { get; set; } - [DataMember(Name = "Settable", EmitDefaultValue = false)] + [JsonPropertyName("Settable")] public IList Settable { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginDisableParameters.Generated.cs b/src/Docker.DotNet/Models/PluginDisableParameters.Generated.cs index d7571151..6c85dae1 100644 --- a/src/Docker.DotNet/Models/PluginDisableParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginDisableParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginDisableParameters // (main.PluginDisableParameters) { [QueryStringParameter("force", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/PluginEnableParameters.Generated.cs b/src/Docker.DotNet/Models/PluginEnableParameters.Generated.cs index 34f94a5f..5e077528 100644 --- a/src/Docker.DotNet/Models/PluginEnableParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginEnableParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginEnableParameters // (main.PluginEnableParameters) { [QueryStringParameter("timeout", false)] diff --git a/src/Docker.DotNet/Models/PluginEnv.Generated.cs b/src/Docker.DotNet/Models/PluginEnv.Generated.cs index 92ba4d41..dd78bfe3 100644 --- a/src/Docker.DotNet/Models/PluginEnv.Generated.cs +++ b/src/Docker.DotNet/Models/PluginEnv.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginEnv // (types.PluginEnv) { - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public string Description { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Settable", EmitDefaultValue = false)] + [JsonPropertyName("Settable")] public IList Settable { get; set; } - [DataMember(Name = "Value", EmitDefaultValue = false)] + [JsonPropertyName("Value")] public string Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginGetPrivilegeParameters.Generated.cs b/src/Docker.DotNet/Models/PluginGetPrivilegeParameters.Generated.cs index 7d8560b4..0d25b5a3 100644 --- a/src/Docker.DotNet/Models/PluginGetPrivilegeParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginGetPrivilegeParameters.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginGetPrivilegeParameters // (main.PluginGetPrivilegeParameters) { [QueryStringParameter("remote", true)] public string Remote { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginInstallParameters.Generated.cs b/src/Docker.DotNet/Models/PluginInstallParameters.Generated.cs index 8d01cf65..088ad738 100644 --- a/src/Docker.DotNet/Models/PluginInstallParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginInstallParameters.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginInstallParameters // (main.PluginInstallParameters) { [QueryStringParameter("remote", true)] @@ -12,10 +11,10 @@ public class PluginInstallParameters // (main.PluginInstallParameters) [QueryStringParameter("name", false)] public string Name { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } - [DataMember(Name = "Privileges", EmitDefaultValue = false)] + [JsonPropertyName("Privileges")] public IList Privileges { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginInterfaceType.Generated.cs b/src/Docker.DotNet/Models/PluginInterfaceType.Generated.cs index 826b81bc..4241c1dd 100644 --- a/src/Docker.DotNet/Models/PluginInterfaceType.Generated.cs +++ b/src/Docker.DotNet/Models/PluginInterfaceType.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginInterfaceType // (types.PluginInterfaceType) { - [DataMember(Name = "Capability", EmitDefaultValue = false)] + [JsonPropertyName("Capability")] public string Capability { get; set; } - [DataMember(Name = "Prefix", EmitDefaultValue = false)] + [JsonPropertyName("Prefix")] public string Prefix { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public string Version { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginListParameters.Generated.cs b/src/Docker.DotNet/Models/PluginListParameters.Generated.cs index c2578796..68b3c151 100644 --- a/src/Docker.DotNet/Models/PluginListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginListParameters // (main.PluginListParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/PluginMount.Generated.cs b/src/Docker.DotNet/Models/PluginMount.Generated.cs index 57ff6b11..a0253b95 100644 --- a/src/Docker.DotNet/Models/PluginMount.Generated.cs +++ b/src/Docker.DotNet/Models/PluginMount.Generated.cs @@ -1,30 +1,29 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginMount // (types.PluginMount) { - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public string Description { get; set; } - [DataMember(Name = "Destination", EmitDefaultValue = false)] + [JsonPropertyName("Destination")] public string Destination { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IList Options { get; set; } - [DataMember(Name = "Settable", EmitDefaultValue = false)] + [JsonPropertyName("Settable")] public IList Settable { get; set; } - [DataMember(Name = "Source", EmitDefaultValue = false)] + [JsonPropertyName("Source")] public string Source { get; set; } - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginPrivilege.Generated.cs b/src/Docker.DotNet/Models/PluginPrivilege.Generated.cs index a548daf5..729624e1 100644 --- a/src/Docker.DotNet/Models/PluginPrivilege.Generated.cs +++ b/src/Docker.DotNet/Models/PluginPrivilege.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginPrivilege // (types.PluginPrivilege) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Description", EmitDefaultValue = false)] + [JsonPropertyName("Description")] public string Description { get; set; } - [DataMember(Name = "Value", EmitDefaultValue = false)] + [JsonPropertyName("Value")] public IList Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginRemoveParameters.Generated.cs b/src/Docker.DotNet/Models/PluginRemoveParameters.Generated.cs index c266f818..f6aed382 100644 --- a/src/Docker.DotNet/Models/PluginRemoveParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginRemoveParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginRemoveParameters // (main.PluginRemoveParameters) { [QueryStringParameter("force", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/PluginSettings.Generated.cs b/src/Docker.DotNet/Models/PluginSettings.Generated.cs index 3ef5c324..e641dc0e 100644 --- a/src/Docker.DotNet/Models/PluginSettings.Generated.cs +++ b/src/Docker.DotNet/Models/PluginSettings.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginSettings // (types.PluginSettings) { - [DataMember(Name = "Args", EmitDefaultValue = false)] + [JsonPropertyName("Args")] public IList Args { get; set; } - [DataMember(Name = "Devices", EmitDefaultValue = false)] + [JsonPropertyName("Devices")] public IList Devices { get; set; } - [DataMember(Name = "Env", EmitDefaultValue = false)] + [JsonPropertyName("Env")] public IList Env { get; set; } - [DataMember(Name = "Mounts", EmitDefaultValue = false)] + [JsonPropertyName("Mounts")] public IList Mounts { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginSpec.Generated.cs b/src/Docker.DotNet/Models/PluginSpec.Generated.cs index 9f00d4ee..5c1e1a87 100644 --- a/src/Docker.DotNet/Models/PluginSpec.Generated.cs +++ b/src/Docker.DotNet/Models/PluginSpec.Generated.cs @@ -1,24 +1,23 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginSpec // (runtime.PluginSpec) { - [DataMember(Name = "name", EmitDefaultValue = false)] + [JsonPropertyName("name")] public string Name { get; set; } - [DataMember(Name = "remote", EmitDefaultValue = false)] + [JsonPropertyName("remote")] public string Remote { get; set; } - [DataMember(Name = "privileges", EmitDefaultValue = false)] + [JsonPropertyName("privileges")] public IList Privileges { get; set; } - [DataMember(Name = "disabled", EmitDefaultValue = false)] + [JsonPropertyName("disabled")] public bool Disabled { get; set; } - [DataMember(Name = "env", EmitDefaultValue = false)] + [JsonPropertyName("env")] public IList Env { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginUpgradeParameters.Generated.cs b/src/Docker.DotNet/Models/PluginUpgradeParameters.Generated.cs index 078aff65..ea71220d 100644 --- a/src/Docker.DotNet/Models/PluginUpgradeParameters.Generated.cs +++ b/src/Docker.DotNet/Models/PluginUpgradeParameters.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginUpgradeParameters // (main.PluginUpgradeParameters) { [QueryStringParameter("remote", true)] public string Remote { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } - [DataMember(Name = "Privileges", EmitDefaultValue = false)] + [JsonPropertyName("Privileges")] public IList Privileges { get; set; } } } diff --git a/src/Docker.DotNet/Models/PluginsInfo.Generated.cs b/src/Docker.DotNet/Models/PluginsInfo.Generated.cs index 44ddcced..d3971549 100644 --- a/src/Docker.DotNet/Models/PluginsInfo.Generated.cs +++ b/src/Docker.DotNet/Models/PluginsInfo.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PluginsInfo // (types.PluginsInfo) { - [DataMember(Name = "Volume", EmitDefaultValue = false)] + [JsonPropertyName("Volume")] public IList Volume { get; set; } - [DataMember(Name = "Network", EmitDefaultValue = false)] + [JsonPropertyName("Network")] public IList Network { get; set; } - [DataMember(Name = "Authorization", EmitDefaultValue = false)] + [JsonPropertyName("Authorization")] public IList Authorization { get; set; } - [DataMember(Name = "Log", EmitDefaultValue = false)] + [JsonPropertyName("Log")] public IList Log { get; set; } } } diff --git a/src/Docker.DotNet/Models/Port.Generated.cs b/src/Docker.DotNet/Models/Port.Generated.cs index b34d60ec..6ca819a8 100644 --- a/src/Docker.DotNet/Models/Port.Generated.cs +++ b/src/Docker.DotNet/Models/Port.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Port // (types.Port) { - [DataMember(Name = "IP", EmitDefaultValue = false)] + [JsonPropertyName("IP")] public string IP { get; set; } - [DataMember(Name = "PrivatePort", EmitDefaultValue = false)] + [JsonPropertyName("PrivatePort")] public ushort PrivatePort { get; set; } - [DataMember(Name = "PublicPort", EmitDefaultValue = false)] + [JsonPropertyName("PublicPort")] public ushort PublicPort { get; set; } - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } } } diff --git a/src/Docker.DotNet/Models/PortBinding.Generated.cs b/src/Docker.DotNet/Models/PortBinding.Generated.cs index d8d459c0..fb3040e1 100644 --- a/src/Docker.DotNet/Models/PortBinding.Generated.cs +++ b/src/Docker.DotNet/Models/PortBinding.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PortBinding // (nat.PortBinding) { - [DataMember(Name = "HostIp", EmitDefaultValue = false)] + [JsonPropertyName("HostIp")] public string HostIP { get; set; } - [DataMember(Name = "HostPort", EmitDefaultValue = false)] + [JsonPropertyName("HostPort")] public string HostPort { get; set; } } } diff --git a/src/Docker.DotNet/Models/PortConfig.Generated.cs b/src/Docker.DotNet/Models/PortConfig.Generated.cs index 8f780b65..aff87bb5 100644 --- a/src/Docker.DotNet/Models/PortConfig.Generated.cs +++ b/src/Docker.DotNet/Models/PortConfig.Generated.cs @@ -1,23 +1,22 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PortConfig // (swarm.PortConfig) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Protocol", EmitDefaultValue = false)] + [JsonPropertyName("Protocol")] public string Protocol { get; set; } - [DataMember(Name = "TargetPort", EmitDefaultValue = false)] + [JsonPropertyName("TargetPort")] public uint TargetPort { get; set; } - [DataMember(Name = "PublishedPort", EmitDefaultValue = false)] + [JsonPropertyName("PublishedPort")] public uint PublishedPort { get; set; } - [DataMember(Name = "PublishMode", EmitDefaultValue = false)] + [JsonPropertyName("PublishMode")] public string PublishMode { get; set; } } } diff --git a/src/Docker.DotNet/Models/PortStatus.Generated.cs b/src/Docker.DotNet/Models/PortStatus.Generated.cs index 625f4c58..266ae4fd 100644 --- a/src/Docker.DotNet/Models/PortStatus.Generated.cs +++ b/src/Docker.DotNet/Models/PortStatus.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PortStatus // (swarm.PortStatus) { - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IList Ports { get; set; } } } diff --git a/src/Docker.DotNet/Models/Privileges.Generated.cs b/src/Docker.DotNet/Models/Privileges.Generated.cs index 3f671926..1e142256 100644 --- a/src/Docker.DotNet/Models/Privileges.Generated.cs +++ b/src/Docker.DotNet/Models/Privileges.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Privileges // (swarm.Privileges) { - [DataMember(Name = "CredentialSpec", EmitDefaultValue = false)] + [JsonPropertyName("CredentialSpec")] public CredentialSpec CredentialSpec { get; set; } - [DataMember(Name = "SELinuxContext", EmitDefaultValue = false)] + [JsonPropertyName("SELinuxContext")] public SELinuxContext SELinuxContext { get; set; } } } diff --git a/src/Docker.DotNet/Models/PublishStatus.Generated.cs b/src/Docker.DotNet/Models/PublishStatus.Generated.cs index db35f19b..aec78cd4 100644 --- a/src/Docker.DotNet/Models/PublishStatus.Generated.cs +++ b/src/Docker.DotNet/Models/PublishStatus.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class PublishStatus // (volume.PublishStatus) { - [DataMember(Name = "NodeID", EmitDefaultValue = false)] + [JsonPropertyName("NodeID")] public string NodeID { get; set; } - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public string State { get; set; } - [DataMember(Name = "PublishContext", EmitDefaultValue = false)] + [JsonPropertyName("PublishContext")] public IDictionary PublishContext { get; set; } } } diff --git a/src/Docker.DotNet/Models/RaftConfig.Generated.cs b/src/Docker.DotNet/Models/RaftConfig.Generated.cs index 07b06e81..5573c3fd 100644 --- a/src/Docker.DotNet/Models/RaftConfig.Generated.cs +++ b/src/Docker.DotNet/Models/RaftConfig.Generated.cs @@ -1,23 +1,22 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class RaftConfig // (swarm.RaftConfig) { - [DataMember(Name = "SnapshotInterval", EmitDefaultValue = false)] + [JsonPropertyName("SnapshotInterval")] public ulong SnapshotInterval { get; set; } - [DataMember(Name = "KeepOldSnapshots", EmitDefaultValue = false)] + [JsonPropertyName("KeepOldSnapshots")] public ulong? KeepOldSnapshots { get; set; } - [DataMember(Name = "LogEntriesForSlowFollowers", EmitDefaultValue = false)] + [JsonPropertyName("LogEntriesForSlowFollowers")] public ulong LogEntriesForSlowFollowers { get; set; } - [DataMember(Name = "ElectionTick", EmitDefaultValue = false)] + [JsonPropertyName("ElectionTick")] public long ElectionTick { get; set; } - [DataMember(Name = "HeartbeatTick", EmitDefaultValue = false)] + [JsonPropertyName("HeartbeatTick")] public long HeartbeatTick { get; set; } } } diff --git a/src/Docker.DotNet/Models/ReplicatedJob.Generated.cs b/src/Docker.DotNet/Models/ReplicatedJob.Generated.cs index ad84b284..97ba4a10 100644 --- a/src/Docker.DotNet/Models/ReplicatedJob.Generated.cs +++ b/src/Docker.DotNet/Models/ReplicatedJob.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ReplicatedJob // (swarm.ReplicatedJob) { - [DataMember(Name = "MaxConcurrent", EmitDefaultValue = false)] + [JsonPropertyName("MaxConcurrent")] public ulong? MaxConcurrent { get; set; } - [DataMember(Name = "TotalCompletions", EmitDefaultValue = false)] + [JsonPropertyName("TotalCompletions")] public ulong? TotalCompletions { get; set; } } } diff --git a/src/Docker.DotNet/Models/ReplicatedService.Generated.cs b/src/Docker.DotNet/Models/ReplicatedService.Generated.cs index a729a1f6..790a3627 100644 --- a/src/Docker.DotNet/Models/ReplicatedService.Generated.cs +++ b/src/Docker.DotNet/Models/ReplicatedService.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ReplicatedService // (swarm.ReplicatedService) { - [DataMember(Name = "Replicas", EmitDefaultValue = false)] + [JsonPropertyName("Replicas")] public ulong? Replicas { get; set; } } } diff --git a/src/Docker.DotNet/Models/ResourceRequirements.Generated.cs b/src/Docker.DotNet/Models/ResourceRequirements.Generated.cs index cca6d8ab..d60f3611 100644 --- a/src/Docker.DotNet/Models/ResourceRequirements.Generated.cs +++ b/src/Docker.DotNet/Models/ResourceRequirements.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ResourceRequirements // (swarm.ResourceRequirements) { - [DataMember(Name = "Limits", EmitDefaultValue = false)] + [JsonPropertyName("Limits")] public SwarmLimit Limits { get; set; } - [DataMember(Name = "Reservations", EmitDefaultValue = false)] + [JsonPropertyName("Reservations")] public SwarmResources Reservations { get; set; } } } diff --git a/src/Docker.DotNet/Models/Resources.Generated.cs b/src/Docker.DotNet/Models/Resources.Generated.cs index e11d6bf3..99e85b68 100644 --- a/src/Docker.DotNet/Models/Resources.Generated.cs +++ b/src/Docker.DotNet/Models/Resources.Generated.cs @@ -1,102 +1,101 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Resources // (container.Resources) { - [DataMember(Name = "CpuShares", EmitDefaultValue = false)] + [JsonPropertyName("CpuShares")] public long CPUShares { get; set; } - [DataMember(Name = "Memory", EmitDefaultValue = false)] + [JsonPropertyName("Memory")] public long Memory { get; set; } - [DataMember(Name = "NanoCpus", EmitDefaultValue = false)] + [JsonPropertyName("NanoCpus")] public long NanoCPUs { get; set; } - [DataMember(Name = "CgroupParent", EmitDefaultValue = false)] + [JsonPropertyName("CgroupParent")] public string CgroupParent { get; set; } - [DataMember(Name = "BlkioWeight", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeight")] public ushort BlkioWeight { get; set; } - [DataMember(Name = "BlkioWeightDevice", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeightDevice")] public IList BlkioWeightDevice { get; set; } - [DataMember(Name = "BlkioDeviceReadBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadBps")] public IList BlkioDeviceReadBps { get; set; } - [DataMember(Name = "BlkioDeviceWriteBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteBps")] public IList BlkioDeviceWriteBps { get; set; } - [DataMember(Name = "BlkioDeviceReadIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadIOps")] public IList BlkioDeviceReadIOps { get; set; } - [DataMember(Name = "BlkioDeviceWriteIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteIOps")] public IList BlkioDeviceWriteIOps { get; set; } - [DataMember(Name = "CpuPeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuPeriod")] public long CPUPeriod { get; set; } - [DataMember(Name = "CpuQuota", EmitDefaultValue = false)] + [JsonPropertyName("CpuQuota")] public long CPUQuota { get; set; } - [DataMember(Name = "CpuRealtimePeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimePeriod")] public long CPURealtimePeriod { get; set; } - [DataMember(Name = "CpuRealtimeRuntime", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimeRuntime")] public long CPURealtimeRuntime { get; set; } - [DataMember(Name = "CpusetCpus", EmitDefaultValue = false)] + [JsonPropertyName("CpusetCpus")] public string CpusetCpus { get; set; } - [DataMember(Name = "CpusetMems", EmitDefaultValue = false)] + [JsonPropertyName("CpusetMems")] public string CpusetMems { get; set; } - [DataMember(Name = "Devices", EmitDefaultValue = false)] + [JsonPropertyName("Devices")] public IList Devices { get; set; } - [DataMember(Name = "DeviceCgroupRules", EmitDefaultValue = false)] + [JsonPropertyName("DeviceCgroupRules")] public IList DeviceCgroupRules { get; set; } - [DataMember(Name = "DeviceRequests", EmitDefaultValue = false)] + [JsonPropertyName("DeviceRequests")] public IList DeviceRequests { get; set; } - [DataMember(Name = "KernelMemory", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemory")] public long KernelMemory { get; set; } - [DataMember(Name = "KernelMemoryTCP", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemoryTCP")] public long KernelMemoryTCP { get; set; } - [DataMember(Name = "MemoryReservation", EmitDefaultValue = false)] + [JsonPropertyName("MemoryReservation")] public long MemoryReservation { get; set; } - [DataMember(Name = "MemorySwap", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwap")] public long MemorySwap { get; set; } - [DataMember(Name = "MemorySwappiness", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwappiness")] public long? MemorySwappiness { get; set; } - [DataMember(Name = "OomKillDisable", EmitDefaultValue = false)] + [JsonPropertyName("OomKillDisable")] public bool? OomKillDisable { get; set; } - [DataMember(Name = "PidsLimit", EmitDefaultValue = false)] + [JsonPropertyName("PidsLimit")] public long? PidsLimit { get; set; } - [DataMember(Name = "Ulimits", EmitDefaultValue = false)] + [JsonPropertyName("Ulimits")] public IList Ulimits { get; set; } - [DataMember(Name = "CpuCount", EmitDefaultValue = false)] + [JsonPropertyName("CpuCount")] public long CPUCount { get; set; } - [DataMember(Name = "CpuPercent", EmitDefaultValue = false)] + [JsonPropertyName("CpuPercent")] public long CPUPercent { get; set; } - [DataMember(Name = "IOMaximumIOps", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumIOps")] public ulong IOMaximumIOps { get; set; } - [DataMember(Name = "IOMaximumBandwidth", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumBandwidth")] public ulong IOMaximumBandwidth { get; set; } } } diff --git a/src/Docker.DotNet/Models/RestartPolicy.Generated.cs b/src/Docker.DotNet/Models/RestartPolicy.Generated.cs index 097270a4..8da3edd9 100644 --- a/src/Docker.DotNet/Models/RestartPolicy.Generated.cs +++ b/src/Docker.DotNet/Models/RestartPolicy.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class RestartPolicy // (container.RestartPolicy) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public RestartPolicyKind Name { get; set; } - [DataMember(Name = "MaximumRetryCount", EmitDefaultValue = false)] + [JsonPropertyName("MaximumRetryCount")] public long MaximumRetryCount { get; set; } } } diff --git a/src/Docker.DotNet/Models/RootFS.Generated.cs b/src/Docker.DotNet/Models/RootFS.Generated.cs index f1c72d7e..3b0c6fa7 100644 --- a/src/Docker.DotNet/Models/RootFS.Generated.cs +++ b/src/Docker.DotNet/Models/RootFS.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class RootFS // (types.RootFS) { - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Layers", EmitDefaultValue = false)] + [JsonPropertyName("Layers")] public IList Layers { get; set; } } } diff --git a/src/Docker.DotNet/Models/Runtime.Generated.cs b/src/Docker.DotNet/Models/Runtime.Generated.cs index 0cedce60..b7a3053f 100644 --- a/src/Docker.DotNet/Models/Runtime.Generated.cs +++ b/src/Docker.DotNet/Models/Runtime.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Runtime // (types.Runtime) { - [DataMember(Name = "path", EmitDefaultValue = false)] + [JsonPropertyName("path")] public string Path { get; set; } - [DataMember(Name = "runtimeArgs", EmitDefaultValue = false)] + [JsonPropertyName("runtimeArgs")] public IList Args { get; set; } - [DataMember(Name = "runtimeType", EmitDefaultValue = false)] + [JsonPropertyName("runtimeType")] public string Type { get; set; } - [DataMember(Name = "options", EmitDefaultValue = false)] + [JsonPropertyName("options")] public IDictionary Options { get; set; } } } diff --git a/src/Docker.DotNet/Models/RuntimePluginPrivilege.Generated.cs b/src/Docker.DotNet/Models/RuntimePluginPrivilege.Generated.cs index 79d4eba6..b6d9b280 100644 --- a/src/Docker.DotNet/Models/RuntimePluginPrivilege.Generated.cs +++ b/src/Docker.DotNet/Models/RuntimePluginPrivilege.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class RuntimePluginPrivilege // (runtime.PluginPrivilege) { - [DataMember(Name = "name", EmitDefaultValue = false)] + [JsonPropertyName("name")] public string Name { get; set; } - [DataMember(Name = "description", EmitDefaultValue = false)] + [JsonPropertyName("description")] public string Description { get; set; } - [DataMember(Name = "value", EmitDefaultValue = false)] + [JsonPropertyName("value")] public IList Value { get; set; } } } diff --git a/src/Docker.DotNet/Models/SELinuxContext.Generated.cs b/src/Docker.DotNet/Models/SELinuxContext.Generated.cs index 41cd9227..93c35e69 100644 --- a/src/Docker.DotNet/Models/SELinuxContext.Generated.cs +++ b/src/Docker.DotNet/Models/SELinuxContext.Generated.cs @@ -1,23 +1,22 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SELinuxContext // (swarm.SELinuxContext) { - [DataMember(Name = "Disable", EmitDefaultValue = false)] + [JsonPropertyName("Disable")] public bool Disable { get; set; } - [DataMember(Name = "User", EmitDefaultValue = false)] + [JsonPropertyName("User")] public string User { get; set; } - [DataMember(Name = "Role", EmitDefaultValue = false)] + [JsonPropertyName("Role")] public string Role { get; set; } - [DataMember(Name = "Type", EmitDefaultValue = false)] + [JsonPropertyName("Type")] public string Type { get; set; } - [DataMember(Name = "Level", EmitDefaultValue = false)] + [JsonPropertyName("Level")] public string Level { get; set; } } } diff --git a/src/Docker.DotNet/Models/Secret.Generated.cs b/src/Docker.DotNet/Models/Secret.Generated.cs index fd31a702..5e95d575 100644 --- a/src/Docker.DotNet/Models/Secret.Generated.cs +++ b/src/Docker.DotNet/Models/Secret.Generated.cs @@ -1,9 +1,8 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Secret // (swarm.Secret) { public Secret() @@ -20,19 +19,19 @@ public Secret(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public SecretSpec Spec { get; set; } } } diff --git a/src/Docker.DotNet/Models/SecretCreateResponse.Generated.cs b/src/Docker.DotNet/Models/SecretCreateResponse.Generated.cs index 55422170..e7e34382 100644 --- a/src/Docker.DotNet/Models/SecretCreateResponse.Generated.cs +++ b/src/Docker.DotNet/Models/SecretCreateResponse.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SecretCreateResponse // (main.SecretCreateResponse) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } } } diff --git a/src/Docker.DotNet/Models/SecretReference.Generated.cs b/src/Docker.DotNet/Models/SecretReference.Generated.cs index b497fc69..9aeb29f2 100644 --- a/src/Docker.DotNet/Models/SecretReference.Generated.cs +++ b/src/Docker.DotNet/Models/SecretReference.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SecretReference // (swarm.SecretReference) { - [DataMember(Name = "File", EmitDefaultValue = false)] + [JsonPropertyName("File")] public SecretReferenceFileTarget File { get; set; } - [DataMember(Name = "SecretID", EmitDefaultValue = false)] + [JsonPropertyName("SecretID")] public string SecretID { get; set; } - [DataMember(Name = "SecretName", EmitDefaultValue = false)] + [JsonPropertyName("SecretName")] public string SecretName { get; set; } } } diff --git a/src/Docker.DotNet/Models/SecretReferenceFileTarget.Generated.cs b/src/Docker.DotNet/Models/SecretReferenceFileTarget.Generated.cs index 7a2b677d..39122ded 100644 --- a/src/Docker.DotNet/Models/SecretReferenceFileTarget.Generated.cs +++ b/src/Docker.DotNet/Models/SecretReferenceFileTarget.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SecretReferenceFileTarget // (swarm.SecretReferenceFileTarget) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "UID", EmitDefaultValue = false)] + [JsonPropertyName("UID")] public string UID { get; set; } - [DataMember(Name = "GID", EmitDefaultValue = false)] + [JsonPropertyName("GID")] public string GID { get; set; } - [DataMember(Name = "Mode", EmitDefaultValue = false)] + [JsonPropertyName("Mode")] public uint Mode { get; set; } } } diff --git a/src/Docker.DotNet/Models/SecretSpec.Generated.cs b/src/Docker.DotNet/Models/SecretSpec.Generated.cs index 98b14b56..01c2bf07 100644 --- a/src/Docker.DotNet/Models/SecretSpec.Generated.cs +++ b/src/Docker.DotNet/Models/SecretSpec.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SecretSpec // (swarm.SecretSpec) { public SecretSpec() @@ -19,19 +18,19 @@ public SecretSpec(Annotations Annotations) } } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Data", EmitDefaultValue = false)] + [JsonPropertyName("Data")] public IList Data { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public SwarmDriver Driver { get; set; } - [DataMember(Name = "Templating", EmitDefaultValue = false)] + [JsonPropertyName("Templating")] public SwarmDriver Templating { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceConfig.Generated.cs b/src/Docker.DotNet/Models/ServiceConfig.Generated.cs index 14c8e7b7..7932222d 100644 --- a/src/Docker.DotNet/Models/ServiceConfig.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceConfig.Generated.cs @@ -1,24 +1,23 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceConfig // (registry.ServiceConfig) { - [DataMember(Name = "AllowNondistributableArtifactsCIDRs", EmitDefaultValue = false)] + [JsonPropertyName("AllowNondistributableArtifactsCIDRs")] public IList AllowNondistributableArtifactsCIDRs { get; set; } - [DataMember(Name = "AllowNondistributableArtifactsHostnames", EmitDefaultValue = false)] + [JsonPropertyName("AllowNondistributableArtifactsHostnames")] public IList AllowNondistributableArtifactsHostnames { get; set; } - [DataMember(Name = "InsecureRegistryCIDRs", EmitDefaultValue = false)] + [JsonPropertyName("InsecureRegistryCIDRs")] public IList InsecureRegistryCIDRs { get; set; } - [DataMember(Name = "IndexConfigs", EmitDefaultValue = false)] + [JsonPropertyName("IndexConfigs")] public IDictionary IndexConfigs { get; set; } - [DataMember(Name = "Mirrors", EmitDefaultValue = false)] + [JsonPropertyName("Mirrors")] public IList Mirrors { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceCreateParameters.Generated.cs b/src/Docker.DotNet/Models/ServiceCreateParameters.Generated.cs index 92fc96aa..280aa3af 100644 --- a/src/Docker.DotNet/Models/ServiceCreateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceCreateParameters.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceCreateParameters // (main.ServiceCreateParameters) { - [DataMember(Name = "Service", EmitDefaultValue = false)] + [JsonPropertyName("Service")] public ServiceSpec Service { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceCreateResponse.Generated.cs b/src/Docker.DotNet/Models/ServiceCreateResponse.Generated.cs index da30303f..ef88bc86 100644 --- a/src/Docker.DotNet/Models/ServiceCreateResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceCreateResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceCreateResponse // (types.ServiceCreateResponse) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceInfo.Generated.cs b/src/Docker.DotNet/Models/ServiceInfo.Generated.cs index 91f02094..337b570b 100644 --- a/src/Docker.DotNet/Models/ServiceInfo.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceInfo.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceInfo // (network.ServiceInfo) { - [DataMember(Name = "VIP", EmitDefaultValue = false)] + [JsonPropertyName("VIP")] public string VIP { get; set; } - [DataMember(Name = "Ports", EmitDefaultValue = false)] + [JsonPropertyName("Ports")] public IList Ports { get; set; } - [DataMember(Name = "LocalLBIndex", EmitDefaultValue = false)] + [JsonPropertyName("LocalLBIndex")] public long LocalLBIndex { get; set; } - [DataMember(Name = "Tasks", EmitDefaultValue = false)] + [JsonPropertyName("Tasks")] public IList Tasks { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceListParameters.Generated.cs b/src/Docker.DotNet/Models/ServiceListParameters.Generated.cs index ed970662..86bbd15e 100644 --- a/src/Docker.DotNet/Models/ServiceListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceListParameters // (main.ServiceListParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ServiceLogsParameters.Generated.cs b/src/Docker.DotNet/Models/ServiceLogsParameters.Generated.cs index 4dbe47cf..82360df3 100644 --- a/src/Docker.DotNet/Models/ServiceLogsParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceLogsParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceLogsParameters // (main.ServiceLogsParameters) { [QueryStringParameter("stdout", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ServiceMode.Generated.cs b/src/Docker.DotNet/Models/ServiceMode.Generated.cs index 2b95862c..b3cefb45 100644 --- a/src/Docker.DotNet/Models/ServiceMode.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceMode.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceMode // (swarm.ServiceMode) { - [DataMember(Name = "Replicated", EmitDefaultValue = false)] + [JsonPropertyName("Replicated")] public ReplicatedService Replicated { get; set; } - [DataMember(Name = "Global", EmitDefaultValue = false)] + [JsonPropertyName("Global")] public GlobalService Global { get; set; } - [DataMember(Name = "ReplicatedJob", EmitDefaultValue = false)] + [JsonPropertyName("ReplicatedJob")] public ReplicatedJob ReplicatedJob { get; set; } - [DataMember(Name = "GlobalJob", EmitDefaultValue = false)] + [JsonPropertyName("GlobalJob")] public GlobalJob GlobalJob { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceSpec.Generated.cs b/src/Docker.DotNet/Models/ServiceSpec.Generated.cs index 1d5038c6..65ad6cf6 100644 --- a/src/Docker.DotNet/Models/ServiceSpec.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceSpec.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceSpec // (swarm.ServiceSpec) { public ServiceSpec() @@ -19,28 +18,28 @@ public ServiceSpec(Annotations Annotations) } } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "TaskTemplate", EmitDefaultValue = false)] + [JsonPropertyName("TaskTemplate")] public TaskSpec TaskTemplate { get; set; } - [DataMember(Name = "Mode", EmitDefaultValue = false)] + [JsonPropertyName("Mode")] public ServiceMode Mode { get; set; } - [DataMember(Name = "UpdateConfig", EmitDefaultValue = false)] + [JsonPropertyName("UpdateConfig")] public SwarmUpdateConfig UpdateConfig { get; set; } - [DataMember(Name = "RollbackConfig", EmitDefaultValue = false)] + [JsonPropertyName("RollbackConfig")] public SwarmUpdateConfig RollbackConfig { get; set; } - [DataMember(Name = "Networks", EmitDefaultValue = false)] + [JsonPropertyName("Networks")] public IList Networks { get; set; } - [DataMember(Name = "EndpointSpec", EmitDefaultValue = false)] + [JsonPropertyName("EndpointSpec")] public EndpointSpec EndpointSpec { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceStatus.Generated.cs b/src/Docker.DotNet/Models/ServiceStatus.Generated.cs index 4db3b5aa..b7ea3474 100644 --- a/src/Docker.DotNet/Models/ServiceStatus.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceStatus.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceStatus // (swarm.ServiceStatus) { - [DataMember(Name = "RunningTasks", EmitDefaultValue = false)] + [JsonPropertyName("RunningTasks")] public ulong RunningTasks { get; set; } - [DataMember(Name = "DesiredTasks", EmitDefaultValue = false)] + [JsonPropertyName("DesiredTasks")] public ulong DesiredTasks { get; set; } - [DataMember(Name = "CompletedTasks", EmitDefaultValue = false)] + [JsonPropertyName("CompletedTasks")] public ulong CompletedTasks { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs b/src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs index bc6e61bc..0bea58fd 100644 --- a/src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceUpdateParameters // (main.ServiceUpdateParameters) { - [DataMember(Name = "Service", EmitDefaultValue = false)] + [JsonPropertyName("Service")] public ServiceSpec Service { get; set; } [QueryStringParameter("version", true)] @@ -17,7 +16,7 @@ public class ServiceUpdateParameters // (main.ServiceUpdateParameters) [QueryStringParameter("rollback", false)] public string Rollback { get; set; } - [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)] + [JsonPropertyName("RegistryAuth")] public AuthConfig RegistryAuth { get; set; } } } diff --git a/src/Docker.DotNet/Models/ServiceUpdateResponse.Generated.cs b/src/Docker.DotNet/Models/ServiceUpdateResponse.Generated.cs index 937d9686..852f4a81 100644 --- a/src/Docker.DotNet/Models/ServiceUpdateResponse.Generated.cs +++ b/src/Docker.DotNet/Models/ServiceUpdateResponse.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ServiceUpdateResponse // (types.ServiceUpdateResponse) { - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/ShimConfig.Generated.cs b/src/Docker.DotNet/Models/ShimConfig.Generated.cs index 3711c984..3e327a02 100644 --- a/src/Docker.DotNet/Models/ShimConfig.Generated.cs +++ b/src/Docker.DotNet/Models/ShimConfig.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ShimConfig // (types.ShimConfig) { - [DataMember(Name = "Binary", EmitDefaultValue = false)] + [JsonPropertyName("Binary")] public string Binary { get; set; } - [DataMember(Name = "Opts", EmitDefaultValue = false)] + [JsonPropertyName("Opts")] public object Opts { get; set; } } } diff --git a/src/Docker.DotNet/Models/Spec.Generated.cs b/src/Docker.DotNet/Models/Spec.Generated.cs index 9f6e81c1..f753e2b5 100644 --- a/src/Docker.DotNet/Models/Spec.Generated.cs +++ b/src/Docker.DotNet/Models/Spec.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Spec // (swarm.Spec) { public Spec() @@ -19,28 +18,28 @@ public Spec(Annotations Annotations) } } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Orchestration", EmitDefaultValue = false)] + [JsonPropertyName("Orchestration")] public OrchestrationConfig Orchestration { get; set; } - [DataMember(Name = "Raft", EmitDefaultValue = false)] + [JsonPropertyName("Raft")] public RaftConfig Raft { get; set; } - [DataMember(Name = "Dispatcher", EmitDefaultValue = false)] + [JsonPropertyName("Dispatcher")] public DispatcherConfig Dispatcher { get; set; } - [DataMember(Name = "CAConfig", EmitDefaultValue = false)] + [JsonPropertyName("CAConfig")] public CAConfig CAConfig { get; set; } - [DataMember(Name = "TaskDefaults", EmitDefaultValue = false)] + [JsonPropertyName("TaskDefaults")] public TaskDefaults TaskDefaults { get; set; } - [DataMember(Name = "EncryptionConfig", EmitDefaultValue = false)] + [JsonPropertyName("EncryptionConfig")] public EncryptionConfig EncryptionConfig { get; set; } } } diff --git a/src/Docker.DotNet/Models/SpreadOver.Generated.cs b/src/Docker.DotNet/Models/SpreadOver.Generated.cs index 0ad24d77..b200b5eb 100644 --- a/src/Docker.DotNet/Models/SpreadOver.Generated.cs +++ b/src/Docker.DotNet/Models/SpreadOver.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SpreadOver // (swarm.SpreadOver) { - [DataMember(Name = "SpreadDescriptor", EmitDefaultValue = false)] + [JsonPropertyName("SpreadDescriptor")] public string SpreadDescriptor { get; set; } } } diff --git a/src/Docker.DotNet/Models/Stats.Generated.cs b/src/Docker.DotNet/Models/Stats.Generated.cs index 0741ee63..25258c26 100644 --- a/src/Docker.DotNet/Models/Stats.Generated.cs +++ b/src/Docker.DotNet/Models/Stats.Generated.cs @@ -1,36 +1,35 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Stats // (types.Stats) { - [DataMember(Name = "read", EmitDefaultValue = false)] + [JsonPropertyName("read")] public DateTime Read { get; set; } - [DataMember(Name = "preread", EmitDefaultValue = false)] + [JsonPropertyName("preread")] public DateTime PreRead { get; set; } - [DataMember(Name = "pids_stats", EmitDefaultValue = false)] + [JsonPropertyName("pids_stats")] public PidsStats PidsStats { get; set; } - [DataMember(Name = "blkio_stats", EmitDefaultValue = false)] + [JsonPropertyName("blkio_stats")] public BlkioStats BlkioStats { get; set; } - [DataMember(Name = "num_procs", EmitDefaultValue = false)] + [JsonPropertyName("num_procs")] public uint NumProcs { get; set; } - [DataMember(Name = "storage_stats", EmitDefaultValue = false)] + [JsonPropertyName("storage_stats")] public StorageStats StorageStats { get; set; } - [DataMember(Name = "cpu_stats", EmitDefaultValue = false)] + [JsonPropertyName("cpu_stats")] public CPUStats CPUStats { get; set; } - [DataMember(Name = "precpu_stats", EmitDefaultValue = false)] + [JsonPropertyName("precpu_stats")] public CPUStats PreCPUStats { get; set; } - [DataMember(Name = "memory_stats", EmitDefaultValue = false)] + [JsonPropertyName("memory_stats")] public MemoryStats MemoryStats { get; set; } } } diff --git a/src/Docker.DotNet/Models/StorageStats.Generated.cs b/src/Docker.DotNet/Models/StorageStats.Generated.cs index 4c5db32b..091522e5 100644 --- a/src/Docker.DotNet/Models/StorageStats.Generated.cs +++ b/src/Docker.DotNet/Models/StorageStats.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class StorageStats // (types.StorageStats) { - [DataMember(Name = "read_count_normalized", EmitDefaultValue = false)] + [JsonPropertyName("read_count_normalized")] public ulong ReadCountNormalized { get; set; } - [DataMember(Name = "read_size_bytes", EmitDefaultValue = false)] + [JsonPropertyName("read_size_bytes")] public ulong ReadSizeBytes { get; set; } - [DataMember(Name = "write_count_normalized", EmitDefaultValue = false)] + [JsonPropertyName("write_count_normalized")] public ulong WriteCountNormalized { get; set; } - [DataMember(Name = "write_size_bytes", EmitDefaultValue = false)] + [JsonPropertyName("write_size_bytes")] public ulong WriteSizeBytes { get; set; } } } diff --git a/src/Docker.DotNet/Models/SummaryNetworkSettings.Generated.cs b/src/Docker.DotNet/Models/SummaryNetworkSettings.Generated.cs index 04076185..8e32e603 100644 --- a/src/Docker.DotNet/Models/SummaryNetworkSettings.Generated.cs +++ b/src/Docker.DotNet/Models/SummaryNetworkSettings.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SummaryNetworkSettings // (types.SummaryNetworkSettings) { - [DataMember(Name = "Networks", EmitDefaultValue = false)] + [JsonPropertyName("Networks")] public IDictionary Networks { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmConfig.Generated.cs b/src/Docker.DotNet/Models/SwarmConfig.Generated.cs index dd85ef54..815241c3 100644 --- a/src/Docker.DotNet/Models/SwarmConfig.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmConfig.Generated.cs @@ -1,9 +1,8 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmConfig // (main.SwarmConfig) { public SwarmConfig() @@ -20,19 +19,19 @@ public SwarmConfig(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public SwarmConfigSpec Spec { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmConfigReference.Generated.cs b/src/Docker.DotNet/Models/SwarmConfigReference.Generated.cs index 1da38f2f..7e851b5c 100644 --- a/src/Docker.DotNet/Models/SwarmConfigReference.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmConfigReference.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmConfigReference // (swarm.ConfigReference) { - [DataMember(Name = "File", EmitDefaultValue = false)] + [JsonPropertyName("File")] public ConfigReferenceFileTarget File { get; set; } - [DataMember(Name = "Runtime", EmitDefaultValue = false)] + [JsonPropertyName("Runtime")] public ConfigReferenceRuntimeTarget Runtime { get; set; } - [DataMember(Name = "ConfigID", EmitDefaultValue = false)] + [JsonPropertyName("ConfigID")] public string ConfigID { get; set; } - [DataMember(Name = "ConfigName", EmitDefaultValue = false)] + [JsonPropertyName("ConfigName")] public string ConfigName { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmConfigSpec.Generated.cs b/src/Docker.DotNet/Models/SwarmConfigSpec.Generated.cs index 09cf6b8a..967b2c26 100644 --- a/src/Docker.DotNet/Models/SwarmConfigSpec.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmConfigSpec.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmConfigSpec // (swarm.ConfigSpec) { public SwarmConfigSpec() @@ -19,16 +18,16 @@ public SwarmConfigSpec(Annotations Annotations) } } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Data", EmitDefaultValue = false)] + [JsonPropertyName("Data")] public IList Data { get; set; } - [DataMember(Name = "Templating", EmitDefaultValue = false)] + [JsonPropertyName("Templating")] public SwarmDriver Templating { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmCreateConfigParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmCreateConfigParameters.Generated.cs index 8054da32..7cc4fa9d 100644 --- a/src/Docker.DotNet/Models/SwarmCreateConfigParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmCreateConfigParameters.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmCreateConfigParameters // (main.SwarmCreateConfigParameters) { - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public SwarmConfigSpec Config { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmCreateConfigResponse.Generated.cs b/src/Docker.DotNet/Models/SwarmCreateConfigResponse.Generated.cs index fb8cee38..d75abc9f 100644 --- a/src/Docker.DotNet/Models/SwarmCreateConfigResponse.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmCreateConfigResponse.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmCreateConfigResponse // (main.SwarmCreateConfigResponse) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmDriver.Generated.cs b/src/Docker.DotNet/Models/SwarmDriver.Generated.cs index 743239c7..cce6bafc 100644 --- a/src/Docker.DotNet/Models/SwarmDriver.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmDriver.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmDriver // (swarm.Driver) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmIPAMConfig.Generated.cs b/src/Docker.DotNet/Models/SwarmIPAMConfig.Generated.cs index 2564724c..77b4cd61 100644 --- a/src/Docker.DotNet/Models/SwarmIPAMConfig.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmIPAMConfig.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmIPAMConfig // (swarm.IPAMConfig) { - [DataMember(Name = "Subnet", EmitDefaultValue = false)] + [JsonPropertyName("Subnet")] public string Subnet { get; set; } - [DataMember(Name = "Range", EmitDefaultValue = false)] + [JsonPropertyName("Range")] public string Range { get; set; } - [DataMember(Name = "Gateway", EmitDefaultValue = false)] + [JsonPropertyName("Gateway")] public string Gateway { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmInitParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmInitParameters.Generated.cs index f897d252..67cf8512 100644 --- a/src/Docker.DotNet/Models/SwarmInitParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmInitParameters.Generated.cs @@ -1,39 +1,38 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmInitParameters // (swarm.InitRequest) { - [DataMember(Name = "ListenAddr", EmitDefaultValue = false)] + [JsonPropertyName("ListenAddr")] public string ListenAddr { get; set; } - [DataMember(Name = "AdvertiseAddr", EmitDefaultValue = false)] + [JsonPropertyName("AdvertiseAddr")] public string AdvertiseAddr { get; set; } - [DataMember(Name = "DataPathAddr", EmitDefaultValue = false)] + [JsonPropertyName("DataPathAddr")] public string DataPathAddr { get; set; } - [DataMember(Name = "DataPathPort", EmitDefaultValue = false)] + [JsonPropertyName("DataPathPort")] public uint DataPathPort { get; set; } - [DataMember(Name = "ForceNewCluster", EmitDefaultValue = false)] + [JsonPropertyName("ForceNewCluster")] public bool ForceNewCluster { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public Spec Spec { get; set; } - [DataMember(Name = "AutoLockManagers", EmitDefaultValue = false)] + [JsonPropertyName("AutoLockManagers")] public bool AutoLockManagers { get; set; } - [DataMember(Name = "Availability", EmitDefaultValue = false)] + [JsonPropertyName("Availability")] public string Availability { get; set; } - [DataMember(Name = "DefaultAddrPool", EmitDefaultValue = false)] + [JsonPropertyName("DefaultAddrPool")] public IList DefaultAddrPool { get; set; } - [DataMember(Name = "SubnetSize", EmitDefaultValue = false)] + [JsonPropertyName("SubnetSize")] public uint SubnetSize { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmInspectResponse.Generated.cs b/src/Docker.DotNet/Models/SwarmInspectResponse.Generated.cs index 156da811..5f4d036c 100644 --- a/src/Docker.DotNet/Models/SwarmInspectResponse.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmInspectResponse.Generated.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmInspectResponse // (swarm.Swarm) { public SwarmInspectResponse() @@ -28,37 +27,37 @@ public SwarmInspectResponse(ClusterInfo ClusterInfo) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public Spec Spec { get; set; } - [DataMember(Name = "TLSInfo", EmitDefaultValue = false)] + [JsonPropertyName("TLSInfo")] public TLSInfo TLSInfo { get; set; } - [DataMember(Name = "RootRotationInProgress", EmitDefaultValue = false)] + [JsonPropertyName("RootRotationInProgress")] public bool RootRotationInProgress { get; set; } - [DataMember(Name = "DefaultAddrPool", EmitDefaultValue = false)] + [JsonPropertyName("DefaultAddrPool")] public IList DefaultAddrPool { get; set; } - [DataMember(Name = "SubnetSize", EmitDefaultValue = false)] + [JsonPropertyName("SubnetSize")] public uint SubnetSize { get; set; } - [DataMember(Name = "DataPathPort", EmitDefaultValue = false)] + [JsonPropertyName("DataPathPort")] public uint DataPathPort { get; set; } - [DataMember(Name = "JoinTokens", EmitDefaultValue = false)] + [JsonPropertyName("JoinTokens")] public JoinTokens JoinTokens { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmJoinParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmJoinParameters.Generated.cs index c16a5562..90a3e317 100644 --- a/src/Docker.DotNet/Models/SwarmJoinParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmJoinParameters.Generated.cs @@ -1,27 +1,26 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmJoinParameters // (swarm.JoinRequest) { - [DataMember(Name = "ListenAddr", EmitDefaultValue = false)] + [JsonPropertyName("ListenAddr")] public string ListenAddr { get; set; } - [DataMember(Name = "AdvertiseAddr", EmitDefaultValue = false)] + [JsonPropertyName("AdvertiseAddr")] public string AdvertiseAddr { get; set; } - [DataMember(Name = "DataPathAddr", EmitDefaultValue = false)] + [JsonPropertyName("DataPathAddr")] public string DataPathAddr { get; set; } - [DataMember(Name = "RemoteAddrs", EmitDefaultValue = false)] + [JsonPropertyName("RemoteAddrs")] public IList RemoteAddrs { get; set; } - [DataMember(Name = "JoinToken", EmitDefaultValue = false)] + [JsonPropertyName("JoinToken")] public string JoinToken { get; set; } - [DataMember(Name = "Availability", EmitDefaultValue = false)] + [JsonPropertyName("Availability")] public string Availability { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmLeaveParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmLeaveParameters.Generated.cs index 4ba1424f..498e1b90 100644 --- a/src/Docker.DotNet/Models/SwarmLeaveParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmLeaveParameters.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmLeaveParameters // (main.SwarmLeaveParameters) { [QueryStringParameter("force", false, typeof(BoolQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/SwarmLimit.Generated.cs b/src/Docker.DotNet/Models/SwarmLimit.Generated.cs index d09fb7f0..78e1fa7d 100644 --- a/src/Docker.DotNet/Models/SwarmLimit.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmLimit.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmLimit // (swarm.Limit) { - [DataMember(Name = "NanoCPUs", EmitDefaultValue = false)] + [JsonPropertyName("NanoCPUs")] public long NanoCPUs { get; set; } - [DataMember(Name = "MemoryBytes", EmitDefaultValue = false)] + [JsonPropertyName("MemoryBytes")] public long MemoryBytes { get; set; } - [DataMember(Name = "Pids", EmitDefaultValue = false)] + [JsonPropertyName("Pids")] public long Pids { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmResources.Generated.cs b/src/Docker.DotNet/Models/SwarmResources.Generated.cs index c5a95bbc..8e72dc9e 100644 --- a/src/Docker.DotNet/Models/SwarmResources.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmResources.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmResources // (swarm.Resources) { - [DataMember(Name = "NanoCPUs", EmitDefaultValue = false)] + [JsonPropertyName("NanoCPUs")] public long NanoCPUs { get; set; } - [DataMember(Name = "MemoryBytes", EmitDefaultValue = false)] + [JsonPropertyName("MemoryBytes")] public long MemoryBytes { get; set; } - [DataMember(Name = "GenericResources", EmitDefaultValue = false)] + [JsonPropertyName("GenericResources")] public IList GenericResources { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmRestartPolicy.Generated.cs b/src/Docker.DotNet/Models/SwarmRestartPolicy.Generated.cs index a33403c8..90fb7771 100644 --- a/src/Docker.DotNet/Models/SwarmRestartPolicy.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmRestartPolicy.Generated.cs @@ -1,20 +1,19 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmRestartPolicy // (swarm.RestartPolicy) { - [DataMember(Name = "Condition", EmitDefaultValue = false)] + [JsonPropertyName("Condition")] public string Condition { get; set; } - [DataMember(Name = "Delay", EmitDefaultValue = false)] + [JsonPropertyName("Delay")] public long? Delay { get; set; } - [DataMember(Name = "MaxAttempts", EmitDefaultValue = false)] + [JsonPropertyName("MaxAttempts")] public ulong? MaxAttempts { get; set; } - [DataMember(Name = "Window", EmitDefaultValue = false)] + [JsonPropertyName("Window")] public long? Window { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmService.Generated.cs b/src/Docker.DotNet/Models/SwarmService.Generated.cs index db960019..84f032f5 100644 --- a/src/Docker.DotNet/Models/SwarmService.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmService.Generated.cs @@ -1,9 +1,8 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmService // (swarm.Service) { public SwarmService() @@ -20,34 +19,34 @@ public SwarmService(Meta Meta) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public ServiceSpec Spec { get; set; } - [DataMember(Name = "PreviousSpec", EmitDefaultValue = false)] + [JsonPropertyName("PreviousSpec")] public ServiceSpec PreviousSpec { get; set; } - [DataMember(Name = "Endpoint", EmitDefaultValue = false)] + [JsonPropertyName("Endpoint")] public Endpoint Endpoint { get; set; } - [DataMember(Name = "UpdateStatus", EmitDefaultValue = false)] + [JsonPropertyName("UpdateStatus")] public UpdateStatus UpdateStatus { get; set; } - [DataMember(Name = "ServiceStatus", EmitDefaultValue = false)] + [JsonPropertyName("ServiceStatus")] public ServiceStatus ServiceStatus { get; set; } - [DataMember(Name = "JobStatus", EmitDefaultValue = false)] + [JsonPropertyName("JobStatus")] public JobStatus JobStatus { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmUnlockParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmUnlockParameters.Generated.cs index 15b47f98..c27fe91b 100644 --- a/src/Docker.DotNet/Models/SwarmUnlockParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmUnlockParameters.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmUnlockParameters // (main.SwarmUnlockParameters) { - [DataMember(Name = "UnlockKey", EmitDefaultValue = false)] + [JsonPropertyName("UnlockKey")] public string UnlockKey { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmUnlockResponse.Generated.cs b/src/Docker.DotNet/Models/SwarmUnlockResponse.Generated.cs index fa37accf..0adc6895 100644 --- a/src/Docker.DotNet/Models/SwarmUnlockResponse.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmUnlockResponse.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmUnlockResponse // (main.SwarmUnlockResponse) { - [DataMember(Name = "UnlockKey", EmitDefaultValue = false)] + [JsonPropertyName("UnlockKey")] public string UnlockKey { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmUpdateConfig.Generated.cs b/src/Docker.DotNet/Models/SwarmUpdateConfig.Generated.cs index a027132b..717fe561 100644 --- a/src/Docker.DotNet/Models/SwarmUpdateConfig.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmUpdateConfig.Generated.cs @@ -1,26 +1,25 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmUpdateConfig // (swarm.UpdateConfig) { - [DataMember(Name = "Parallelism", EmitDefaultValue = false)] + [JsonPropertyName("Parallelism")] public ulong Parallelism { get; set; } - [DataMember(Name = "Delay", EmitDefaultValue = false)] + [JsonPropertyName("Delay")] public long Delay { get; set; } - [DataMember(Name = "FailureAction", EmitDefaultValue = false)] + [JsonPropertyName("FailureAction")] public string FailureAction { get; set; } - [DataMember(Name = "Monitor", EmitDefaultValue = false)] + [JsonPropertyName("Monitor")] public long Monitor { get; set; } - [DataMember(Name = "MaxFailureRatio", EmitDefaultValue = false)] + [JsonPropertyName("MaxFailureRatio")] public float MaxFailureRatio { get; set; } - [DataMember(Name = "Order", EmitDefaultValue = false)] + [JsonPropertyName("Order")] public string Order { get; set; } } } diff --git a/src/Docker.DotNet/Models/SwarmUpdateConfigParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmUpdateConfigParameters.Generated.cs index ed5b2df9..54fdcbfc 100644 --- a/src/Docker.DotNet/Models/SwarmUpdateConfigParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmUpdateConfigParameters.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmUpdateConfigParameters // (main.SwarmUpdateConfigParameters) { - [DataMember(Name = "Config", EmitDefaultValue = false)] + [JsonPropertyName("Config")] public SwarmConfigSpec Config { get; set; } [QueryStringParameter("version", true)] diff --git a/src/Docker.DotNet/Models/SwarmUpdateParameters.Generated.cs b/src/Docker.DotNet/Models/SwarmUpdateParameters.Generated.cs index 2a397cd2..47b7dc2b 100644 --- a/src/Docker.DotNet/Models/SwarmUpdateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/SwarmUpdateParameters.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SwarmUpdateParameters // (main.SwarmUpdateParameters) { - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public Spec Spec { get; set; } [QueryStringParameter("version", true)] diff --git a/src/Docker.DotNet/Models/SystemInfoResponse.Generated.cs b/src/Docker.DotNet/Models/SystemInfoResponse.Generated.cs index c1f7d013..7348f6bc 100644 --- a/src/Docker.DotNet/Models/SystemInfoResponse.Generated.cs +++ b/src/Docker.DotNet/Models/SystemInfoResponse.Generated.cs @@ -1,195 +1,194 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class SystemInfoResponse // (types.Info) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Containers", EmitDefaultValue = false)] + [JsonPropertyName("Containers")] public long Containers { get; set; } - [DataMember(Name = "ContainersRunning", EmitDefaultValue = false)] + [JsonPropertyName("ContainersRunning")] public long ContainersRunning { get; set; } - [DataMember(Name = "ContainersPaused", EmitDefaultValue = false)] + [JsonPropertyName("ContainersPaused")] public long ContainersPaused { get; set; } - [DataMember(Name = "ContainersStopped", EmitDefaultValue = false)] + [JsonPropertyName("ContainersStopped")] public long ContainersStopped { get; set; } - [DataMember(Name = "Images", EmitDefaultValue = false)] + [JsonPropertyName("Images")] public long Images { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "DriverStatus", EmitDefaultValue = false)] + [JsonPropertyName("DriverStatus")] public IList DriverStatus { get; set; } - [DataMember(Name = "SystemStatus", EmitDefaultValue = false)] + [JsonPropertyName("SystemStatus")] public IList SystemStatus { get; set; } - [DataMember(Name = "Plugins", EmitDefaultValue = false)] + [JsonPropertyName("Plugins")] public PluginsInfo Plugins { get; set; } - [DataMember(Name = "MemoryLimit", EmitDefaultValue = false)] + [JsonPropertyName("MemoryLimit")] public bool MemoryLimit { get; set; } - [DataMember(Name = "SwapLimit", EmitDefaultValue = false)] + [JsonPropertyName("SwapLimit")] public bool SwapLimit { get; set; } - [DataMember(Name = "KernelMemory", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemory")] public bool KernelMemory { get; set; } - [DataMember(Name = "KernelMemoryTCP", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemoryTCP")] public bool KernelMemoryTCP { get; set; } - [DataMember(Name = "CpuCfsPeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuCfsPeriod")] public bool CPUCfsPeriod { get; set; } - [DataMember(Name = "CpuCfsQuota", EmitDefaultValue = false)] + [JsonPropertyName("CpuCfsQuota")] public bool CPUCfsQuota { get; set; } - [DataMember(Name = "CPUShares", EmitDefaultValue = false)] + [JsonPropertyName("CPUShares")] public bool CPUShares { get; set; } - [DataMember(Name = "CPUSet", EmitDefaultValue = false)] + [JsonPropertyName("CPUSet")] public bool CPUSet { get; set; } - [DataMember(Name = "PidsLimit", EmitDefaultValue = false)] + [JsonPropertyName("PidsLimit")] public bool PidsLimit { get; set; } - [DataMember(Name = "IPv4Forwarding", EmitDefaultValue = false)] + [JsonPropertyName("IPv4Forwarding")] public bool IPv4Forwarding { get; set; } - [DataMember(Name = "BridgeNfIptables", EmitDefaultValue = false)] + [JsonPropertyName("BridgeNfIptables")] public bool BridgeNfIptables { get; set; } - [DataMember(Name = "BridgeNfIp6tables", EmitDefaultValue = false)] + [JsonPropertyName("BridgeNfIp6tables")] public bool BridgeNfIP6tables { get; set; } - [DataMember(Name = "Debug", EmitDefaultValue = false)] + [JsonPropertyName("Debug")] public bool Debug { get; set; } - [DataMember(Name = "NFd", EmitDefaultValue = false)] + [JsonPropertyName("NFd")] public long NFd { get; set; } - [DataMember(Name = "OomKillDisable", EmitDefaultValue = false)] + [JsonPropertyName("OomKillDisable")] public bool OomKillDisable { get; set; } - [DataMember(Name = "NGoroutines", EmitDefaultValue = false)] + [JsonPropertyName("NGoroutines")] public long NGoroutines { get; set; } - [DataMember(Name = "SystemTime", EmitDefaultValue = false)] + [JsonPropertyName("SystemTime")] public string SystemTime { get; set; } - [DataMember(Name = "LoggingDriver", EmitDefaultValue = false)] + [JsonPropertyName("LoggingDriver")] public string LoggingDriver { get; set; } - [DataMember(Name = "CgroupDriver", EmitDefaultValue = false)] + [JsonPropertyName("CgroupDriver")] public string CgroupDriver { get; set; } - [DataMember(Name = "CgroupVersion", EmitDefaultValue = false)] + [JsonPropertyName("CgroupVersion")] public string CgroupVersion { get; set; } - [DataMember(Name = "NEventsListener", EmitDefaultValue = false)] + [JsonPropertyName("NEventsListener")] public long NEventsListener { get; set; } - [DataMember(Name = "KernelVersion", EmitDefaultValue = false)] + [JsonPropertyName("KernelVersion")] public string KernelVersion { get; set; } - [DataMember(Name = "OperatingSystem", EmitDefaultValue = false)] + [JsonPropertyName("OperatingSystem")] public string OperatingSystem { get; set; } - [DataMember(Name = "OSVersion", EmitDefaultValue = false)] + [JsonPropertyName("OSVersion")] public string OSVersion { get; set; } - [DataMember(Name = "OSType", EmitDefaultValue = false)] + [JsonPropertyName("OSType")] public string OSType { get; set; } - [DataMember(Name = "Architecture", EmitDefaultValue = false)] + [JsonPropertyName("Architecture")] public string Architecture { get; set; } - [DataMember(Name = "IndexServerAddress", EmitDefaultValue = false)] + [JsonPropertyName("IndexServerAddress")] public string IndexServerAddress { get; set; } - [DataMember(Name = "RegistryConfig", EmitDefaultValue = false)] + [JsonPropertyName("RegistryConfig")] public ServiceConfig RegistryConfig { get; set; } - [DataMember(Name = "NCPU", EmitDefaultValue = false)] + [JsonPropertyName("NCPU")] public long NCPU { get; set; } - [DataMember(Name = "MemTotal", EmitDefaultValue = false)] + [JsonPropertyName("MemTotal")] public long MemTotal { get; set; } - [DataMember(Name = "GenericResources", EmitDefaultValue = false)] + [JsonPropertyName("GenericResources")] public IList GenericResources { get; set; } - [DataMember(Name = "DockerRootDir", EmitDefaultValue = false)] + [JsonPropertyName("DockerRootDir")] public string DockerRootDir { get; set; } - [DataMember(Name = "HttpProxy", EmitDefaultValue = false)] + [JsonPropertyName("HttpProxy")] public string HTTPProxy { get; set; } - [DataMember(Name = "HttpsProxy", EmitDefaultValue = false)] + [JsonPropertyName("HttpsProxy")] public string HTTPSProxy { get; set; } - [DataMember(Name = "NoProxy", EmitDefaultValue = false)] + [JsonPropertyName("NoProxy")] public string NoProxy { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IList Labels { get; set; } - [DataMember(Name = "ExperimentalBuild", EmitDefaultValue = false)] + [JsonPropertyName("ExperimentalBuild")] public bool ExperimentalBuild { get; set; } - [DataMember(Name = "ServerVersion", EmitDefaultValue = false)] + [JsonPropertyName("ServerVersion")] public string ServerVersion { get; set; } - [DataMember(Name = "Runtimes", EmitDefaultValue = false)] + [JsonPropertyName("Runtimes")] public IDictionary Runtimes { get; set; } - [DataMember(Name = "DefaultRuntime", EmitDefaultValue = false)] + [JsonPropertyName("DefaultRuntime")] public string DefaultRuntime { get; set; } - [DataMember(Name = "Swarm", EmitDefaultValue = false)] + [JsonPropertyName("Swarm")] public Info Swarm { get; set; } - [DataMember(Name = "LiveRestoreEnabled", EmitDefaultValue = false)] + [JsonPropertyName("LiveRestoreEnabled")] public bool LiveRestoreEnabled { get; set; } - [DataMember(Name = "Isolation", EmitDefaultValue = false)] + [JsonPropertyName("Isolation")] public string Isolation { get; set; } - [DataMember(Name = "InitBinary", EmitDefaultValue = false)] + [JsonPropertyName("InitBinary")] public string InitBinary { get; set; } - [DataMember(Name = "ContainerdCommit", EmitDefaultValue = false)] + [JsonPropertyName("ContainerdCommit")] public Commit ContainerdCommit { get; set; } - [DataMember(Name = "RuncCommit", EmitDefaultValue = false)] + [JsonPropertyName("RuncCommit")] public Commit RuncCommit { get; set; } - [DataMember(Name = "InitCommit", EmitDefaultValue = false)] + [JsonPropertyName("InitCommit")] public Commit InitCommit { get; set; } - [DataMember(Name = "SecurityOptions", EmitDefaultValue = false)] + [JsonPropertyName("SecurityOptions")] public IList SecurityOptions { get; set; } - [DataMember(Name = "ProductLicense", EmitDefaultValue = false)] + [JsonPropertyName("ProductLicense")] public string ProductLicense { get; set; } - [DataMember(Name = "DefaultAddressPools", EmitDefaultValue = false)] + [JsonPropertyName("DefaultAddressPools")] public IList DefaultAddressPools { get; set; } - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/TLSInfo.Generated.cs b/src/Docker.DotNet/Models/TLSInfo.Generated.cs index eca8ff1e..c52e3370 100644 --- a/src/Docker.DotNet/Models/TLSInfo.Generated.cs +++ b/src/Docker.DotNet/Models/TLSInfo.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TLSInfo // (swarm.TLSInfo) { - [DataMember(Name = "TrustRoot", EmitDefaultValue = false)] + [JsonPropertyName("TrustRoot")] public string TrustRoot { get; set; } - [DataMember(Name = "CertIssuerSubject", EmitDefaultValue = false)] + [JsonPropertyName("CertIssuerSubject")] public IList CertIssuerSubject { get; set; } - [DataMember(Name = "CertIssuerPublicKey", EmitDefaultValue = false)] + [JsonPropertyName("CertIssuerPublicKey")] public IList CertIssuerPublicKey { get; set; } } } diff --git a/src/Docker.DotNet/Models/TaskDefaults.Generated.cs b/src/Docker.DotNet/Models/TaskDefaults.Generated.cs index dc6f90ae..5c62677b 100644 --- a/src/Docker.DotNet/Models/TaskDefaults.Generated.cs +++ b/src/Docker.DotNet/Models/TaskDefaults.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TaskDefaults // (swarm.TaskDefaults) { - [DataMember(Name = "LogDriver", EmitDefaultValue = false)] + [JsonPropertyName("LogDriver")] public SwarmDriver LogDriver { get; set; } } } diff --git a/src/Docker.DotNet/Models/TaskResponse.Generated.cs b/src/Docker.DotNet/Models/TaskResponse.Generated.cs index be6225db..94c6f1c4 100644 --- a/src/Docker.DotNet/Models/TaskResponse.Generated.cs +++ b/src/Docker.DotNet/Models/TaskResponse.Generated.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TaskResponse // (swarm.Task) { public TaskResponse() @@ -27,52 +26,52 @@ public TaskResponse(Meta Meta, Annotations Annotations) } } - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public Version Version { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public DateTime CreatedAt { get; set; } - [DataMember(Name = "UpdatedAt", EmitDefaultValue = false)] + [JsonPropertyName("UpdatedAt")] public DateTime UpdatedAt { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Spec", EmitDefaultValue = false)] + [JsonPropertyName("Spec")] public TaskSpec Spec { get; set; } - [DataMember(Name = "ServiceID", EmitDefaultValue = false)] + [JsonPropertyName("ServiceID")] public string ServiceID { get; set; } - [DataMember(Name = "Slot", EmitDefaultValue = false)] + [JsonPropertyName("Slot")] public long Slot { get; set; } - [DataMember(Name = "NodeID", EmitDefaultValue = false)] + [JsonPropertyName("NodeID")] public string NodeID { get; set; } - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public TaskStatus Status { get; set; } - [DataMember(Name = "DesiredState", EmitDefaultValue = false)] + [JsonPropertyName("DesiredState")] public TaskState DesiredState { get; set; } - [DataMember(Name = "NetworksAttachments", EmitDefaultValue = false)] + [JsonPropertyName("NetworksAttachments")] public IList NetworksAttachments { get; set; } - [DataMember(Name = "GenericResources", EmitDefaultValue = false)] + [JsonPropertyName("GenericResources")] public IList GenericResources { get; set; } - [DataMember(Name = "JobIteration", EmitDefaultValue = false)] + [JsonPropertyName("JobIteration")] public Version JobIteration { get; set; } - [DataMember(Name = "Volumes", EmitDefaultValue = false)] + [JsonPropertyName("Volumes")] public IList Volumes { get; set; } } } diff --git a/src/Docker.DotNet/Models/TaskSpec.Generated.cs b/src/Docker.DotNet/Models/TaskSpec.Generated.cs index 00735598..b6fec4e0 100644 --- a/src/Docker.DotNet/Models/TaskSpec.Generated.cs +++ b/src/Docker.DotNet/Models/TaskSpec.Generated.cs @@ -1,39 +1,38 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TaskSpec // (swarm.TaskSpec) { - [DataMember(Name = "ContainerSpec", EmitDefaultValue = false)] + [JsonPropertyName("ContainerSpec")] public ContainerSpec ContainerSpec { get; set; } - [DataMember(Name = "PluginSpec", EmitDefaultValue = false)] + [JsonPropertyName("PluginSpec")] public PluginSpec PluginSpec { get; set; } - [DataMember(Name = "NetworkAttachmentSpec", EmitDefaultValue = false)] + [JsonPropertyName("NetworkAttachmentSpec")] public NetworkAttachmentSpec NetworkAttachmentSpec { get; set; } - [DataMember(Name = "Resources", EmitDefaultValue = false)] + [JsonPropertyName("Resources")] public ResourceRequirements Resources { get; set; } - [DataMember(Name = "RestartPolicy", EmitDefaultValue = false)] + [JsonPropertyName("RestartPolicy")] public SwarmRestartPolicy RestartPolicy { get; set; } - [DataMember(Name = "Placement", EmitDefaultValue = false)] + [JsonPropertyName("Placement")] public Placement Placement { get; set; } - [DataMember(Name = "Networks", EmitDefaultValue = false)] + [JsonPropertyName("Networks")] public IList Networks { get; set; } - [DataMember(Name = "LogDriver", EmitDefaultValue = false)] + [JsonPropertyName("LogDriver")] public SwarmDriver LogDriver { get; set; } - [DataMember(Name = "ForceUpdate", EmitDefaultValue = false)] + [JsonPropertyName("ForceUpdate")] public ulong ForceUpdate { get; set; } - [DataMember(Name = "Runtime", EmitDefaultValue = false)] + [JsonPropertyName("Runtime")] public string Runtime { get; set; } } } diff --git a/src/Docker.DotNet/Models/TaskStatus.Generated.cs b/src/Docker.DotNet/Models/TaskStatus.Generated.cs index 83f6acce..d37f09be 100644 --- a/src/Docker.DotNet/Models/TaskStatus.Generated.cs +++ b/src/Docker.DotNet/Models/TaskStatus.Generated.cs @@ -1,27 +1,26 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TaskStatus // (swarm.TaskStatus) { - [DataMember(Name = "Timestamp", EmitDefaultValue = false)] + [JsonPropertyName("Timestamp")] public DateTime Timestamp { get; set; } - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public TaskState State { get; set; } - [DataMember(Name = "Message", EmitDefaultValue = false)] + [JsonPropertyName("Message")] public string Message { get; set; } - [DataMember(Name = "Err", EmitDefaultValue = false)] + [JsonPropertyName("Err")] public string Err { get; set; } - [DataMember(Name = "ContainerStatus", EmitDefaultValue = false)] + [JsonPropertyName("ContainerStatus")] public ContainerStatus ContainerStatus { get; set; } - [DataMember(Name = "PortStatus", EmitDefaultValue = false)] + [JsonPropertyName("PortStatus")] public PortStatus PortStatus { get; set; } } } diff --git a/src/Docker.DotNet/Models/TasksListParameters.Generated.cs b/src/Docker.DotNet/Models/TasksListParameters.Generated.cs index 39be9ba4..07c46243 100644 --- a/src/Docker.DotNet/Models/TasksListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/TasksListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TasksListParameters // (main.TasksListParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/ThrottleDevice.Generated.cs b/src/Docker.DotNet/Models/ThrottleDevice.Generated.cs index 977e4645..d94c9666 100644 --- a/src/Docker.DotNet/Models/ThrottleDevice.Generated.cs +++ b/src/Docker.DotNet/Models/ThrottleDevice.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ThrottleDevice // (blkiodev.ThrottleDevice) { - [DataMember(Name = "Path", EmitDefaultValue = false)] + [JsonPropertyName("Path")] public string Path { get; set; } - [DataMember(Name = "Rate", EmitDefaultValue = false)] + [JsonPropertyName("Rate")] public ulong Rate { get; set; } } } diff --git a/src/Docker.DotNet/Models/ThrottlingData.Generated.cs b/src/Docker.DotNet/Models/ThrottlingData.Generated.cs index 5e3ac51c..3f312954 100644 --- a/src/Docker.DotNet/Models/ThrottlingData.Generated.cs +++ b/src/Docker.DotNet/Models/ThrottlingData.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class ThrottlingData // (types.ThrottlingData) { - [DataMember(Name = "periods", EmitDefaultValue = false)] + [JsonPropertyName("periods")] public ulong Periods { get; set; } - [DataMember(Name = "throttled_periods", EmitDefaultValue = false)] + [JsonPropertyName("throttled_periods")] public ulong ThrottledPeriods { get; set; } - [DataMember(Name = "throttled_time", EmitDefaultValue = false)] + [JsonPropertyName("throttled_time")] public ulong ThrottledTime { get; set; } } } diff --git a/src/Docker.DotNet/Models/TmpfsOptions.Generated.cs b/src/Docker.DotNet/Models/TmpfsOptions.Generated.cs index 91e44418..90bdaac3 100644 --- a/src/Docker.DotNet/Models/TmpfsOptions.Generated.cs +++ b/src/Docker.DotNet/Models/TmpfsOptions.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TmpfsOptions // (mount.TmpfsOptions) { - [DataMember(Name = "SizeBytes", EmitDefaultValue = false)] + [JsonPropertyName("SizeBytes")] public long SizeBytes { get; set; } - [DataMember(Name = "Mode", EmitDefaultValue = false)] + [JsonPropertyName("Mode")] public uint Mode { get; set; } } } diff --git a/src/Docker.DotNet/Models/Topology.Generated.cs b/src/Docker.DotNet/Models/Topology.Generated.cs index d2062839..0793a73d 100644 --- a/src/Docker.DotNet/Models/Topology.Generated.cs +++ b/src/Docker.DotNet/Models/Topology.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Topology // (swarm.Topology) { - [DataMember(Name = "Segments", EmitDefaultValue = false)] + [JsonPropertyName("Segments")] public IDictionary Segments { get; set; } } } diff --git a/src/Docker.DotNet/Models/TopologyRequirement.Generated.cs b/src/Docker.DotNet/Models/TopologyRequirement.Generated.cs index 567885ea..a8fa5f91 100644 --- a/src/Docker.DotNet/Models/TopologyRequirement.Generated.cs +++ b/src/Docker.DotNet/Models/TopologyRequirement.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TopologyRequirement // (volume.TopologyRequirement) { - [DataMember(Name = "Requisite", EmitDefaultValue = false)] + [JsonPropertyName("Requisite")] public IList Requisite { get; set; } - [DataMember(Name = "Preferred", EmitDefaultValue = false)] + [JsonPropertyName("Preferred")] public IList Preferred { get; set; } } } diff --git a/src/Docker.DotNet/Models/TypeBlock.Generated.cs b/src/Docker.DotNet/Models/TypeBlock.Generated.cs index 39353325..82ba1d8c 100644 --- a/src/Docker.DotNet/Models/TypeBlock.Generated.cs +++ b/src/Docker.DotNet/Models/TypeBlock.Generated.cs @@ -1,8 +1,6 @@ -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TypeBlock // (volume.TypeBlock) { } diff --git a/src/Docker.DotNet/Models/TypeMount.Generated.cs b/src/Docker.DotNet/Models/TypeMount.Generated.cs index 3f2475a8..1be8b3d0 100644 --- a/src/Docker.DotNet/Models/TypeMount.Generated.cs +++ b/src/Docker.DotNet/Models/TypeMount.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class TypeMount // (volume.TypeMount) { - [DataMember(Name = "FsType", EmitDefaultValue = false)] + [JsonPropertyName("FsType")] public string FsType { get; set; } - [DataMember(Name = "MountFlags", EmitDefaultValue = false)] + [JsonPropertyName("MountFlags")] public IList MountFlags { get; set; } } } diff --git a/src/Docker.DotNet/Models/Ulimit.Generated.cs b/src/Docker.DotNet/Models/Ulimit.Generated.cs index a0d3712c..f6d1c694 100644 --- a/src/Docker.DotNet/Models/Ulimit.Generated.cs +++ b/src/Docker.DotNet/Models/Ulimit.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Ulimit // (units.Ulimit) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Hard", EmitDefaultValue = false)] + [JsonPropertyName("Hard")] public long Hard { get; set; } - [DataMember(Name = "Soft", EmitDefaultValue = false)] + [JsonPropertyName("Soft")] public long Soft { get; set; } } } diff --git a/src/Docker.DotNet/Models/UpdateConfig.Generated.cs b/src/Docker.DotNet/Models/UpdateConfig.Generated.cs index 337d85e9..3190b216 100644 --- a/src/Docker.DotNet/Models/UpdateConfig.Generated.cs +++ b/src/Docker.DotNet/Models/UpdateConfig.Generated.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class UpdateConfig // (container.UpdateConfig) { public UpdateConfig() @@ -48,100 +47,100 @@ public UpdateConfig(Resources Resources) } } - [DataMember(Name = "CpuShares", EmitDefaultValue = false)] + [JsonPropertyName("CpuShares")] public long CPUShares { get; set; } - [DataMember(Name = "Memory", EmitDefaultValue = false)] + [JsonPropertyName("Memory")] public long Memory { get; set; } - [DataMember(Name = "NanoCpus", EmitDefaultValue = false)] + [JsonPropertyName("NanoCpus")] public long NanoCPUs { get; set; } - [DataMember(Name = "CgroupParent", EmitDefaultValue = false)] + [JsonPropertyName("CgroupParent")] public string CgroupParent { get; set; } - [DataMember(Name = "BlkioWeight", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeight")] public ushort BlkioWeight { get; set; } - [DataMember(Name = "BlkioWeightDevice", EmitDefaultValue = false)] + [JsonPropertyName("BlkioWeightDevice")] public IList BlkioWeightDevice { get; set; } - [DataMember(Name = "BlkioDeviceReadBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadBps")] public IList BlkioDeviceReadBps { get; set; } - [DataMember(Name = "BlkioDeviceWriteBps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteBps")] public IList BlkioDeviceWriteBps { get; set; } - [DataMember(Name = "BlkioDeviceReadIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceReadIOps")] public IList BlkioDeviceReadIOps { get; set; } - [DataMember(Name = "BlkioDeviceWriteIOps", EmitDefaultValue = false)] + [JsonPropertyName("BlkioDeviceWriteIOps")] public IList BlkioDeviceWriteIOps { get; set; } - [DataMember(Name = "CpuPeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuPeriod")] public long CPUPeriod { get; set; } - [DataMember(Name = "CpuQuota", EmitDefaultValue = false)] + [JsonPropertyName("CpuQuota")] public long CPUQuota { get; set; } - [DataMember(Name = "CpuRealtimePeriod", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimePeriod")] public long CPURealtimePeriod { get; set; } - [DataMember(Name = "CpuRealtimeRuntime", EmitDefaultValue = false)] + [JsonPropertyName("CpuRealtimeRuntime")] public long CPURealtimeRuntime { get; set; } - [DataMember(Name = "CpusetCpus", EmitDefaultValue = false)] + [JsonPropertyName("CpusetCpus")] public string CpusetCpus { get; set; } - [DataMember(Name = "CpusetMems", EmitDefaultValue = false)] + [JsonPropertyName("CpusetMems")] public string CpusetMems { get; set; } - [DataMember(Name = "Devices", EmitDefaultValue = false)] + [JsonPropertyName("Devices")] public IList Devices { get; set; } - [DataMember(Name = "DeviceCgroupRules", EmitDefaultValue = false)] + [JsonPropertyName("DeviceCgroupRules")] public IList DeviceCgroupRules { get; set; } - [DataMember(Name = "DeviceRequests", EmitDefaultValue = false)] + [JsonPropertyName("DeviceRequests")] public IList DeviceRequests { get; set; } - [DataMember(Name = "KernelMemory", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemory")] public long KernelMemory { get; set; } - [DataMember(Name = "KernelMemoryTCP", EmitDefaultValue = false)] + [JsonPropertyName("KernelMemoryTCP")] public long KernelMemoryTCP { get; set; } - [DataMember(Name = "MemoryReservation", EmitDefaultValue = false)] + [JsonPropertyName("MemoryReservation")] public long MemoryReservation { get; set; } - [DataMember(Name = "MemorySwap", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwap")] public long MemorySwap { get; set; } - [DataMember(Name = "MemorySwappiness", EmitDefaultValue = false)] + [JsonPropertyName("MemorySwappiness")] public long? MemorySwappiness { get; set; } - [DataMember(Name = "OomKillDisable", EmitDefaultValue = false)] + [JsonPropertyName("OomKillDisable")] public bool? OomKillDisable { get; set; } - [DataMember(Name = "PidsLimit", EmitDefaultValue = false)] + [JsonPropertyName("PidsLimit")] public long? PidsLimit { get; set; } - [DataMember(Name = "Ulimits", EmitDefaultValue = false)] + [JsonPropertyName("Ulimits")] public IList Ulimits { get; set; } - [DataMember(Name = "CpuCount", EmitDefaultValue = false)] + [JsonPropertyName("CpuCount")] public long CPUCount { get; set; } - [DataMember(Name = "CpuPercent", EmitDefaultValue = false)] + [JsonPropertyName("CpuPercent")] public long CPUPercent { get; set; } - [DataMember(Name = "IOMaximumIOps", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumIOps")] public ulong IOMaximumIOps { get; set; } - [DataMember(Name = "IOMaximumBandwidth", EmitDefaultValue = false)] + [JsonPropertyName("IOMaximumBandwidth")] public ulong IOMaximumBandwidth { get; set; } - [DataMember(Name = "RestartPolicy", EmitDefaultValue = false)] + [JsonPropertyName("RestartPolicy")] public RestartPolicy RestartPolicy { get; set; } } } diff --git a/src/Docker.DotNet/Models/UpdateStatus.Generated.cs b/src/Docker.DotNet/Models/UpdateStatus.Generated.cs index 9034a7df..b0d7d363 100644 --- a/src/Docker.DotNet/Models/UpdateStatus.Generated.cs +++ b/src/Docker.DotNet/Models/UpdateStatus.Generated.cs @@ -1,21 +1,20 @@ using System; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class UpdateStatus // (swarm.UpdateStatus) { - [DataMember(Name = "State", EmitDefaultValue = false)] + [JsonPropertyName("State")] public string State { get; set; } - [DataMember(Name = "StartedAt", EmitDefaultValue = false)] + [JsonPropertyName("StartedAt")] public DateTime? StartedAt { get; set; } - [DataMember(Name = "CompletedAt", EmitDefaultValue = false)] + [JsonPropertyName("CompletedAt")] public DateTime? CompletedAt { get; set; } - [DataMember(Name = "Message", EmitDefaultValue = false)] + [JsonPropertyName("Message")] public string Message { get; set; } } } diff --git a/src/Docker.DotNet/Models/UsageData.Generated.cs b/src/Docker.DotNet/Models/UsageData.Generated.cs index b30fde97..abe10c20 100644 --- a/src/Docker.DotNet/Models/UsageData.Generated.cs +++ b/src/Docker.DotNet/Models/UsageData.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class UsageData // (volume.UsageData) { - [DataMember(Name = "RefCount", EmitDefaultValue = false)] + [JsonPropertyName("RefCount")] public long RefCount { get; set; } - [DataMember(Name = "Size", EmitDefaultValue = false)] + [JsonPropertyName("Size")] public long Size { get; set; } } } diff --git a/src/Docker.DotNet/Models/Version.Generated.cs b/src/Docker.DotNet/Models/Version.Generated.cs index 44b15120..76b1c857 100644 --- a/src/Docker.DotNet/Models/Version.Generated.cs +++ b/src/Docker.DotNet/Models/Version.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class Version // (swarm.Version) { - [DataMember(Name = "Index", EmitDefaultValue = false)] + [JsonPropertyName("Index")] public ulong Index { get; set; } } } diff --git a/src/Docker.DotNet/Models/VersionResponse.Generated.cs b/src/Docker.DotNet/Models/VersionResponse.Generated.cs index 87045def..c2ed007e 100644 --- a/src/Docker.DotNet/Models/VersionResponse.Generated.cs +++ b/src/Docker.DotNet/Models/VersionResponse.Generated.cs @@ -1,42 +1,41 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VersionResponse // (types.Version) { - [DataMember(Name = "Components", EmitDefaultValue = false)] + [JsonPropertyName("Components")] public IList Components { get; set; } - [DataMember(Name = "Version", EmitDefaultValue = false)] + [JsonPropertyName("Version")] public string Version { get; set; } - [DataMember(Name = "ApiVersion", EmitDefaultValue = false)] + [JsonPropertyName("ApiVersion")] public string APIVersion { get; set; } - [DataMember(Name = "MinAPIVersion", EmitDefaultValue = false)] + [JsonPropertyName("MinAPIVersion")] public string MinAPIVersion { get; set; } - [DataMember(Name = "GitCommit", EmitDefaultValue = false)] + [JsonPropertyName("GitCommit")] public string GitCommit { get; set; } - [DataMember(Name = "GoVersion", EmitDefaultValue = false)] + [JsonPropertyName("GoVersion")] public string GoVersion { get; set; } - [DataMember(Name = "Os", EmitDefaultValue = false)] + [JsonPropertyName("Os")] public string Os { get; set; } - [DataMember(Name = "Arch", EmitDefaultValue = false)] + [JsonPropertyName("Arch")] public string Arch { get; set; } - [DataMember(Name = "KernelVersion", EmitDefaultValue = false)] + [JsonPropertyName("KernelVersion")] public string KernelVersion { get; set; } - [DataMember(Name = "Experimental", EmitDefaultValue = false)] + [JsonPropertyName("Experimental")] public bool Experimental { get; set; } - [DataMember(Name = "BuildTime", EmitDefaultValue = false)] + [JsonPropertyName("BuildTime")] public string BuildTime { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumeAttachment.Generated.cs b/src/Docker.DotNet/Models/VolumeAttachment.Generated.cs index 38f469d0..4da2f3ef 100644 --- a/src/Docker.DotNet/Models/VolumeAttachment.Generated.cs +++ b/src/Docker.DotNet/Models/VolumeAttachment.Generated.cs @@ -1,17 +1,16 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumeAttachment // (swarm.VolumeAttachment) { - [DataMember(Name = "ID", EmitDefaultValue = false)] + [JsonPropertyName("ID")] public string ID { get; set; } - [DataMember(Name = "Source", EmitDefaultValue = false)] + [JsonPropertyName("Source")] public string Source { get; set; } - [DataMember(Name = "Target", EmitDefaultValue = false)] + [JsonPropertyName("Target")] public string Target { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumeInfo.Generated.cs b/src/Docker.DotNet/Models/VolumeInfo.Generated.cs index 2c2377df..5b23ca52 100644 --- a/src/Docker.DotNet/Models/VolumeInfo.Generated.cs +++ b/src/Docker.DotNet/Models/VolumeInfo.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumeInfo // (volume.Info) { - [DataMember(Name = "CapacityBytes", EmitDefaultValue = false)] + [JsonPropertyName("CapacityBytes")] public long CapacityBytes { get; set; } - [DataMember(Name = "VolumeContext", EmitDefaultValue = false)] + [JsonPropertyName("VolumeContext")] public IDictionary VolumeContext { get; set; } - [DataMember(Name = "VolumeID", EmitDefaultValue = false)] + [JsonPropertyName("VolumeID")] public string VolumeID { get; set; } - [DataMember(Name = "AccessibleTopology", EmitDefaultValue = false)] + [JsonPropertyName("AccessibleTopology")] public IList AccessibleTopology { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumeOptions.Generated.cs b/src/Docker.DotNet/Models/VolumeOptions.Generated.cs index 5d3cb442..ea019dd8 100644 --- a/src/Docker.DotNet/Models/VolumeOptions.Generated.cs +++ b/src/Docker.DotNet/Models/VolumeOptions.Generated.cs @@ -1,18 +1,17 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumeOptions // (mount.VolumeOptions) { - [DataMember(Name = "NoCopy", EmitDefaultValue = false)] + [JsonPropertyName("NoCopy")] public bool NoCopy { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "DriverConfig", EmitDefaultValue = false)] + [JsonPropertyName("DriverConfig")] public Driver DriverConfig { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumeResponse.Generated.cs b/src/Docker.DotNet/Models/VolumeResponse.Generated.cs index 12b92997..f1285895 100644 --- a/src/Docker.DotNet/Models/VolumeResponse.Generated.cs +++ b/src/Docker.DotNet/Models/VolumeResponse.Generated.cs @@ -1,39 +1,38 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumeResponse // (main.VolumeResponse) { - [DataMember(Name = "ClusterVolume", EmitDefaultValue = false)] + [JsonPropertyName("ClusterVolume")] public ClusterVolume ClusterVolume { get; set; } - [DataMember(Name = "CreatedAt", EmitDefaultValue = false)] + [JsonPropertyName("CreatedAt")] public string CreatedAt { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } - [DataMember(Name = "Mountpoint", EmitDefaultValue = false)] + [JsonPropertyName("Mountpoint")] public string Mountpoint { get; set; } - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Options", EmitDefaultValue = false)] + [JsonPropertyName("Options")] public IDictionary Options { get; set; } - [DataMember(Name = "Scope", EmitDefaultValue = false)] + [JsonPropertyName("Scope")] public string Scope { get; set; } - [DataMember(Name = "Status", EmitDefaultValue = false)] + [JsonPropertyName("Status")] public IDictionary Status { get; set; } - [DataMember(Name = "UsageData", EmitDefaultValue = false)] + [JsonPropertyName("UsageData")] public UsageData UsageData { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumeSecret.Generated.cs b/src/Docker.DotNet/Models/VolumeSecret.Generated.cs index 8df3da99..60f0d4c6 100644 --- a/src/Docker.DotNet/Models/VolumeSecret.Generated.cs +++ b/src/Docker.DotNet/Models/VolumeSecret.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumeSecret // (volume.Secret) { - [DataMember(Name = "Key", EmitDefaultValue = false)] + [JsonPropertyName("Key")] public string Key { get; set; } - [DataMember(Name = "Secret", EmitDefaultValue = false)] + [JsonPropertyName("Secret")] public string Secret { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumeTopology.Generated.cs b/src/Docker.DotNet/Models/VolumeTopology.Generated.cs index b87b0521..4f98aadb 100644 --- a/src/Docker.DotNet/Models/VolumeTopology.Generated.cs +++ b/src/Docker.DotNet/Models/VolumeTopology.Generated.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumeTopology // (volume.Topology) { - [DataMember(Name = "Segments", EmitDefaultValue = false)] + [JsonPropertyName("Segments")] public IDictionary Segments { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumesCreateParameters.Generated.cs b/src/Docker.DotNet/Models/VolumesCreateParameters.Generated.cs index cc2a4102..b7b983f5 100644 --- a/src/Docker.DotNet/Models/VolumesCreateParameters.Generated.cs +++ b/src/Docker.DotNet/Models/VolumesCreateParameters.Generated.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumesCreateParameters // (main.VolumesCreateParameters) { - [DataMember(Name = "Name", EmitDefaultValue = false)] + [JsonPropertyName("Name")] public string Name { get; set; } - [DataMember(Name = "Driver", EmitDefaultValue = false)] + [JsonPropertyName("Driver")] public string Driver { get; set; } - [DataMember(Name = "DriverOpts", EmitDefaultValue = false)] + [JsonPropertyName("DriverOpts")] public IDictionary DriverOpts { get; set; } - [DataMember(Name = "Labels", EmitDefaultValue = false)] + [JsonPropertyName("Labels")] public IDictionary Labels { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumesListParameters.Generated.cs b/src/Docker.DotNet/Models/VolumesListParameters.Generated.cs index a71d5df4..6d23c6dd 100644 --- a/src/Docker.DotNet/Models/VolumesListParameters.Generated.cs +++ b/src/Docker.DotNet/Models/VolumesListParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumesListParameters // (main.VolumesListParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/VolumesListResponse.Generated.cs b/src/Docker.DotNet/Models/VolumesListResponse.Generated.cs index acd2ce97..b02a3109 100644 --- a/src/Docker.DotNet/Models/VolumesListResponse.Generated.cs +++ b/src/Docker.DotNet/Models/VolumesListResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumesListResponse // (main.VolumesListResponse) { - [DataMember(Name = "Volumes", EmitDefaultValue = false)] + [JsonPropertyName("Volumes")] public IList Volumes { get; set; } - [DataMember(Name = "Warnings", EmitDefaultValue = false)] + [JsonPropertyName("Warnings")] public IList Warnings { get; set; } } } diff --git a/src/Docker.DotNet/Models/VolumesPruneParameters.Generated.cs b/src/Docker.DotNet/Models/VolumesPruneParameters.Generated.cs index 80f5b1de..55193858 100644 --- a/src/Docker.DotNet/Models/VolumesPruneParameters.Generated.cs +++ b/src/Docker.DotNet/Models/VolumesPruneParameters.Generated.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; -using System.Runtime.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumesPruneParameters // (main.VolumesPruneParameters) { [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))] diff --git a/src/Docker.DotNet/Models/VolumesPruneResponse.Generated.cs b/src/Docker.DotNet/Models/VolumesPruneResponse.Generated.cs index 02741059..a7bc50e6 100644 --- a/src/Docker.DotNet/Models/VolumesPruneResponse.Generated.cs +++ b/src/Docker.DotNet/Models/VolumesPruneResponse.Generated.cs @@ -1,15 +1,14 @@ using System.Collections.Generic; -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class VolumesPruneResponse // (types.VolumesPruneReport) { - [DataMember(Name = "VolumesDeleted", EmitDefaultValue = false)] + [JsonPropertyName("VolumesDeleted")] public IList VolumesDeleted { get; set; } - [DataMember(Name = "SpaceReclaimed", EmitDefaultValue = false)] + [JsonPropertyName("SpaceReclaimed")] public ulong SpaceReclaimed { get; set; } } } diff --git a/src/Docker.DotNet/Models/WaitExitError.Generated.cs b/src/Docker.DotNet/Models/WaitExitError.Generated.cs index 7d019089..4d730dc5 100644 --- a/src/Docker.DotNet/Models/WaitExitError.Generated.cs +++ b/src/Docker.DotNet/Models/WaitExitError.Generated.cs @@ -1,11 +1,10 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class WaitExitError // (container.WaitExitError) { - [DataMember(Name = "Message", EmitDefaultValue = false)] + [JsonPropertyName("Message")] public string Message { get; set; } } } diff --git a/src/Docker.DotNet/Models/WeightDevice.Generated.cs b/src/Docker.DotNet/Models/WeightDevice.Generated.cs index 08478de3..d76318a0 100644 --- a/src/Docker.DotNet/Models/WeightDevice.Generated.cs +++ b/src/Docker.DotNet/Models/WeightDevice.Generated.cs @@ -1,14 +1,13 @@ -using System.Runtime.Serialization; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { - [DataContract] public class WeightDevice // (blkiodev.WeightDevice) { - [DataMember(Name = "Path", EmitDefaultValue = false)] + [JsonPropertyName("Path")] public string Path { get; set; } - [DataMember(Name = "Weight", EmitDefaultValue = false)] + [JsonPropertyName("Weight")] public ushort Weight { get; set; } } } From a53a4a106d3742f0d4a257ca78ebddb85eff5c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Thu, 7 Mar 2024 15:36:12 +0100 Subject: [PATCH 3/6] Migrate from Newtonsoft.Json to System.Text.Json --- src/Directory.Build.props | 1 + src/Docker.DotNet/Docker.DotNet.csproj | 4 +- src/Docker.DotNet/Endpoints/StreamUtil.cs | 9 +- .../EnumerableQueryStringConverter.cs | 3 +- src/Docker.DotNet/JsonBase64Converter.cs | 38 +++++---- src/Docker.DotNet/JsonDateTimeConverter.cs | 24 ++++++ .../JsonIso8601AndUnixEpochDateConverter.cs | 56 ------------ .../JsonNullableDateTimeConverter.cs | 25 ++++++ src/Docker.DotNet/JsonQueryStringConverter.cs | 3 +- src/Docker.DotNet/JsonRequestContent.cs | 6 +- src/Docker.DotNet/JsonSerializer.cs | 85 ++++++++++++------- src/Docker.DotNet/JsonVersionConverter.cs | 30 ------- src/Docker.DotNet/MapQueryStringConverter.cs | 3 +- .../Models/ObjectExtensionData.cs | 5 +- .../TimeSpanNanoSecondsConverter.cs | 35 +++----- src/Docker.DotNet/TimeSpanSecondsConverter.cs | 29 +++---- .../IContainerOperationsTests.cs | 4 +- .../ISystemOperations.Tests.cs | 6 +- 18 files changed, 162 insertions(+), 204 deletions(-) create mode 100644 src/Docker.DotNet/JsonDateTimeConverter.cs delete mode 100644 src/Docker.DotNet/JsonIso8601AndUnixEpochDateConverter.cs create mode 100644 src/Docker.DotNet/JsonNullableDateTimeConverter.cs delete mode 100644 src/Docker.DotNet/JsonVersionConverter.cs diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a7f73cae..27089d75 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -5,6 +5,7 @@ true netstandard2.0;netstandard2.1 + latest https://camo.githubusercontent.com/fa6d5c12609ed8a3ba1163b96f9e9979b8f59b0d/687474703a2f2f7765732e696f2f566663732f636f6e74656e74 Copyright (c) .NET Foundation and Contributors Docker Container C# .NET diff --git a/src/Docker.DotNet/Docker.DotNet.csproj b/src/Docker.DotNet/Docker.DotNet.csproj index 81c58101..2fbe89a9 100644 --- a/src/Docker.DotNet/Docker.DotNet.csproj +++ b/src/Docker.DotNet/Docker.DotNet.csproj @@ -5,8 +5,10 @@ Docker.DotNet - + + + \ No newline at end of file diff --git a/src/Docker.DotNet/Endpoints/StreamUtil.cs b/src/Docker.DotNet/Endpoints/StreamUtil.cs index 03e1c1b6..9594151f 100644 --- a/src/Docker.DotNet/Endpoints/StreamUtil.cs +++ b/src/Docker.DotNet/Endpoints/StreamUtil.cs @@ -5,7 +5,6 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -using Newtonsoft.Json; namespace Docker.DotNet.Models { @@ -29,16 +28,10 @@ internal static async Task MonitorStreamAsync(Task streamTask, DockerCli internal static async Task MonitorStreamForMessagesAsync(Task streamTask, DockerClient client, CancellationToken cancellationToken, IProgress progress) { - var tcs = new TaskCompletionSource(); - using (var stream = await streamTask) - using (var reader = new StreamReader(stream, new UTF8Encoding(false))) - using (var jsonReader = new JsonTextReader(reader) { SupportMultipleContent = true }) - using (cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken))) { - while (await await Task.WhenAny(jsonReader.ReadAsync(cancellationToken), tcs.Task)) + await foreach (var ev in client.JsonSerializer.Deserialize(stream, cancellationToken)) { - var ev = await client.JsonSerializer.Deserialize(jsonReader, cancellationToken); progress.Report(ev); } } diff --git a/src/Docker.DotNet/EnumerableQueryStringConverter.cs b/src/Docker.DotNet/EnumerableQueryStringConverter.cs index 5e015d1a..6b2fe59a 100644 --- a/src/Docker.DotNet/EnumerableQueryStringConverter.cs +++ b/src/Docker.DotNet/EnumerableQueryStringConverter.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Reflection; -using Newtonsoft.Json; namespace Docker.DotNet { @@ -32,7 +31,7 @@ public string[] Convert(object o) } else { - items.Add(JsonConvert.SerializeObject(e)); + items.Add(System.Text.Json.JsonSerializer.Serialize(e)); } } diff --git a/src/Docker.DotNet/JsonBase64Converter.cs b/src/Docker.DotNet/JsonBase64Converter.cs index 889cf3ca..9c22272a 100644 --- a/src/Docker.DotNet/JsonBase64Converter.cs +++ b/src/Docker.DotNet/JsonBase64Converter.cs @@ -1,31 +1,39 @@ using System; using System.Collections.Generic; -using Newtonsoft.Json; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet { - internal class JsonBase64Converter : JsonConverter + internal class JsonBase64Converter : JsonConverter> { - private static readonly Type _byteListType = typeof(IList); - public override bool CanRead => true; - - public override bool CanWrite => false; - - public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) + public override IList Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - throw new NotImplementedException(); + return reader.GetBytesFromBase64(); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) + public override void Write(Utf8JsonWriter writer, IList value, JsonSerializerOptions options) { - var strVal = reader.Value as string; - - return Convert.FromBase64String(strVal); + var bytes = GetBytes(value); + writer.WriteBase64StringValue(bytes); } - public override bool CanConvert(Type objectType) + private static ReadOnlySpan GetBytes(IList value) { - return objectType == _byteListType; +#if !NETSTANDARD + if (value is List list) + { + return CollectionsMarshal.AsSpan(list); + } +#endif + if (value is byte[] array) + { + return array; + } + + return value.ToArray(); } } } \ No newline at end of file diff --git a/src/Docker.DotNet/JsonDateTimeConverter.cs b/src/Docker.DotNet/JsonDateTimeConverter.cs new file mode 100644 index 00000000..3256ef95 --- /dev/null +++ b/src/Docker.DotNet/JsonDateTimeConverter.cs @@ -0,0 +1,24 @@ +using System; +using System.Text.Json; + +namespace Docker.DotNet; + +internal class JsonDateTimeConverter : System.Text.Json.Serialization.JsonConverter +{ + private static readonly DateTime UnixEpochBase = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); + + public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return reader.TokenType switch + { + JsonTokenType.Number => UnixEpochBase.AddSeconds(reader.GetInt64()), + JsonTokenType.String => reader.GetDateTime(), + _ => throw new NotImplementedException($"Deserializing a JSON {reader.TokenType} to DateTime is not handled.") + }; + } + + public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/src/Docker.DotNet/JsonIso8601AndUnixEpochDateConverter.cs b/src/Docker.DotNet/JsonIso8601AndUnixEpochDateConverter.cs deleted file mode 100644 index e59f41b3..00000000 --- a/src/Docker.DotNet/JsonIso8601AndUnixEpochDateConverter.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Globalization; -using Newtonsoft.Json; - -namespace Docker.DotNet -{ - using System.Reflection; - - internal class JsonIso8601AndUnixEpochDateConverter : JsonConverter - { - private static readonly DateTime UnixEpochBase = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); - - public override bool CanConvert(Type objectType) - { - return objectType == typeof (DateTime) || objectType == typeof (DateTime?); - } - - public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) - { - throw new NotImplementedException(); - } - - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) - { - var isNullableType = (objectType.GetTypeInfo().IsGenericType && objectType.GetGenericTypeDefinition() == typeof (Nullable<>)); - var value = reader.Value; - - DateTime result; - if (value is DateTime) - { - result = (DateTime) value; - } - else if (value is string) - { - // ISO 8601 String - result = DateTime.Parse((string) value, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind); - } - else if (value is long) - { - // UNIX epoch timestamp (in seconds) - result = UnixEpochBase.AddSeconds((long) value); - } - else - { - throw new NotImplementedException($"Deserializing {value.GetType().FullName} back to {objectType.FullName} is not handled."); - } - - if (isNullableType && result == default(DateTime)) - { - return null; // do not set result on DateTime? field - } - - return result; - } - } -} \ No newline at end of file diff --git a/src/Docker.DotNet/JsonNullableDateTimeConverter.cs b/src/Docker.DotNet/JsonNullableDateTimeConverter.cs new file mode 100644 index 00000000..bfb6fa8b --- /dev/null +++ b/src/Docker.DotNet/JsonNullableDateTimeConverter.cs @@ -0,0 +1,25 @@ +using System; +using System.Text.Json; + +namespace Docker.DotNet; + +internal class JsonNullableDateTimeConverter : System.Text.Json.Serialization.JsonConverter +{ + private static readonly DateTime UnixEpochBase = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); + + public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return reader.TokenType switch + { + JsonTokenType.Null => null, + JsonTokenType.Number => UnixEpochBase.AddSeconds(reader.GetInt64()), + JsonTokenType.String => reader.GetDateTime(), + _ => throw new NotImplementedException($"Deserializing a JSON {reader.TokenType} to DateTime? is not handled.") + }; + } + + public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/src/Docker.DotNet/JsonQueryStringConverter.cs b/src/Docker.DotNet/JsonQueryStringConverter.cs index 323c64f3..61b05a3f 100644 --- a/src/Docker.DotNet/JsonQueryStringConverter.cs +++ b/src/Docker.DotNet/JsonQueryStringConverter.cs @@ -1,6 +1,5 @@ using System; using System.Diagnostics; -using Newtonsoft.Json; namespace Docker.DotNet.Models { @@ -15,7 +14,7 @@ public string[] Convert(object o) { Debug.Assert(o != null); - return new[] {JsonConvert.SerializeObject(o, Formatting.None)}; + return new[] {System.Text.Json.JsonSerializer.Serialize(o)}; } } } \ No newline at end of file diff --git a/src/Docker.DotNet/JsonRequestContent.cs b/src/Docker.DotNet/JsonRequestContent.cs index 1a078481..183d9474 100644 --- a/src/Docker.DotNet/JsonRequestContent.cs +++ b/src/Docker.DotNet/JsonRequestContent.cs @@ -1,14 +1,11 @@ using System; using System.Collections.Generic; using System.Net.Http; -using System.Text; namespace Docker.DotNet { internal class JsonRequestContent : IRequestContent { - private const string JsonMimeType = "application/json"; - private readonly T _value; private readonly JsonSerializer _serializer; @@ -30,8 +27,7 @@ public JsonRequestContent(T val, JsonSerializer serializer) public HttpContent GetContent() { - var serializedObject = this._serializer.SerializeObject(this._value); - return new StringContent(serializedObject, Encoding.UTF8, JsonMimeType); + return this._serializer.GetHttpContent(_value); } } } \ No newline at end of file diff --git a/src/Docker.DotNet/JsonSerializer.cs b/src/Docker.DotNet/JsonSerializer.cs index 748c6b47..b62937fd 100644 --- a/src/Docker.DotNet/JsonSerializer.cs +++ b/src/Docker.DotNet/JsonSerializer.cs @@ -1,60 +1,81 @@ -using System.Threading; -using System.Threading.Tasks; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; +using System.Buffers; +using System.Collections.Generic; +using System.IO; +using System.IO.Pipelines; +using System.Net.Http.Json; +using System.Runtime.CompilerServices; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Threading; namespace Docker.DotNet { /// - /// Facade for . + /// Facade for serialization. /// internal class JsonSerializer { - private readonly Newtonsoft.Json.JsonSerializer _serializer; - - private readonly JsonSerializerSettings _settings = new JsonSerializerSettings + private readonly JsonSerializerOptions _options = new() { - NullValueHandling = NullValueHandling.Ignore, - Converters = new JsonConverter[] + Converters = { - new JsonIso8601AndUnixEpochDateConverter(), - new JsonVersionConverter(), - new StringEnumConverter(), - new TimeSpanSecondsConverter(), - new TimeSpanNanosecondsConverter(), - new JsonBase64Converter() - } + new JsonDateTimeConverter(), + new JsonNullableDateTimeConverter(), + new JsonStringEnumConverter(), + new JsonBase64Converter(), + }, }; - public JsonSerializer() + // Adapted from https://github.com/dotnet/runtime/issues/33030#issuecomment-1524227075 + public async IAsyncEnumerable Deserialize(Stream stream, [EnumeratorCancellation] CancellationToken cancellationToken) { - _serializer = Newtonsoft.Json.JsonSerializer.CreateDefault(this._settings); + var reader = PipeReader.Create(stream); + while (true) + { + var result = await reader.ReadAsync(cancellationToken); + var buffer = result.Buffer; + while (!buffer.IsEmpty && TryParseJson(ref buffer, out var jsonDocument)) + { + yield return jsonDocument.Deserialize(_options); + } + + if (result.IsCompleted) + { + break; + } + + reader.AdvanceTo(buffer.Start, buffer.End); + } + + await reader.CompleteAsync(); } - public Task Deserialize(JsonReader jsonReader, CancellationToken cancellationToken) + private static bool TryParseJson(ref ReadOnlySequence buffer, out JsonDocument jsonDocument) { - var tcs = new TaskCompletionSource(); - using (cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken))) + var reader = new Utf8JsonReader(buffer, isFinalBlock: false, default); + + if (JsonDocument.TryParseValue(ref reader, out jsonDocument)) { - Task.Factory.StartNew( - () => tcs.TrySetResult(_serializer.Deserialize(jsonReader)), - cancellationToken, - TaskCreationOptions.LongRunning, - TaskScheduler.Default - ); - - return tcs.Task; + buffer = buffer.Slice(reader.BytesConsumed); + return true; } + + return false; } public T DeserializeObject(string json) { - return JsonConvert.DeserializeObject(json, this._settings); + return System.Text.Json.JsonSerializer.Deserialize(json, _options); } public string SerializeObject(T value) { - return JsonConvert.SerializeObject(value, this._settings); + return System.Text.Json.JsonSerializer.Serialize(value, _options); + } + + public JsonContent GetHttpContent(T value) + { + return JsonContent.Create(value, options: _options); } } } diff --git a/src/Docker.DotNet/JsonVersionConverter.cs b/src/Docker.DotNet/JsonVersionConverter.cs deleted file mode 100644 index b27871c3..00000000 --- a/src/Docker.DotNet/JsonVersionConverter.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using Newtonsoft.Json; - -namespace Docker.DotNet -{ - internal class JsonVersionConverter : JsonConverter - { - public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) - { - throw new NotImplementedException(); - } - - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) - { - var strVal = reader.Value as string; - if (strVal == null) - { - var valueType = reader.Value == null ? "" : reader.Value.GetType().FullName; - throw new InvalidOperationException($"Cannot deserialize value of type '{valueType}' to '{objectType.FullName}' "); - } - - return Version.Parse(strVal); - } - - public override bool CanConvert(Type objectType) - { - return objectType == typeof (Version); - } - } -} \ No newline at end of file diff --git a/src/Docker.DotNet/MapQueryStringConverter.cs b/src/Docker.DotNet/MapQueryStringConverter.cs index 222ab9fc..6078541f 100644 --- a/src/Docker.DotNet/MapQueryStringConverter.cs +++ b/src/Docker.DotNet/MapQueryStringConverter.cs @@ -2,7 +2,6 @@ using System.Collections; using System.Diagnostics; using System.Reflection; -using Newtonsoft.Json; namespace Docker.DotNet { @@ -17,7 +16,7 @@ public string[] Convert(object o) { Debug.Assert(o != null); - return new[] { JsonConvert.SerializeObject(o) }; + return new[] { System.Text.Json.JsonSerializer.Serialize(o) }; } } } \ No newline at end of file diff --git a/src/Docker.DotNet/Models/ObjectExtensionData.cs b/src/Docker.DotNet/Models/ObjectExtensionData.cs index 200e9c74..3807e0de 100644 --- a/src/Docker.DotNet/Models/ObjectExtensionData.cs +++ b/src/Docker.DotNet/Models/ObjectExtensionData.cs @@ -1,12 +1,11 @@ using System.Collections.Generic; -using System.Runtime.Serialization; -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet.Models { public class ObjectExtensionData { - [JsonExtensionDataAttribute] + [JsonExtensionData] public IDictionary ExtensionData { get; set; } } } \ No newline at end of file diff --git a/src/Docker.DotNet/TimeSpanNanoSecondsConverter.cs b/src/Docker.DotNet/TimeSpanNanoSecondsConverter.cs index f2c5ef38..f6fb7b52 100644 --- a/src/Docker.DotNet/TimeSpanNanoSecondsConverter.cs +++ b/src/Docker.DotNet/TimeSpanNanoSecondsConverter.cs @@ -1,38 +1,23 @@ using System; -using Newtonsoft.Json; +using System.Text.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet { - internal class TimeSpanNanosecondsConverter : JsonConverter + internal class TimeSpanNanosecondsConverter : JsonConverter { - const int MiliSecondToNanoSecond = 1000000; - public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) - { - var timeSpan = value as TimeSpan?; - if (timeSpan == null) - { - return; - } - - writer.WriteValue((long)(timeSpan.Value.TotalMilliseconds * MiliSecondToNanoSecond)); - } + const int MilliSecondToNanoSecond = 1000000; - public override bool CanConvert(Type objectType) + public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - return objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?); + var valueInNanoSeconds = reader.GetInt64(); + var milliSecondValue = valueInNanoSeconds / MilliSecondToNanoSecond; + return TimeSpan.FromMilliseconds(milliSecondValue); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) + public override void Write(Utf8JsonWriter writer, TimeSpan timeSpan, JsonSerializerOptions options) { - var valueInNanoSeconds = (long?)reader.Value; - - if (!valueInNanoSeconds.HasValue) - { - return null; - } - var miliSecondValue = valueInNanoSeconds.Value / MiliSecondToNanoSecond; - - return TimeSpan.FromMilliseconds((long)miliSecondValue); + writer.WriteNumberValue((long)(timeSpan.TotalMilliseconds * MilliSecondToNanoSecond)); } } } \ No newline at end of file diff --git a/src/Docker.DotNet/TimeSpanSecondsConverter.cs b/src/Docker.DotNet/TimeSpanSecondsConverter.cs index 0704ab40..22adfe3b 100644 --- a/src/Docker.DotNet/TimeSpanSecondsConverter.cs +++ b/src/Docker.DotNet/TimeSpanSecondsConverter.cs @@ -1,36 +1,29 @@ using System; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; namespace Docker.DotNet { - internal class TimeSpanSecondsConverter : JsonConverter + internal class TimeSpanSecondsConverter : JsonConverter { - public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) + public override TimeSpan? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - var timeSpan = value as TimeSpan?; - if (timeSpan == null) + if (reader.TokenType == JsonTokenType.Null) { - return; + return null; } - writer.WriteValue((long)timeSpan.Value.TotalSeconds); + return TimeSpan.FromSeconds(reader.GetInt64()); } - public override bool CanConvert(Type objectType) + public override void Write(Utf8JsonWriter writer, TimeSpan? value, JsonSerializerOptions options) { - return objectType == typeof(TimeSpan) || objectType == typeof(TimeSpan?); - } - - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) - { - var valueInSeconds = (long?)reader.Value; - if(!valueInSeconds.HasValue) + if (value == null) { - return null; + return; } - return TimeSpan.FromSeconds(valueInSeconds.Value); + writer.WriteNumberValue((long)value.Value.TotalSeconds); } } } \ No newline at end of file diff --git a/test/Docker.DotNet.Tests/IContainerOperationsTests.cs b/test/Docker.DotNet.Tests/IContainerOperationsTests.cs index 3da5a876..462865a2 100644 --- a/test/Docker.DotNet.Tests/IContainerOperationsTests.cs +++ b/test/Docker.DotNet.Tests/IContainerOperationsTests.cs @@ -441,7 +441,7 @@ await _dockerClient.Containers.GetContainerStatsAsync( linkedCts.Token ); } - catch (TaskCanceledException) + catch (OperationCanceledException) { // this is expected to happen on task cancelaltion } @@ -534,7 +534,7 @@ await _dockerClient.Containers.GetContainerStatsAsync( linkedTcs.Token ); } - catch (TaskCanceledException) + catch (OperationCanceledException) { // this is expected to happen on task cancelaltion } diff --git a/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs b/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs index 61f805a4..bcf39406 100644 --- a/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs +++ b/test/Docker.DotNet.Tests/ISystemOperations.Tests.cs @@ -119,7 +119,7 @@ await _dockerClient.Images.DeleteImageAsync( cts.Cancel(); - await Assert.ThrowsAsync(() => task).ConfigureAwait(false); + await Assert.ThrowsAsync(() => task).ConfigureAwait(false); Assert.True(wasProgressCalled); } @@ -184,7 +184,7 @@ public async Task MonitorEventsAsync_IsCancelled_NoStreamCorruption() monitorTask.GetAwaiter().GetResult(); } - catch (TaskCanceledException) + catch (OperationCanceledException) { // Exceptions other than this causes test to fail } @@ -267,7 +267,7 @@ await _dockerClient.Images.TagImageAsync( await Task.Delay(TimeSpan.FromSeconds(1)); cts.Cancel(); - await Assert.ThrowsAsync(() => task); + await Assert.ThrowsAsync(() => task); Assert.Equal(2, progressCalledCounter); Assert.True(task.IsCanceled); From 8ed97cef9957095fa945f14a80e2d92a4289abc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Thu, 7 Mar 2024 17:11:41 +0100 Subject: [PATCH 4/6] Avoid roundtrip to string by serializing directly to UTF-8 bytes --- src/Docker.DotNet/Endpoints/ImageOperations.cs | 7 ++----- src/Docker.DotNet/Endpoints/SwarmOperations.cs | 3 +-- src/Docker.DotNet/JsonSerializer.cs | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Docker.DotNet/Endpoints/ImageOperations.cs b/src/Docker.DotNet/Endpoints/ImageOperations.cs index 27e26d2f..6360da4b 100644 --- a/src/Docker.DotNet/Endpoints/ImageOperations.cs +++ b/src/Docker.DotNet/Endpoints/ImageOperations.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Net; using System.Net.Http; -using System.Text; using System.Threading; using System.Threading.Tasks; @@ -307,9 +306,7 @@ private Dictionary RegistryAuthHeaders(AuthConfig authConfig) { { RegistryAuthHeaderKey, - Convert.ToBase64String( - Encoding.UTF8.GetBytes( - this._client.JsonSerializer.SerializeObject(authConfig ?? new AuthConfig()))) + Convert.ToBase64String(this._client.JsonSerializer.SerializeObject(authConfig ?? new AuthConfig())) .Replace("/", "_").Replace("+", "-") // This is not documented in Docker API but from source code (https://github.com/docker/docker-ce/blob/10e40bd1548f69354a803a15fde1b672cc024b91/components/cli/cli/command/registry.go#L47) // and from multiple internet sources it has to be base64-url-safe. @@ -325,7 +322,7 @@ private Dictionary RegistryConfigHeaders(IEnumerable { { RegistryConfigHeaderKey, - Convert.ToBase64String(Encoding.UTF8.GetBytes(this._client.JsonSerializer.SerializeObject(configDictionary))) + Convert.ToBase64String(this._client.JsonSerializer.SerializeObject(configDictionary)) } }; } diff --git a/src/Docker.DotNet/Endpoints/SwarmOperations.cs b/src/Docker.DotNet/Endpoints/SwarmOperations.cs index 7a482a85..60635870 100644 --- a/src/Docker.DotNet/Endpoints/SwarmOperations.cs +++ b/src/Docker.DotNet/Endpoints/SwarmOperations.cs @@ -4,7 +4,6 @@ namespace Docker.DotNet using System.Collections.Generic; using System.Net; using System.Net.Http; - using System.Text; using System.Threading.Tasks; using System.Threading; using Models; @@ -226,7 +225,7 @@ private IDictionary RegistryAuthHeaders(AuthConfig authConfig) { { "X-Registry-Auth", - Convert.ToBase64String(Encoding.UTF8.GetBytes(this._client.JsonSerializer.SerializeObject(authConfig))) + Convert.ToBase64String(this._client.JsonSerializer.SerializeObject(authConfig)) } }; } diff --git a/src/Docker.DotNet/JsonSerializer.cs b/src/Docker.DotNet/JsonSerializer.cs index b62937fd..c2143ad6 100644 --- a/src/Docker.DotNet/JsonSerializer.cs +++ b/src/Docker.DotNet/JsonSerializer.cs @@ -68,9 +68,9 @@ public T DeserializeObject(string json) return System.Text.Json.JsonSerializer.Deserialize(json, _options); } - public string SerializeObject(T value) + public byte[] SerializeObject(T value) { - return System.Text.Json.JsonSerializer.Serialize(value, _options); + return System.Text.Json.JsonSerializer.SerializeToUtf8Bytes(value, _options); } public JsonContent GetHttpContent(T value) From 6a87013e18ed0f02c9e296a53f1707e538e4780c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Thu, 7 Mar 2024 17:53:33 +0100 Subject: [PATCH 5/6] Avoid roundtrip to string by deserializing directly from the HTTP response stream --- src/Docker.DotNet/DockerApiResponse.cs | 17 ----- src/Docker.DotNet/DockerClient.cs | 73 ++++++++++++++++--- .../Endpoints/ConfigsOperations.cs | 9 +-- .../Endpoints/ContainerOperations.cs | 39 ++++------ src/Docker.DotNet/Endpoints/ExecOperations.cs | 6 +- .../Endpoints/ImageOperations.cs | 21 ++---- .../Endpoints/NetworkOperations.cs | 12 +-- .../Endpoints/PluginOperations.cs | 9 +-- .../Endpoints/SecretsOperations.cs | 9 +-- .../Endpoints/SwarmOperations.cs | 30 +++----- .../Endpoints/SystemOperations.cs | 12 ++- .../Endpoints/TasksOperations.cs | 6 +- .../Endpoints/VolumeOperations.cs | 16 ++-- src/Docker.DotNet/JsonSerializer.cs | 10 ++- 14 files changed, 129 insertions(+), 140 deletions(-) delete mode 100644 src/Docker.DotNet/DockerApiResponse.cs diff --git a/src/Docker.DotNet/DockerApiResponse.cs b/src/Docker.DotNet/DockerApiResponse.cs deleted file mode 100644 index 8639137d..00000000 --- a/src/Docker.DotNet/DockerApiResponse.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Net; - -namespace Docker.DotNet -{ - internal class DockerApiResponse - { - public HttpStatusCode StatusCode { get; private set; } - - public string Body { get; private set; } - - public DockerApiResponse(HttpStatusCode statusCode, string body) - { - this.StatusCode = statusCode; - this.Body = body; - } - } -} \ No newline at end of file diff --git a/src/Docker.DotNet/DockerClient.cs b/src/Docker.DotNet/DockerClient.cs index 64a428f8..f04e24ee 100644 --- a/src/Docker.DotNet/DockerClient.cs +++ b/src/Docker.DotNet/DockerClient.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Net; using System.Net.Http; +using System.Net.Http.Json; using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; @@ -157,49 +158,92 @@ public void Dispose() _client.Dispose(); } - internal Task MakeRequestAsync( + internal Task MakeRequestAsync( IEnumerable errorHandlers, HttpMethod method, string path, CancellationToken token) { - return MakeRequestAsync(errorHandlers, method, path, null, null, token); + return MakeRequestAsync(errorHandlers, method, path, null, null, token); } - internal Task MakeRequestAsync( + internal Task MakeRequestAsync( + IEnumerable errorHandlers, + HttpMethod method, + string path, + CancellationToken token) + { + return MakeRequestAsync(errorHandlers, method, path, null, null, token); + } + + internal Task MakeRequestAsync( + IEnumerable errorHandlers, + HttpMethod method, + string path, + IQueryString queryString, + CancellationToken token) + { + return MakeRequestAsync(errorHandlers, method, path, queryString, null, token); + } + + internal Task MakeRequestAsync( + IEnumerable errorHandlers, + HttpMethod method, + string path, + IQueryString queryString, + CancellationToken token) + { + return MakeRequestAsync(errorHandlers, method, path, queryString, null, token); + } + + internal Task MakeRequestAsync( + IEnumerable errorHandlers, + HttpMethod method, + string path, + IQueryString queryString, + IRequestContent body, + CancellationToken token) + { + return MakeRequestAsync(errorHandlers, method, path, queryString, body, null, token); + } + + internal Task MakeRequestAsync( IEnumerable errorHandlers, HttpMethod method, string path, IQueryString queryString, + IRequestContent body, CancellationToken token) { - return MakeRequestAsync(errorHandlers, method, path, queryString, null, token); + return MakeRequestAsync(errorHandlers, method, path, queryString, body, null, token); } - internal Task MakeRequestAsync( + internal Task MakeRequestAsync( IEnumerable errorHandlers, HttpMethod method, string path, IQueryString queryString, IRequestContent body, + IDictionary headers, CancellationToken token) { - return MakeRequestAsync(errorHandlers, method, path, queryString, body, null, token); + return MakeRequestAsync(errorHandlers, method, path, queryString, body, headers, DefaultTimeout, token); } - internal Task MakeRequestAsync( + internal Task MakeRequestAsync( IEnumerable errorHandlers, HttpMethod method, string path, IQueryString queryString, IRequestContent body, IDictionary headers, + TimeSpan timeout, CancellationToken token) { - return MakeRequestAsync(errorHandlers, method, path, queryString, body, headers, DefaultTimeout, token); + return MakeRequestAsync(errorHandlers, method, path, queryString, body, headers, timeout, token); } - internal async Task MakeRequestAsync( + internal async Task MakeRequestAsync( IEnumerable errorHandlers, HttpMethod method, string path, @@ -217,10 +261,13 @@ internal async Task MakeRequestAsync( await HandleIfErrorResponseAsync(response.StatusCode, response, errorHandlers) .ConfigureAwait(false); - var responseBody = await response.Content.ReadAsStringAsync() - .ConfigureAwait(false); + if (typeof(T) == typeof(NoContent)) + { + return default; + } - return new DockerApiResponse(response.StatusCode, responseBody); + return await JsonSerializer.DeserializeAsync(response.Content, token) + .ConfigureAwait(false); } } @@ -469,6 +516,8 @@ private async Task HandleIfErrorResponseAsync(HttpStatusCode statusCode, HttpRes throw new DockerApiException(statusCode, responseBody); } } + + private struct NoContent {} } internal delegate void ApiResponseErrorHandlingDelegate(HttpStatusCode statusCode, string responseBody); diff --git a/src/Docker.DotNet/Endpoints/ConfigsOperations.cs b/src/Docker.DotNet/Endpoints/ConfigsOperations.cs index ec118263..ac466c29 100644 --- a/src/Docker.DotNet/Endpoints/ConfigsOperations.cs +++ b/src/Docker.DotNet/Endpoints/ConfigsOperations.cs @@ -18,8 +18,7 @@ internal ConfigOperations(DockerClient client) async Task> IConfigOperations.ListConfigsAsync(CancellationToken cancellationToken) { - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "configs", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject>(response.Body); + return await this._client.MakeRequestAsync>(this._client.NoErrorHandlers, HttpMethod.Get, "configs", cancellationToken).ConfigureAwait(false); } async Task IConfigOperations.CreateConfigAsync(SwarmCreateConfigParameters body, CancellationToken cancellationToken) @@ -30,8 +29,7 @@ async Task IConfigOperations.CreateConfigAsync(SwarmC } var data = new JsonRequestContent(body.Config, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "configs/create", null, data, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "configs/create", null, data, cancellationToken).ConfigureAwait(false); } async Task IConfigOperations.InspectConfigAsync(string id, CancellationToken cancellationToken) @@ -41,8 +39,7 @@ async Task IConfigOperations.InspectConfigAsync(string id, Cancella throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"configs/{id}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"configs/{id}", cancellationToken).ConfigureAwait(false); } Task IConfigOperations.RemoveConfigAsync(string id, CancellationToken cancellationToken) diff --git a/src/Docker.DotNet/Endpoints/ContainerOperations.cs b/src/Docker.DotNet/Endpoints/ContainerOperations.cs index 4fd1e343..7db06f3c 100644 --- a/src/Docker.DotNet/Endpoints/ContainerOperations.cs +++ b/src/Docker.DotNet/Endpoints/ContainerOperations.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Net; using System.Net.Http; -using System.Text; using System.Threading; using System.Threading.Tasks; @@ -43,8 +42,7 @@ internal ContainerOperations(DockerClient client) } IQueryString queryParameters = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "containers/json", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "containers/json", queryParameters, cancellationToken).ConfigureAwait(false); } public async Task CreateContainerAsync(CreateContainerParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -62,8 +60,7 @@ internal ContainerOperations(DockerClient client) } var data = new JsonRequestContent(parameters, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Post, "containers/create", qs, data, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Post, "containers/create", qs, data, cancellationToken).ConfigureAwait(false); } public async Task InspectContainerAsync(string id, CancellationToken cancellationToken = default(CancellationToken)) @@ -73,8 +70,7 @@ internal ContainerOperations(DockerClient client) throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"containers/{id}/json", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"containers/{id}/json", cancellationToken).ConfigureAwait(false); } public async Task ListProcessesAsync(string id, ContainerListProcessesParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -90,8 +86,7 @@ internal ContainerOperations(DockerClient client) } IQueryString queryParameters = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"containers/{id}/top", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"containers/{id}/top", queryParameters, cancellationToken).ConfigureAwait(false); } public Task GetContainerLogsAsync(string id, ContainerLogsParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -145,8 +140,7 @@ public Task GetContainerLogsAsync(string id, ContainerLogsParameters parameters, throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"containers/{id}/changes", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"containers/{id}/changes", cancellationToken).ConfigureAwait(false); } public Task ExportContainerAsync(string id, CancellationToken cancellationToken) @@ -208,8 +202,9 @@ public Task GetContainerStatsAsync(string id, ContainerStatsParameters p } var queryParams = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/start", queryParams, cancellationToken).ConfigureAwait(false); - return response.StatusCode != HttpStatusCode.NotModified; + bool? result = null; + await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler, (statusCode, _) => result = statusCode != HttpStatusCode.NotModified }, HttpMethod.Post, $"containers/{id}/start", queryParams, cancellationToken).ConfigureAwait(false); + return result ?? throw new InvalidOperationException(); } public async Task StopContainerAsync(string id, ContainerStopParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -227,8 +222,9 @@ public Task GetContainerStatsAsync(string id, ContainerStatsParameters p IQueryString queryParameters = new QueryString(parameters); // since specified wait timespan can be greater than HttpClient's default, we set the // client timeout to infinite and provide a cancellation token. - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/stop", queryParameters, null, null, TimeSpan.FromMilliseconds(Timeout.Infinite), cancellationToken).ConfigureAwait(false); - return response.StatusCode != HttpStatusCode.NotModified; + bool? result = null; + await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler, (statusCode, _) => result = statusCode != HttpStatusCode.NotModified }, HttpMethod.Post, $"containers/{id}/stop", queryParameters, null, null, TimeSpan.FromMilliseconds(Timeout.Infinite), cancellationToken).ConfigureAwait(false); + return result ?? throw new InvalidOperationException(); } public Task RestartContainerAsync(string id, ContainerRestartParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -327,8 +323,7 @@ public Task RenameContainerAsync(string id, ContainerRenameParameters parameters throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/wait", null, null, null, TimeSpan.FromMilliseconds(Timeout.Infinite), cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/wait", null, null, null, TimeSpan.FromMilliseconds(Timeout.Infinite), cancellationToken).ConfigureAwait(false); } public Task RemoveContainerAsync(string id, ContainerRemoveParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -367,9 +362,7 @@ public Task RenameContainerAsync(string id, ContainerRenameParameters parameters var bytes = Convert.FromBase64String(statHeader); - var stat = Encoding.UTF8.GetString(bytes, 0, bytes.Length); - - var pathStat = this._client.JsonSerializer.DeserializeObject(stat); + var pathStat = this._client.JsonSerializer.DeserializeObject(bytes); return new GetArchiveFromContainerResponse { @@ -399,8 +392,7 @@ public Task RenameContainerAsync(string id, ContainerRenameParameters parameters public async Task PruneContainersAsync(ContainersPruneParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "containers/prune", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "containers/prune", queryParameters, cancellationToken).ConfigureAwait(false); } public async Task UpdateContainerAsync(string id, ContainerUpdateParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -416,8 +408,7 @@ public async Task PruneContainersAsync(ContainersPruneP } var data = new JsonRequestContent(parameters, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/update", null, data, cancellationToken); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/update", null, data, cancellationToken); } } } \ No newline at end of file diff --git a/src/Docker.DotNet/Endpoints/ExecOperations.cs b/src/Docker.DotNet/Endpoints/ExecOperations.cs index 5b0152f6..0930eab3 100644 --- a/src/Docker.DotNet/Endpoints/ExecOperations.cs +++ b/src/Docker.DotNet/Endpoints/ExecOperations.cs @@ -37,8 +37,7 @@ internal ExecOperations(DockerClient client) } var data = new JsonRequestContent(parameters, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/exec", null, data, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Post, $"containers/{id}/exec", null, data, cancellationToken).ConfigureAwait(false); } public async Task InspectContainerExecAsync(string id, CancellationToken cancellationToken) @@ -48,8 +47,7 @@ public async Task InspectContainerExecAsync(string throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"exec/{id}/json", null, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchContainerHandler }, HttpMethod.Get, $"exec/{id}/json", null, cancellationToken).ConfigureAwait(false); } public Task ResizeContainerExecTtyAsync(string id, ContainerResizeParameters parameters, CancellationToken cancellationToken) diff --git a/src/Docker.DotNet/Endpoints/ImageOperations.cs b/src/Docker.DotNet/Endpoints/ImageOperations.cs index 6360da4b..39d249ea 100644 --- a/src/Docker.DotNet/Endpoints/ImageOperations.cs +++ b/src/Docker.DotNet/Endpoints/ImageOperations.cs @@ -40,8 +40,7 @@ internal ImageOperations(DockerClient client) } IQueryString queryParameters = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "images/json", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "images/json", queryParameters, cancellationToken).ConfigureAwait(false); } public Task BuildImageFromDockerfileAsync(Stream contents, ImageBuildParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -160,8 +159,7 @@ public Task BuildImageFromDockerfileAsync(ImageBuildParameters parameters, Strea throw new ArgumentNullException(nameof(name)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Get, $"images/{name}/json", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Get, $"images/{name}/json", cancellationToken).ConfigureAwait(false); } public async Task> GetImageHistoryAsync(string name, CancellationToken cancellationToken = default(CancellationToken)) @@ -171,8 +169,7 @@ public Task BuildImageFromDockerfileAsync(ImageBuildParameters parameters, Strea throw new ArgumentNullException(nameof(name)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Get, $"images/{name}/history", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Get, $"images/{name}/history", cancellationToken).ConfigureAwait(false); } public Task PushImageAsync(string name, ImagePushParameters parameters, AuthConfig authConfig, IProgress progress, CancellationToken cancellationToken = default(CancellationToken)) @@ -224,8 +221,7 @@ public Task BuildImageFromDockerfileAsync(ImageBuildParameters parameters, Strea } IQueryString queryParameters = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(new[] { NoSuchImageHandler }, HttpMethod.Delete, $"images/{name}", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject[]>(response.Body); + return await this._client.MakeRequestAsync[]>(new[] { NoSuchImageHandler }, HttpMethod.Delete, $"images/{name}", queryParameters, cancellationToken).ConfigureAwait(false); } public async Task> SearchImagesAsync(ImagesSearchParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -236,15 +232,13 @@ public Task BuildImageFromDockerfileAsync(ImageBuildParameters parameters, Strea } IQueryString queryParameters = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "images/search", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "images/search", queryParameters, cancellationToken).ConfigureAwait(false); } public async Task PruneImagesAsync(ImagesPruneParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "images/prune", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "images/prune", queryParameters, cancellationToken).ConfigureAwait(false); } public async Task CommitContainerChangesAsync(CommitContainerChangesParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -257,8 +251,7 @@ public async Task PruneImagesAsync(ImagesPruneParameters pa var data = new JsonRequestContent(parameters, this._client.JsonSerializer); IQueryString queryParameters = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "commit", queryParameters, data, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "commit", queryParameters, data, cancellationToken).ConfigureAwait(false); } public Task SaveImageAsync(string name, CancellationToken cancellationToken = default(CancellationToken)) diff --git a/src/Docker.DotNet/Endpoints/NetworkOperations.cs b/src/Docker.DotNet/Endpoints/NetworkOperations.cs index a4757b82..f8febe0d 100644 --- a/src/Docker.DotNet/Endpoints/NetworkOperations.cs +++ b/src/Docker.DotNet/Endpoints/NetworkOperations.cs @@ -29,8 +29,7 @@ internal NetworkOperations(DockerClient client) async Task> INetworkOperations.ListNetworksAsync(NetworksListParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "networks", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "networks", queryParameters, cancellationToken).ConfigureAwait(false); } async Task INetworkOperations.InspectNetworkAsync(string id, CancellationToken cancellationToken) @@ -40,8 +39,7 @@ async Task INetworkOperations.InspectNetworkAsync(string id, Ca throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchNetworkHandler }, HttpMethod.Get, $"networks/{id}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchNetworkHandler }, HttpMethod.Get, $"networks/{id}", cancellationToken).ConfigureAwait(false); } Task INetworkOperations.DeleteNetworkAsync(string id, CancellationToken cancellationToken) @@ -62,8 +60,7 @@ async Task INetworkOperations.CreateNetworkAsync(Network } var data = new JsonRequestContent(parameters, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "networks/create", null, data, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "networks/create", null, data, cancellationToken).ConfigureAwait(false); } Task INetworkOperations.ConnectNetworkAsync(string id, NetworkConnectParameters parameters, CancellationToken cancellationToken) @@ -106,8 +103,7 @@ Task INetworkOperations.DeleteUnusedNetworksAsync(NetworksDeleteUnusedParameters async Task INetworkOperations.PruneNetworksAsync(NetworksDeleteUnusedParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(null, HttpMethod.Post, "networks/prune", queryParameters, cancellationToken); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(null, HttpMethod.Post, "networks/prune", queryParameters, cancellationToken); } } } diff --git a/src/Docker.DotNet/Endpoints/PluginOperations.cs b/src/Docker.DotNet/Endpoints/PluginOperations.cs index df6e65bb..e26205dd 100644 --- a/src/Docker.DotNet/Endpoints/PluginOperations.cs +++ b/src/Docker.DotNet/Endpoints/PluginOperations.cs @@ -30,8 +30,7 @@ internal PluginOperations(DockerClient client) public async Task> ListPluginsAsync(PluginListParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) { IQueryString queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "plugins", queryParameters, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "plugins", queryParameters, cancellationToken).ConfigureAwait(false); } public async Task> GetPluginPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -42,8 +41,7 @@ internal PluginOperations(DockerClient client) } var query = new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "plugins/privileges", query, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "plugins/privileges", query, cancellationToken).ConfigureAwait(false); } public Task InstallPluginAsync(PluginInstallParameters parameters, IProgress progress, CancellationToken cancellationToken = default(CancellationToken)) @@ -75,8 +73,7 @@ public async Task InspectPluginAsync(string name, CancellationToken canc throw new ArgumentNullException(nameof(name)); } - var response = await this._client.MakeRequestAsync(new[] { NoSuchPluginHandler }, HttpMethod.Get, $"plugins/{name}/json", cancellationToken); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { NoSuchPluginHandler }, HttpMethod.Get, $"plugins/{name}/json", cancellationToken); } public Task RemovePluginAsync(string name, PluginRemoveParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) diff --git a/src/Docker.DotNet/Endpoints/SecretsOperations.cs b/src/Docker.DotNet/Endpoints/SecretsOperations.cs index 45ea29cd..174823c2 100644 --- a/src/Docker.DotNet/Endpoints/SecretsOperations.cs +++ b/src/Docker.DotNet/Endpoints/SecretsOperations.cs @@ -18,8 +18,7 @@ internal SecretsOperations(DockerClient client) async Task> ISecretsOperations.ListAsync(CancellationToken cancellationToken) { - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "secrets", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject>(response.Body); + return await this._client.MakeRequestAsync>(this._client.NoErrorHandlers, HttpMethod.Get, "secrets", cancellationToken).ConfigureAwait(false); } async Task ISecretsOperations.CreateAsync(SecretSpec body, CancellationToken cancellationToken) @@ -30,8 +29,7 @@ async Task ISecretsOperations.CreateAsync(SecretSpec body, } var data = new JsonRequestContent(body, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "secrets/create", null, data, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "secrets/create", null, data, cancellationToken).ConfigureAwait(false); } async Task ISecretsOperations.InspectAsync(string id, CancellationToken cancellationToken) @@ -41,8 +39,7 @@ async Task ISecretsOperations.InspectAsync(string id, CancellationToken throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"secrets/{id}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"secrets/{id}", cancellationToken).ConfigureAwait(false); } Task ISecretsOperations.DeleteAsync(string id, CancellationToken cancellationToken) diff --git a/src/Docker.DotNet/Endpoints/SwarmOperations.cs b/src/Docker.DotNet/Endpoints/SwarmOperations.cs index 60635870..bfbd0ec2 100644 --- a/src/Docker.DotNet/Endpoints/SwarmOperations.cs +++ b/src/Docker.DotNet/Endpoints/SwarmOperations.cs @@ -32,20 +32,18 @@ async Task ISwarmOperations.CreateServiceAsync(ServiceCre if (parameters == null) throw new ArgumentNullException(nameof(parameters)); var data = new JsonRequestContent(parameters.Service ?? throw new ArgumentNullException(nameof(parameters.Service)), this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Post, "services/create", null, data, RegistryAuthHeaders(parameters.RegistryAuth), cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Post, "services/create", null, data, RegistryAuthHeaders(parameters.RegistryAuth), cancellationToken).ConfigureAwait(false); } async Task ISwarmOperations.GetSwarmUnlockKeyAsync(CancellationToken cancellationToken) { - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, "swarm/unlockkey", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, "swarm/unlockkey", cancellationToken).ConfigureAwait(false); } async Task ISwarmOperations.InitSwarmAsync(SwarmInitParameters parameters, CancellationToken cancellationToken) { var data = new JsonRequestContent(parameters ?? throw new ArgumentNullException(nameof(parameters)), this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync( + return await this._client.MakeRequestAsync( new ApiResponseErrorHandlingDelegate[] { (statusCode, responseBody) => @@ -62,22 +60,18 @@ async Task ISwarmOperations.InitSwarmAsync(SwarmInitParameters parameter null, data, cancellationToken).ConfigureAwait(false); - - return response.Body; } async Task ISwarmOperations.InspectServiceAsync(string id, CancellationToken cancellationToken) { if (string.IsNullOrEmpty(id)) throw new ArgumentNullException(nameof(id)); - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"services/{id}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"services/{id}", cancellationToken).ConfigureAwait(false); } async Task ISwarmOperations.InspectSwarmAsync(CancellationToken cancellationToken) { - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, "swarm", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, "swarm", cancellationToken).ConfigureAwait(false); } async Task ISwarmOperations.JoinSwarmAsync(SwarmJoinParameters parameters, CancellationToken cancellationToken) @@ -126,10 +120,9 @@ await this._client.MakeRequestAsync( async Task> ISwarmOperations.ListServicesAsync(ServicesListParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters != null ? new QueryString(parameters) : null; - var response = await this._client - .MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"services", queryParameters, cancellationToken) + return await this._client + .MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"services", queryParameters, cancellationToken) .ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); } async Task ISwarmOperations.RemoveServiceAsync(string id, CancellationToken cancellationToken) @@ -152,8 +145,7 @@ async Task ISwarmOperations.UpdateServiceAsync(string id, var query = new QueryString(parameters); var body = new JsonRequestContent(parameters.Service ?? throw new ArgumentNullException(nameof(parameters.Service)), this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Post, $"services/{id}/update", query, body, RegistryAuthHeaders(parameters.RegistryAuth), cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Post, $"services/{id}/update", query, body, RegistryAuthHeaders(parameters.RegistryAuth), cancellationToken).ConfigureAwait(false); } public Task GetServiceLogsAsync(string id, ServiceLogsParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) @@ -232,15 +224,13 @@ private IDictionary RegistryAuthHeaders(AuthConfig authConfig) async Task> ISwarmOperations.ListNodesAsync(CancellationToken cancellationToken) { - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"nodes", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"nodes", cancellationToken).ConfigureAwait(false); } async Task ISwarmOperations.InspectNodeAsync(string id, CancellationToken cancellationToken) { if (string.IsNullOrEmpty(id)) throw new ArgumentNullException(nameof(id)); - var response = await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"nodes/{id}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"nodes/{id}", cancellationToken).ConfigureAwait(false); } async Task ISwarmOperations.RemoveNodeAsync(string id, bool force, CancellationToken cancellationToken) diff --git a/src/Docker.DotNet/Endpoints/SystemOperations.cs b/src/Docker.DotNet/Endpoints/SystemOperations.cs index 50179bf0..93d272f2 100644 --- a/src/Docker.DotNet/Endpoints/SystemOperations.cs +++ b/src/Docker.DotNet/Endpoints/SystemOperations.cs @@ -29,8 +29,7 @@ internal SystemOperations(DockerClient client) public async Task GetVersionAsync(CancellationToken cancellationToken = default(CancellationToken)) { - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "version", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "version", cancellationToken).ConfigureAwait(false); } public Task PingAsync(CancellationToken cancellationToken = default(CancellationToken)) @@ -40,8 +39,7 @@ internal SystemOperations(DockerClient client) public async Task GetSystemInfoAsync(CancellationToken cancellationToken = default(CancellationToken)) { - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "info", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "info", cancellationToken).ConfigureAwait(false); } public Task MonitorEventsAsync(ContainerEventsParameters parameters, CancellationToken cancellationToken) @@ -57,9 +55,9 @@ public Task MonitorEventsAsync(ContainerEventsParameters parameters, Can public Task MonitorEventsAsync(ContainerEventsParameters parameters, IProgress progress, CancellationToken cancellationToken = default(CancellationToken)) { - if (progress == null) - { - throw new ArgumentNullException(nameof(progress)); + if (progress == null) + { + throw new ArgumentNullException(nameof(progress)); } return StreamUtil.MonitorStreamForMessagesAsync( diff --git a/src/Docker.DotNet/Endpoints/TasksOperations.cs b/src/Docker.DotNet/Endpoints/TasksOperations.cs index d6d6d18a..5bab20cc 100644 --- a/src/Docker.DotNet/Endpoints/TasksOperations.cs +++ b/src/Docker.DotNet/Endpoints/TasksOperations.cs @@ -28,8 +28,7 @@ async Task> ITasksOperations.ListAsync(TasksListParameters p query = new QueryString(parameters); } - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "tasks", query, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject>(response.Body); + return await this._client.MakeRequestAsync>(this._client.NoErrorHandlers, HttpMethod.Get, "tasks", query, cancellationToken).ConfigureAwait(false); } async Task ITasksOperations.InspectAsync(string id, CancellationToken cancellationToken) @@ -39,8 +38,7 @@ async Task ITasksOperations.InspectAsync(string id, CancellationTo throw new ArgumentNullException(nameof(id)); } - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"tasks/{id}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"tasks/{id}", cancellationToken).ConfigureAwait(false); } } } \ No newline at end of file diff --git a/src/Docker.DotNet/Endpoints/VolumeOperations.cs b/src/Docker.DotNet/Endpoints/VolumeOperations.cs index 69e74138..3d4572c1 100644 --- a/src/Docker.DotNet/Endpoints/VolumeOperations.cs +++ b/src/Docker.DotNet/Endpoints/VolumeOperations.cs @@ -1,6 +1,5 @@ using Docker.DotNet.Models; using System; -using System.IO; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -18,15 +17,13 @@ internal VolumeOperations(DockerClient client) async Task IVolumeOperations.ListAsync(CancellationToken cancellationToken) { - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "volumes", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "volumes", cancellationToken).ConfigureAwait(false); } async Task IVolumeOperations.ListAsync(VolumesListParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "volumes", queryParameters, null, cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, "volumes", queryParameters, null, cancellationToken).ConfigureAwait(false); } async Task IVolumeOperations.CreateAsync(VolumesCreateParameters parameters, CancellationToken cancellationToken) @@ -37,8 +34,7 @@ async Task IVolumeOperations.CreateAsync(VolumesCreateParameters } var data = new JsonRequestContent(parameters, this._client.JsonSerializer); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "volumes/create", null, data, cancellationToken); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "volumes/create", null, data, cancellationToken); } async Task IVolumeOperations.InspectAsync(string name, CancellationToken cancellationToken) @@ -48,8 +44,7 @@ async Task IVolumeOperations.InspectAsync(string name, Cancellat throw new ArgumentNullException(nameof(name)); } - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"volumes/{name}", cancellationToken).ConfigureAwait(false); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Get, $"volumes/{name}", cancellationToken).ConfigureAwait(false); } Task IVolumeOperations.RemoveAsync(string name, bool? force, CancellationToken cancellationToken) @@ -65,8 +60,7 @@ Task IVolumeOperations.RemoveAsync(string name, bool? force, CancellationToken c async Task IVolumeOperations.PruneAsync(VolumesPruneParameters parameters, CancellationToken cancellationToken) { var queryParameters = parameters == null ? null : new QueryString(parameters); - var response = await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, $"volumes/prune", queryParameters, cancellationToken); - return this._client.JsonSerializer.DeserializeObject(response.Body); + return await this._client.MakeRequestAsync(this._client.NoErrorHandlers, HttpMethod.Post, "volumes/prune", queryParameters, cancellationToken); } } } \ No newline at end of file diff --git a/src/Docker.DotNet/JsonSerializer.cs b/src/Docker.DotNet/JsonSerializer.cs index c2143ad6..d3395e1c 100644 --- a/src/Docker.DotNet/JsonSerializer.cs +++ b/src/Docker.DotNet/JsonSerializer.cs @@ -2,11 +2,13 @@ using System.Collections.Generic; using System.IO; using System.IO.Pipelines; +using System.Net.Http; using System.Net.Http.Json; using System.Runtime.CompilerServices; using System.Text.Json; using System.Text.Json.Serialization; using System.Threading; +using System.Threading.Tasks; namespace Docker.DotNet { @@ -63,7 +65,7 @@ private static bool TryParseJson(ref ReadOnlySequence buffer, out JsonDocu return false; } - public T DeserializeObject(string json) + public T DeserializeObject(byte[] json) { return System.Text.Json.JsonSerializer.Deserialize(json, _options); } @@ -77,5 +79,11 @@ public JsonContent GetHttpContent(T value) { return JsonContent.Create(value, options: _options); } + + public async Task DeserializeAsync(HttpContent content, CancellationToken token) + { + return await content.ReadFromJsonAsync(_options, token) + .ConfigureAwait(false); + } } } From 5150c424fb96adc9fe3d7c2a2908b1cddac27392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Thu, 4 Jul 2024 21:04:48 +0200 Subject: [PATCH 6/6] Fix deserialization of enums --- src/Docker.DotNet/JsonEnumMemberConverter.cs | 36 ++++++++++++++++++++ src/Docker.DotNet/JsonSerializer.cs | 5 +-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/Docker.DotNet/JsonEnumMemberConverter.cs diff --git a/src/Docker.DotNet/JsonEnumMemberConverter.cs b/src/Docker.DotNet/JsonEnumMemberConverter.cs new file mode 100644 index 00000000..dbb60799 --- /dev/null +++ b/src/Docker.DotNet/JsonEnumMemberConverter.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Docker.DotNet; + +// Adapted from https://github.com/dotnet/runtime/issues/74385#issuecomment-1705083109 +internal sealed class JsonEnumMemberConverter : JsonStringEnumConverter where TEnum : struct, Enum +{ + public JsonEnumMemberConverter() : base(namingPolicy: ResolveNamingPolicy()) + { + } + + private static JsonNamingPolicy ResolveNamingPolicy() + { + var map = typeof(TEnum).GetFields(BindingFlags.Public | BindingFlags.Static) + .Select(f => (f.Name, AttributeName: f.GetCustomAttribute()?.Value)) + .Where(pair => pair.AttributeName != null) + .ToDictionary(e => e.Name, e => e.AttributeName); + + return map.Count > 0 ? new EnumMemberNamingPolicy(map) : null; + } + + private sealed class EnumMemberNamingPolicy : JsonNamingPolicy + { + private readonly IReadOnlyDictionary _map; + + public EnumMemberNamingPolicy(IReadOnlyDictionary map) => _map = map; + + public override string ConvertName(string name) => _map.TryGetValue(name, out var newName) ? newName : name; + } +} \ No newline at end of file diff --git a/src/Docker.DotNet/JsonSerializer.cs b/src/Docker.DotNet/JsonSerializer.cs index d3395e1c..d9b97992 100644 --- a/src/Docker.DotNet/JsonSerializer.cs +++ b/src/Docker.DotNet/JsonSerializer.cs @@ -6,9 +6,9 @@ using System.Net.Http.Json; using System.Runtime.CompilerServices; using System.Text.Json; -using System.Text.Json.Serialization; using System.Threading; using System.Threading.Tasks; +using Docker.DotNet.Models; namespace Docker.DotNet { @@ -21,9 +21,10 @@ internal class JsonSerializer { Converters = { + new JsonEnumMemberConverter(), + new JsonEnumMemberConverter(), new JsonDateTimeConverter(), new JsonNullableDateTimeConverter(), - new JsonStringEnumConverter(), new JsonBase64Converter(), }, };