From 3fea2da2cffe1c2940286ec4ff4012faf8ac9498 Mon Sep 17 00:00:00 2001 From: Joseph Doherty Date: Mon, 23 Feb 2026 08:56:15 -0500 Subject: [PATCH] Fix merge regressions after jetstream parity merge --- src/NATS.Server/Monitoring/VarzHandler.cs | 1 - src/NATS.Server/Protocol/ClientCommandMatrix.cs | 4 ++-- src/NATS.Server/Protocol/ClientKind.cs | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 src/NATS.Server/Protocol/ClientKind.cs diff --git a/src/NATS.Server/Monitoring/VarzHandler.cs b/src/NATS.Server/Monitoring/VarzHandler.cs index a3bcf5f..cf4fb57 100644 --- a/src/NATS.Server/Monitoring/VarzHandler.cs +++ b/src/NATS.Server/Monitoring/VarzHandler.cs @@ -138,7 +138,6 @@ public sealed class VarzHandler : IDisposable Consumers = _server.JetStreamConsumers, }, }, - Mqtt = BuildMqttVarz(), }; } finally diff --git a/src/NATS.Server/Protocol/ClientCommandMatrix.cs b/src/NATS.Server/Protocol/ClientCommandMatrix.cs index 973e151..2754615 100644 --- a/src/NATS.Server/Protocol/ClientCommandMatrix.cs +++ b/src/NATS.Server/Protocol/ClientCommandMatrix.cs @@ -2,14 +2,14 @@ namespace NATS.Server.Protocol; public sealed class ClientCommandMatrix { - public bool IsAllowed(ClientKind kind, string? op) + public bool IsAllowed(global::NATS.Server.ClientKind kind, string? op) { if (string.IsNullOrWhiteSpace(op)) return true; return (kind, op.ToUpperInvariant()) switch { - (ClientKind.Router, "RS+") => true, + (global::NATS.Server.ClientKind.Router, "RS+") => true, (_, "RS+") => false, _ => true, }; diff --git a/src/NATS.Server/Protocol/ClientKind.cs b/src/NATS.Server/Protocol/ClientKind.cs deleted file mode 100644 index d0d9973..0000000 --- a/src/NATS.Server/Protocol/ClientKind.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace NATS.Server.Protocol; - -public enum ClientKind -{ - Client, - Router, - Gateway, - Leaf, - System, - JetStream, - Account, -}