You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/05/24 16:23:43 UTC
[activemq-artemis] 01/02: get artemis-cli compiling
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 08c9ab666fd79a168e707a478374cd862eb68898
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue May 24 17:21:39 2022 +0100
get artemis-cli compiling
---
.../cli/commands/tools/xml/XMLMessageImporter.java | 5 +--
.../cli/commands/tools/xml/XmlDataImporter.java | 7 ++--
.../org/apache/activemq/cli/test/ArtemisTest.java | 41 +++++++++++-----------
.../org/apache/activemq/cli/test/HashUtilTest.java | 7 ++--
4 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
index 78ae5ecb1d..c9383b9b6a 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
@@ -40,12 +40,13 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.utils.Base64;
import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** This is an Utility class that will import the outputs in XML format. */
public class XMLMessageImporter {
- private static final Logger logger = Logger.getLogger(XMLMessageImporter.class);
+ private static final Logger logger = LoggerFactory.getLogger(XMLMessageImporter.class);
private XMLStreamReader reader;
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index 027db44cb3..8372741b8f 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -63,7 +63,8 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
import org.apache.activemq.artemis.utils.ListUtil;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
@@ -73,7 +74,7 @@ import org.jboss.logging.Logger;
@Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
public final class XmlDataImporter extends ActionAbstract {
- private static final Logger logger = Logger.getLogger(XmlDataImporter.class);
+ private static final Logger logger = LoggerFactory.getLogger(XmlDataImporter.class);
private XMLStreamReader reader;
@@ -329,7 +330,7 @@ public final class XmlDataImporter extends ActionAbstract {
logMessage.delete(logMessage.length() - 2, logMessage.length()); // take off the trailing comma
if (logger.isDebugEnabled()) {
- logger.debug(logMessage);
+ logger.debug(logMessage.toString());
}
message.putBytesProperty(Message.HDR_ROUTE_TO_IDS, buffer.array());
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index 745dce07d6..ca8c354178 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -96,11 +96,12 @@ import org.apache.activemq.artemis.utils.Wait;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
import org.apache.commons.configuration2.builder.fluent.Configurations;
-import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -116,7 +117,7 @@ import static org.junit.Assert.fail;
* Test to validate that the CLI doesn't throw improper exceptions when invoked.
*/
public class ArtemisTest extends CliTestBase {
- private static final Logger log = Logger.getLogger(ArtemisTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ArtemisTest.class);
// some tests will set this, as some security methods will need to know the server the CLI started
private ActiveMQServer server;
@@ -167,9 +168,9 @@ public class ArtemisTest extends CliTestBase {
int writes = 2;
int tries = 5;
long totalAvg = SyncCalculation.syncTest(temporaryFolder.getRoot(), 4096, writes, tries, true, true, true, "file.tmp", 1, JournalType.NIO);
- log.debug("TotalAvg = " + totalAvg);
+ log.debug("TotalAvg = {}", totalAvg);
long nanoTime = SyncCalculation.toNanos(totalAvg, writes, false);
- log.debug("nanoTime avg = " + nanoTime);
+ log.debug("nanoTime avg = {}", nanoTime);
assertEquals(0, LibaioContext.getTotalMaxIO());
}
@@ -300,7 +301,7 @@ public class ArtemisTest extends CliTestBase {
byte[] contents = Files.readAllBytes(bootstrapFile.toPath());
String cfgText = new String(contents);
- log.debug("confg: " + cfgText);
+ log.debug("confg: {}", cfgText);
config = parseXml(bootstrapFile);
webElem = (Element) config.getElementsByTagName("web").item(0);
@@ -446,7 +447,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
//default only one user admin with role amq
assertTrue(result.contains("\"admin\"(amq)"));
@@ -465,7 +466,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output2:\n" + result);
+ log.debug("output2:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -486,7 +487,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output3:\n" + result);
+ log.debug("output3:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -511,7 +512,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output4:\n" + result);
+ log.debug("output4:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -528,7 +529,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output5:\n" + result);
+ log.debug("output5:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertFalse(result.contains("\"guest\"(admin)"));
@@ -546,7 +547,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output6:\n" + result);
+ log.debug("output6:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertFalse(result.contains("\"guest\"(admin)"));
@@ -567,7 +568,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output7:\n" + result);
+ log.debug("output7:\n{}", result);
assertTrue(result.contains("\"admin\"(amq)"));
assertTrue(result.contains("Total: 1"));
@@ -582,7 +583,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output8:\n" + result);
+ log.debug("output8:\n{}", result);
assertTrue(result.contains("Total: 0"));
} finally {
@@ -876,7 +877,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
//default only one user admin with role amq
assertTrue(result.contains("\"admin\"(amq)"));
@@ -892,7 +893,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output8:\n" + result);
+ log.debug("output8:\n{}", result);
assertTrue(result.contains("Total: 0"));
@@ -925,7 +926,7 @@ public class ArtemisTest extends CliTestBase {
context = new TestActionContext();
listCmd.execute(context);
result = context.getStdout();
- log.debug("output2:\n" + result);
+ log.debug("output2:\n{}", result);
assertTrue(result.contains("Total: 4"));
assertTrue(result.contains("\"guest\"(admin)"));
@@ -1006,7 +1007,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
assertTrue(result.contains("Total: 1"));
assertTrue(result.contains("\"admin\"(amq)"));
@@ -1036,7 +1037,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
result = context.getStdout();
- log.debug("output2:\n" + result);
+ log.debug("output2:\n{}", result);
// make sure the admin user is still in tact (i.e. that the file wasn't corrupted via concurrent access)
assertTrue(result.contains("\"admin\"(amq)"));
@@ -1109,7 +1110,7 @@ public class ArtemisTest extends CliTestBase {
listCmd.execute(context);
String result = context.getStdout();
- log.debug("output1:\n" + result);
+ log.debug("output1:\n{}", result);
assertTrue(result.contains("\"admin\"(" + roleWithSpaces + ")"));
@@ -2131,7 +2132,7 @@ public class ArtemisTest extends CliTestBase {
for (String r : roles) {
String storedUsers = (String) roleConfig.getProperty(r);
- log.debug("users in role: " + r + " ; " + storedUsers);
+ log.debug("users in role: {} ; {}", r, storedUsers);
List<String> userList = StringUtil.splitStringList(storedUsers, ",");
assertTrue(userList.contains(user));
}
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
index 6394d72c22..7d7c26cd53 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
@@ -18,21 +18,22 @@ package org.apache.activemq.cli.test;
import org.apache.activemq.artemis.cli.commands.util.HashUtil;
import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
-import org.jboss.logging.Logger;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class HashUtilTest {
- private static final Logger log = Logger.getLogger(HashUtilTest.class);
+ private static final Logger log = LoggerFactory.getLogger(HashUtilTest.class);
@Test
public void testDefaultHashFormat() throws Exception {
final String password = "helloworld";
String hash = HashUtil.tryHash(new TestActionContext(), password);
String hashStr = PasswordMaskingUtil.unwrap(hash);
- log.debug("hashString: " + hashStr);
+ log.debug("hashString: {}", hashStr);
String[] parts = hashStr.split(":");
assertEquals(3, parts.length);
//first part should be able to convert to an int