(qpid-broker-j) branch main updated: QPID-8666: [Broker-J] Moved BROKER constant to BrokerStoreUpgraderAndRecoverer

[vavrtom]

This is an automated email from the ASF dual-hosted git repository.

vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/main by this push:
     new dae78d991f QPID-8666: [Broker-J] Moved BROKER constant to 
BrokerStoreUpgraderAndRecoverer
dae78d991f is described below

commit dae78d991f42c2ca2b85f9e365762bf98bf5e10f
Author: Tomas Vavricka <vavr...@apache.org>
AuthorDate: Fri Feb 2 09:40:06 2024 +0100

    QPID-8666: [Broker-J] Moved BROKER constant to 
BrokerStoreUpgraderAndRecoverer
---
 .../server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java  | 1 -
 .../org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java
 
b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java
index 924f48d568..90349ee905 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java
@@ -31,7 +31,6 @@ import org.apache.qpid.server.util.Action;
 
 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
index 820285238d..c06aaf3269 100644
--- 
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


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org