dohertj2/natsnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove duplicate gateway types from MonitorTypes.cs

Browse Source 
GatewayzOptions, Gatewayz, RemoteGatewayz, AccountGatewayz were defined
in both MonitorHelpers.cs (batch 42) and MonitorTypes.cs (batch 46).
Removed duplicates from MonitorTypes.cs, keeping the versions in
MonitorHelpers.cs.
This commit is contained in:
Joseph Doherty
2026-03-01 09:18:02 -05:00
parent ab71f03b46
commit 01c47b1b35
2 changed files with 3 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
dotnet/src/ZB.MOM.NatsNet.Server/Monitor/MonitorTypes.cs
View File

@@ -607,105 +607,8 @@ public sealed class Subsz
}
// ============================================================================
// Gatewayz — gateway monitoring types
// Mirrors Go types in server/monitor.go.
// ============================================================================
/// <summary>Options for the <c>/gatewayz</c> endpoint. Mirrors Go <c>GatewayzOptions</c>.</summary>
public sealed class GatewayzOptions
{
[JsonPropertyName("name")]
public string Name { get; set; } = string.Empty;
[JsonPropertyName("accounts")]
public bool Accounts { get; set; }
[JsonPropertyName("account_name")]
public string AccountName { get; set; } = string.Empty;
[JsonPropertyName("subscriptions")]
public bool AccountSubscriptions { get; set; }
[JsonPropertyName("subscriptions_detail")]
public bool AccountSubscriptionsDetail { get; set; }
}
/// <summary>Top-level response for <c>/gatewayz</c>. Mirrors Go <c>Gatewayz</c>.</summary>
public sealed class Gatewayz
{
[JsonPropertyName("server_id")]
public string Id { get; set; } = string.Empty;
[JsonPropertyName("now")]
public DateTime Now { get; set; }
[JsonPropertyName("name")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? Name { get; set; }
[JsonPropertyName("host")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? Host { get; set; }
[JsonPropertyName("port")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public int Port { get; set; }
[JsonPropertyName("outbound_gateways")]
public Dictionary<string, RemoteGatewayz> OutboundGateways { get; set; } = [];
[JsonPropertyName("inbound_gateways")]
public Dictionary<string, List<RemoteGatewayz>> InboundGateways { get; set; } = [];
}
/// <summary>Remote gateway entry. Mirrors Go <c>RemoteGatewayz</c>.</summary>
public sealed class RemoteGatewayz
{
[JsonPropertyName("configured")]
public bool IsConfigured { get; set; }
[JsonPropertyName("connection")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public ConnInfo? Connection { get; set; }
[JsonPropertyName("accounts")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public List<AccountGatewayz>? Accounts { get; set; }
}
/// <summary>Per-account interest mode for gateway. Mirrors Go <c>AccountGatewayz</c>.</summary>
public sealed class AccountGatewayz
{
[JsonPropertyName("name")]
public string Name { get; set; } = string.Empty;
[JsonPropertyName("interest_mode")]
public string InterestMode { get; set; } = string.Empty;
[JsonPropertyName("no_interest_count")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public int NoInterestCount { get; set; }
[JsonPropertyName("interest_only_threshold")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public int InterestOnlyThreshold { get; set; }
[JsonPropertyName("num_subs")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public int TotalSubscriptions { get; set; }
[JsonPropertyName("num_queue_subs")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
public int NumQueueSubscriptions { get; set; }
[JsonPropertyName("subscriptions_list")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public List<string>? Subs { get; set; }
[JsonPropertyName("subscriptions_list_detail")]
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public List<SubDetail>? SubsDetail { get; set; }
}
// Gatewayz types (GatewayzOptions, Gatewayz, RemoteGatewayz, AccountGatewayz)
// are defined in MonitorHelpers.cs to avoid duplication.
// ============================================================================
// Leafz — leaf-node monitoring types