Skip to content

Commit a5d4578

Browse files
[ActivatorUtilitiesConstructor] is dependent on constructor ordering (#6959)
1 parent 0ef7098 commit a5d4578

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+683
-675
lines changed

src/HotChocolate/Core/src/Types.NodaTime/DurationType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ public class DurationType : StringToStructBaseType<Duration>
1313
private readonly IPattern<Duration>[] _allowedPatterns;
1414
private readonly IPattern<Duration> _serializationPattern;
1515

16-
/// <summary>
17-
/// Initializes a new instance of <see cref="DurationType"/>.
18-
/// </summary>
19-
[ActivatorUtilitiesConstructor]
20-
public DurationType() : this(DurationPattern.Roundtrip)
21-
{
22-
}
23-
2416
/// <summary>
2517
/// Initializes a new instance of <see cref="DurationType"/>.
2618
/// </summary>
@@ -36,6 +28,14 @@ public DurationType(params IPattern<Duration>[] allowedPatterns) : base("Duratio
3628
Description = NodaTimeResources.DurationType_Description;
3729
}
3830

31+
/// <summary>
32+
/// Initializes a new instance of <see cref="DurationType"/>.
33+
/// </summary>
34+
[ActivatorUtilitiesConstructor]
35+
public DurationType() : this(DurationPattern.Roundtrip)
36+
{
37+
}
38+
3939
/// <inheritdoc />
4040
protected override string Serialize(Duration runtimeValue)
4141
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/InstantType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ public class InstantType : StringToStructBaseType<Instant>
1313
private readonly IPattern<Instant>[] _allowedPatterns;
1414
private readonly IPattern<Instant> _serializationPattern;
1515

16-
/// <summary>
17-
/// Initializes a new instance of <see cref="InstantType"/>.
18-
/// </summary>
19-
[ActivatorUtilitiesConstructor]
20-
public InstantType() : this(InstantPattern.ExtendedIso)
21-
{
22-
}
23-
2416
/// <summary>
2517
/// Initializes a new instance of <see cref="InstantType"/>.
2618
/// </summary>
@@ -36,6 +28,14 @@ public InstantType(params IPattern<Instant>[] allowedPatterns) : base("Instant")
3628
Description = NodaTimeResources.InstantType_Description;
3729
}
3830

31+
/// <summary>
32+
/// Initializes a new instance of <see cref="InstantType"/>.
33+
/// </summary>
34+
[ActivatorUtilitiesConstructor]
35+
public InstantType() : this(InstantPattern.ExtendedIso)
36+
{
37+
}
38+
3939
/// <inheritdoc />
4040
protected override string Serialize(Instant runtimeValue)
4141
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/LocalDateTimeType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ public class LocalDateTimeType : StringToStructBaseType<LocalDateTime>
1313
private readonly IPattern<LocalDateTime>[] _allowedPatterns;
1414
private readonly IPattern<LocalDateTime> _serializationPattern;
1515

16-
/// <summary>
17-
/// Initializes a new instance of <see cref="LocalDateTimeType"/>.
18-
/// </summary>
19-
[ActivatorUtilitiesConstructor]
20-
public LocalDateTimeType() : this(LocalDateTimePattern.ExtendedIso)
21-
{
22-
}
23-
2416
/// <summary>
2517
/// Initializes a new instance of <see cref="LocalDateTimeType"/>.
2618
/// </summary>
@@ -36,6 +28,14 @@ public LocalDateTimeType(params IPattern<LocalDateTime>[] allowedPatterns) : bas
3628
Description = NodaTimeResources.LocalDateTimeType_Description;
3729
}
3830

31+
/// <summary>
32+
/// Initializes a new instance of <see cref="LocalDateTimeType"/>.
33+
/// </summary>
34+
[ActivatorUtilitiesConstructor]
35+
public LocalDateTimeType() : this(LocalDateTimePattern.ExtendedIso)
36+
{
37+
}
38+
3939
/// <inheritdoc />
4040
protected override string Serialize(LocalDateTime runtimeValue)
4141
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/LocalDateType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ public class LocalDateType : StringToStructBaseType<LocalDate>
1414
private readonly IPattern<LocalDate>[] _allowedPatterns;
1515
private readonly IPattern<LocalDate> _serializationPattern;
1616

17-
/// <summary>
18-
/// Initializes a new instance of <see cref="LocalDateType"/>.
19-
/// </summary>
20-
[ActivatorUtilitiesConstructor]
21-
public LocalDateType() : this(LocalDatePattern.Iso)
22-
{
23-
}
24-
2517
/// <summary>
2618
/// Initializes a new instance of <see cref="LocalDateType"/>.
2719
/// </summary>
@@ -37,6 +29,14 @@ public LocalDateType(params IPattern<LocalDate>[] allowedPatterns) : base("Local
3729
Description = NodaTimeResources.LocalDateType_Description;
3830
}
3931

32+
/// <summary>
33+
/// Initializes a new instance of <see cref="LocalDateType"/>.
34+
/// </summary>
35+
[ActivatorUtilitiesConstructor]
36+
public LocalDateType() : this(LocalDatePattern.Iso)
37+
{
38+
}
39+
4040
/// <inheritdoc />
4141
protected override string Serialize(LocalDate runtimeValue)
4242
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/LocalTimeType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ public class LocalTimeType : StringToStructBaseType<LocalTime>
1414
private readonly IPattern<LocalTime>[] _allowedPatterns;
1515
private readonly IPattern<LocalTime> _serializationPattern;
1616

17-
/// <summary>
18-
/// Initializes a new instance of <see cref="LocalTimeType"/>.
19-
/// </summary>
20-
[ActivatorUtilitiesConstructor]
21-
public LocalTimeType() : this(LocalTimePattern.ExtendedIso)
22-
{
23-
}
24-
2517
/// <summary>
2618
/// Initializes a new instance of <see cref="LocalTimeType"/>.
2719
/// </summary>
@@ -37,6 +29,14 @@ public LocalTimeType(params IPattern<LocalTime>[] allowedPatterns) : base("Local
3729
Description = NodaTimeResources.LocalTimeType_Description;
3830
}
3931

32+
/// <summary>
33+
/// Initializes a new instance of <see cref="LocalTimeType"/>.
34+
/// </summary>
35+
[ActivatorUtilitiesConstructor]
36+
public LocalTimeType() : this(LocalTimePattern.ExtendedIso)
37+
{
38+
}
39+
4040
/// <inheritdoc />
4141
protected override string Serialize(LocalTime runtimeValue)
4242
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/OffsetDateTimeType.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ public class OffsetDateTimeType : StringToStructBaseType<OffsetDateTime>
1313
private readonly IPattern<OffsetDateTime>[] _allowedPatterns;
1414
private readonly IPattern<OffsetDateTime> _serializationPattern;
1515

16-
/// <summary>
17-
/// Initializes a new instance of <see cref="OffsetDateTimeType"/>.
18-
/// </summary>
19-
[ActivatorUtilitiesConstructor]
20-
public OffsetDateTimeType() : this(OffsetDateTimePattern.ExtendedIso)
21-
{
22-
// Backwards compatibility with the original code's behavior
23-
_serializationPattern = OffsetDateTimePattern.GeneralIso;
24-
_allowedPatterns = [OffsetDateTimePattern.ExtendedIso,];
25-
}
26-
2716
/// <summary>
2817
/// Initializes a new instance of <see cref="OffsetDateTimeType"/>.
2918
/// </summary>
@@ -40,6 +29,17 @@ public OffsetDateTimeType(params IPattern<OffsetDateTime>[] allowedPatterns)
4029
Description = NodaTimeResources.OffsetDateTimeType_Description;
4130
}
4231

32+
/// <summary>
33+
/// Initializes a new instance of <see cref="OffsetDateTimeType"/>.
34+
/// </summary>
35+
[ActivatorUtilitiesConstructor]
36+
public OffsetDateTimeType() : this(OffsetDateTimePattern.ExtendedIso)
37+
{
38+
// Backwards compatibility with the original code's behavior
39+
_serializationPattern = OffsetDateTimePattern.GeneralIso;
40+
_allowedPatterns = [OffsetDateTimePattern.ExtendedIso,];
41+
}
42+
4343
/// <inheritdoc />
4444
protected override string Serialize(OffsetDateTime runtimeValue)
4545
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/OffsetDateType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ public class OffsetDateType : StringToStructBaseType<OffsetDate>
1515
private readonly IPattern<OffsetDate>[] _allowedPatterns;
1616
private readonly IPattern<OffsetDate> _serializationPattern;
1717

18-
/// <summary>
19-
/// Initializes a new instance of <see cref="OffsetDateType"/>.
20-
/// </summary>
21-
[ActivatorUtilitiesConstructor]
22-
public OffsetDateType() : this(OffsetDatePattern.GeneralIso)
23-
{
24-
}
25-
2618
/// <summary>
2719
/// Initializes a new instance of <see cref="OffsetDateType"/>.
2820
/// </summary>
@@ -38,6 +30,14 @@ public OffsetDateType(params IPattern<OffsetDate>[] allowedPatterns) : base("Off
3830
Description = NodaTimeResources.OffsetDateType_Description;
3931
}
4032

33+
/// <summary>
34+
/// Initializes a new instance of <see cref="OffsetDateType"/>.
35+
/// </summary>
36+
[ActivatorUtilitiesConstructor]
37+
public OffsetDateType() : this(OffsetDatePattern.GeneralIso)
38+
{
39+
}
40+
4141
/// <inheritdoc />
4242
protected override string Serialize(OffsetDate runtimeValue)
4343
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/OffsetTimeType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ public class OffsetTimeType : StringToStructBaseType<OffsetTime>
1414
private readonly IPattern<OffsetTime>[] _allowedPatterns;
1515
private readonly IPattern<OffsetTime> _serializationPattern;
1616

17-
/// <summary>
18-
/// Initializes a new instance of <see cref="OffsetTimeType"/>.
19-
/// </summary>
20-
[ActivatorUtilitiesConstructor]
21-
public OffsetTimeType() : this(OffsetTimePattern.GeneralIso)
22-
{
23-
}
24-
2517
/// <summary>
2618
/// Initializes a new instance of <see cref="OffsetTimeType"/>.
2719
/// </summary>
@@ -37,6 +29,14 @@ public OffsetTimeType(params IPattern<OffsetTime>[] allowedPatterns) : base("Off
3729
Description = NodaTimeResources.OffsetTimeType_Description;
3830
}
3931

32+
/// <summary>
33+
/// Initializes a new instance of <see cref="OffsetTimeType"/>.
34+
/// </summary>
35+
[ActivatorUtilitiesConstructor]
36+
public OffsetTimeType() : this(OffsetTimePattern.GeneralIso)
37+
{
38+
}
39+
4040
/// <inheritdoc />
4141
protected override string Serialize(OffsetTime runtimeValue)
4242
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/OffsetType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ public class OffsetType : StringToStructBaseType<Offset>
1515
private readonly IPattern<Offset>[] _allowedPatterns;
1616
private readonly IPattern<Offset> _serializationPattern;
1717

18-
/// <summary>
19-
/// Initializes a new instance of <see cref="OffsetType"/>.
20-
/// </summary>
21-
[ActivatorUtilitiesConstructor]
22-
public OffsetType() : this(OffsetPattern.GeneralInvariantWithZ)
23-
{
24-
}
25-
2618
/// <summary>
2719
/// Initializes a new instance of <see cref="OffsetType"/>.
2820
/// </summary>
@@ -38,6 +30,14 @@ public OffsetType(params IPattern<Offset>[] allowedPatterns) : base("Offset")
3830
Description = NodaTimeResources.OffsetType_Description;
3931
}
4032

33+
/// <summary>
34+
/// Initializes a new instance of <see cref="OffsetType"/>.
35+
/// </summary>
36+
[ActivatorUtilitiesConstructor]
37+
public OffsetType() : this(OffsetPattern.GeneralInvariantWithZ)
38+
{
39+
}
40+
4141
/// <inheritdoc />
4242
protected override string Serialize(Offset runtimeValue)
4343
=> _serializationPattern

src/HotChocolate/Core/src/Types.NodaTime/PeriodType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ public class PeriodType : StringToClassBaseType<Period>
1414
private readonly IPattern<Period>[] _allowedPatterns;
1515
private readonly IPattern<Period> _serializationPattern;
1616

17-
/// <summary>
18-
/// Initializes a new instance of <see cref="PeriodType"/>.
19-
/// </summary>
20-
[ActivatorUtilitiesConstructor]
21-
public PeriodType() : this(PeriodPattern.Roundtrip)
22-
{
23-
}
24-
2517
/// <summary>
2618
/// Initializes a new instance of <see cref="PeriodType"/>.
2719
/// </summary>
@@ -37,6 +29,14 @@ public PeriodType(params IPattern<Period>[] allowedPatterns) : base("Period")
3729
Description = NodaTimeResources.PeriodType_Description;
3830
}
3931

32+
/// <summary>
33+
/// Initializes a new instance of <see cref="PeriodType"/>.
34+
/// </summary>
35+
[ActivatorUtilitiesConstructor]
36+
public PeriodType() : this(PeriodPattern.Roundtrip)
37+
{
38+
}
39+
4040
/// <inheritdoc />
4141
protected override string Serialize(Period runtimeValue)
4242
=> _serializationPattern.Format(runtimeValue);

0 commit comments

Comments
 (0)