From 68b684b937aecd7416609c6a00fbd081a360d145 Mon Sep 17 00:00:00 2001
From: TheBurchLog <5104941+TheBurchLog@users.noreply.github.com>
Date: Wed, 13 Dec 2023 12:59:05 -0500
Subject: [PATCH] Cleanup

---
 CHANGELOG.rst                   | 2 +-
 brewtils/rest/publish_client.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f9b2e699..590d5045 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,7 +6,7 @@ Brewtils Changelog
 TBD
 
 - Added new KWARG input to @command for tag/tags. This can be utilized for filtering commands.
-- Adding defaul topic for PublishClient to Plugins {Namespace}.{System}.{Version}.{Instance}
+- Adding default topic for PublishClient to Plugins {Namespace}.{System}.{Version}.{Instance}
 - Removed Python 12 support until we upgrade Marshmallow dependency to 3.15 or greater
 
 3.21.0
diff --git a/brewtils/rest/publish_client.py b/brewtils/rest/publish_client.py
index 839b06db..536f6adf 100644
--- a/brewtils/rest/publish_client.py
+++ b/brewtils/rest/publish_client.py
@@ -78,7 +78,7 @@ def publish(
 
         Args:
             _topic (str): The topic to publish to, default is Plugin level topic
-                (Namespace.System.Version.Instance)
+                {Namespace}.{System}.{Version}.{Instance}
             _regex_only (bool): If the request will be resolved against only annotated topics
             from the @subscribe command
             _propagate (bool): If the request will be pushed up to the parent to be resolved.
@@ -92,9 +92,10 @@ def publish(
                 brewtils.plugin.CONFIG.name
                 and brewtils.plugin.CONFIG.version
                 and brewtils.plugin.CONFIG.instance_name
+                and brewtils.plugin.CONFIG.namespace
             ):
                 _topic = "{0}.{1}.{2}.{3}".format(
-                    brewtils.plugin.CONFIG.namespace or "",
+                    brewtils.plugin.CONFIG.namespace,
                     brewtils.plugin.CONFIG.name,
                     brewtils.plugin.CONFIG.version,
                     brewtils.plugin.CONFIG.instance_name,