Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-9324] Convert activemq-jdbc-store to use j.util.Base64 

- No need to drag JAXB dependency just for a base64 converter
This commit is contained in:
Matt Pavlovich 2023-10-06 10:22:17 -05:00
parent 578d86d726
commit e7f023ce8b
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-jdbc-store/pom.xml
View File

@ -39,10 +39,6 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>

16
activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
View File

@ -16,9 +16,6 @@
*/
package org.apache.activemq.store.jdbc.adapter;
import static javax.xml.bind.DatatypeConverter.parseBase64Binary;
import static javax.xml.bind.DatatypeConverter.printBase64Binary;
import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
@ -26,6 +23,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Base64;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Set;
@ -239,7 +237,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
if (xid != null) {
byte[] xidVal = xid.getEncodedXidBytes();
xidVal[0] = '+';
String xidString = printBase64Binary(xidVal);
String xidString = Base64.getEncoder().encodeToString(xidVal);
s.setString(8, xidString);
} else {
s.setString(8, null);
@ -381,7 +379,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
} else {
byte[] xidVal = xid.getEncodedXidBytes();
xidVal[0] = '-';
String xidString = printBase64Binary(xidVal);
String xidString = Base64.getEncoder().encodeToString(xidVal);
s.setString(1, xidString);
s.setLong(2, seq);
}
@ -466,7 +464,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
}
if (xid != null) {
byte[] xidVal = encodeXid(xid, seq, priority);
String xidString = printBase64Binary(xidVal);
String xidString = Base64.getEncoder().encodeToString(xidVal);
s.setString(1, xidString);
} else {
s.setLong(1, seq);
@ -503,7 +501,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
}
if (xid != null) {
byte[] xidVal = encodeXid(xid, seq, priority);
String xidString = printBase64Binary(xidVal);
String xidString = Base64.getEncoder().encodeToString(xidVal);
s.setString(1, xidString);
} else {
s.setLong(1, seq);
@ -991,7 +989,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
while (rs.next()) {
long id = rs.getLong(1);
String encodedString = rs.getString(2);
byte[] encodedXid = parseBase64Binary(encodedString);
byte[] encodedXid = Base64.getDecoder().decode(encodedString);
if (encodedXid[0] == '+') {
jdbcMemoryTransactionStore.recoverAdd(id, getBinaryData(rs, 3));
} else {
@ -1006,7 +1004,7 @@ public class DefaultJDBCAdapter implements JDBCAdapter {
rs = s.executeQuery();
while (rs.next()) {
String encodedString = rs.getString(1);
byte[] encodedXid = parseBase64Binary(encodedString);
byte[] encodedXid = Base64.getDecoder().decode(encodedString);
String destination = rs.getString(2);
String subId = rs.getString(3);
String subName = rs.getString(4);