Skip to content

Commit b9463ef

Browse files
authored
Fix wrong JsonConverter for HealthConfig.Timeout (#534)
1 parent c9687e4 commit b9463ef

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Runtime.Serialization;
4-
using Newtonsoft.Json;
5-
6-
namespace Docker.DotNet.Models
7-
{
8-
[DataContract]
9-
public class HealthConfig // (container.HealthConfig)
10-
{
11-
[DataMember(Name = "Test", EmitDefaultValue = false)]
12-
public IList<string> Test { get; set; }
13-
14-
[DataMember(Name = "Interval", EmitDefaultValue = false)]
15-
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
16-
public TimeSpan Interval { get; set; }
17-
18-
[DataMember(Name = "Timeout", EmitDefaultValue = false)]
19-
[JsonConverter(typeof(TimeSpanSecondsConverter))]
20-
public TimeSpan Timeout { get; set; }
21-
22-
[DataMember(Name = "StartPeriod", EmitDefaultValue = false)]
23-
public long StartPeriod { get; set; }
24-
25-
[DataMember(Name = "Retries", EmitDefaultValue = false)]
26-
public long Retries { get; set; }
27-
}
28-
}
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Runtime.Serialization;
4+
using Newtonsoft.Json;
5+
6+
namespace Docker.DotNet.Models
7+
{
8+
[DataContract]
9+
public class HealthConfig // (container.HealthConfig)
10+
{
11+
[DataMember(Name = "Test", EmitDefaultValue = false)]
12+
public IList<string> Test { get; set; }
13+
14+
[DataMember(Name = "Interval", EmitDefaultValue = false)]
15+
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
16+
public TimeSpan Interval { get; set; }
17+
18+
[DataMember(Name = "Timeout", EmitDefaultValue = false)]
19+
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
20+
public TimeSpan Timeout { get; set; }
21+
22+
[DataMember(Name = "StartPeriod", EmitDefaultValue = false)]
23+
public long StartPeriod { get; set; }
24+
25+
[DataMember(Name = "Retries", EmitDefaultValue = false)]
26+
public long Retries { get; set; }
27+
}
28+
}

tools/specgen/specgen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var typesToDisambiguate = map[string]*CSModelType{
4848
CSProperty{
4949
Name: "Timeout",
5050
Type: CSType{"System", "TimeSpan", true},
51-
Attributes: []CSAttribute{CSAttribute{Type: CSType{"Newtonsoft.Json", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanSecondsConverter)"}}}},
51+
Attributes: []CSAttribute{CSAttribute{Type: CSType{"Newtonsoft.Json", "JsonConverter", false}, Arguments: []CSArgument{{Value: "typeof(TimeSpanNanosecondsConverter)"}}}},
5252
},
5353
},
5454
},

0 commit comments

Comments
 (0)