QPID-8666: [Broker-J] Moved BROKER constant to BrokerStoreUpgraderAnd…

…Recoverer
apache · Feb 2, 2024 · dae78d9 · dae78d9
1 parent f154ea9
commit dae78d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ain/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java b/...ain/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java
@@ -31,7 +31,6 @@
 
 abstract class AbstractConfigurationStoreUpgraderAndRecoverer
 {
-    protected static final String BROKER = "Broker";
     protected static final String VIRTUALHOST = "VirtualHost";
     protected static final String JDBC_VIRTUALHOST_TYPE = "JDBC";
     protected static final String CONTEXT = "context";

diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
@@ -48,7 +48,9 @@ public class BrokerStoreUpgraderAndRecoverer extends AbstractConfigurationStoreU
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(BrokerStoreUpgraderAndRecoverer.class);
 
-    public static final String VIRTUALHOSTS = "virtualhosts";
+    private static final String BROKER = "Broker";
+    private static final String VIRTUALHOSTS = "virtualhosts";
+
     private final SystemConfig<?> _systemConfig;
 
     // Note: don't use externally defined constants in upgraders in case they change, the values here MUST stay the same