diff --git a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/persist/api/TransactionInfo.java b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/persist/api/TransactionInfo.java
index a42fd7b3e..b5562051a 100644
--- a/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/persist/api/TransactionInfo.java
+++ b/mq/main/mq-broker/mqbroker-core/src/main/java/com/sun/messaging/jmq/jmsserver/persist/api/TransactionInfo.java
@@ -237,8 +237,7 @@ public Object clone() {
 
     @Override
     public String toString() {
-        return (new StringBuilder(128).append("TransactionInfo[type=").append(toString(type)).append(", state=").append(state).append(", home broker=")
-                .append(txnHomeBroker).append(", brokers=").append(Arrays.toString(txnBkrs)).append(']').toString());
+        return "TransactionInfo[type=" + toString(type) + ", state=" + state + ", home broker=" + txnHomeBroker + ", brokers=" + Arrays.toString(txnBkrs) + ']';
     }
 
     public static String toString(int type) {
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/BrokerDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/BrokerDAOImpl.java
index 68972582b..d510dc04e 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/BrokerDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/BrokerDAOImpl.java
@@ -75,50 +75,29 @@ class BrokerDAOImpl extends BaseDAOImpl implements BrokerDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(URL_COLUMN).append(", ")
-                .append(VERSION_COLUMN).append(", ").append(STATE_COLUMN).append(", ").append(TAKEOVER_BROKER_COLUMN).append(", ").append(HEARTBEAT_TS_COLUMN)
-                .append(") VALUES ( ?, ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + URL_COLUMN + ", " + VERSION_COLUMN + ", " + STATE_COLUMN + ", " + TAKEOVER_BROKER_COLUMN + ", " + HEARTBEAT_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ? )";
 
-        updateVersionSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(VERSION_COLUMN).append(" = ? ").append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        updateVersionSQL = "UPDATE " + tableName + " SET " + VERSION_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?";
 
-        updateURLSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(URL_COLUMN).append(" = ? ").append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        updateURLSQL = "UPDATE " + tableName + " SET " + URL_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?";
 
-        resetTakeoverBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TAKEOVER_BROKER_COLUMN).append(" = NULL, ")
-                .append(STATE_COLUMN).append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(TAKEOVER_BROKER_COLUMN)
-                .append(" IS NOT NULL").append(" AND ").append(STATE_COLUMN).append(" = ").append(BrokerState.I_FAILOVER_COMPLETE).toString();
+        resetTakeoverBrokerSQL = "UPDATE " + tableName + " SET " + TAKEOVER_BROKER_COLUMN + " = NULL, " + STATE_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " IS NOT NULL" + " AND " + STATE_COLUMN + " = " + (BrokerState.I_FAILOVER_COMPLETE);
 
-        restoreOnTakeoverFailSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TAKEOVER_BROKER_COLUMN).append(" = NULL, ")
-                .append(STATE_COLUMN).append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ")
-                .append(BrokerState.I_FAILOVER_STARTED).append(" AND ").append(TAKEOVER_BROKER_COLUMN).append(" = ?").toString();
+        restoreOnTakeoverFailSQL = "UPDATE " + tableName + " SET " + TAKEOVER_BROKER_COLUMN + " = NULL, " + STATE_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = " + (BrokerState.I_FAILOVER_STARTED) + " AND " + TAKEOVER_BROKER_COLUMN + " = ?";
 
-        restoreHeartbeatOnTakeoverFailSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(HEARTBEAT_TS_COLUMN)
-                .append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ")
-                .append(BrokerState.I_FAILOVER_STARTED).append(" AND ").append(HEARTBEAT_TS_COLUMN).append(" = ? ").append(" AND ")
-                .append(TAKEOVER_BROKER_COLUMN).append(" = ?").toString();
+        restoreHeartbeatOnTakeoverFailSQL = "UPDATE " + tableName + " SET " + HEARTBEAT_TS_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = " + (BrokerState.I_FAILOVER_STARTED) + " AND " + HEARTBEAT_TS_COLUMN + " = ? " + " AND " + TAKEOVER_BROKER_COLUMN + " = ?";
 
-        updateHeartbeatSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(HEARTBEAT_TS_COLUMN).append(" = ?")
-                .append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        updateHeartbeatSQL = "UPDATE " + tableName + " SET " + HEARTBEAT_TS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?";
 
-        updateHeartbeatAndCheckStateSQL = new StringBuilder(updateHeartbeatSQL).append(" AND ").append(HEARTBEAT_TS_COLUMN).append(" = ?").append(" AND ")
-                .append(STATE_COLUMN).append(" NOT IN (").append(BrokerState.I_FAILOVER_PENDING).append(", ").append(BrokerState.I_FAILOVER_STARTED)
-                .append(", ").append(BrokerState.I_FAILOVER_COMPLETE).append(", ").append(BrokerState.I_FAILOVER_FAILED).append(')').toString();
+        updateHeartbeatAndCheckStateSQL = updateHeartbeatSQL + " AND " + HEARTBEAT_TS_COLUMN + " = ?" + " AND " + STATE_COLUMN + " NOT IN (" + (BrokerState.I_FAILOVER_PENDING) + ", " + (BrokerState.I_FAILOVER_STARTED) + ", " + (BrokerState.I_FAILOVER_COMPLETE) + ", " + (BrokerState.I_FAILOVER_FAILED) + ')';
 
-        updateStateThisBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?")
-                .append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ?").append(" AND ")
-                .append(TAKEOVER_BROKER_COLUMN).append(" IS NULL ").toString();
+        updateStateThisBrokerSQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " IS NULL ";
 
-        updateStateOtherBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?")
-                .append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN).append(" = ?").append(" AND ")
-                .append(TAKEOVER_BROKER_COLUMN).append(" = ?").toString();
+        updateStateOtherBrokerSQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " = ?";
 
-        takeoverSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TAKEOVER_BROKER_COLUMN).append(" = ?, ")
-                .append(STATE_COLUMN).append(" = ?, ").append(HEARTBEAT_TS_COLUMN).append(" = ?").append(" WHERE ").append(ID_COLUMN).append(" = ?")
-                .append(" AND ").append(STATE_COLUMN).append(" = ?").append(" AND ").append(HEARTBEAT_TS_COLUMN).append(" = ?").append(" AND ")
-                .append(TAKEOVER_BROKER_COLUMN).append(" is NULL").toString();
+        takeoverSQL = "UPDATE " + tableName + " SET " + TAKEOVER_BROKER_COLUMN + " = ?, " + STATE_COLUMN + " = ?, " + HEARTBEAT_TS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?" + " AND " + HEARTBEAT_TS_COLUMN + " = ?" + " AND " + TAKEOVER_BROKER_COLUMN + " is NULL";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
         /*
          * All the supported store sessions for a broker is kept in the session table but for convenience we will load the
@@ -126,33 +105,23 @@ class BrokerDAOImpl extends BaseDAOImpl implements BrokerDAO {
          * another broker, then its value will be 0.
          */
 
-        selectAllSQL = new StringBuilder(128).append("SELECT bTbl.").append(ID_COLUMN).append(", ").append(URL_COLUMN).append(", ").append(VERSION_COLUMN)
-                .append(", ").append(STATE_COLUMN).append(", ").append(TAKEOVER_BROKER_COLUMN).append(", ").append(HEARTBEAT_TS_COLUMN).append(", sTbl.")
-                .append(StoreSessionDAO.ID_COLUMN).append(" AS ").append(STORE_SESSION_ID_COLUMN).append(" FROM ").append(tableName).append(" bTbl LEFT JOIN ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sTbl ON bTbl.").append(ID_COLUMN).append(" = sTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" AND sTbl.").append(StoreSessionDAO.IS_CURRENT_COLUMN).append(" = 1").toString();
+        selectAllSQL = "SELECT bTbl." + ID_COLUMN + ", " + URL_COLUMN + ", " + VERSION_COLUMN + ", " + STATE_COLUMN + ", " + TAKEOVER_BROKER_COLUMN + ", " + HEARTBEAT_TS_COLUMN + ", sTbl." + (StoreSessionDAO.ID_COLUMN) + " AS " + STORE_SESSION_ID_COLUMN + " FROM " + tableName + " bTbl LEFT JOIN " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sTbl ON bTbl." + ID_COLUMN + " = sTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " AND sTbl." + (StoreSessionDAO.IS_CURRENT_COLUMN) + " = 1";
 
-        selectAllByStateSQL = new StringBuilder(128).append(selectAllSQL).append(" WHERE bTbl.").append(STATE_COLUMN).append(" = ?").toString();
+        selectAllByStateSQL = selectAllSQL + " WHERE bTbl." + STATE_COLUMN + " = ?";
 
-        selectSQL = new StringBuilder(128).append(selectAllSQL).append(" WHERE bTbl.").append(ID_COLUMN).append(" = ?").toString();
+        selectSQL = selectAllSQL + " WHERE bTbl." + ID_COLUMN + " = ?";
 
-        selectHeartbeatSQL = new StringBuilder(128).append("SELECT ").append(HEARTBEAT_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        selectHeartbeatSQL = "SELECT " + HEARTBEAT_TS_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectAllHeartbeatsSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(HEARTBEAT_TS_COLUMN).append(" FROM ")
-                .append(tableName).toString();
+        selectAllHeartbeatsSQL = "SELECT " + ID_COLUMN + ", " + HEARTBEAT_TS_COLUMN + " FROM " + tableName;
 
-        selectStateSQL = new StringBuilder(128).append("SELECT ").append(STATE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
+        selectStateSQL = "SELECT " + STATE_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectAllStatesSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(STATE_COLUMN).append(" FROM ").append(tableName)
-                .toString();
+        selectAllStatesSQL = "SELECT " + ID_COLUMN + ", " + STATE_COLUMN + " FROM " + tableName;
 
         // SQL that can be embedded in EXISTS clause to check if the specified
         // broker is being takenover (uses by other DAOs)
-        selectIsBeingTakenOverSQL = new StringBuilder(128).append("SELECT 1 FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ? AND ")
-                .append(STATE_COLUMN).append(" IN (").append(BrokerState.I_FAILOVER_PENDING).append(", ").append(BrokerState.I_FAILOVER_STARTED).append(", ")
-                .append(BrokerState.I_FAILOVER_COMPLETE).append(", ").append(BrokerState.I_FAILOVER_FAILED).append(')').toString();
+        selectIsBeingTakenOverSQL = "SELECT 1 FROM " + tableName + " WHERE " + ID_COLUMN + " = ? AND " + STATE_COLUMN + " IN (" + (BrokerState.I_FAILOVER_PENDING) + ", " + (BrokerState.I_FAILOVER_STARTED) + ", " + (BrokerState.I_FAILOVER_COMPLETE) + ", " + (BrokerState.I_FAILOVER_FAILED) + ')';
     }
 
     /**
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConfigRecordDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConfigRecordDAOImpl.java
index fd84a33cd..451fc1608 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConfigRecordDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConfigRecordDAOImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -46,14 +46,11 @@ class ConfigRecordDAOImpl extends BaseDAOImpl implements ConfigRecordDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(RECORD_COLUMN).append(", ").append(CREATED_TS_COLUMN)
-                .append(") VALUES ( ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + RECORD_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ? )";
 
-        selectRecordsSinceSQL = new StringBuilder(128).append("SELECT ").append(RECORD_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(CREATED_TS_COLUMN).append(" > ?").toString();
+        selectRecordsSinceSQL = "SELECT " + RECORD_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName + " WHERE " + CREATED_TS_COLUMN + " > ?";
 
-        selectAllSQL = new StringBuilder(128).append("SELECT ").append(RECORD_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName)
-                .toString();
+        selectAllSQL = "SELECT " + RECORD_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName;
     }
 
     /**
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerDAOImpl.java
index 5976625a2..d2833a0bb 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerDAOImpl.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 2020 Payara Services Ltd.
  *
  * This program and the accompanying materials are made available under the
@@ -55,9 +55,7 @@ class ConsumerDAOImpl extends BaseDAOImpl implements ConsumerDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(CONSUMER_COLUMN)
-                .append(", ").append(DURABLE_NAME_COLUMN).append(", ").append(CLIENT_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN)
-                .append(") VALUES ( ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + CONSUMER_COLUMN + ", " + DURABLE_NAME_COLUMN + ", " + CLIENT_ID_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ? )";
 
         /*
          * insertNoDupSQLDual = new StringBuilder(128) .append( "INSERT INTO " ).append( tableName ) .append( " ( " ) .append(
@@ -67,23 +65,17 @@ class ConsumerDAOImpl extends BaseDAOImpl implements ConsumerDAO {
          * DURABLE_NAME_COLUMN ).append(" = ? ") .append( " AND ").append( CLIENT_ID_COLUMN ).append(" = ? )" ) .toString();
          */
 
-        insertNoDupSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(CONSUMER_COLUMN)
-                .append(", ").append(DURABLE_NAME_COLUMN).append(", ").append(CLIENT_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN)
-                .append(" ) SELECT ?, ?, ?, ?, ? FROM ").append(tableName).append(" WHERE ").append(DURABLE_NAME_COLUMN).append(" = ? ").append(" AND ")
-                .append(CLIENT_ID_COLUMN).append(" = ? ").append(" HAVING COUNT(*) ").append(" = 0 ").toString();
+        insertNoDupSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + CONSUMER_COLUMN + ", " + DURABLE_NAME_COLUMN + ", " + CLIENT_ID_COLUMN + ", " + CREATED_TS_COLUMN + " ) SELECT ?, ?, ?, ?, ? FROM " + tableName + " WHERE " + DURABLE_NAME_COLUMN + " = ? " + " AND " + CLIENT_ID_COLUMN + " = ? " + " HAVING COUNT(*) " + " = 0 ";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
+        selectSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectAllSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).toString();
+        selectAllSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName;
 
-        selectExistSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(DURABLE_NAME_COLUMN).append(" = ?").append(" AND ").append(CLIENT_ID_COLUMN).append(" = ?").toString();
+        selectExistSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName + " WHERE " + DURABLE_NAME_COLUMN + " = ?" + " AND " + CLIENT_ID_COLUMN + " = ?";
 
-        selectExistByIDSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        selectExistByIDSQL = "SELECT " + CONSUMER_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
     }
 
     /**
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerStateDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerStateDAOImpl.java
index c6eea6995..f54a468ef 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerStateDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ConsumerStateDAOImpl.java
@@ -78,67 +78,39 @@ class ConsumerStateDAOImpl extends BaseDAOImpl implements ConsumerStateDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(MESSAGE_ID_COLUMN).append(", ")
-                .append(CONSUMER_ID_COLUMN).append(", ").append(STATE_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ? )")
-                .toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + MESSAGE_ID_COLUMN + ", " + CONSUMER_ID_COLUMN + ", " + STATE_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ? )";
 
-        updateTransactionSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TRANSACTION_ID_COLUMN).append(" = ?")
-                .append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" = ?").append(" AND ").append(CONSUMER_ID_COLUMN).append(" = ?").append(" AND ")
-                .append(TRANSACTION_ID_COLUMN).append(" IS NULL").append(brokerNotTakenOverClause).toString();
+        updateTransactionSQL = "UPDATE " + tableName + " SET " + TRANSACTION_ID_COLUMN + " = ?" + " WHERE " + MESSAGE_ID_COLUMN + " = ?" + " AND " + CONSUMER_ID_COLUMN + " = ?" + " AND " + TRANSACTION_ID_COLUMN + " IS NULL" + brokerNotTakenOverClause;
 
-        updateTransactionNoCheckSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TRANSACTION_ID_COLUMN).append(" = ?")
-                .append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" = ?").append(" AND ").append(CONSUMER_ID_COLUMN).append(" = ?").append(" AND ")
-                .append(TRANSACTION_ID_COLUMN).append(" <> ?").append(brokerNotTakenOverClause).toString();
+        updateTransactionNoCheckSQL = "UPDATE " + tableName + " SET " + TRANSACTION_ID_COLUMN + " = ?" + " WHERE " + MESSAGE_ID_COLUMN + " = ?" + " AND " + CONSUMER_ID_COLUMN + " = ?" + " AND " + TRANSACTION_ID_COLUMN + " <> ?" + brokerNotTakenOverClause;
 
-        updateStateSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?").append(" WHERE ")
-                .append(MESSAGE_ID_COLUMN).append(" = ?").append(" AND ").append(CONSUMER_ID_COLUMN).append(" = ?").toString();
+        updateStateSQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?" + " WHERE " + MESSAGE_ID_COLUMN + " = ?" + " AND " + CONSUMER_ID_COLUMN + " = ?";
 
-        updateState2SQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?").append(" WHERE ")
-                .append(MESSAGE_ID_COLUMN).append(" = ?").append(" AND ").append(CONSUMER_ID_COLUMN).append(" = ?").append(" AND ").append(STATE_COLUMN)
-                .append(" = ?").toString();
+        updateState2SQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?" + " WHERE " + MESSAGE_ID_COLUMN + " = ?" + " AND " + CONSUMER_ID_COLUMN + " = ?" + " AND " + STATE_COLUMN + " = ?";
 
-        clearTxnSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TRANSACTION_ID_COLUMN).append(" = NULL")
-                .append(" WHERE ").append(TRANSACTION_ID_COLUMN).append(" = ?").append(brokerNotTakenOverClause).toString();
+        clearTxnSQL = "UPDATE " + tableName + " SET " + TRANSACTION_ID_COLUMN + " = NULL" + " WHERE " + TRANSACTION_ID_COLUMN + " = ?" + brokerNotTakenOverClause;
 
-        deleteByTxnSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(TRANSACTION_ID_COLUMN).append(" = ?")
-                .toString();
+        deleteByTxnSQL = "DELETE FROM " + tableName + " WHERE " + TRANSACTION_ID_COLUMN + " = ?";
 
-        deleteByDstSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" IN ")
-                .append("(SELECT msgTbl.").append(MessageDAO.ID_COLUMN).append(" FROM ").append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX))
-                .append(" msgTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(MessageDAO.STORE_SESSION_ID_COLUMN).append(" AND ").append(MessageDAO.DESTINATION_ID_COLUMN).append(" = ?)").toString();
+        deleteByDstSQL = "DELETE FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " IN " + "(SELECT msgTbl." + (MessageDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + (MessageDAO.STORE_SESSION_ID_COLUMN) + " AND " + (MessageDAO.DESTINATION_ID_COLUMN) + " = ?)";
 
-        deleteByDstBySessionSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" IN ")
-                .append("(SELECT msgTbl.").append(MessageDAO.ID_COLUMN).append(" FROM ").append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX))
-                .append(" msgTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(MessageDAO.STORE_SESSION_ID_COLUMN).append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = ?").append(" AND ")
-                .append(MessageDAO.DESTINATION_ID_COLUMN).append(" = ?)").toString();
+        deleteByDstBySessionSQL = "DELETE FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " IN " + "(SELECT msgTbl." + (MessageDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + (MessageDAO.STORE_SESSION_ID_COLUMN) + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = ?" + " AND " + (MessageDAO.DESTINATION_ID_COLUMN) + " = ?)";
 
-        deleteByMsgSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" = ?").toString();
+        deleteByMsgSQL = "DELETE FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " = ?";
 
-        selectStateSQL = new StringBuilder(128).append("SELECT ").append(STATE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(MESSAGE_ID_COLUMN).append(" = ?").append(" AND ").append(CONSUMER_ID_COLUMN).append(" = ?").toString();
+        selectStateSQL = "SELECT " + STATE_COLUMN + " FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " = ?" + " AND " + CONSUMER_ID_COLUMN + " = ?";
 
-        selectStatesByMsgSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_ID_COLUMN).append(", ").append(STATE_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" = ?").toString();
+        selectStatesByMsgSQL = "SELECT " + CONSUMER_ID_COLUMN + ", " + STATE_COLUMN + " FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " = ?";
 
-        selectTransactionSQL = new StringBuilder(128).append("SELECT ").append(TRANSACTION_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(MESSAGE_ID_COLUMN).append(" = ?").append(" AND ").append(CONSUMER_ID_COLUMN).append(" = ?").toString();
+        selectTransactionSQL = "SELECT " + TRANSACTION_ID_COLUMN + " FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " = ?" + " AND " + CONSUMER_ID_COLUMN + " = ?";
 
-        selectCountByMsgSQL = new StringBuilder(128).append("SELECT COUNT(*) FROM ").append(tableName).append(" WHERE ").append(MESSAGE_ID_COLUMN).append(" = ?")
-                .toString();
+        selectCountByMsgSQL = "SELECT COUNT(*) FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " = ?";
 
-        selectConsumerIDsByMsgSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(MESSAGE_ID_COLUMN).append(" = ? ").append(" AND ").append(STATE_COLUMN).append(" <> ")
-                .append(PartitionedStore.INTEREST_STATE_ACKNOWLEDGED).toString();
+        selectConsumerIDsByMsgSQL = "SELECT " + CONSUMER_ID_COLUMN + " FROM " + tableName + " WHERE " + MESSAGE_ID_COLUMN + " = ? " + " AND " + STATE_COLUMN + " <> " + (PartitionedStore.INTEREST_STATE_ACKNOWLEDGED);
 
-        selectTransactionAcksSQL = new StringBuilder(128).append("SELECT ").append(CONSUMER_ID_COLUMN).append(", ").append(MESSAGE_ID_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(TRANSACTION_ID_COLUMN).append(" = ?").toString();
+        selectTransactionAcksSQL = "SELECT " + CONSUMER_ID_COLUMN + ", " + MESSAGE_ID_COLUMN + " FROM " + tableName + " WHERE " + TRANSACTION_ID_COLUMN + " = ?";
 
-        selectAllTransactionAcksSQL = new StringBuilder(128).append("SELECT ").append(TRANSACTION_ID_COLUMN).append(", ").append(CONSUMER_ID_COLUMN).append(", ")
-                .append(MESSAGE_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(TRANSACTION_ID_COLUMN).append(" IS NOT NULL").toString();
+        selectAllTransactionAcksSQL = "SELECT " + TRANSACTION_ID_COLUMN + ", " + CONSUMER_ID_COLUMN + ", " + MESSAGE_ID_COLUMN + " FROM " + tableName + " WHERE " + TRANSACTION_ID_COLUMN + " IS NOT NULL";
     }
 
     /**
@@ -968,11 +940,7 @@ public void deleteAll(Connection conn) throws BrokerException {
             // WHERE sestbl.broker_id = 'mybroker' AND
             // sestbl.id = msgtbl.store_session_id)
             DBManager dbMgr = DBManager.getDBManager();
-            whereClause = new StringBuilder(128).append(MESSAGE_ID_COLUMN).append(" IN (SELECT msgTbl.").append(MessageDAO.ID_COLUMN).append(" FROM ")
-                    .append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX)).append(" msgTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX))
-                    .append(" sesTbl").append(" WHERE sesTbl.").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = '").append(dbMgr.getBrokerID())
-                    .append("' AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.").append(MessageDAO.STORE_SESSION_ID_COLUMN).append(')')
-                    .toString();
+            whereClause = MESSAGE_ID_COLUMN + " IN (SELECT msgTbl." + (MessageDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = '" + dbMgr.getBrokerID() + "' AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + (MessageDAO.STORE_SESSION_ID_COLUMN) + ')';
         }
 
         deleteAll(conn, whereClause, null, 0);
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java
index da822fb4c..1a00d60d8 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -59,34 +59,21 @@ class DestinationDAOImpl extends BaseDAOImpl implements DestinationDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(DESTINATION_COLUMN)
-                .append(", ").append(IS_LOCAL_COLUMN).append(", ").append(CONNECTION_ID_COLUMN).append(", ").append(CONNECTED_TS_COLUMN).append(", ")
-                .append(STORE_SESSION_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + DESTINATION_COLUMN + ", " + IS_LOCAL_COLUMN + ", " + CONNECTION_ID_COLUMN + ", " + CONNECTED_TS_COLUMN + ", " + STORE_SESSION_ID_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ?, ? )";
 
-        updateSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(DESTINATION_COLUMN).append(" = ?, ")
-                .append(IS_LOCAL_COLUMN).append(" = ?, ").append(CONNECTION_ID_COLUMN).append(" = ?").append(" WHERE ").append(ID_COLUMN).append(" = ?")
-                .toString();
+        updateSQL = "UPDATE " + tableName + " SET " + DESTINATION_COLUMN + " = ?, " + IS_LOCAL_COLUMN + " = ?, " + CONNECTION_ID_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?";
 
-        updateConnectedTimeSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(CONNECTED_TS_COLUMN).append(" = ?")
-                .append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        updateConnectedTimeSQL = "UPDATE " + tableName + " SET " + CONNECTED_TS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        deleteBySessionSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").append(" AND ")
-                .append(STORE_SESSION_ID_COLUMN).append(" = ? ").append(" AND EXISTS (SELECT * FROM ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.ID_COLUMN).append(" = ? ")
-                .append(" AND ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ? )").toString();
+        deleteBySessionSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?" + " AND " + STORE_SESSION_ID_COLUMN + " = ? " + " AND EXISTS (SELECT * FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.ID_COLUMN) + " = ? " + " AND " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ? )";
 
-        deleteSharedDstSQL = new StringBuilder(128).append(deleteSQL).append(" AND NOT EXISTS (SELECT * FROM ")
-                .append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(MessageDAO.DESTINATION_ID_COLUMN).append(" = ?)")
-                .append(" AND NOT EXISTS (SELECT * FROM ").append(dbMgr.getTableName(BrokerDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(BrokerDAO.ID_COLUMN)
-                .append(" <> ? ").append(" AND ").append(BrokerDAO.STATE_COLUMN).append(" = ").append(BrokerState.I_OPERATING).append(')').toString();
+        deleteSharedDstSQL = deleteSQL + " AND NOT EXISTS (SELECT * FROM " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " WHERE " + (MessageDAO.DESTINATION_ID_COLUMN) + " = ?)" + " AND NOT EXISTS (SELECT * FROM " + dbMgr.getTableName(BrokerDAO.TABLE_NAME_PREFIX) + " WHERE " + (BrokerDAO.ID_COLUMN) + " <> ? " + " AND " + (BrokerDAO.STATE_COLUMN) + " = " + (BrokerState.I_OPERATING) + ')';
 
-        selectSQL = new StringBuilder(128).append("SELECT ").append(DESTINATION_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
+        selectSQL = "SELECT " + DESTINATION_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectConnectedTimeSQL = new StringBuilder(128).append("SELECT ").append(CONNECTED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        selectConnectedTimeSQL = "SELECT " + CONNECTED_TS_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
         StringBuilder tmpbuf = new StringBuilder(128).append("SELECT ").append(DESTINATION_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
                 .append(ID_COLUMN).append(" IN (SELECT ").append(ID_COLUMN);
@@ -104,13 +91,9 @@ class DestinationDAOImpl extends BaseDAOImpl implements DestinationDAO {
         }
         selectDstsByBrokerSQL = tmpbuf.toString();
 
-        selectLocalDstsByBrokerSQL = new StringBuilder(128).append("SELECT ").append(DESTINATION_COLUMN).append(" FROM ").append(tableName).append(" dstTbl, ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl WHERE ").append(" sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND ").append(" sesTbl.").append(StoreSessionDAO.ID_COLUMN)
-                .append(" = dstTbl.").append(STORE_SESSION_ID_COLUMN).toString();
+        selectLocalDstsByBrokerSQL = "SELECT " + DESTINATION_COLUMN + " FROM " + tableName + " dstTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl WHERE " + " sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND " + " sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = dstTbl." + STORE_SESSION_ID_COLUMN;
 
-        selectExistSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
+        selectExistSQL = "SELECT " + ID_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
     }
 
     /**
@@ -495,10 +478,7 @@ public void deleteAll(Connection conn) throws BrokerException {
             // (SELECT id FROM mqses41cmycluster
             // WHERE id = mqdst41cmycluster.store_session_id AND
             // broker_id = 'mybroker')
-            whereClause = new StringBuilder(128).append("EXISTS (SELECT ").append(StoreSessionDAO.ID_COLUMN).append(" FROM ")
-                    .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.ID_COLUMN).append(" = ")
-                    .append(tableName).append('.').append(STORE_SESSION_ID_COLUMN).append(" AND ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = '")
-                    .append(dbMgr.getBrokerID()).append("')").toString();
+            whereClause = "EXISTS (SELECT " + (StoreSessionDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.ID_COLUMN) + " = " + tableName + '.' + STORE_SESSION_ID_COLUMN + " AND " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = '" + dbMgr.getBrokerID() + "')";
         }
 
         deleteAll(conn, whereClause, null, 0);
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MessageDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MessageDAOImpl.java
index 1e8e4cd5e..dc645dfc3 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MessageDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MessageDAOImpl.java
@@ -83,96 +83,50 @@ class MessageDAOImpl extends BaseDAOImpl implements MessageDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(MESSAGE_SIZE_COLUMN)
-                .append(", ").append(STORE_SESSION_ID_COLUMN).append(", ").append(DESTINATION_ID_COLUMN).append(", ").append(TRANSACTION_ID_COLUMN).append(", ")
-                .append(CREATED_TS_COLUMN).append(", ").append(MESSAGE_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + MESSAGE_SIZE_COLUMN + ", " + STORE_SESSION_ID_COLUMN + ", " + DESTINATION_ID_COLUMN + ", " + TRANSACTION_ID_COLUMN + ", " + CREATED_TS_COLUMN + ", " + MESSAGE_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ?, ? )";
 
-        updateDestinationSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(DESTINATION_ID_COLUMN).append(" = ?, ")
-                .append(MESSAGE_SIZE_COLUMN).append(" = ?, ").append(MESSAGE_COLUMN).append(" = ?").append(" WHERE ").append(ID_COLUMN).append(" = ?")
-                .toString();
+        updateDestinationSQL = "UPDATE " + tableName + " SET " + DESTINATION_ID_COLUMN + " = ?, " + MESSAGE_SIZE_COLUMN + " = ?, " + MESSAGE_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?";
 
-        repairSysMessageIDSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(ID_COLUMN).append(" = ?").append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?").toString();
+        repairSysMessageIDSQL = "UPDATE " + tableName + " SET " + ID_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + " AND " + DESTINATION_ID_COLUMN + " = ?";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        deleteByDstSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(DESTINATION_ID_COLUMN).append(" = ?")
-                .append(" AND ").append(STORE_SESSION_ID_COLUMN).append(" IN (SELECT ").append(StoreSessionDAO.ID_COLUMN).append(" FROM ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?)")
-                .toString();
+        deleteByDstSQL = "DELETE FROM " + tableName + " WHERE " + DESTINATION_ID_COLUMN + " = ?" + " AND " + STORE_SESSION_ID_COLUMN + " IN (SELECT " + (StoreSessionDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?)";
 
-        deleteByDstBySessionSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(DESTINATION_ID_COLUMN).append(" = ?")
-                .append(" AND ").append(STORE_SESSION_ID_COLUMN).append(" IN (SELECT ").append(StoreSessionDAO.ID_COLUMN).append(" FROM ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ? ")
-                .append(" AND ").append(StoreSessionDAO.ID_COLUMN).append(" = ?)").toString();
+        deleteByDstBySessionSQL = "DELETE FROM " + tableName + " WHERE " + DESTINATION_ID_COLUMN + " = ?" + " AND " + STORE_SESSION_ID_COLUMN + " IN (SELECT " + (StoreSessionDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ? " + " AND " + (StoreSessionDAO.ID_COLUMN) + " = ?)";
 
-        selectCountByBrokerSQL = new StringBuilder(128).append("SELECT COUNT(*) FROM ").append(tableName).append(" msgTbl, ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(STORE_SESSION_ID_COLUMN).toString();
+        selectCountByBrokerSQL = "SELECT COUNT(*) FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + STORE_SESSION_ID_COLUMN;
 
         // This query is a bit more complex because we want the SQL to count
         // the # of msgs, calculate the total size, and also determine if the
         // destination does exists
-        selectCountByDstBrokerSQL = new StringBuilder(128).append("SELECT totalmsg, totalsize, ").append(DestinationDAO.ID_COLUMN).append(" FROM ")
-                .append(dbMgr.getTableName(DestinationDAO.TABLE_NAME_PREFIX)).append(", (SELECT COUNT(msgTbl.").append(ID_COLUMN).append(") AS totalmsg, SUM(")
-                .append(MESSAGE_SIZE_COLUMN).append(") AS totalsize").append(" FROM ").append(tableName).append(" msgTbl, ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(STORE_SESSION_ID_COLUMN).append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?) msgtable").append(" WHERE ")
-                .append(DestinationDAO.ID_COLUMN).append(" = ?").toString();
-
-        selectCountByDstSessionSQL = new StringBuilder(128).append("SELECT totalmsg, totalsize, ").append(DestinationDAO.ID_COLUMN).append(" FROM ")
-                .append(dbMgr.getTableName(DestinationDAO.TABLE_NAME_PREFIX)).append(", (SELECT COUNT(").append(ID_COLUMN).append(") AS totalmsg, SUM(")
-                .append(MESSAGE_SIZE_COLUMN).append(") AS totalsize").append(" FROM ").append(tableName).append(" WHERE ").append(STORE_SESSION_ID_COLUMN)
-                .append("= ?").append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?) msgtable").append(" WHERE ").append(DestinationDAO.ID_COLUMN)
-                .append(" = ?").toString();
-
-        selectCountByConsumerAckedSQL = new StringBuilder(128).append("SELECT COUNT(*) AS total, SUM(CASE WHEN ").append(ConsumerStateDAO.STATE_COLUMN)
-                .append(" = ").append(PartitionedStore.INTEREST_STATE_ACKNOWLEDGED).append(" THEN 1 ELSE 0 END) AS totalAcked").append(" FROM ")
-                .append(dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(" = ?")
-                .toString();
-
-        selectSQL = new StringBuilder(128).append("SELECT ").append(MESSAGE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
-
-        selectMsgsBySessionSQL = new StringBuilder(128).append("SELECT ").append(MESSAGE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(STORE_SESSION_ID_COLUMN).append(" = ?").toString();
-
-        selectMsgsByBrokerSQL = new StringBuilder(128).append("SELECT ").append(MESSAGE_COLUMN).append(" FROM ").append(tableName).append(" msgTbl, ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(STORE_SESSION_ID_COLUMN).toString();
-
-        selectMsgIDsAndDstIDsByBrokerSQL = new StringBuilder(128).append("SELECT msgTbl.").append(ID_COLUMN).append(", msgTbl.").append(DESTINATION_ID_COLUMN)
-                .append(" FROM ").append(tableName).append(" msgTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl")
-                .append(" WHERE sesTbl.").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN)
-                .append(" = msgTbl.").append(STORE_SESSION_ID_COLUMN).toString();
-
-        selectForUpdateSQL = new StringBuilder(128).append(selectSQL).append(" FOR UPDATE").toString();
-
-        selectBrokerSQL = new StringBuilder(128).append("SELECT ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" FROM ").append(tableName)
-                .append(" msgTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE msgTbl.").append(ID_COLUMN)
-                .append(" = ?").append(" AND msgTbl.").append(STORE_SESSION_ID_COLUMN).append(" = sesTbl.").append(StoreSessionDAO.ID_COLUMN).toString();
-
-        selectIDsByDstBrokerSQL = new StringBuilder(128).append("SELECT msgTbl.").append(ID_COLUMN).append(" FROM ").append(tableName).append(" msgTbl, ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(STORE_SESSION_ID_COLUMN).append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?").toString();
-
-        selectIDsByDstSessionSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(" FROM ").append(tableName)
-                .append(" WHERE STORE_SESSION_ID_COLUMN = ?").append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?").toString();
-
-        selectMsgsByDstBrokerSQL = new StringBuilder(128).append("SELECT msgTbl.").append(MESSAGE_COLUMN).append(" FROM ").append(tableName).append(" msgTbl, ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = msgTbl.")
-                .append(STORE_SESSION_ID_COLUMN).append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?").toString();
-
-        selectMsgsByDstSessionSQL = new StringBuilder(128).append("SELECT ").append(MESSAGE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(STORE_SESSION_ID_COLUMN).append("= ?").append(" AND ").append(DESTINATION_ID_COLUMN).append(" = ?").toString();
-
-        selectExistSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
+        selectCountByDstBrokerSQL = "SELECT totalmsg, totalsize, " + (DestinationDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(DestinationDAO.TABLE_NAME_PREFIX) + ", (SELECT COUNT(msgTbl." + ID_COLUMN + ") AS totalmsg, SUM(" + MESSAGE_SIZE_COLUMN + ") AS totalsize" + " FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + STORE_SESSION_ID_COLUMN + " AND " + DESTINATION_ID_COLUMN + " = ?) msgtable" + " WHERE " + (DestinationDAO.ID_COLUMN) + " = ?";
+
+        selectCountByDstSessionSQL = "SELECT totalmsg, totalsize, " + (DestinationDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(DestinationDAO.TABLE_NAME_PREFIX) + ", (SELECT COUNT(" + ID_COLUMN + ") AS totalmsg, SUM(" + MESSAGE_SIZE_COLUMN + ") AS totalsize" + " FROM " + tableName + " WHERE " + STORE_SESSION_ID_COLUMN + "= ?" + " AND " + DESTINATION_ID_COLUMN + " = ?) msgtable" + " WHERE " + (DestinationDAO.ID_COLUMN) + " = ?";
+
+        selectCountByConsumerAckedSQL = "SELECT COUNT(*) AS total, SUM(CASE WHEN " + (ConsumerStateDAO.STATE_COLUMN) + " = " + (PartitionedStore.INTEREST_STATE_ACKNOWLEDGED) + " THEN 1 ELSE 0 END) AS totalAcked" + " FROM " + dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX) + " WHERE " + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + " = ?";
+
+        selectSQL = "SELECT " + MESSAGE_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
+
+        selectMsgsBySessionSQL = "SELECT " + MESSAGE_COLUMN + " FROM " + tableName + " WHERE " + STORE_SESSION_ID_COLUMN + " = ?";
+
+        selectMsgsByBrokerSQL = "SELECT " + MESSAGE_COLUMN + " FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + STORE_SESSION_ID_COLUMN;
+
+        selectMsgIDsAndDstIDsByBrokerSQL = "SELECT msgTbl." + ID_COLUMN + ", msgTbl." + DESTINATION_ID_COLUMN + " FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + STORE_SESSION_ID_COLUMN;
+
+        selectForUpdateSQL = selectSQL + " FOR UPDATE";
+
+        selectBrokerSQL = "SELECT " + (StoreSessionDAO.BROKER_ID_COLUMN) + " FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE msgTbl." + ID_COLUMN + " = ?" + " AND msgTbl." + STORE_SESSION_ID_COLUMN + " = sesTbl." + (StoreSessionDAO.ID_COLUMN);
+
+        selectIDsByDstBrokerSQL = "SELECT msgTbl." + ID_COLUMN + " FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + STORE_SESSION_ID_COLUMN + " AND " + DESTINATION_ID_COLUMN + " = ?";
+
+        selectIDsByDstSessionSQL = "SELECT " + ID_COLUMN + " FROM " + tableName + " WHERE STORE_SESSION_ID_COLUMN = ?" + " AND " + DESTINATION_ID_COLUMN + " = ?";
+
+        selectMsgsByDstBrokerSQL = "SELECT msgTbl." + MESSAGE_COLUMN + " FROM " + tableName + " msgTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = msgTbl." + STORE_SESSION_ID_COLUMN + " AND " + DESTINATION_ID_COLUMN + " = ?";
+
+        selectMsgsByDstSessionSQL = "SELECT " + MESSAGE_COLUMN + " FROM " + tableName + " WHERE " + STORE_SESSION_ID_COLUMN + "= ?" + " AND " + DESTINATION_ID_COLUMN + " = ?";
+
+        selectExistSQL = "SELECT " + ID_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
         // A single query that can tell us if the msg & destination exist and
         // broker is being taken over by other broker
@@ -676,10 +630,7 @@ public void deleteAll(Connection conn) throws BrokerException {
             // (SELECT id FROM mqses41cmycluster
             // WHERE id = mqmsg41cmycluster.store_session_id AND
             // broker_id = 'mybroker')
-            whereClause = new StringBuilder(128).append("EXISTS (SELECT ").append(StoreSessionDAO.ID_COLUMN).append(" FROM ")
-                    .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.ID_COLUMN).append(" = ")
-                    .append(tableName).append('.').append(STORE_SESSION_ID_COLUMN).append(" AND ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = '")
-                    .append(dbMgr.getBrokerID()).append("')").toString();
+            whereClause = "EXISTS (SELECT " + (StoreSessionDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.ID_COLUMN) + " = " + tableName + '.' + STORE_SESSION_ID_COLUMN + " AND " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = '" + dbMgr.getBrokerID() + "')";
         }
 
         deleteAll(conn, whereClause, null, 0);
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLBrokerDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLBrokerDAOImpl.java
index 400cbe18e..3e743e28f 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLBrokerDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLBrokerDAOImpl.java
@@ -34,7 +34,7 @@ class MySQLBrokerDAOImpl extends BrokerDAOImpl {
     MySQLBrokerDAOImpl() throws BrokerException {
         PROC_IS_BEING_TAKENOVER = "MQ" + JDBCStore.STORE_VERSION + "SP0BKR" + JDBCStore.STORED_PROC_VERSION + DBManager.getDBManager().getTableSuffix(); //NOPMD
 
-        dropStoredProcSQL = new StringBuilder(128).append("DROP PROCEDURE IF EXISTS ").append(PROC_IS_BEING_TAKENOVER).toString();
+        dropStoredProcSQL = "DROP PROCEDURE IF EXISTS " + PROC_IS_BEING_TAKENOVER;
     }
 
     @Override
@@ -51,12 +51,7 @@ public void createStoredProc(Connection conn) throws BrokerException {
                 myConn = true; // Set to true since this is our connection
             }
 
-            sql = new StringBuilder(128).append("CREATE PROCEDURE ").append(PROC_IS_BEING_TAKENOVER)
-                    .append("( IN brokerID VARCHAR (100), OUT status INT, OUT state INT )").append(" BEGIN ").append(" SET status=0; ").append("SELECT ")
-                    .append(STATE_COLUMN).append(" INTO state ").append("FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ")
-                    .append("brokerID; ").append(" IF state=").append(BrokerState.I_FAILOVER_PENDING).append(" OR state=")
-                    .append(BrokerState.I_FAILOVER_STARTED).append(" OR state=").append(BrokerState.I_FAILOVER_COMPLETE).append(" OR state=")
-                    .append(BrokerState.I_FAILOVER_FAILED).append(" THEN ").append(" SET status=1; ").append(" END IF; ").append("END;").toString();
+            sql = "CREATE PROCEDURE " + PROC_IS_BEING_TAKENOVER + "( IN brokerID VARCHAR (100), OUT status INT, OUT state INT )" + " BEGIN " + " SET status=0; " + "SELECT " + STATE_COLUMN + " INTO state " + "FROM " + tableName + " WHERE " + ID_COLUMN + " = " + "brokerID; " + " IF state=" + (BrokerState.I_FAILOVER_PENDING) + " OR state=" + (BrokerState.I_FAILOVER_STARTED) + " OR state=" + (BrokerState.I_FAILOVER_COMPLETE) + " OR state=" + (BrokerState.I_FAILOVER_FAILED) + " THEN " + " SET status=1; " + " END IF; " + "END;";
 
             stmt = conn.createStatement();
             try {
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLMessageDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLMessageDAOImpl.java
index 5fb50541c..b92675873 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLMessageDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/MySQLMessageDAOImpl.java
@@ -39,7 +39,7 @@ class MySQLMessageDAOImpl extends MessageDAOImpl {
     MySQLMessageDAOImpl() throws BrokerException {
         PROC_DELETE = "MQ" + JDBCStore.STORE_VERSION + "SP0MSG" + JDBCStore.STORED_PROC_VERSION + DBManager.getDBManager().getTableSuffix(); //NOPMD
 
-        dropStoredProcSQL = new StringBuilder(128).append("DROP PROCEDURE IF EXISTS ").append(PROC_DELETE).toString();
+        dropStoredProcSQL = "DROP PROCEDURE IF EXISTS " + PROC_DELETE;
     }
 
     @Override
@@ -56,17 +56,7 @@ public void createStoredProc(Connection conn) throws BrokerException {
                 myConn = true; // Set to true since this is our connection
             }
 
-            sql = new StringBuilder(128).append("CREATE PROCEDURE ").append(PROC_DELETE).append("( IN msgID VARCHAR (100), ")
-                    .append("IN brokerID VARCHAR(100), ").append("OUT row_affected INT, ").append("OUT beingTakenOver INT, ").append("OUT brokerState INT )")
-                    .append(" BEGIN ").append(" DECLARE not_found INT; ").append(" DECLARE CONTINUE HANDLER FOR NOT FOUND SET not_found=1; ")
-                    .append(" SET not_found=0; ").append(" SET row_affected=1; ").append(" SET beingTakenOver=0; ").append(" SET autocommit=0; ")
-                    .append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ").append("msgID; ")
-                    .append(" IF not_found = 1 THEN ").append(" SET row_affected=0; ").append(" END IF; ")
-                    .append(" IF not_found = 0 AND brokerID IS NOT NULL THEN ").append(" CALL ")
-                    .append(MySQLBrokerDAOImpl.PROC_IS_BEING_TAKENOVER).append('(')
-                    .append("brokerID, beingTakenOver, brokerState); ").append(" END IF; ").append(" IF beingTakenOver = 0 THEN ").append("DELETE FROM ")
-                    .append(dbMgr.getDAOFactory().getConsumerStateDAO().getTableName()).append(" WHERE ").append(ConsumerStateDAO.MESSAGE_ID_COLUMN)
-                    .append(" = msgID; ").append(" END IF; ").append("END;").toString();
+            sql = "CREATE PROCEDURE " + PROC_DELETE + "( IN msgID VARCHAR (100), " + "IN brokerID VARCHAR(100), " + "OUT row_affected INT, " + "OUT beingTakenOver INT, " + "OUT brokerState INT )" + " BEGIN " + " DECLARE not_found INT; " + " DECLARE CONTINUE HANDLER FOR NOT FOUND SET not_found=1; " + " SET not_found=0; " + " SET row_affected=1; " + " SET beingTakenOver=0; " + " SET autocommit=0; " + "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = " + "msgID; " + " IF not_found = 1 THEN " + " SET row_affected=0; " + " END IF; " + " IF not_found = 0 AND brokerID IS NOT NULL THEN " + " CALL " + (MySQLBrokerDAOImpl.PROC_IS_BEING_TAKENOVER) + '(' + "brokerID, beingTakenOver, brokerState); " + " END IF; " + " IF beingTakenOver = 0 THEN " + "DELETE FROM " + dbMgr.getDAOFactory().getConsumerStateDAO().getTableName() + " WHERE " + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + " = msgID; " + " END IF; " + "END;";
 
             stmt = conn.createStatement();
             try {
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/OracleMessageDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/OracleMessageDAOImpl.java
index 82374beb1..68babd44f 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/OracleMessageDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/OracleMessageDAOImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,13 +40,10 @@ class OracleMessageDAOImpl extends MessageDAOImpl {
 
     OracleMessageDAOImpl() throws BrokerException {
         // Initialize message column with an "empty" BLOB
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(MESSAGE_SIZE_COLUMN)
-                .append(", ").append(STORE_SESSION_ID_COLUMN).append(", ").append(DESTINATION_ID_COLUMN).append(", ").append(TRANSACTION_ID_COLUMN).append(", ")
-                .append(CREATED_TS_COLUMN).append(", ").append(MESSAGE_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, EMPTY_BLOB() )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + MESSAGE_SIZE_COLUMN + ", " + STORE_SESSION_ID_COLUMN + ", " + DESTINATION_ID_COLUMN + ", " + TRANSACTION_ID_COLUMN + ", " + CREATED_TS_COLUMN + ", " + MESSAGE_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ?, EMPTY_BLOB() )";
 
         // Blob column need to be update separately
-        updateDestinationSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(DESTINATION_ID_COLUMN).append(" = ?, ")
-                .append(MESSAGE_SIZE_COLUMN).append(" = ? ").append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        updateDestinationSQL = "UPDATE " + tableName + " SET " + DESTINATION_ID_COLUMN + " = ?, " + MESSAGE_SIZE_COLUMN + " = ? " + " WHERE " + ID_COLUMN + " = ?";
     }
 
     /**
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/PropertyDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/PropertyDAOImpl.java
index 22482945d..18e8c3def 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/PropertyDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/PropertyDAOImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,21 +50,17 @@ class PropertyDAOImpl extends BaseDAOImpl implements PropertyDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(PROPNAME_COLUMN).append(", ").append(PROPVALUE_COLUMN)
-                .append(") VALUES ( ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + PROPNAME_COLUMN + ", " + PROPVALUE_COLUMN + ") VALUES ( ?, ? )";
 
-        updateSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(PROPVALUE_COLUMN).append(" = ?").append(" WHERE ")
-                .append(PROPNAME_COLUMN).append(" = ?").toString();
+        updateSQL = "UPDATE " + tableName + " SET " + PROPVALUE_COLUMN + " = ?" + " WHERE " + PROPNAME_COLUMN + " = ?";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(PROPNAME_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + PROPNAME_COLUMN + " = ?";
 
-        selectSQL = new StringBuilder(128).append("SELECT ").append(PROPVALUE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(PROPNAME_COLUMN).append(" = ?").toString();
+        selectSQL = "SELECT " + PROPVALUE_COLUMN + " FROM " + tableName + " WHERE " + PROPNAME_COLUMN + " = ?";
 
-        selectAllNamesSQL = new StringBuilder(128).append("SELECT ").append(PROPNAME_COLUMN).append(" FROM ").append(tableName).toString();
+        selectAllNamesSQL = "SELECT " + PROPNAME_COLUMN + " FROM " + tableName;
 
-        selectAllSQL = new StringBuilder(128).append("SELECT ").append(PROPNAME_COLUMN).append(", ").append(PROPVALUE_COLUMN).append(" FROM ").append(tableName)
-                .toString();
+        selectAllSQL = "SELECT " + PROPNAME_COLUMN + ", " + PROPVALUE_COLUMN + " FROM " + tableName;
     }
 
     /**
@@ -226,8 +222,7 @@ public void deleteAll(Connection conn) throws BrokerException {
         if (Globals.getHAEnabled()) {
             return; // Share table cannot be reset
         } else {
-            String whereClause = new StringBuilder(128).append(PROPNAME_COLUMN).append(" <> '").append(DBTool.STORE_PROPERTY_SUPPORT_JMSBRIDGE).append('\'')
-                    .toString();
+            String whereClause = PROPNAME_COLUMN + " <> '" + (DBTool.STORE_PROPERTY_SUPPORT_JMSBRIDGE) + '\'';
 
             super.deleteAll(conn, whereClause, null, 0);
         }
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/StoreSessionDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/StoreSessionDAOImpl.java
index dc3d17527..bc062ba34 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/StoreSessionDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/StoreSessionDAOImpl.java
@@ -63,22 +63,18 @@ class StoreSessionDAOImpl extends BaseDAOImpl implements StoreSessionDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(BROKER_ID_COLUMN)
-                .append(", ").append(IS_CURRENT_COLUMN).append(", ").append(CREATED_BY_COLUMN).append(", ").append(CREATED_TS_COLUMN)
-                .append(") VALUES ( ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + BROKER_ID_COLUMN + ", " + IS_CURRENT_COLUMN + ", " + CREATED_BY_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ? )";
 
         /*
          * updateIsCurrentSQL = new StringBuilder(128) .append( "UPDATE " ).append( tableName ) .append( " SET " ) .append(
          * IS_CURRENT_COLUMN ).append( " = ? " ) .append( " WHERE " ) .append( ID_COLUMN ).append( " = ?" ) .toString();
          */
 
-        takeoverSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(BROKER_ID_COLUMN).append(" = ?, ")
-                .append(CREATED_TS_COLUMN).append(" = ?, ").append(IS_CURRENT_COLUMN).append(" = 0").append(" WHERE ").append(BROKER_ID_COLUMN).append(" = ?")
-                .toString();
+        takeoverSQL = "UPDATE " + tableName + " SET " + BROKER_ID_COLUMN + " = ?, " + CREATED_TS_COLUMN + " = ?, " + IS_CURRENT_COLUMN + " = 0" + " WHERE " + BROKER_ID_COLUMN + " = ?";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        deleteByBrokerSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(BROKER_ID_COLUMN).append(" = ?").toString();
+        deleteByBrokerSQL = "DELETE FROM " + tableName + " WHERE " + BROKER_ID_COLUMN + " = ?";
 
         StringBuilder tmpbuf = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?")
                 .append(" AND NOT EXISTS (");
@@ -95,24 +91,15 @@ class StoreSessionDAOImpl extends BaseDAOImpl implements StoreSessionDAO {
         }
         deleteInactiveByBrokerSQL = tmpbuf.toString();
 
-        selectSQL = new StringBuilder(128).append("SELECT ").append(BROKER_ID_COLUMN).append(", ").append(IS_CURRENT_COLUMN).append(", ")
-                .append(CREATED_BY_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").toString();
+        selectSQL = "SELECT " + BROKER_ID_COLUMN + ", " + IS_CURRENT_COLUMN + ", " + CREATED_BY_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectIfOwnStoreSessionSQL = new StringBuilder(128).append("SELECT 1").append(" FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN)
-                .append(" = ?").append(" AND ").append(BROKER_ID_COLUMN).append(" = ?").append(" AND NOT EXISTS (")
-                .append(((BrokerDAOImpl) dbMgr.getDAOFactory().getBrokerDAO()).selectIsBeingTakenOverSQL)
-                .append(')').toString();
+        selectIfOwnStoreSessionSQL = "SELECT 1" + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?" + " AND NOT EXISTS (" + (((BrokerDAOImpl) dbMgr.getDAOFactory().getBrokerDAO()).selectIsBeingTakenOverSQL) + ')';
 
-        selectAllSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(BROKER_ID_COLUMN).append(", ").append(IS_CURRENT_COLUMN)
-                .append(", ").append(CREATED_BY_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName).append(" ORDER BY ")
-                .append(BROKER_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN).toString();
+        selectAllSQL = "SELECT " + ID_COLUMN + ", " + BROKER_ID_COLUMN + ", " + IS_CURRENT_COLUMN + ", " + CREATED_BY_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName + " ORDER BY " + BROKER_ID_COLUMN + ", " + CREATED_TS_COLUMN;
 
-        selectAllOldSessionsSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(", ")
-                .append(BROKER_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(IS_CURRENT_COLUMN).append(" = 0").toString();
+        selectAllOldSessionsSQL = "SELECT " + ID_COLUMN + ", " + CREATED_TS_COLUMN + ", " + BROKER_ID_COLUMN + " FROM " + tableName + " WHERE " + IS_CURRENT_COLUMN + " = 0";
 
-        selectCurrentSessionSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(BROKER_ID_COLUMN).append(" = ?").append(" AND ").append(IS_CURRENT_COLUMN).append(" = 1").toString();
+        selectCurrentSessionSQL = "SELECT " + ID_COLUMN + " FROM " + tableName + " WHERE " + BROKER_ID_COLUMN + " = ?" + " AND " + IS_CURRENT_COLUMN + " = 1";
 
         /*
          * selectPreviousSessionSQL = new StringBuilder(128) .append( "SELECT sTbl." ) .append( ID_COLUMN ).append( ", sTbl."
@@ -123,15 +110,9 @@ class StoreSessionDAOImpl extends BaseDAOImpl implements StoreSessionDAO {
          * BROKER_ID_COLUMN ) .append( " ORDER BY sTbl." ) .append( CREATED_TS_COLUMN ) .append( " DESC" ) .toString();
          */
 
-        selectIDsByBrokerSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(BROKER_ID_COLUMN).append(" = ?").toString();
+        selectIDsByBrokerSQL = "SELECT " + ID_COLUMN + " FROM " + tableName + " WHERE " + BROKER_ID_COLUMN + " = ?";
 
-        moveStoreSessionSQL = new StringBuilder(128).append(" UPDATE ").append(tableName).append(" SET ").append(BROKER_ID_COLUMN).append(" = ? ")
-                .append(" WHERE ").append(BROKER_ID_COLUMN).append(" = ? ").append(" AND ").append(ID_COLUMN).append(" = ?").append(" AND ")
-                .append(IS_CURRENT_COLUMN).append(" <> 1 ").append(" AND NOT EXISTS (")
-                .append(((BrokerDAOImpl) dbMgr.getDAOFactory().getBrokerDAO()).selectIsBeingTakenOverSQL)
-                .append(')').append(" AND NOT EXISTS (").append(((BrokerDAOImpl) dbMgr.getDAOFactory().getBrokerDAO()).selectIsBeingTakenOverSQL)
-                .append(')').toString();
+        moveStoreSessionSQL = " UPDATE " + tableName + " SET " + BROKER_ID_COLUMN + " = ? " + " WHERE " + BROKER_ID_COLUMN + " = ? " + " AND " + ID_COLUMN + " = ?" + " AND " + IS_CURRENT_COLUMN + " <> 1 " + " AND NOT EXISTS (" + (((BrokerDAOImpl) dbMgr.getDAOFactory().getBrokerDAO()).selectIsBeingTakenOverSQL) + ')' + " AND NOT EXISTS (" + (((BrokerDAOImpl) dbMgr.getDAOFactory().getBrokerDAO()).selectIsBeingTakenOverSQL) + ')';
     }
 
     /**
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/TransactionDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/TransactionDAOImpl.java
index 76451ac87..765cdd1a8 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/TransactionDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/TransactionDAOImpl.java
@@ -75,94 +75,49 @@ class TransactionDAOImpl extends BaseDAOImpl implements TransactionDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(ID_COLUMN).append(", ").append(TYPE_COLUMN).append(", ")
-                .append(STATE_COLUMN).append(", ").append(AUTO_ROLLBACK_COLUMN).append(", ").append(XID_COLUMN).append(", ").append(TXN_STATE_COLUMN)
-                .append(", ").append(TXN_HOME_BROKER_COLUMN).append(", ").append(TXN_BROKERS_COLUMN).append(", ").append(STORE_SESSION_ID_COLUMN).append(", ")
-                .append(EXPIRED_TS_COLUMN).append(", ").append(ACCESSED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + ID_COLUMN + ", " + TYPE_COLUMN + ", " + STATE_COLUMN + ", " + AUTO_ROLLBACK_COLUMN + ", " + XID_COLUMN + ", " + TXN_STATE_COLUMN + ", " + TXN_HOME_BROKER_COLUMN + ", " + TXN_BROKERS_COLUMN + ", " + STORE_SESSION_ID_COLUMN + ", " + EXPIRED_TS_COLUMN + ", " + ACCESSED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
 
-        updateTxnStateSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(STATE_COLUMN).append(" = ?, ")
-                .append(TXN_STATE_COLUMN).append(" = ?").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(brokerNotTakenOverClause).toString();
+        updateTxnStateSQL = "UPDATE " + tableName + " SET " + STATE_COLUMN + " = ?, " + TXN_STATE_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + brokerNotTakenOverClause;
 
-        updateTxnHomeBrokerSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TXN_HOME_BROKER_COLUMN).append(" = ?")
-                .append(" WHERE ").append(ID_COLUMN).append(" = ?").append(brokerNotTakenOverClause).toString();
+        updateTxnHomeBrokerSQL = "UPDATE " + tableName + " SET " + TXN_HOME_BROKER_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + brokerNotTakenOverClause;
 
-        updateTxnBrokersSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(TYPE_COLUMN).append(" = ?, ")
-                .append(TXN_BROKERS_COLUMN).append(" = ?").append(" WHERE ").append(ID_COLUMN).append(" = ?").append(brokerNotTakenOverClause).toString();
+        updateTxnBrokersSQL = "UPDATE " + tableName + " SET " + TYPE_COLUMN + " = ?, " + TXN_BROKERS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?" + brokerNotTakenOverClause;
 
-        updateAccessedTimeSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(ACCESSED_TS_COLUMN).append(" = ?")
-                .append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        updateAccessedTimeSQL = "UPDATE " + tableName + " SET " + ACCESSED_TS_COLUMN + " = ?" + " WHERE " + ID_COLUMN + " = ?";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
         /*
          * deleteNotInStateSQL = new StringBuilder(128) .append( "DELETE FROM " ).append( tableName ) .append( " WHERE " )
          * .append( STATE_COLUMN ).append( " <> ?" ) .toString();
          */
 
-        selectTxnStateSQL = new StringBuilder(128).append("SELECT ").append(STATE_COLUMN).append(", ").append(TXN_STATE_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        selectTxnStateSQL = "SELECT " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectTxnHomeBrokerSQL = new StringBuilder(128).append("SELECT ").append(TXN_HOME_BROKER_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        selectTxnHomeBrokerSQL = "SELECT " + TXN_HOME_BROKER_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectTxnBrokersSQL = new StringBuilder(128).append("SELECT ").append(TXN_BROKERS_COLUMN).append(", ").append(STATE_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(ID_COLUMN).append(" = ?").toString();
+        selectTxnBrokersSQL = "SELECT " + TXN_BROKERS_COLUMN + ", " + STATE_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectAccessedTimeSQL = new StringBuilder(128).append("SELECT ").append(ACCESSED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        selectAccessedTimeSQL = "SELECT " + ACCESSED_TS_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectTxnInfoSQL = new StringBuilder(128).append("SELECT ").append(TYPE_COLUMN).append(", ").append(STATE_COLUMN).append(", ").append(TXN_STATE_COLUMN)
-                .append(", ").append(TXN_HOME_BROKER_COLUMN).append(", ").append(TXN_BROKERS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(ID_COLUMN).append(" = ?").toString();
+        selectTxnInfoSQL = "SELECT " + TYPE_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + ", " + TXN_HOME_BROKER_COLUMN + ", " + TXN_BROKERS_COLUMN + " FROM " + tableName + " WHERE " + ID_COLUMN + " = ?";
 
-        selectTxnStatesByBrokerSQL = new StringBuilder(128).append("SELECT txnTbl.").append(ID_COLUMN).append(", ").append(TYPE_COLUMN).append(", ")
-                .append(STATE_COLUMN).append(", ").append(TXN_STATE_COLUMN).append(", ").append(TXN_BROKERS_COLUMN).append(" FROM ").append(tableName)
-                .append(" txnTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" sesTbl").append(" WHERE sesTbl.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.").append(StoreSessionDAO.ID_COLUMN).append(" = txnTbl.")
-                .append(STORE_SESSION_ID_COLUMN).append(" AND ").append(STATE_COLUMN).append(" <> -1").append(" AND ").append(TYPE_COLUMN).append(" IN (")
-                .append(TransactionInfo.TXN_LOCAL).append(", ").append(TransactionInfo.TXN_CLUSTER).append(')').toString();
+        selectTxnStatesByBrokerSQL = "SELECT txnTbl." + ID_COLUMN + ", " + TYPE_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + ", " + TXN_BROKERS_COLUMN + " FROM " + tableName + " txnTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = txnTbl." + STORE_SESSION_ID_COLUMN + " AND " + STATE_COLUMN + " <> -1" + " AND " + TYPE_COLUMN + " IN (" + (TransactionInfo.TXN_LOCAL) + ", " + (TransactionInfo.TXN_CLUSTER) + ')';
 
-        selectTxnStatesBySessionSQL = new StringBuilder(128).append("SELECT ").append(ID_COLUMN).append(", ").append(TYPE_COLUMN).append(", ")
-                .append(STATE_COLUMN).append(", ").append(TXN_STATE_COLUMN).append(", ").append(TXN_BROKERS_COLUMN).append(" FROM ").append(tableName)
-                .append(" WHERE ").append(STORE_SESSION_ID_COLUMN).append("= ?").append(" AND ").append(STATE_COLUMN).append(" <> -1").append(" AND ")
-                .append(TYPE_COLUMN).append(" IN (").append(TransactionInfo.TXN_LOCAL).append(", ").append(TransactionInfo.TXN_CLUSTER).append(')').toString();
+        selectTxnStatesBySessionSQL = "SELECT " + ID_COLUMN + ", " + TYPE_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + ", " + TXN_BROKERS_COLUMN + " FROM " + tableName + " WHERE " + STORE_SESSION_ID_COLUMN + "= ?" + " AND " + STATE_COLUMN + " <> -1" + " AND " + TYPE_COLUMN + " IN (" + (TransactionInfo.TXN_LOCAL) + ", " + (TransactionInfo.TXN_CLUSTER) + ')';
 
-        selectTxnStatesByBrokerAndTypeSQL = new StringBuilder(128).append("SELECT txnTbl.").append(ID_COLUMN).append(", ").append(STATE_COLUMN).append(", ")
-                .append(TXN_STATE_COLUMN).append(" FROM ").append(tableName).append(" txnTbl, ").append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX))
-                .append(" sesTbl").append(" WHERE sesTbl.").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND sesTbl.")
-                .append(StoreSessionDAO.ID_COLUMN).append(" = txnTbl.").append(STORE_SESSION_ID_COLUMN).append(" AND ").append(STATE_COLUMN).append(" <> -1")
-                .append(" AND ").append(TYPE_COLUMN).append(" = ?").toString();
+        selectTxnStatesByBrokerAndTypeSQL = "SELECT txnTbl." + ID_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + " FROM " + tableName + " txnTbl, " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " sesTbl" + " WHERE sesTbl." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND sesTbl." + (StoreSessionDAO.ID_COLUMN) + " = txnTbl." + STORE_SESSION_ID_COLUMN + " AND " + STATE_COLUMN + " <> -1" + " AND " + TYPE_COLUMN + " = ?";
 
-        selectTxnStatesBySessionAndTypeSQL = new StringBuilder(128).append("SELECT txnTbl.").append(ID_COLUMN).append(", ").append(STATE_COLUMN).append(", ")
-                .append(TXN_STATE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(STORE_SESSION_ID_COLUMN).append("= ?").append(" AND ")
-                .append(STATE_COLUMN).append(" <> -1").append(" AND ").append(TYPE_COLUMN).append(" = ?").toString();
+        selectTxnStatesBySessionAndTypeSQL = "SELECT txnTbl." + ID_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + " FROM " + tableName + " WHERE " + STORE_SESSION_ID_COLUMN + "= ?" + " AND " + STATE_COLUMN + " <> -1" + " AND " + TYPE_COLUMN + " = ?";
 
         /*
          * Cannot specify a LOB column in a SELECT...DISTINCT so use subquery
          */
-        selectRemoteTxnStatesByBrokerAndTypeSQL = new StringBuilder(256).append("SELECT ").append(ID_COLUMN).append(", ").append(STATE_COLUMN).append(", ")
-                .append(TXN_STATE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(TYPE_COLUMN).append(" = ?").append(" AND ")
-                .append(STORE_SESSION_ID_COLUMN).append(" NOT IN (SELECT ").append(StoreSessionDAO.ID_COLUMN).append(" FROM ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?)")
-                .append(" AND ").append(ID_COLUMN).append(" IN (SELECT DISTINCT c.").append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(" FROM ")
-                .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" s, ").append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX))
-                .append(" m, ").append(dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX)).append(" c").append(" WHERE s.")
-                .append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = ?").append(" AND s.").append(StoreSessionDAO.ID_COLUMN).append(" = m.")
-                .append(MessageDAO.STORE_SESSION_ID_COLUMN).append(" AND m.").append(MessageDAO.ID_COLUMN).append(" = c.")
-                .append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(" AND c.").append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(" IS NOT NULL)").toString();
-
-        selectRemoteTxnStatesBySessionAndTypeSQL = new StringBuilder(256).append("SELECT ").append(ID_COLUMN).append(", ").append(STATE_COLUMN).append(", ")
-                .append(TXN_STATE_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(TYPE_COLUMN).append(" = ?").append(" AND ")
-                .append(STORE_SESSION_ID_COLUMN).append("<> ?").append(" AND ").append(ID_COLUMN).append(" IN (SELECT DISTINCT c.")
-                .append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(" FROM ").append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX)).append(" m, ")
-                .append(dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX)).append(" c").append(" WHERE m.").append(MessageDAO.STORE_SESSION_ID_COLUMN)
-                .append("= ?").append(" AND m.").append(MessageDAO.ID_COLUMN).append(" = c.").append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(" AND c.")
-                .append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(" IS NOT NULL)").toString();
-
-        selectUsageInfoSQL = new StringBuilder(128).append("SELECT MAX(mcount), MAX(scount) FROM (").append("SELECT COUNT(*) AS mcount, 0 AS scount FROM ")
-                .append(dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(MessageDAO.TRANSACTION_ID_COLUMN).append(" = ?")
-                .append(" UNION ").append("SELECT 0 AS mcount, COUNT(*) AS scount FROM ").append(dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX))
-                .append(" WHERE ").append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(" = ?").append(") tmptbl").toString();
+        selectRemoteTxnStatesByBrokerAndTypeSQL = "SELECT " + ID_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + " FROM " + tableName + " WHERE " + TYPE_COLUMN + " = ?" + " AND " + STORE_SESSION_ID_COLUMN + " NOT IN (SELECT " + (StoreSessionDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?)" + " AND " + ID_COLUMN + " IN (SELECT DISTINCT c." + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " s, " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " m, " + dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX) + " c" + " WHERE s." + (StoreSessionDAO.BROKER_ID_COLUMN) + " = ?" + " AND s." + (StoreSessionDAO.ID_COLUMN) + " = m." + (MessageDAO.STORE_SESSION_ID_COLUMN) + " AND m." + (MessageDAO.ID_COLUMN) + " = c." + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + " AND c." + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + " IS NOT NULL)";
+
+        selectRemoteTxnStatesBySessionAndTypeSQL = "SELECT " + ID_COLUMN + ", " + STATE_COLUMN + ", " + TXN_STATE_COLUMN + " FROM " + tableName + " WHERE " + TYPE_COLUMN + " = ?" + " AND " + STORE_SESSION_ID_COLUMN + "<> ?" + " AND " + ID_COLUMN + " IN (SELECT DISTINCT c." + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + " FROM " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " m, " + dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX) + " c" + " WHERE m." + (MessageDAO.STORE_SESSION_ID_COLUMN) + "= ?" + " AND m." + (MessageDAO.ID_COLUMN) + " = c." + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + " AND c." + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + " IS NOT NULL)";
+
+        selectUsageInfoSQL = "SELECT MAX(mcount), MAX(scount) FROM (" + "SELECT COUNT(*) AS mcount, 0 AS scount FROM " + dbMgr.getTableName(MessageDAO.TABLE_NAME_PREFIX) + " WHERE " + (MessageDAO.TRANSACTION_ID_COLUMN) + " = ?" + " UNION " + "SELECT 0 AS mcount, COUNT(*) AS scount FROM " + dbMgr.getTableName(ConsumerStateDAO.TABLE_NAME_PREFIX) + " WHERE " + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + " = ?" + ") tmptbl";
     }
 
     /**
@@ -810,10 +765,7 @@ public void deleteAll(Connection conn) throws BrokerException {
             // (SELECT id FROM mqses41cmycluster
             // WHERE id = mqtxn41cmycluster.store_session_id AND
             // broker_id = 'mybroker')
-            whereClause = new StringBuilder(128).append("EXISTS (SELECT ").append(StoreSessionDAO.ID_COLUMN).append(" FROM ")
-                    .append(dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX)).append(" WHERE ").append(StoreSessionDAO.ID_COLUMN).append(" = ")
-                    .append(tableName).append('.').append(STORE_SESSION_ID_COLUMN).append(" AND ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(" = '")
-                    .append(dbMgr.getBrokerID()).append("')").toString();
+            whereClause = "EXISTS (SELECT " + (StoreSessionDAO.ID_COLUMN) + " FROM " + dbMgr.getTableName(StoreSessionDAO.TABLE_NAME_PREFIX) + " WHERE " + (StoreSessionDAO.ID_COLUMN) + " = " + tableName + '.' + STORE_SESSION_ID_COLUMN + " AND " + (StoreSessionDAO.BROKER_ID_COLUMN) + " = '" + dbMgr.getBrokerID() + "')";
         }
 
         deleteAll(conn, whereClause, null, 0);
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeHAStore.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeHAStore.java
index 2038f0df0..935c810b0 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeHAStore.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeHAStore.java
@@ -156,12 +156,7 @@ void upgradeStoreSessions(Connection conn) throws BrokerException {
         String oldtable = StoreSessionDAO.TABLE_NAME_PREFIX + "S" + brokerID;
 
         // SQL to insert store sessions from Non-HA table into new table
-        String insertAllStoreSessionsFromOldSQL = new StringBuilder(128).append("INSERT INTO ").append(sesDAO.getTableName()).append(" ( ")
-                .append(StoreSessionDAO.ID_COLUMN).append(", ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(", ").append(StoreSessionDAO.IS_CURRENT_COLUMN)
-                .append(", ").append(StoreSessionDAO.CREATED_BY_COLUMN).append(", ").append(StoreSessionDAO.CREATED_TS_COLUMN).append(") SELECT ")
-                .append(StoreSessionDAO.ID_COLUMN).append(", ").append(StoreSessionDAO.BROKER_ID_COLUMN).append(", ").append(StoreSessionDAO.IS_CURRENT_COLUMN)
-                .append(", ").append(StoreSessionDAO.CREATED_BY_COLUMN).append(", ").append(StoreSessionDAO.CREATED_TS_COLUMN).append(" FROM ").append(oldtable)
-                .toString();
+        String insertAllStoreSessionsFromOldSQL = "INSERT INTO " + sesDAO.getTableName() + " ( " + (StoreSessionDAO.ID_COLUMN) + ", " + (StoreSessionDAO.BROKER_ID_COLUMN) + ", " + (StoreSessionDAO.IS_CURRENT_COLUMN) + ", " + (StoreSessionDAO.CREATED_BY_COLUMN) + ", " + (StoreSessionDAO.CREATED_TS_COLUMN) + ") SELECT " + (StoreSessionDAO.ID_COLUMN) + ", " + (StoreSessionDAO.BROKER_ID_COLUMN) + ", " + (StoreSessionDAO.IS_CURRENT_COLUMN) + ", " + (StoreSessionDAO.CREATED_BY_COLUMN) + ", " + (StoreSessionDAO.CREATED_TS_COLUMN) + " FROM " + oldtable;
 
         Statement stmt = null;
         Exception myex = null;
@@ -190,17 +185,10 @@ void upgradeDestinations(Connection conn) throws BrokerException {
         String oldtable = DestinationDAO.TABLE_NAME_PREFIX + "S" + brokerID;
 
         // SQL to select all destination from Non-HA table
-        String getAllDestFromOldSQL = new StringBuilder(128).append("SELECT ").append(DestinationDAO.DESTINATION_COLUMN).append(", ")
-                .append(DestinationDAO.CREATED_TS_COLUMN).append(", ").append(DestinationDAO.CONNECTED_TS_COLUMN).append(", ")
-                .append(DestinationDAO.STORE_SESSION_ID_COLUMN).append(" FROM ").append(oldtable).append(" WHERE ").append(DestinationDAO.ID_COLUMN)
-                .append(" NOT IN (SELECT ").append(DestinationDAO.ID_COLUMN).append(" FROM ").append(dstDAO.getTableName()).append(')').toString();
+        String getAllDestFromOldSQL = "SELECT " + (DestinationDAO.DESTINATION_COLUMN) + ", " + (DestinationDAO.CREATED_TS_COLUMN) + ", " + (DestinationDAO.CONNECTED_TS_COLUMN) + ", " + (DestinationDAO.STORE_SESSION_ID_COLUMN) + " FROM " + oldtable + " WHERE " + (DestinationDAO.ID_COLUMN) + " NOT IN (SELECT " + (DestinationDAO.ID_COLUMN) + " FROM " + dstDAO.getTableName() + ')';
 
         // SQL to insert a destination to new table
-        String insertDestSQL = new StringBuilder(128).append("INSERT INTO ").append(dstDAO.getTableName()).append(" ( ").append(DestinationDAO.ID_COLUMN)
-                .append(", ").append(DestinationDAO.DESTINATION_COLUMN).append(", ").append(DestinationDAO.IS_LOCAL_COLUMN).append(", ")
-                .append(DestinationDAO.CONNECTION_ID_COLUMN).append(", ").append(DestinationDAO.CONNECTED_TS_COLUMN).append(", ")
-                .append(DestinationDAO.STORE_SESSION_ID_COLUMN).append(", ").append(DestinationDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ? )")
-                .toString();
+        String insertDestSQL = "INSERT INTO " + dstDAO.getTableName() + " ( " + (DestinationDAO.ID_COLUMN) + ", " + (DestinationDAO.DESTINATION_COLUMN) + ", " + (DestinationDAO.IS_LOCAL_COLUMN) + ", " + (DestinationDAO.CONNECTION_ID_COLUMN) + ", " + (DestinationDAO.CONNECTED_TS_COLUMN) + ", " + (DestinationDAO.STORE_SESSION_ID_COLUMN) + ", " + (DestinationDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         Statement stmt = null;
@@ -284,15 +272,10 @@ private void upgradeInterests(Connection conn) throws BrokerException {
         String oldtbl = ConsumerDAO.TABLE_NAME_PREFIX + "S" + brokerID;
 
         // SQL to select all interest from Non-HA table
-        String getAllInterestFromOldSQL = new StringBuilder(128).append("SELECT ").append(ConsumerDAO.CONSUMER_COLUMN).append(", ")
-                .append(ConsumerDAO.CREATED_TS_COLUMN).append(", ").append(ConsumerDAO.ID_COLUMN).append(" FROM ").append(oldtbl).append(" WHERE ")
-                .append(ConsumerDAO.ID_COLUMN).append(" NOT IN (SELECT ").append(ConsumerDAO.ID_COLUMN).append(" FROM ").append(conDAO.getTableName())
-                .append(')').toString();
+        String getAllInterestFromOldSQL = "SELECT " + (ConsumerDAO.CONSUMER_COLUMN) + ", " + (ConsumerDAO.CREATED_TS_COLUMN) + ", " + (ConsumerDAO.ID_COLUMN) + " FROM " + oldtbl + " WHERE " + (ConsumerDAO.ID_COLUMN) + " NOT IN (SELECT " + (ConsumerDAO.ID_COLUMN) + " FROM " + conDAO.getTableName() + ')';
 
         // SQL to insert interest to new table
-        String insertInterestSQL = new StringBuilder(128).append("INSERT INTO ").append(conDAO.getTableName()).append(" ( ").append(ConsumerDAO.ID_COLUMN)
-                .append(", ").append(ConsumerDAO.CONSUMER_COLUMN).append(", ").append(ConsumerDAO.DURABLE_NAME_COLUMN).append(", ")
-                .append(ConsumerDAO.CLIENT_ID_COLUMN).append(", ").append(ConsumerDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ? )").toString();
+        String insertInterestSQL = "INSERT INTO " + conDAO.getTableName() + " ( " + (ConsumerDAO.ID_COLUMN) + ", " + (ConsumerDAO.CONSUMER_COLUMN) + ", " + (ConsumerDAO.DURABLE_NAME_COLUMN) + ", " + (ConsumerDAO.CLIENT_ID_COLUMN) + ", " + (ConsumerDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
@@ -399,9 +382,7 @@ private void doUpgradeMsg(Connection conn) throws BrokerException {
         HashMap msgToDst = new HashMap();
 
         // SQL to select all messages from Non-HA table
-        String getAllMsgFromOldSQL = new StringBuilder(128).append("SELECT ").append(MessageDAO.ID_COLUMN).append(", ").append(MessageDAO.MESSAGE_COLUMN)
-                .append(", ").append(MessageDAO.DESTINATION_ID_COLUMN).append(", ").append(MessageDAO.STORE_SESSION_ID_COLUMN).append(", ")
-                .append(MessageDAO.CREATED_TS_COLUMN).append(" FROM ").append(oldmsgtbl).toString();
+        String getAllMsgFromOldSQL = "SELECT " + (MessageDAO.ID_COLUMN) + ", " + (MessageDAO.MESSAGE_COLUMN) + ", " + (MessageDAO.DESTINATION_ID_COLUMN) + ", " + (MessageDAO.STORE_SESSION_ID_COLUMN) + ", " + (MessageDAO.CREATED_TS_COLUMN) + " FROM " + oldmsgtbl;
 
         Statement stmt = null;
         ResultSet rs = null;
@@ -455,15 +436,9 @@ private void doUpgradeMsg(Connection conn) throws BrokerException {
         String oldstatetbl = ConsumerStateDAO.TABLE_NAME_PREFIX + "S" + brokerID;
 
         // SQL to select all interest states from Non-HA table
-        String getAllStateFromOldSQL = new StringBuilder(128).append("SELECT ").append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(", ")
-                .append(ConsumerStateDAO.CONSUMER_ID_COLUMN).append(", ").append(ConsumerStateDAO.STATE_COLUMN).append(", ")
-                .append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(", ").append(ConsumerStateDAO.CREATED_TS_COLUMN).append(" FROM ").append(oldstatetbl)
-                .append(" WHERE ").append(TINTSTATE_CSTATE).append(" <> ").append(PartitionedStore.INTEREST_STATE_ACKNOWLEDGED).toString();
+        String getAllStateFromOldSQL = "SELECT " + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + ", " + (ConsumerStateDAO.CONSUMER_ID_COLUMN) + ", " + (ConsumerStateDAO.STATE_COLUMN) + ", " + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + ", " + (ConsumerStateDAO.CREATED_TS_COLUMN) + " FROM " + oldstatetbl + " WHERE " + TINTSTATE_CSTATE + " <> " + (PartitionedStore.INTEREST_STATE_ACKNOWLEDGED);
 
-        String insertStateSQL = new StringBuilder(128).append("INSERT INTO ").append(stateDAO.getTableName()).append(" ( ")
-                .append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(", ").append(ConsumerStateDAO.CONSUMER_ID_COLUMN).append(", ")
-                .append(ConsumerStateDAO.STATE_COLUMN).append(", ").append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(", ")
-                .append(ConsumerStateDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ? )").toString();
+        String insertStateSQL = "INSERT INTO " + stateDAO.getTableName() + " ( " + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + ", " + (ConsumerStateDAO.CONSUMER_ID_COLUMN) + ", " + (ConsumerStateDAO.STATE_COLUMN) + ", " + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + ", " + (ConsumerStateDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
@@ -538,19 +513,10 @@ private void upgradeTxns(Connection conn) throws BrokerException {
         String oldtxntbl = TransactionDAO.TABLE_NAME_PREFIX + "S" + brokerID;
 
         // SQL to select all transactions from version Non_HA table
-        String getAllTxnsFromOldSQL = new StringBuilder(128).append("SELECT ").append(TransactionDAO.ID_COLUMN).append(", ").append(TransactionDAO.TYPE_COLUMN)
-                .append(", ").append(TransactionDAO.STATE_COLUMN).append(", ").append(TransactionDAO.TXN_STATE_COLUMN).append(", ")
-                .append(TransactionDAO.TXN_HOME_BROKER_COLUMN).append(", ").append(TransactionDAO.TXN_BROKERS_COLUMN).append(", ")
-                .append(TransactionDAO.STORE_SESSION_ID_COLUMN).append(" FROM ").append(oldtxntbl).append(" WHERE ").append(TransactionDAO.ID_COLUMN)
-                .append(" NOT IN (SELECT ").append(TransactionDAO.ID_COLUMN).append(" FROM ").append(txnDAO.getTableName()).append(')').toString();
+        String getAllTxnsFromOldSQL = "SELECT " + (TransactionDAO.ID_COLUMN) + ", " + (TransactionDAO.TYPE_COLUMN) + ", " + (TransactionDAO.STATE_COLUMN) + ", " + (TransactionDAO.TXN_STATE_COLUMN) + ", " + (TransactionDAO.TXN_HOME_BROKER_COLUMN) + ", " + (TransactionDAO.TXN_BROKERS_COLUMN) + ", " + (TransactionDAO.STORE_SESSION_ID_COLUMN) + " FROM " + oldtxntbl + " WHERE " + (TransactionDAO.ID_COLUMN) + " NOT IN (SELECT " + (TransactionDAO.ID_COLUMN) + " FROM " + txnDAO.getTableName() + ')';
 
         // SQL to insert transactions to new table
-        String insertTxnSQL = new StringBuilder(128).append("INSERT INTO ").append(txnDAO.getTableName()).append(" ( ").append(TransactionDAO.ID_COLUMN)
-                .append(", ").append(TransactionDAO.TYPE_COLUMN).append(", ").append(TransactionDAO.STATE_COLUMN).append(", ")
-                .append(TransactionDAO.AUTO_ROLLBACK_COLUMN).append(", ").append(TransactionDAO.XID_COLUMN).append(", ").append(TransactionDAO.TXN_STATE_COLUMN)
-                .append(", ").append(TransactionDAO.TXN_HOME_BROKER_COLUMN).append(", ").append(TransactionDAO.TXN_BROKERS_COLUMN).append(", ")
-                .append(TransactionDAO.STORE_SESSION_ID_COLUMN).append(", ").append(TransactionDAO.EXPIRED_TS_COLUMN).append(", ")
-                .append(TransactionDAO.ACCESSED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )").toString();
+        String insertTxnSQL = "INSERT INTO " + txnDAO.getTableName() + " ( " + (TransactionDAO.ID_COLUMN) + ", " + (TransactionDAO.TYPE_COLUMN) + ", " + (TransactionDAO.STATE_COLUMN) + ", " + (TransactionDAO.AUTO_ROLLBACK_COLUMN) + ", " + (TransactionDAO.XID_COLUMN) + ", " + (TransactionDAO.TXN_STATE_COLUMN) + ", " + (TransactionDAO.TXN_HOME_BROKER_COLUMN) + ", " + (TransactionDAO.TXN_BROKERS_COLUMN) + ", " + (TransactionDAO.STORE_SESSION_ID_COLUMN) + ", " + (TransactionDAO.EXPIRED_TS_COLUMN) + ", " + (TransactionDAO.ACCESSED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeStore.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeStore.java
index c942caf85..903e489d2 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeStore.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/UpgradeStore.java
@@ -200,11 +200,7 @@ private void upgradeDestinations(Connection conn) throws BrokerException {
         String getAllDestFromOldSQL = strBuf.toString();
 
         // SQL to insert a destination to new table
-        String insertDestSQL = new StringBuilder(128).append("INSERT INTO ").append(dstDAO.getTableName()).append(" ( ").append(DestinationDAO.ID_COLUMN)
-                .append(", ").append(DestinationDAO.DESTINATION_COLUMN).append(", ").append(DestinationDAO.IS_LOCAL_COLUMN).append(", ")
-                .append(DestinationDAO.CONNECTION_ID_COLUMN).append(", ").append(DestinationDAO.CONNECTED_TS_COLUMN).append(", ")
-                .append(DestinationDAO.STORE_SESSION_ID_COLUMN).append(", ").append(DestinationDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ? )")
-                .toString();
+        String insertDestSQL = "INSERT INTO " + dstDAO.getTableName() + " ( " + (DestinationDAO.ID_COLUMN) + ", " + (DestinationDAO.DESTINATION_COLUMN) + ", " + (DestinationDAO.IS_LOCAL_COLUMN) + ", " + (DestinationDAO.CONNECTION_ID_COLUMN) + ", " + (DestinationDAO.CONNECTED_TS_COLUMN) + ", " + (DestinationDAO.STORE_SESSION_ID_COLUMN) + ", " + (DestinationDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         Statement stmt = null;
@@ -423,10 +419,7 @@ private void doUpgradeMsg(Connection conn) throws BrokerException {
 
         String getAllStateFromOldSQL = strBuf.toString();
 
-        String insertStateSQL = new StringBuilder(128).append("INSERT INTO ").append(stateDAO.getTableName()).append(" ( ")
-                .append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(", ").append(ConsumerStateDAO.CONSUMER_ID_COLUMN).append(", ")
-                .append(ConsumerStateDAO.STATE_COLUMN).append(", ").append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(", ")
-                .append(ConsumerStateDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ? )").toString();
+        String insertStateSQL = "INSERT INTO " + stateDAO.getTableName() + " ( " + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + ", " + (ConsumerStateDAO.CONSUMER_ID_COLUMN) + ", " + (ConsumerStateDAO.STATE_COLUMN) + ", " + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + ", " + (ConsumerStateDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
@@ -570,9 +563,7 @@ private void doUpgradeInterests(JDBCStore store, Connection conn) throws BrokerE
         String getAllInterestFromOldSQL = strBuf.toString();
 
         // SQL to insert interest to new table
-        String insertInterestSQL = new StringBuilder(128).append("INSERT INTO ").append(conDAO.getTableName()).append(" ( ").append(ConsumerDAO.ID_COLUMN)
-                .append(", ").append(ConsumerDAO.CONSUMER_COLUMN).append(", ").append(ConsumerDAO.DURABLE_NAME_COLUMN).append(", ")
-                .append(ConsumerDAO.CLIENT_ID_COLUMN).append(", ").append(ConsumerDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ? )").toString();
+        String insertInterestSQL = "INSERT INTO " + conDAO.getTableName() + " ( " + (ConsumerDAO.ID_COLUMN) + ", " + (ConsumerDAO.CONSUMER_COLUMN) + ", " + (ConsumerDAO.DURABLE_NAME_COLUMN) + ", " + (ConsumerDAO.CLIENT_ID_COLUMN) + ", " + (ConsumerDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
@@ -663,12 +654,7 @@ private void upgradeTxns(Connection conn) throws BrokerException {
         String getAllTxnsFromOldSQL = strBuf.toString();
 
         // SQL to insert transactions to new table
-        String insertTxnSQL = new StringBuilder(128).append("INSERT INTO ").append(txnDAO.getTableName()).append(" ( ").append(TransactionDAO.ID_COLUMN)
-                .append(", ").append(TransactionDAO.TYPE_COLUMN).append(", ").append(TransactionDAO.STATE_COLUMN).append(", ")
-                .append(TransactionDAO.AUTO_ROLLBACK_COLUMN).append(", ").append(TransactionDAO.XID_COLUMN).append(", ").append(TransactionDAO.TXN_STATE_COLUMN)
-                .append(", ").append(TransactionDAO.TXN_HOME_BROKER_COLUMN).append(", ").append(TransactionDAO.TXN_BROKERS_COLUMN).append(", ")
-                .append(TransactionDAO.STORE_SESSION_ID_COLUMN).append(", ").append(TransactionDAO.EXPIRED_TS_COLUMN).append(", ")
-                .append(TransactionDAO.ACCESSED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )").toString();
+        String insertTxnSQL = "INSERT INTO " + txnDAO.getTableName() + " ( " + (TransactionDAO.ID_COLUMN) + ", " + (TransactionDAO.TYPE_COLUMN) + ", " + (TransactionDAO.STATE_COLUMN) + ", " + (TransactionDAO.AUTO_ROLLBACK_COLUMN) + ", " + (TransactionDAO.XID_COLUMN) + ", " + (TransactionDAO.TXN_STATE_COLUMN) + ", " + (TransactionDAO.TXN_HOME_BROKER_COLUMN) + ", " + (TransactionDAO.TXN_BROKERS_COLUMN) + ", " + (TransactionDAO.STORE_SESSION_ID_COLUMN) + ", " + (TransactionDAO.EXPIRED_TS_COLUMN) + ", " + (TransactionDAO.ACCESSED_TS_COLUMN) + ") VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
@@ -764,9 +750,7 @@ private void upgradeTxnAcks(Connection conn) throws BrokerException {
 
         // SQL to insert acknowledgements to consumer state table;
         // for 400, txn ack is represent as a column in consumer state table.
-        String insertTxnAckSQL = new StringBuilder(128).append("UPDATE ").append(stateDAO.getTableName()).append(" SET ")
-                .append(ConsumerStateDAO.TRANSACTION_ID_COLUMN).append(" = ? ").append(" WHERE ").append(ConsumerStateDAO.MESSAGE_ID_COLUMN).append(" = ?")
-                .append(" AND ").append(ConsumerStateDAO.CONSUMER_ID_COLUMN).append(" = ?").toString();
+        String insertTxnAckSQL = "UPDATE " + stateDAO.getTableName() + " SET " + (ConsumerStateDAO.TRANSACTION_ID_COLUMN) + " = ? " + " WHERE " + (ConsumerStateDAO.MESSAGE_ID_COLUMN) + " = ?" + " AND " + (ConsumerStateDAO.CONSUMER_ID_COLUMN) + " = ?";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         PreparedStatement pstmt = null;
@@ -840,8 +824,7 @@ private void upgradeChangeRecords(Connection conn) throws BrokerException {
         String getAllRecordFromOldSQL = strBuf.toString();
 
         // SQL to insert ConfigRecord to new table
-        String insertRecordSQL = new StringBuilder(128).append("INSERT INTO ").append(recordDAO.getTableName()).append(" ( ")
-                .append(ConfigRecordDAO.RECORD_COLUMN).append(", ").append(ConfigRecordDAO.CREATED_TS_COLUMN).append(") VALUES ( ?, ? )").toString();
+        String insertRecordSQL = "INSERT INTO " + recordDAO.getTableName() + " ( " + (ConfigRecordDAO.RECORD_COLUMN) + ", " + (ConfigRecordDAO.CREATED_TS_COLUMN) + ") VALUES ( ?, ? )";
 
         PreparedStatement pstmt = null;
         Statement stmt = null;
@@ -897,8 +880,7 @@ private void upgradeProperties(Connection conn) throws BrokerException {
         String getAllPropFromOldSQL = "SELECT " + TPROP_CNAME + ", " + TPROP_CVALUE + " FROM " + oldPropTable;
 
         // SQL to insert property to new table
-        String insertPropSQL = new StringBuilder(128).append("INSERT INTO ").append(propDAO.getTableName()).append(" ( ").append(PropertyDAO.PROPNAME_COLUMN)
-                .append(", ").append(PropertyDAO.PROPVALUE_COLUMN).append(") VALUES ( ?, ? )").toString();
+        String insertPropSQL = "INSERT INTO " + propDAO.getTableName() + " ( " + (PropertyDAO.PROPNAME_COLUMN) + ", " + (PropertyDAO.PROPVALUE_COLUMN) + ") VALUES ( ?, ? )";
 
         boolean dobatch = dbMgr.supportsBatchUpdates();
         Statement stmt = null;
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/VersionDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/VersionDAOImpl.java
index 55db4ff8d..84a88cac2 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/VersionDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/VersionDAOImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -49,22 +49,17 @@ class VersionDAOImpl extends BaseDAOImpl implements VersionDAO {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(STORE_VERSION_COLUMN).append(") VALUES ( ? )")
-                .toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + STORE_VERSION_COLUMN + ") VALUES ( ? )";
 
-        updateLockSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(LOCK_ID_COLUMN).append(" = ?").append(" WHERE ")
-                .append(STORE_VERSION_COLUMN).append(" = ? AND ").append(LOCK_ID_COLUMN).append(" IS NULL").toString();
+        updateLockSQL = "UPDATE " + tableName + " SET " + LOCK_ID_COLUMN + " = ?" + " WHERE " + STORE_VERSION_COLUMN + " = ? AND " + LOCK_ID_COLUMN + " IS NULL";
 
-        updateLockByLockIDSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(LOCK_ID_COLUMN).append(" = ?")
-                .append(" WHERE ").append(STORE_VERSION_COLUMN).append(" = ? AND ").append(LOCK_ID_COLUMN).append(" = ?").toString();
+        updateLockByLockIDSQL = "UPDATE " + tableName + " SET " + LOCK_ID_COLUMN + " = ?" + " WHERE " + STORE_VERSION_COLUMN + " = ? AND " + LOCK_ID_COLUMN + " = ?";
 
-        selectStoreVersionSQL = new StringBuilder(128).append("SELECT ").append(STORE_VERSION_COLUMN).append(" FROM ").append(tableName).toString();
+        selectStoreVersionSQL = "SELECT " + STORE_VERSION_COLUMN + " FROM " + tableName;
 
-        selectLockSQL = new StringBuilder(128).append("SELECT ").append(LOCK_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(STORE_VERSION_COLUMN).append(" = ?").toString();
+        selectLockSQL = "SELECT " + LOCK_ID_COLUMN + " FROM " + tableName + " WHERE " + STORE_VERSION_COLUMN + " = ?";
 
-        selectAllSQL = new StringBuilder(128).append("SELECT ").append(LOCK_ID_COLUMN).append(", ").append(STORE_VERSION_COLUMN).append(" FROM ")
-                .append(tableName).toString();
+        selectAllSQL = "SELECT " + LOCK_ID_COLUMN + ", " + STORE_VERSION_COLUMN + " FROM " + tableName;
     }
 
     /**
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommBaseDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommBaseDAOImpl.java
index 6dd974465..376d99363 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommBaseDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommBaseDAOImpl.java
@@ -61,8 +61,7 @@ public int getRowCount(Connection conn, String whereClause) throws BrokerExcepti
 
         int count = -1;
 
-        String sql = new StringBuilder(128).append("SELECT COUNT(*) FROM ").append(getTableName())
-                .append((whereClause != null && whereClause.length() > 0) ? " WHERE " + whereClause : "").toString();
+        String sql = "SELECT COUNT(*) FROM " + getTableName() + ((whereClause != null && whereClause.length() > 0) ? " WHERE " + whereClause : "");
 
         boolean myConn = false;
         Statement stmt = null;
@@ -330,10 +329,9 @@ private void deleteAll(Connection conn, String whereClause) throws BrokerExcepti
         String sql = null;
 
         if (dbMgr.isOracle() && whereClause == null) {
-            sql = new StringBuilder(128).append("TRUNCATE TABLE ").append(tableName).toString();
+            sql = "TRUNCATE TABLE " + tableName;
         } else {
-            sql = new StringBuilder(128).append("DELETE FROM ").append(tableName)
-                    .append((whereClause != null && whereClause.length() > 0) ? " WHERE " + whereClause : "").toString();
+            sql = "DELETE FROM " + tableName + ((whereClause != null && whereClause.length() > 0) ? " WHERE " + whereClause : "");
         }
 
         boolean myConn = false;
@@ -405,8 +403,7 @@ private void deleteAllInChunk(Connection conn, String whereClause, String timest
 
             // Get the number of rows to be deleted to see if we need to delete
             // data in multiple chunks, i.e. # rowToBeDeleted > chunkSize
-            sql = new StringBuilder(128).append("SELECT COUNT(*)").append(" FROM ").append(tableName)
-                    .append(whereClause.length() > 0 ? " WHERE " + whereClause : "").toString();
+            sql = "SELECT COUNT(*)" + " FROM " + tableName + (whereClause.length() > 0 ? " WHERE " + whereClause : "");
 
             pstmt = dbMgr.createPreparedStatement(conn, sql);
             ResultSet rs = pstmt.executeQuery();
@@ -425,8 +422,7 @@ private void deleteAllInChunk(Connection conn, String whereClause, String timest
 
             // We will need to delete all records in multiple chunks; so
             // generate the timestamp delimeter for each chunk.
-            sql = new StringBuilder(128).append("SELECT ").append(timestampColumn).append(" FROM ").append(tableName)
-                    .append(whereClause.length() > 0 ? " WHERE " + whereClause : "").append(" ORDER BY ").append(timestampColumn).toString();
+            sql = "SELECT " + timestampColumn + " FROM " + tableName + (whereClause.length() > 0 ? " WHERE " + whereClause : "") + " ORDER BY " + timestampColumn;
             pstmt = dbMgr.createPreparedStatement(conn, sql);
             rs = pstmt.executeQuery();
             List chunkList = Util.getChunkDelimiters(rs, 1, chunkSize);
@@ -439,8 +435,7 @@ private void deleteAllInChunk(Connection conn, String whereClause, String timest
             }
 
             // Now, we delete all data in multiple chunks...
-            sql = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(timestampColumn).append(" < ?")
-                    .append(whereClause.length() > 0 ? " AND " + whereClause : "").toString();
+            sql = "DELETE FROM " + tableName + " WHERE " + timestampColumn + " < ?" + (whereClause.length() > 0 ? " AND " + whereClause : "");
             pstmt = dbMgr.createPreparedStatement(conn, sql);
 
             Long[] a = (Long[]) chunkList.toArray(new Long[chunkList.size()]);
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommDBManager.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommDBManager.java
index ed370b4a2..d4ede73c1 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommDBManager.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/comm/CommDBManager.java
@@ -154,9 +154,7 @@ protected void initDBMetaData() throws BrokerException {
             // we know how to deal w/ Oracle LOB handling!
             isOraDriver = "oracle".equalsIgnoreCase(dbProductName);
 
-            String logMsg = new StringBuilder(256).append(getLogStringTag() + "DBManager: database product name=").append(dbProductName)
-                    .append(", database version number=").append(dbProductVersion).append(", driver version number=").append(driverv)
-                    .append(", supports batch updates=").append(supportBatch).append(", supports getGeneratedKey=").append(supportGetGeneratedKey).toString();
+            String logMsg = getLogStringTag() + "DBManager: database product name=" + dbProductName + ", database version number=" + dbProductVersion + ", driver version number=" + driverv + ", supports batch updates=" + supportBatch + ", supports getGeneratedKey=" + supportGetGeneratedKey;
             logger.log(Logger.FORCE, getLogStringTag() + dbProductName + ", " + dbProductVersion + ", " + driverv);
             logger.log((Store.getDEBUG() ? Logger.INFO : Logger.DEBUG), logMsg);
         } catch (SQLException e) {
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/JMSBGDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/JMSBGDAOImpl.java
index 7ae788a96..5aa218200 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/JMSBGDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/JMSBGDAOImpl.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -52,27 +52,19 @@ public JMSBGDAOImpl() throws BrokerException {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(NAME_COLUMN).append(", ").append(BROKER_ID_COLUMN)
-                .append(", ").append(CREATED_TS_COLUMN).append(", ").append(UPDATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?)").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + NAME_COLUMN + ", " + BROKER_ID_COLUMN + ", " + CREATED_TS_COLUMN + ", " + UPDATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?)";
 
-        updateBrokerIdSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(BROKER_ID_COLUMN).append(" = ?, ")
-                .append(UPDATED_TS_COLUMN).append(" = ? ").append(" WHERE ").append(NAME_COLUMN).append(" = ?").append(" AND ").append(BROKER_ID_COLUMN)
-                .append(" = ?").append(Util.brokerNotTakenOverClause(dbMgr)).toString();
+        updateBrokerIdSQL = "UPDATE " + tableName + " SET " + BROKER_ID_COLUMN + " = ?, " + UPDATED_TS_COLUMN + " = ? " + " WHERE " + NAME_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?" + Util.brokerNotTakenOverClause(dbMgr);
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(NAME_COLUMN).append(" = ?").append(" AND ")
-                .append(BROKER_ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + NAME_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?";
 
-        selectBrokerIdSQL = new StringBuilder(128).append("SELECT ").append(BROKER_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(NAME_COLUMN).append(" = ?").toString();
+        selectBrokerIdSQL = "SELECT " + BROKER_ID_COLUMN + " FROM " + tableName + " WHERE " + NAME_COLUMN + " = ?";
 
-        selectUpdatedTimeSQL = new StringBuilder(128).append("SELECT ").append(UPDATED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(NAME_COLUMN).append(" = ?").toString();
+        selectUpdatedTimeSQL = "SELECT " + UPDATED_TS_COLUMN + " FROM " + tableName + " WHERE " + NAME_COLUMN + " = ?";
 
-        selectCreatedTimeSQL = new StringBuilder(128).append("SELECT ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(NAME_COLUMN).append(" = ?").toString();
+        selectCreatedTimeSQL = "SELECT " + CREATED_TS_COLUMN + " FROM " + tableName + " WHERE " + NAME_COLUMN + " = ?";
 
-        selectNamesByBrokerIdSQL = new StringBuilder(128).append("SELECT ").append(NAME_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(BROKER_ID_COLUMN).append(" = ?").toString();
+        selectNamesByBrokerIdSQL = "SELECT " + NAME_COLUMN + " FROM " + tableName + " WHERE " + BROKER_ID_COLUMN + " = ?";
     }
 
     @Override
@@ -241,7 +233,7 @@ public void deleteAll(Connection conn) throws BrokerException {
 
         DBManager dbMgr = DBManager.getDBManager();
 
-        String whereClause = new StringBuilder(128).append(BROKER_ID_COLUMN).append(" = '").append(dbMgr.getBrokerID()).append('\'').toString();
+        String whereClause = BROKER_ID_COLUMN + " = '" + dbMgr.getBrokerID() + '\'';
 
         deleteAll(conn, whereClause, null, 0);
     }
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/TMLogRecordDAOJMSBG.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/TMLogRecordDAOJMSBG.java
index b8a0ab02d..716cbc274 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/TMLogRecordDAOJMSBG.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/ext/TMLogRecordDAOJMSBG.java
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 Payara Services Ltd.
- * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -58,31 +58,21 @@ public TMLogRecordDAOJMSBG() throws BrokerException {
 
         tableName = dbMgr.getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(XID_COLUMN).append(", ").append(LOG_RECORD_COLUMN)
-                .append(", ").append(NAME_COLUMN).append(", ").append(BROKER_ID_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(", ")
-                .append(UPDATED_TS_COLUMN).append(") VALUES ( ?, ?, ?, ?, ?, ?)").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + XID_COLUMN + ", " + LOG_RECORD_COLUMN + ", " + NAME_COLUMN + ", " + BROKER_ID_COLUMN + ", " + CREATED_TS_COLUMN + ", " + UPDATED_TS_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ?)";
 
-        updateLogRecordSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(LOG_RECORD_COLUMN).append(" = ?, ")
-                .append(UPDATED_TS_COLUMN).append(" = ? ").append(" WHERE ").append(XID_COLUMN).append(" = ?").append(" AND ").append(BROKER_ID_COLUMN)
-                .append(" = ?").toString();
+        updateLogRecordSQL = "UPDATE " + tableName + " SET " + LOG_RECORD_COLUMN + " = ?, " + UPDATED_TS_COLUMN + " = ? " + " WHERE " + XID_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?";
 
-        deleteSQL = new StringBuilder(128).append("DELETE FROM ").append(tableName).append(" WHERE ").append(XID_COLUMN).append(" = ?").append(" AND ")
-                .append(BROKER_ID_COLUMN).append(" = ?").toString();
+        deleteSQL = "DELETE FROM " + tableName + " WHERE " + XID_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?";
 
-        selectLogRecordSQL = new StringBuilder(128).append("SELECT ").append(LOG_RECORD_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(XID_COLUMN).append(" = ?").append(" AND ").append(BROKER_ID_COLUMN).append(" = ?").toString();
+        selectLogRecordSQL = "SELECT " + LOG_RECORD_COLUMN + " FROM " + tableName + " WHERE " + XID_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?";
 
-        selectUpdatedTimeSQL = new StringBuilder(128).append("SELECT ").append(UPDATED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(XID_COLUMN).append(" = ?").toString();
+        selectUpdatedTimeSQL = "SELECT " + UPDATED_TS_COLUMN + " FROM " + tableName + " WHERE " + XID_COLUMN + " = ?";
 
-        selectCreatedTimeSQL = new StringBuilder(128).append("SELECT ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(XID_COLUMN).append(" = ?").toString();
+        selectCreatedTimeSQL = "SELECT " + CREATED_TS_COLUMN + " FROM " + tableName + " WHERE " + XID_COLUMN + " = ?";
 
-        selectLogRecordsByNameByBrokerSQL = new StringBuilder(128).append("SELECT ").append(XID_COLUMN).append(", ").append(LOG_RECORD_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(NAME_COLUMN).append(" = ?").append(" AND ").append(BROKER_ID_COLUMN).append(" = ?").toString();
+        selectLogRecordsByNameByBrokerSQL = "SELECT " + XID_COLUMN + ", " + LOG_RECORD_COLUMN + " FROM " + tableName + " WHERE " + NAME_COLUMN + " = ?" + " AND " + BROKER_ID_COLUMN + " = ?";
 
-        selectTMNamesByBrokerSQL = new StringBuilder(128).append("SELECT ").append(NAME_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(BROKER_ID_COLUMN).append(" = ?").toString();
+        selectTMNamesByBrokerSQL = "SELECT " + NAME_COLUMN + " FROM " + tableName + " WHERE " + BROKER_ID_COLUMN + " = ?";
     }
 
     @Override
@@ -274,8 +264,7 @@ public void deleteAllByName(Connection conn, String name, java.util.logging.Logg
 
         DBManager dbMgr = DBManager.getDBManager();
 
-        String whereClause = new StringBuilder(128).append(BROKER_ID_COLUMN).append(" = '").append(dbMgr.getBrokerID()).append('\'').append(" AND ")
-                .append(NAME_COLUMN).append(" = '").append(name).append('\'').toString();
+        String whereClause = BROKER_ID_COLUMN + " = '" + dbMgr.getBrokerID() + '\'' + " AND " + NAME_COLUMN + " = '" + name + '\'';
 
         deleteAll(conn, whereClause, null, 0);
     }
@@ -290,7 +279,7 @@ public void deleteAll(Connection conn) throws BrokerException {
 
         DBManager dbMgr = DBManager.getDBManager();
 
-        String whereClause = new StringBuilder(128).append(BROKER_ID_COLUMN).append(" = '").append(dbMgr.getBrokerID()).append('\'').toString();
+        String whereClause = BROKER_ID_COLUMN + " = '" + dbMgr.getBrokerID() + '\'';
 
         deleteAll(conn, whereClause, null, 0);
     }
diff --git a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/sharecc/ShareConfigRecordDAOImpl.java b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/sharecc/ShareConfigRecordDAOImpl.java
index 5d4c0398a..d47b3c312 100644
--- a/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/sharecc/ShareConfigRecordDAOImpl.java
+++ b/mq/main/mq-broker/mqpersist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/sharecc/ShareConfigRecordDAOImpl.java
@@ -65,59 +65,35 @@ public class ShareConfigRecordDAOImpl extends ShareConfigRecordBaseDAOImpl imple
 
         tableName = getDBManager().getTableName(TABLE_NAME_PREFIX);
 
-        insertSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(UUID_COLUMN).append(", ").append(RECORD_COLUMN)
-                .append(", ").append(TYPE_COLUMN).append(", ").append(UKEY_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(", ").append(FLAG_COLUMN)
-                .append(") VALUES ( ?, ?, ?, ?, ?, ? )").toString();
+        insertSQL = "INSERT INTO " + tableName + " ( " + UUID_COLUMN + ", " + RECORD_COLUMN + ", " + TYPE_COLUMN + ", " + UKEY_COLUMN + ", " + CREATED_TS_COLUMN + ", " + FLAG_COLUMN + ") VALUES ( ?, ?, ?, ?, ?, ? )";
 
-        insertSQLOracle = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(SEQ_COLUMN).append(", ").append(UUID_COLUMN)
-                .append(", ").append(RECORD_COLUMN).append(", ").append(TYPE_COLUMN).append(", ").append(UKEY_COLUMN).append(", ").append(CREATED_TS_COLUMN)
-                .append(", ").append(FLAG_COLUMN).append(") VALUES (" + tableName + "_seq.NEXTVAL, ?, ?, ?, ?, ?, ? )").toString();
+        insertSQLOracle = "INSERT INTO " + tableName + " ( " + SEQ_COLUMN + ", " + UUID_COLUMN + ", " + RECORD_COLUMN + ", " + TYPE_COLUMN + ", " + UKEY_COLUMN + ", " + CREATED_TS_COLUMN + ", " + FLAG_COLUMN + (") VALUES (" + tableName + "_seq.NEXTVAL, ?, ?, ?, ?, ?, ? )");
 
-        selectSeqSQLOracle = new StringBuilder(128).append("SELECT ").append(tableName + "_seq.CURRVAL ").append("FROM DUAL").toString();
+        selectSeqSQLOracle = "SELECT " + (tableName + "_seq.CURRVAL ") + "FROM DUAL";
 
-        insertResetRecordSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(SEQ_COLUMN).append(", ").append(UUID_COLUMN)
-                .append(", ").append(RECORD_COLUMN).append(", ").append(TYPE_COLUMN).append(", ").append(UKEY_COLUMN).append(", ").append(CREATED_TS_COLUMN)
-                .append(") VALUES ( 1, ?, ?, ?, ?, ? )").toString();
+        insertResetRecordSQL = "INSERT INTO " + tableName + " ( " + SEQ_COLUMN + ", " + UUID_COLUMN + ", " + RECORD_COLUMN + ", " + TYPE_COLUMN + ", " + UKEY_COLUMN + ", " + CREATED_TS_COLUMN + ") VALUES ( 1, ?, ?, ?, ?, ? )";
 
-        insertResetRecordWithLockSQL = new StringBuilder(128).append("INSERT INTO ").append(tableName).append(" ( ").append(SEQ_COLUMN).append(", ")
-                .append(UUID_COLUMN).append(", ").append(RECORD_COLUMN).append(", ").append(TYPE_COLUMN).append(", ").append(UKEY_COLUMN).append(", ")
-                .append(CREATED_TS_COLUMN).append(", ").append(LOCK_ID_COLUMN).append(") VALUES ( 1, ?, ?, ?, ?, ?, ? )").toString();
+        insertResetRecordWithLockSQL = "INSERT INTO " + tableName + " ( " + SEQ_COLUMN + ", " + UUID_COLUMN + ", " + RECORD_COLUMN + ", " + TYPE_COLUMN + ", " + UKEY_COLUMN + ", " + CREATED_TS_COLUMN + ", " + LOCK_ID_COLUMN + ") VALUES ( 1, ?, ?, ?, ?, ?, ? )";
 
-        selectTypeFlagByMaxSeqUKeySQL = new StringBuilder(128).append("SELECT ").append(TYPE_COLUMN).append(", ").append(FLAG_COLUMN).append(" FROM ")
-                .append(tableName).append(" WHERE ").append(SEQ_COLUMN).append(" IN (").append(" SELECT MAX(").append(SEQ_COLUMN).append(") ").append("FROM ")
-                .append(tableName).append(" WHERE ").append(UKEY_COLUMN).append(" = ? )").toString();
+        selectTypeFlagByMaxSeqUKeySQL = "SELECT " + TYPE_COLUMN + ", " + FLAG_COLUMN + " FROM " + tableName + " WHERE " + SEQ_COLUMN + " IN (" + " SELECT MAX(" + SEQ_COLUMN + ") " + "FROM " + tableName + " WHERE " + UKEY_COLUMN + " = ? )";
 
-        selectMaxSeqFlagUKeySQL = new StringBuilder(128).append("SELECT ").append(SEQ_COLUMN).append(", ").append(FLAG_COLUMN).append(" FROM ").append(tableName)
-                .append(" WHERE ").append(UKEY_COLUMN).append(" = ? ").append(" AND ").append(SEQ_COLUMN).append(" = ").append("(SELECT MAX(")
-                .append(SEQ_COLUMN).append(") ").append(" FROM ").append(tableName).append(" WHERE ").append(UKEY_COLUMN).append(" = ? )").toString();
+        selectMaxSeqFlagUKeySQL = "SELECT " + SEQ_COLUMN + ", " + FLAG_COLUMN + " FROM " + tableName + " WHERE " + UKEY_COLUMN + " = ? " + " AND " + SEQ_COLUMN + " = " + "(SELECT MAX(" + SEQ_COLUMN + ") " + " FROM " + tableName + " WHERE " + UKEY_COLUMN + " = ? )";
 
-        selectSinceWithResetRecordSQL = new StringBuilder(128).append("SELECT ").append(SEQ_COLUMN).append(", ").append(UUID_COLUMN).append(", ")
-                .append(RECORD_COLUMN).append(", ").append(TYPE_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(" FROM ").append(tableName)
-                .append(" WHERE ").append(SEQ_COLUMN).append(" > ?").append(" OR ").append(TYPE_COLUMN).append(" = ")
-                .append(ChangeRecordInfo.TYPE_RESET_PERSISTENCE).append(" ORDER BY ").append(SEQ_COLUMN).toString();
+        selectSinceWithResetRecordSQL = "SELECT " + SEQ_COLUMN + ", " + UUID_COLUMN + ", " + RECORD_COLUMN + ", " + TYPE_COLUMN + ", " + CREATED_TS_COLUMN + " FROM " + tableName + " WHERE " + SEQ_COLUMN + " > ?" + " OR " + TYPE_COLUMN + " = " + (ChangeRecordInfo.TYPE_RESET_PERSISTENCE) + " ORDER BY " + SEQ_COLUMN;
 
-        selectAllSQL = new StringBuilder(128).append("SELECT ").append(SEQ_COLUMN).append(", ").append(UUID_COLUMN).append(", ").append(RECORD_COLUMN)
-                .append(", ").append(TYPE_COLUMN).append(", ").append(CREATED_TS_COLUMN).append(", ").append(LOCK_ID_COLUMN).append(" FROM ").append(tableName)
-                .append(" ORDER BY ").append(SEQ_COLUMN).toString();
+        selectAllSQL = "SELECT " + SEQ_COLUMN + ", " + UUID_COLUMN + ", " + RECORD_COLUMN + ", " + TYPE_COLUMN + ", " + CREATED_TS_COLUMN + ", " + LOCK_ID_COLUMN + " FROM " + tableName + " ORDER BY " + SEQ_COLUMN;
 
-        selectSeqByUUIDSQL = new StringBuilder(128).append("SELECT ").append(SEQ_COLUMN).append(" FROM ").append(tableName).append(" WHERE ").append(UUID_COLUMN)
-                .append(" = ?").toString();
+        selectSeqByUUIDSQL = "SELECT " + SEQ_COLUMN + " FROM " + tableName + " WHERE " + UUID_COLUMN + " = ?";
 
-        selectLockIDSQL = new StringBuilder(128).append("SELECT ").append(LOCK_ID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(TYPE_COLUMN).append(" = ").append(ChangeRecordInfo.TYPE_RESET_PERSISTENCE).toString();
+        selectLockIDSQL = "SELECT " + LOCK_ID_COLUMN + " FROM " + tableName + " WHERE " + TYPE_COLUMN + " = " + (ChangeRecordInfo.TYPE_RESET_PERSISTENCE);
 
-        updateResetRecordUUIDSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(UUID_COLUMN).append(" = ?")
-                .append(" WHERE ").append(TYPE_COLUMN).append(" = ").append(ChangeRecordInfo.TYPE_RESET_PERSISTENCE).toString();
+        updateResetRecordUUIDSQL = "UPDATE " + tableName + " SET " + UUID_COLUMN + " = ?" + " WHERE " + TYPE_COLUMN + " = " + (ChangeRecordInfo.TYPE_RESET_PERSISTENCE);
 
-        setResetRecordFLAGNULLSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(FLAG_COLUMN).append(" = NULL")
-                .append(" WHERE ").append(TYPE_COLUMN).append(" = ").append(ChangeRecordInfo.TYPE_RESET_PERSISTENCE).toString();
+        setResetRecordFLAGNULLSQL = "UPDATE " + tableName + " SET " + FLAG_COLUMN + " = NULL" + " WHERE " + TYPE_COLUMN + " = " + (ChangeRecordInfo.TYPE_RESET_PERSISTENCE);
 
-        selectResetRecordUUIDSQL = new StringBuilder(128).append("SELECT ").append(UUID_COLUMN).append(" FROM ").append(tableName).append(" WHERE ")
-                .append(TYPE_COLUMN).append(" = ").append(ChangeRecordInfo.TYPE_RESET_PERSISTENCE).toString();
+        selectResetRecordUUIDSQL = "SELECT " + UUID_COLUMN + " FROM " + tableName + " WHERE " + TYPE_COLUMN + " = " + (ChangeRecordInfo.TYPE_RESET_PERSISTENCE);
 
-        updateLockIDSQL = new StringBuilder(128).append("UPDATE ").append(tableName).append(" SET ").append(LOCK_ID_COLUMN).append(" = ? ").append(" WHERE ")
-                .append(TYPE_COLUMN).append(" = ").append(ChangeRecordInfo.TYPE_RESET_PERSISTENCE).append(" AND ").append(LOCK_ID_COLUMN).append(" = ? ")
-                .toString();
+        updateLockIDSQL = "UPDATE " + tableName + " SET " + LOCK_ID_COLUMN + " = ? " + " WHERE " + TYPE_COLUMN + " = " + (ChangeRecordInfo.TYPE_RESET_PERSISTENCE) + " AND " + LOCK_ID_COLUMN + " = ? ";
     }
 
     /**
diff --git a/mq/main/pom.xml b/mq/main/pom.xml
index 2920e0908..98e057650 100644
--- a/mq/main/pom.xml
+++ b/mq/main/pom.xml
@@ -1111,7 +1111,6 @@
                                       -Xep:UnnecessaryLongToIntConversion:OFF \
                                       -Xep:UnnecessaryParentheses:OFF \
                                       -Xep:UnnecessarySemicolon:OFF \
-                                      -Xep:UnnecessaryStringBuilder:OFF \
                                       -Xep:UnsafeLocaleUsage:OFF \
                                       -Xep:UnsafeReflectiveConstructionCast:OFF \
                                       -Xep:UnsynchronizedOverridesSynchronized:OFF \
@@ -1195,6 +1194,7 @@ Existing jvm.config.error-prone can be copied to jvm.config.
                                 <recipe>org.openrewrite.staticanalysis.RemoveExtraSemicolons</recipe>
                                 <recipe>org.openrewrite.staticanalysis.NoFinalizer</recipe>
                                 <recipe>org.openrewrite.staticanalysis.NoToStringOnStringType</recipe>
+                                <recipe>org.openrewrite.staticanalysis.ReplaceStringBuilderWithString</recipe>
                                 <recipe>org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments</recipe>
                                 <recipe>org.openrewrite.staticanalysis.UseDiamondOperator</recipe>
                                 <recipe>org.openrewrite.staticanalysis.PrimitiveWrapperClassConstructorToValueOf</recipe>