ARTEMIS-4020 Using a little trick to create the Loggers
Trick provided by Tim Bish
This commit is contained in:
parent
4cfc4cbb12
commit
12cc70c5bf
|
@ -36,13 +36,14 @@ import org.apache.activemq.artemis.dto.ManagementContextDTO;
|
||||||
import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
|
import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstract class where we can replace the configuration in various places *
|
* Abstract class where we can replace the configuration in various places *
|
||||||
*/
|
*/
|
||||||
public abstract class Configurable extends ActionAbstract {
|
public abstract class Configurable extends ActionAbstract {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(Configurable.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
|
@Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
|
||||||
String configuration;
|
String configuration;
|
||||||
|
|
|
@ -42,11 +42,12 @@ import org.apache.activemq.artemis.utils.Base64;
|
||||||
import org.apache.activemq.artemis.utils.UUIDGenerator;
|
import org.apache.activemq.artemis.utils.UUIDGenerator;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/** This is an Utility class that will import the outputs in XML format. */
|
/** This is an Utility class that will import the outputs in XML format. */
|
||||||
public class XMLMessageImporter {
|
public class XMLMessageImporter {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(XMLMessageImporter.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private XMLStreamReader reader;
|
private XMLStreamReader reader;
|
||||||
|
|
||||||
|
|
|
@ -66,11 +66,12 @@ import org.apache.activemq.artemis.core.server.JournalType;
|
||||||
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
|
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
@Command(name = "exp", description = "Export all message-data using an XML that could be interpreted by any system.")
|
@Command(name = "exp", description = "Export all message-data using an XML that could be interpreted by any system.")
|
||||||
public final class XmlDataExporter extends DBOption {
|
public final class XmlDataExporter extends DBOption {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(XmlDataExporter.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private XMLStreamWriter xmlWriter;
|
private XMLStreamWriter xmlWriter;
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,7 @@ import org.apache.activemq.artemis.utils.ClassloadingUtil;
|
||||||
import org.apache.activemq.artemis.utils.ListUtil;
|
import org.apache.activemq.artemis.utils.ListUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
|
* Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
|
||||||
|
@ -74,7 +75,7 @@ import org.slf4j.LoggerFactory;
|
||||||
@Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
|
@Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
|
||||||
public final class XmlDataImporter extends ActionAbstract {
|
public final class XmlDataImporter extends ActionAbstract {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(XmlDataImporter.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private XMLStreamReader reader;
|
private XMLStreamReader reader;
|
||||||
|
|
||||||
|
|
|
@ -103,6 +103,7 @@ import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
|
@ -118,7 +119,7 @@ import static org.junit.Assert.fail;
|
||||||
* Test to validate that the CLI doesn't throw improper exceptions when invoked.
|
* Test to validate that the CLI doesn't throw improper exceptions when invoked.
|
||||||
*/
|
*/
|
||||||
public class ArtemisTest extends CliTestBase {
|
public class ArtemisTest extends CliTestBase {
|
||||||
private static final Logger log = LoggerFactory.getLogger(ArtemisTest.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
// some tests will set this, as some security methods will need to know the server the CLI started
|
// some tests will set this, as some security methods will need to know the server the CLI started
|
||||||
private ActiveMQServer server;
|
private ActiveMQServer server;
|
||||||
|
|
|
@ -21,12 +21,13 @@ import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
public class HashUtilTest {
|
public class HashUtilTest {
|
||||||
private static final Logger log = LoggerFactory.getLogger(HashUtilTest.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testDefaultHashFormat() throws Exception {
|
public void testDefaultHashFormat() throws Exception {
|
||||||
|
|
|
@ -30,13 +30,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
|
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is for components with a scheduled at a fixed rate.
|
* This is for components with a scheduled at a fixed rate.
|
||||||
*/
|
*/
|
||||||
public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, Runnable {
|
public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, Runnable {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ActiveMQScheduledComponent.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
protected ScheduledExecutorService scheduledExecutorService;
|
protected ScheduledExecutorService scheduledExecutorService;
|
||||||
private boolean startedOwnScheduler;
|
private boolean startedOwnScheduler;
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@ import org.apache.activemq.artemis.utils.Env;
|
||||||
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This will use {@link InetAddress#isReachable(int)} to determine if the network is alive.
|
* This will use {@link InetAddress#isReachable(int)} to determine if the network is alive.
|
||||||
|
@ -44,7 +45,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class NetworkHealthCheck extends ActiveMQScheduledComponent {
|
public class NetworkHealthCheck extends ActiveMQScheduledComponent {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(NetworkHealthCheck.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final Set<ActiveMQComponent> componentList = new ConcurrentHashSet<>();
|
private final Set<ActiveMQComponent> componentList = new ConcurrentHashSet<>();
|
||||||
private final Set<String> addresses = new ConcurrentHashSet<>();
|
private final Set<String> addresses = new ConcurrentHashSet<>();
|
||||||
|
|
|
@ -21,6 +21,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class will be used to perform generic class-loader operations,
|
* This class will be used to perform generic class-loader operations,
|
||||||
|
@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public final class ClassloadingUtil {
|
public final class ClassloadingUtil {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ClassloadingUtil.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final String INSTANTIATION_EXCEPTION_MESSAGE = "Your class must have a constructor without arguments. If it is an inner class, it must be static!";
|
private static final String INSTANTIATION_EXCEPTION_MESSAGE = "Your class must have a constructor without arguments. If it is an inner class, it must be static!";
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,7 @@ import java.util.Properties;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DefaultSensitiveDataCodec
|
* A DefaultSensitiveDataCodec
|
||||||
|
@ -49,7 +50,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
|
public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(DefaultSensitiveStringCodec.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final String ALGORITHM = "algorithm";
|
public static final String ALGORITHM = "algorithm";
|
||||||
public static final String BLOWFISH_KEY = "key";
|
public static final String BLOWFISH_KEY = "key";
|
||||||
|
|
|
@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class SizeAwareMetric {
|
public class SizeAwareMetric {
|
||||||
|
|
||||||
|
@ -29,7 +30,7 @@ public class SizeAwareMetric {
|
||||||
void add(int delta, boolean sizeOnly);
|
void add(int delta, boolean sizeOnly);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(SizeAwareMetric.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final int PENDING_FREE = 0, FREE = 1, PENDING_OVER_SIZE = 2, OVER_SIZE = 3, PENDING_OVER_ELEMENTS = 4, OVER_ELEMENTS = 5, NOT_USED = -1;
|
private static final int PENDING_FREE = 0, FREE = 1, PENDING_OVER_SIZE = 2, OVER_SIZE = 3, PENDING_OVER_ELEMENTS = 4, OVER_ELEMENTS = 5, NOT_USED = -1;
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ package org.apache.activemq.artemis.utils;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
|
@ -32,7 +33,7 @@ import java.lang.management.ThreadInfo;
|
||||||
import java.lang.management.ThreadMXBean;
|
import java.lang.management.ThreadMXBean;
|
||||||
|
|
||||||
public final class ThreadDumpUtil {
|
public final class ThreadDumpUtil {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ThreadDumpUtil.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static String threadDump(final String msg) {
|
public static String threadDump(final String msg) {
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
|
||||||
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
|
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A UTF8Util
|
* A UTF8Util
|
||||||
|
@ -33,7 +34,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public final class UTF8Util {
|
public final class UTF8Util {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(UTF8Util.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final ThreadLocal<SoftReference<StringUtilBuffer>> currentBuffer = new ThreadLocal<>();
|
private static final ThreadLocal<SoftReference<StringUtilBuffer>> currentBuffer = new ThreadLocal<>();
|
||||||
|
|
||||||
|
|
|
@ -34,10 +34,11 @@ import java.util.concurrent.TimeUnit;
|
||||||
import org.apache.activemq.artemis.api.core.SimpleString;
|
import org.apache.activemq.artemis.api.core.SimpleString;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public final class UUIDGenerator {
|
public final class UUIDGenerator {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(UUIDGenerator.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final UUIDGenerator sSingleton = new UUIDGenerator();
|
private static final UUIDGenerator sSingleton = new UUIDGenerator();
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ import java.util.concurrent.Executor;
|
||||||
import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
|
import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An executor that always runs all tasks in order, using a delegate executor to run the tasks.
|
* An executor that always runs all tasks in order, using a delegate executor to run the tasks.
|
||||||
|
@ -35,7 +36,7 @@ public class OrderedExecutor extends ProcessorBase<Runnable> implements ArtemisE
|
||||||
super(delegate);
|
super(delegate);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(OrderedExecutor.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private boolean fair;
|
private boolean fair;
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,11 @@ import java.util.function.Consumer;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public abstract class ProcessorBase<T> extends HandlerBase {
|
public abstract class ProcessorBase<T> extends HandlerBase {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ProcessorBase.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
public static final int STATE_NOT_RUNNING = 0;
|
public static final int STATE_NOT_RUNNING = 0;
|
||||||
public static final int STATE_RUNNING = 1;
|
public static final int STATE_RUNNING = 1;
|
||||||
public static final int STATE_FORCED_SHUTDOWN = 2;
|
public static final int STATE_FORCED_SHUTDOWN = 2;
|
||||||
|
|
|
@ -23,10 +23,11 @@ import java.util.function.ToIntFunction;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class ThresholdActor<T> extends ProcessorBase<Object> {
|
public class ThresholdActor<T> extends ProcessorBase<Object> {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ThresholdActor.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final AtomicIntegerFieldUpdater<ThresholdActor> SIZE_UPDATER = AtomicIntegerFieldUpdater.newUpdater(ThresholdActor.class, "size");
|
private static final AtomicIntegerFieldUpdater<ThresholdActor> SIZE_UPDATER = AtomicIntegerFieldUpdater.newUpdater(ThresholdActor.class, "size");
|
||||||
private volatile int size = 0;
|
private volatile int size = 0;
|
||||||
|
|
|
@ -28,6 +28,7 @@ import java.util.concurrent.locks.StampedLock;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
|
import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
|
||||||
|
|
||||||
|
@ -41,7 +42,7 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
|
||||||
*/
|
*/
|
||||||
public class ConcurrentLongHashSet {
|
public class ConcurrentLongHashSet {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ConcurrentLongHashSet.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final long EmptyItem = -1L;
|
private static final long EmptyItem = -1L;
|
||||||
private static final long DeletedItem = -2L;
|
private static final long DeletedItem = -2L;
|
||||||
|
|
|
@ -26,10 +26,11 @@ import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
|
||||||
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class CriticalAnalyzerImpl implements CriticalAnalyzer {
|
public class CriticalAnalyzerImpl implements CriticalAnalyzer {
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(CriticalAnalyzer.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private volatile long timeoutNanoSeconds;
|
private volatile long timeoutNanoSeconds;
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
|
||||||
import org.apache.activemq.artemis.utils.ArtemisCloseable;
|
import org.apache.activemq.artemis.utils.ArtemisCloseable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class CriticalMeasure {
|
public class CriticalMeasure {
|
||||||
|
|
||||||
|
@ -29,7 +30,7 @@ public class CriticalMeasure {
|
||||||
return closeable == dummyCloseable;
|
return closeable == dummyCloseable;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(CriticalMeasure.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
// this is used on enterCritical, if the logger is in trace mode
|
// this is used on enterCritical, if the logger is in trace mode
|
||||||
private volatile Exception traceEnter;
|
private volatile Exception traceEnter;
|
||||||
|
|
|
@ -28,10 +28,11 @@ import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
|
||||||
import org.apache.commons.beanutils.IntrospectionContext;
|
import org.apache.commons.beanutils.IntrospectionContext;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class FluentPropertyBeanIntrospectorWithIgnores extends FluentPropertyBeanIntrospector {
|
public class FluentPropertyBeanIntrospectorWithIgnores extends FluentPropertyBeanIntrospector {
|
||||||
|
|
||||||
static Logger logger = LoggerFactory.getLogger(FluentPropertyBeanIntrospectorWithIgnores.class);
|
static Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static ConcurrentHashSet<Pair<String, String>> ignores = new ConcurrentHashSet<>();
|
private static ConcurrentHashSet<Pair<String, String>> ignores = new ConcurrentHashSet<>();
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ import io.netty.buffer.Unpooled;
|
||||||
import io.netty.util.internal.PlatformDependent;
|
import io.netty.util.internal.PlatformDependent;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Assume;
|
import org.junit.Assume;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -40,7 +41,7 @@ import static org.junit.Assert.fail;
|
||||||
|
|
||||||
public class ByteUtilTest {
|
public class ByteUtilTest {
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(ByteUtilTest.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testBytesToString() {
|
public void testBytesToString() {
|
||||||
|
|
|
@ -18,6 +18,7 @@ package org.apache.activemq.artemis.utils;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -30,7 +31,7 @@ import static org.junit.Assert.fail;
|
||||||
|
|
||||||
public class DefaultSensitiveStringCodecTest {
|
public class DefaultSensitiveStringCodecTest {
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(DefaultSensitiveStringCodecTest.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testDefaultAlgorithm() throws Exception {
|
public void testDefaultAlgorithm() throws Exception {
|
||||||
|
|
|
@ -28,11 +28,12 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class OrderedExecutorSanityTest {
|
public class OrderedExecutorSanityTest {
|
||||||
private static final Logger log = LoggerFactory.getLogger(OrderedExecutorSanityTest.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void shouldExecuteTasksInOrder() throws InterruptedException {
|
public void shouldExecuteTasksInOrder() throws InterruptedException {
|
||||||
|
|
|
@ -29,12 +29,13 @@ import org.apache.activemq.artemis.utils.ReusableLatch;
|
||||||
import org.apache.activemq.artemis.utils.Wait;
|
import org.apache.activemq.artemis.utils.Wait;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class MultiThreadCriticalMeasureTest {
|
public class MultiThreadCriticalMeasureTest {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(MultiThreadCriticalMeasureTest.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testMultiThread() throws Throwable {
|
public void testMultiThread() throws Throwable {
|
||||||
|
|
|
@ -25,13 +25,14 @@ import org.apache.activemq.artemis.core.server.ComponentConfigurationRoutingType
|
||||||
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
|
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default values of ActiveMQ Artemis configuration parameters.
|
* Default values of ActiveMQ Artemis configuration parameters.
|
||||||
*/
|
*/
|
||||||
public final class ActiveMQDefaultConfiguration {
|
public final class ActiveMQDefaultConfiguration {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ActiveMQDefaultConfiguration.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* <p> In order to avoid compile time in-lining of constants, all access is done through methods
|
* <p> In order to avoid compile time in-lining of constants, all access is done through methods
|
||||||
|
|
|
@ -19,6 +19,7 @@ package org.apache.activemq.artemis.api.core;
|
||||||
import org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
|
import org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.jgroups.JChannel;
|
import org.jgroups.JChannel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -28,7 +29,7 @@ import org.jgroups.JChannel;
|
||||||
*/
|
*/
|
||||||
public class ChannelBroadcastEndpointFactory implements BroadcastEndpointFactory {
|
public class ChannelBroadcastEndpointFactory implements BroadcastEndpointFactory {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ChannelBroadcastEndpointFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final JChannel channel;
|
private final JChannel channel;
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ import org.apache.activemq.artemis.api.core.jgroups.JChannelWrapper;
|
||||||
import org.apache.activemq.artemis.api.core.jgroups.JGroupsReceiver;
|
import org.apache.activemq.artemis.api.core.jgroups.JGroupsReceiver;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.jgroups.JChannel;
|
import org.jgroups.JChannel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,7 +31,7 @@ import org.jgroups.JChannel;
|
||||||
*/
|
*/
|
||||||
public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
|
public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JGroupsBroadcastEndpoint.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final String channelName;
|
private final String channelName;
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ import java.util.Map;
|
||||||
import org.apache.activemq.artemis.api.core.JGroupsBroadcastEndpoint;
|
import org.apache.activemq.artemis.api.core.JGroupsBroadcastEndpoint;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class maintain a global Map of JChannels wrapped in JChannelWrapper for
|
* This class maintain a global Map of JChannels wrapped in JChannelWrapper for
|
||||||
|
@ -33,6 +34,8 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class JChannelManager {
|
public class JChannelManager {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final JChannelManager theInstance = new JChannelManager();
|
private static final JChannelManager theInstance = new JChannelManager();
|
||||||
|
|
||||||
public static JChannelManager getInstance() {
|
public static JChannelManager getInstance() {
|
||||||
|
@ -55,8 +58,6 @@ public class JChannelManager {
|
||||||
// this is useful for testcases using a single channel.
|
// this is useful for testcases using a single channel.
|
||||||
private boolean loopbackMessages = false;
|
private boolean loopbackMessages = false;
|
||||||
|
|
||||||
private final Logger logger = LoggerFactory.getLogger(JChannelManager.class);
|
|
||||||
|
|
||||||
private static final Map<String, JChannelWrapper> channels = new HashMap<>();
|
private static final Map<String, JChannelWrapper> channels = new HashMap<>();
|
||||||
|
|
||||||
public boolean isLoopbackMessages() {
|
public boolean isLoopbackMessages() {
|
||||||
|
|
|
@ -25,6 +25,7 @@ import org.jgroups.Message;
|
||||||
import org.jgroups.Receiver;
|
import org.jgroups.Receiver;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class wraps a JChannel with a reference counter. The reference counter
|
* This class wraps a JChannel with a reference counter. The reference counter
|
||||||
|
@ -33,7 +34,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class JChannelWrapper {
|
public class JChannelWrapper {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JChannelWrapper.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private boolean connected = false;
|
private boolean connected = false;
|
||||||
int refCount = 1;
|
int refCount = 1;
|
||||||
|
|
|
@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.jgroups.Receiver;
|
import org.jgroups.Receiver;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -31,7 +32,7 @@ import org.jgroups.Receiver;
|
||||||
*/
|
*/
|
||||||
public class JGroupsReceiver implements Receiver {
|
public class JGroupsReceiver implements Receiver {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JGroupsReceiver.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final BlockingQueue<byte[]> dequeue = new LinkedBlockingDeque<>();
|
private final BlockingQueue<byte[]> dequeue = new LinkedBlockingDeque<>();
|
||||||
|
|
||||||
|
|
|
@ -23,10 +23,11 @@ import org.apache.activemq.artemis.api.core.SimpleString;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
|
import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public abstract class AbstractProducerCreditsImpl implements ClientProducerCredits {
|
public abstract class AbstractProducerCreditsImpl implements ClientProducerCredits {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AbstractProducerCreditsImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
protected int pendingCredits;
|
protected int pendingCredits;
|
||||||
|
|
||||||
|
|
|
@ -20,10 +20,11 @@ package org.apache.activemq.artemis.core.client.impl;
|
||||||
import org.apache.activemq.artemis.api.core.SimpleString;
|
import org.apache.activemq.artemis.api.core.SimpleString;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class AsynchronousProducerCreditsImpl extends AbstractProducerCreditsImpl {
|
public class AsynchronousProducerCreditsImpl extends AbstractProducerCreditsImpl {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AsynchronousProducerCreditsImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
int balance;
|
int balance;
|
||||||
|
|
||||||
|
|
|
@ -47,11 +47,12 @@ import org.apache.activemq.artemis.utils.collections.PriorityLinkedList;
|
||||||
import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
|
import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public final class ClientConsumerImpl implements ClientConsumerInternal {
|
public final class ClientConsumerImpl implements ClientConsumerInternal {
|
||||||
|
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ClientConsumerImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final long CLOSE_TIMEOUT_MILLISECONDS = 10000;
|
private static final long CLOSE_TIMEOUT_MILLISECONDS = 10000;
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,14 @@ import org.apache.activemq.artemis.utils.TokenBucketLimiter;
|
||||||
import org.apache.activemq.artemis.utils.UUIDGenerator;
|
import org.apache.activemq.artemis.utils.UUIDGenerator;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The client-side Producer.
|
* The client-side Producer.
|
||||||
*/
|
*/
|
||||||
public class ClientProducerImpl implements ClientProducerInternal {
|
public class ClientProducerImpl implements ClientProducerInternal {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ClientProducerImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final SimpleString address;
|
private final SimpleString address;
|
||||||
|
|
||||||
|
|
|
@ -72,10 +72,11 @@ import org.apache.activemq.artemis.utils.actors.OrderedExecutorFactory;
|
||||||
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, ClientConnectionLifeCycleListener {
|
public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, ClientConnectionLifeCycleListener {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ClientSessionFactoryImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final ServerLocatorInternal serverLocator;
|
private final ServerLocatorInternal serverLocator;
|
||||||
|
|
||||||
|
|
|
@ -60,10 +60,11 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
|
||||||
import org.apache.activemq.artemis.utils.XidCodecSupport;
|
import org.apache.activemq.artemis.utils.XidCodecSupport;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public final class ClientSessionImpl implements ClientSessionInternal, FailureListener {
|
public final class ClientSessionImpl implements ClientSessionInternal, FailureListener {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ClientSessionImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final Map<String, String> metadata = new HashMap<>();
|
private final Map<String, String> metadata = new HashMap<>();
|
||||||
|
|
||||||
|
|
|
@ -75,6 +75,7 @@ import org.apache.activemq.artemis.utils.actors.OrderedExecutor;
|
||||||
import org.apache.activemq.artemis.utils.uri.FluentPropertyBeanIntrospectorWithIgnores;
|
import org.apache.activemq.artemis.utils.uri.FluentPropertyBeanIntrospectorWithIgnores;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the implementation of {@link org.apache.activemq.artemis.api.core.client.ServerLocator} and all
|
* This is the implementation of {@link org.apache.activemq.artemis.api.core.client.ServerLocator} and all
|
||||||
|
@ -82,7 +83,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public final class ServerLocatorImpl implements ServerLocatorInternal, DiscoveryListener {
|
public final class ServerLocatorImpl implements ServerLocatorInternal, DiscoveryListener {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ServerLocatorImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private enum STATE {
|
private enum STATE {
|
||||||
INITIALIZED, CLOSED, CLOSING
|
INITIALIZED, CLOSED, CLOSING
|
||||||
|
|
|
@ -33,10 +33,11 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.Connector;
|
import org.apache.activemq.artemis.spi.core.remoting.Connector;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public final class Topology {
|
public final class Topology {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(Topology.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final Set<ClusterTopologyListener> topologyListeners;
|
private final Set<ClusterTopologyListener> topologyListeners;
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@ import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
|
||||||
import org.apache.activemq.artemis.utils.collections.TypedProperties;
|
import org.apache.activemq.artemis.utils.collections.TypedProperties;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class is used to search for members on the cluster through the opaque interface {@link BroadcastEndpoint}.
|
* This class is used to search for members on the cluster through the opaque interface {@link BroadcastEndpoint}.
|
||||||
|
@ -53,7 +54,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public final class DiscoveryGroup implements ActiveMQComponent {
|
public final class DiscoveryGroup implements ActiveMQComponent {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(DiscoveryGroup.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final List<DiscoveryListener> listeners = new ArrayList<>();
|
private final List<DiscoveryListener> listeners = new ArrayList<>();
|
||||||
|
|
||||||
|
|
|
@ -60,6 +60,7 @@ import org.apache.activemq.artemis.utils.UUID;
|
||||||
import org.apache.activemq.artemis.utils.collections.TypedProperties;
|
import org.apache.activemq.artemis.utils.collections.TypedProperties;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.utils.ByteUtil.ensureExactWritable;
|
import static org.apache.activemq.artemis.utils.ByteUtil.ensureExactWritable;
|
||||||
|
|
||||||
|
@ -71,7 +72,7 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
|
||||||
|
|
||||||
protected volatile int memoryEstimate = -1;
|
protected volatile int memoryEstimate = -1;
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(CoreMessage.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
// There's an integer with the number of bytes for the body
|
// There's an integer with the number of bytes for the body
|
||||||
public static final int BODY_OFFSET = DataConstants.SIZE_INT;
|
public static final int BODY_OFFSET = DataConstants.SIZE_INT;
|
||||||
|
|
|
@ -36,10 +36,11 @@ import org.apache.activemq.artemis.api.core.Message;
|
||||||
import org.apache.activemq.artemis.api.core.SimpleString;
|
import org.apache.activemq.artemis.api.core.SimpleString;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class MessageOpenTypeFactory<M extends Message> {
|
public class MessageOpenTypeFactory<M extends Message> {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(MessageOpenTypeFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public MessageOpenTypeFactory() {
|
public MessageOpenTypeFactory() {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -65,6 +65,7 @@ import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
|
||||||
import org.apache.activemq.artemis.utils.VersionLoader;
|
import org.apache.activemq.artemis.utils.VersionLoader;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class will return specific packets for different types of actions happening on a messaging protocol.
|
* This class will return specific packets for different types of actions happening on a messaging protocol.
|
||||||
|
@ -80,7 +81,7 @@ import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
public class ActiveMQClientProtocolManager implements ClientProtocolManager {
|
public class ActiveMQClientProtocolManager implements ClientProtocolManager {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ActiveMQClientProtocolManager.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final String handshake = "ARTEMIS";
|
private static final String handshake = "ARTEMIS";
|
||||||
|
|
||||||
|
|
|
@ -131,10 +131,11 @@ import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
|
||||||
import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
|
import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class ActiveMQSessionContext extends SessionContext {
|
public class ActiveMQSessionContext extends SessionContext {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ActiveMQSessionContext.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final Channel sessionChannel;
|
private final Channel sessionChannel;
|
||||||
private final int serverVersion;
|
private final int serverVersion;
|
||||||
|
|
|
@ -44,10 +44,11 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
|
||||||
import org.apache.activemq.artemis.utils.ConcurrentUtil;
|
import org.apache.activemq.artemis.utils.ConcurrentUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public final class ChannelImpl implements Channel {
|
public final class ChannelImpl implements Channel {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ChannelImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public enum CHANNEL_ID {
|
public enum CHANNEL_ID {
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -48,10 +48,11 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
|
||||||
import org.apache.activemq.artemis.utils.SimpleIDGenerator;
|
import org.apache.activemq.artemis.utils.SimpleIDGenerator;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class RemotingConnectionImpl extends AbstractRemotingConnection implements CoreRemotingConnection {
|
public class RemotingConnectionImpl extends AbstractRemotingConnection implements CoreRemotingConnection {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(RemotingConnectionImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final PacketDecoder packetDecoder;
|
private final PacketDecoder packetDecoder;
|
||||||
|
|
||||||
|
|
|
@ -32,10 +32,11 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.Connection;
|
import org.apache.activemq.artemis.spi.core.remoting.Connection;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class CertificateUtil {
|
public class CertificateUtil {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(CertificateUtil.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final String SSL_HANDLER_NAME = "ssl";
|
private static final String SSL_HANDLER_NAME = "ssl";
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
|
||||||
import org.apache.activemq.artemis.utils.Env;
|
import org.apache.activemq.artemis.utils.Env;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class will check for Epoll or KQueue is available, and return false in case of NoClassDefFoundError
|
* This class will check for Epoll or KQueue is available, and return false in case of NoClassDefFoundError
|
||||||
|
@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class CheckDependencies {
|
public class CheckDependencies {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(CheckDependencies.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final boolean isEpollAvailable() {
|
public static final boolean isEpollAvailable() {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -45,12 +45,13 @@ import org.apache.activemq.artemis.utils.Env;
|
||||||
import org.apache.activemq.artemis.utils.IPV6Util;
|
import org.apache.activemq.artemis.utils.IPV6Util;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
|
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
|
||||||
|
|
||||||
public class NettyConnection implements Connection {
|
public class NettyConnection implements Connection {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(NettyConnection.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final int DEFAULT_WAIT_MILLIS = 10_000;
|
private static final int DEFAULT_WAIT_MILLIS = 10_000;
|
||||||
|
|
||||||
|
|
|
@ -125,6 +125,7 @@ import org.apache.activemq.artemis.utils.FutureLatch;
|
||||||
import org.apache.activemq.artemis.utils.IPV6Util;
|
import org.apache.activemq.artemis.utils.IPV6Util;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.utils.Base64.encodeBytes;
|
import static org.apache.activemq.artemis.utils.Base64.encodeBytes;
|
||||||
|
|
||||||
|
@ -134,7 +135,7 @@ public class NettyConnector extends AbstractConnector {
|
||||||
public static String EPOLL_CONNECTOR_TYPE = "EPOLL";
|
public static String EPOLL_CONNECTOR_TYPE = "EPOLL";
|
||||||
public static String KQUEUE_CONNECTOR_TYPE = "KQUEUE";
|
public static String KQUEUE_CONNECTOR_TYPE = "KQUEUE";
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(NettyConnector.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final String JAVAX_KEYSTORE_PATH_PROP_NAME = "javax.net.ssl.keyStore";
|
public static final String JAVAX_KEYSTORE_PATH_PROP_NAME = "javax.net.ssl.keyStore";
|
||||||
public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword";
|
public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword";
|
||||||
|
|
|
@ -25,10 +25,11 @@ import io.netty.util.Version;
|
||||||
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
|
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class TransportConstants {
|
public class TransportConstants {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(TransportConstants.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final String SSL_CONTEXT_PROP_NAME = "sslContext";
|
public static final String SSL_CONTEXT_PROP_NAME = "sslContext";
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.activemq.artemis.core.remoting.impl.ssl;
|
package org.apache.activemq.artemis.core.remoting.impl.ssl;
|
||||||
|
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import io.netty.handler.ssl.SslContext;
|
import io.netty.handler.ssl.SslContext;
|
||||||
|
@ -23,12 +24,16 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
|
||||||
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
|
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.ssl.OpenSSLContextFactory;
|
import org.apache.activemq.artemis.spi.core.remoting.ssl.OpenSSLContextFactory;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextConfig;
|
import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextConfig;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default {@link OpenSSLContextFactory} for use in {@link NettyConnector} and NettyAcceptor.
|
* Default {@link OpenSSLContextFactory} for use in {@link NettyConnector} and NettyAcceptor.
|
||||||
*/
|
*/
|
||||||
public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
|
public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param additionalOpts not used by this implementation
|
* @param additionalOpts not used by this implementation
|
||||||
*
|
*
|
||||||
|
@ -36,7 +41,7 @@ public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SslContext getClientSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
|
public SslContext getClientSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
|
||||||
log.debug("Creating Client OpenSSL Context with {}", config);
|
logger.debug("Creating Client OpenSSL Context with {}", config);
|
||||||
return new SSLSupport(config)
|
return new SSLSupport(config)
|
||||||
.setSslProvider(TransportConstants.OPENSSL_PROVIDER)
|
.setSslProvider(TransportConstants.OPENSSL_PROVIDER)
|
||||||
.createNettyClientContext();
|
.createNettyClientContext();
|
||||||
|
@ -49,7 +54,7 @@ public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SslContext getServerSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
|
public SslContext getServerSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
|
||||||
log.debug("Creating Server OpenSSL Context with {}", config);
|
logger.debug("Creating Server OpenSSL Context with {}", config);
|
||||||
return new SSLSupport(config)
|
return new SSLSupport(config)
|
||||||
.setSslProvider(TransportConstants.OPENSSL_PROVIDER)
|
.setSslProvider(TransportConstants.OPENSSL_PROVIDER)
|
||||||
.createNettyContext();
|
.createNettyContext();
|
||||||
|
|
|
@ -15,18 +15,23 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.activemq.artemis.core.remoting.impl.ssl;
|
package org.apache.activemq.artemis.core.remoting.impl.ssl;
|
||||||
|
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
|
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextConfig;
|
import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextConfig;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextFactory;
|
import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextFactory;
|
||||||
import org.apache.activemq.artemis.utils.ConfigurationHelper;
|
import org.apache.activemq.artemis.utils.ConfigurationHelper;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Simple SSLContextFactory for use in NettyConnector and NettyAcceptor.
|
* Simple SSLContextFactory for use in NettyConnector and NettyAcceptor.
|
||||||
*/
|
*/
|
||||||
public class DefaultSSLContextFactory implements SSLContextFactory {
|
public class DefaultSSLContextFactory implements SSLContextFactory {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SSLContext getSSLContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
|
public SSLContext getSSLContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
|
||||||
final boolean useDefaultSslContext = ConfigurationHelper.getBooleanProperty(
|
final boolean useDefaultSslContext = ConfigurationHelper.getBooleanProperty(
|
||||||
|
@ -36,11 +41,11 @@ public class DefaultSSLContextFactory implements SSLContextFactory {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (useDefaultSslContext) {
|
if (useDefaultSslContext) {
|
||||||
log.debug("Using the Default JDK SSLContext.");
|
logger.debug("Using the Default JDK SSLContext.");
|
||||||
return SSLContext.getDefault();
|
return SSLContext.getDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
log.debug("Creating JDK SSLContext with {}", config);
|
logger.debug("Creating JDK SSLContext with {}", config);
|
||||||
return new SSLSupport(config).createContext();
|
return new SSLSupport(config).createContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,12 +35,13 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
|
import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import javax.security.auth.Subject;
|
import javax.security.auth.Subject;
|
||||||
|
|
||||||
public abstract class AbstractRemotingConnection implements RemotingConnection {
|
public abstract class AbstractRemotingConnection implements RemotingConnection {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AbstractRemotingConnection.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
protected final List<FailureListener> failureListeners = new CopyOnWriteArrayList<>();
|
protected final List<FailureListener> failureListeners = new CopyOnWriteArrayList<>();
|
||||||
protected final List<CloseListener> closeListeners = new CopyOnWriteArrayList<>();
|
protected final List<CloseListener> closeListeners = new CopyOnWriteArrayList<>();
|
||||||
|
|
|
@ -19,8 +19,6 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import io.netty.handler.ssl.SslContext;
|
import io.netty.handler.ssl.SslContext;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service interface to create an {@link SslContext} for a configuration.
|
* Service interface to create an {@link SslContext} for a configuration.
|
||||||
|
@ -31,8 +29,6 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public interface OpenSSLContextFactory extends Comparable<OpenSSLContextFactory> {
|
public interface OpenSSLContextFactory extends Comparable<OpenSSLContextFactory> {
|
||||||
|
|
||||||
Logger log = LoggerFactory.getLogger(OpenSSLContextFactory.class);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Release any cached {@link SslContext} instances.
|
* Release any cached {@link SslContext} instances.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -17,8 +17,6 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service interface to create a SSLContext for a configuration.
|
* Service interface to create a SSLContext for a configuration.
|
||||||
|
@ -28,7 +26,6 @@ import org.slf4j.LoggerFactory;
|
||||||
* in your jar and fill it with the full qualified name of your implementation.
|
* in your jar and fill it with the full qualified name of your implementation.
|
||||||
*/
|
*/
|
||||||
public interface SSLContextFactory extends Comparable<SSLContextFactory> {
|
public interface SSLContextFactory extends Comparable<SSLContextFactory> {
|
||||||
Logger log = LoggerFactory.getLogger(SSLContextFactory.class);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return an {@link SSLContext} for the given configuration.
|
* @return an {@link SSLContext} for the given configuration.
|
||||||
|
|
|
@ -27,13 +27,14 @@ import org.apache.activemq.artemis.api.core.client.ClientSession.AddressQuery;
|
||||||
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
|
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility class to create queues 'automatically'.
|
* Utility class to create queues 'automatically'.
|
||||||
*/
|
*/
|
||||||
public class AutoCreateUtil {
|
public class AutoCreateUtil {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AutoCreateUtil.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static void autoCreateQueue(ClientSession session, SimpleString destAddress, SimpleString selectorString) throws ActiveMQException {
|
public static void autoCreateQueue(ClientSession session, SimpleString destAddress, SimpleString selectorString) throws ActiveMQException {
|
||||||
AddressQuery response = session.addressQuery(destAddress);
|
AddressQuery response = session.addressQuery(destAddress);
|
||||||
|
|
|
@ -37,6 +37,7 @@ import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
|
||||||
import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
|
import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
import org.w3c.dom.NamedNodeMap;
|
import org.w3c.dom.NamedNodeMap;
|
||||||
|
@ -47,7 +48,7 @@ import org.xml.sax.SAXException;
|
||||||
|
|
||||||
public final class XMLUtil {
|
public final class XMLUtil {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(XMLUtil.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private XMLUtil() {
|
private XMLUtil() {
|
||||||
// Utility class
|
// Utility class
|
||||||
|
|
|
@ -23,12 +23,13 @@ import org.apache.activemq.artemis.api.core.TransportConfiguration;
|
||||||
import org.apache.activemq.artemis.uri.ConnectorTransportConfigurationParser;
|
import org.apache.activemq.artemis.uri.ConnectorTransportConfigurationParser;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class ConnectorTransportConfigurationParserURITest {
|
public class ConnectorTransportConfigurationParserURITest {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ConnectorTransportConfigurationParserURITest.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testParse() throws Exception {
|
public void testParse() throws Exception {
|
||||||
|
|
|
@ -19,6 +19,7 @@ package org.apache.activemq.hawtio.branding;
|
||||||
import io.hawt.web.plugin.HawtioPlugin;
|
import io.hawt.web.plugin.HawtioPlugin;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import javax.servlet.ServletContext;
|
import javax.servlet.ServletContext;
|
||||||
import javax.servlet.ServletContextEvent;
|
import javax.servlet.ServletContextEvent;
|
||||||
|
@ -29,7 +30,7 @@ import javax.servlet.ServletContextListener;
|
||||||
**/
|
**/
|
||||||
public class PluginContextListener implements ServletContextListener {
|
public class PluginContextListener implements ServletContextListener {
|
||||||
|
|
||||||
private static final Logger LOG = LoggerFactory.getLogger(PluginContextListener.class);
|
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
HawtioPlugin plugin = null;
|
HawtioPlugin plugin = null;
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ package org.apache.activemq.hawtio.plugin;
|
||||||
import io.hawt.web.plugin.HawtioPlugin;
|
import io.hawt.web.plugin.HawtioPlugin;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import javax.servlet.ServletContext;
|
import javax.servlet.ServletContext;
|
||||||
import javax.servlet.ServletContextEvent;
|
import javax.servlet.ServletContextEvent;
|
||||||
|
@ -29,7 +30,7 @@ import javax.servlet.ServletContextListener;
|
||||||
**/
|
**/
|
||||||
public class PluginContextListener implements ServletContextListener {
|
public class PluginContextListener implements ServletContextListener {
|
||||||
|
|
||||||
private static final Logger LOG = LoggerFactory.getLogger(PluginContextListener.class);
|
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
HawtioPlugin plugin = null;
|
HawtioPlugin plugin = null;
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@ import java.util.stream.Stream;
|
||||||
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class to hold common database functionality such as drivers and connections
|
* Class to hold common database functionality such as drivers and connections
|
||||||
|
@ -34,7 +35,7 @@ import org.slf4j.LoggerFactory;
|
||||||
@SuppressWarnings("SynchronizeOnNonFinalField")
|
@SuppressWarnings("SynchronizeOnNonFinalField")
|
||||||
public abstract class AbstractJDBCDriver {
|
public abstract class AbstractJDBCDriver {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AbstractJDBCDriver.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
protected SQLProvider sqlProvider;
|
protected SQLProvider sqlProvider;
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,11 @@ import org.apache.activemq.artemis.jdbc.store.logging.LoggingConnection;
|
||||||
import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
|
import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class JDBCConnectionProvider {
|
public class JDBCConnectionProvider {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCConnectionProvider.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
private DataSource dataSource;
|
private DataSource dataSource;
|
||||||
private Executor networkTimeoutExecutor;
|
private Executor networkTimeoutExecutor;
|
||||||
private int networkTimeoutMillis;
|
private int networkTimeoutMillis;
|
||||||
|
|
|
@ -23,10 +23,11 @@ import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
|
||||||
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class JDBCUtils {
|
public class JDBCUtils {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCUtils.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static SQLProvider.Factory getSQLProviderFactory(String url) {
|
public static SQLProvider.Factory getSQLProviderFactory(String url) {
|
||||||
PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.identifyDialect(url);
|
PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.identifyDialect(url);
|
||||||
|
|
|
@ -36,10 +36,11 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
|
||||||
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
|
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class JDBCSequentialFile implements SequentialFile {
|
public class JDBCSequentialFile implements SequentialFile {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFile.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final String filename;
|
private final String filename;
|
||||||
|
|
||||||
|
|
|
@ -35,10 +35,11 @@ import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
||||||
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveMQComponent {
|
public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveMQComponent {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFileFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private boolean started;
|
private boolean started;
|
||||||
|
|
||||||
|
|
|
@ -31,11 +31,12 @@ import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
|
||||||
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
@SuppressWarnings("SynchronizeOnNonFinalField")
|
@SuppressWarnings("SynchronizeOnNonFinalField")
|
||||||
public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
|
public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFileFactoryDriver.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
protected String deleteFile;
|
protected String deleteFile;
|
||||||
protected String createFile;
|
protected String createFile;
|
||||||
|
|
|
@ -56,10 +56,11 @@ import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
|
||||||
import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
|
import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
|
public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCJournalImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
// Sync Delay in ms
|
// Sync Delay in ms
|
||||||
//private static final int SYNC_DELAY = 5;
|
//private static final int SYNC_DELAY = 5;
|
||||||
|
|
|
@ -34,10 +34,11 @@ import org.apache.activemq.artemis.core.journal.RecordInfo;
|
||||||
import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
|
import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
class JDBCJournalRecord {
|
class JDBCJournalRecord {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JDBCJournalRecord.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
/*
|
/*
|
||||||
Database Table Schema:
|
Database Table Schema:
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ import java.util.stream.Stream;
|
||||||
import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
|
import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static java.lang.String.format;
|
import static java.lang.String.format;
|
||||||
|
|
||||||
|
@ -42,7 +43,7 @@ import static java.lang.String.format;
|
||||||
*/
|
*/
|
||||||
public class PropertySQLProvider implements SQLProvider {
|
public class PropertySQLProvider implements SQLProvider {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(PropertySQLProvider.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private enum LetterCase implements Function<String, String> {
|
private enum LetterCase implements Function<String, String> {
|
||||||
upper(String::toUpperCase),
|
upper(String::toUpperCase),
|
||||||
|
|
|
@ -28,12 +28,13 @@ import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
|
||||||
import org.apache.activemq.artemis.utils.ClassloadingUtil;
|
import org.apache.activemq.artemis.utils.ClassloadingUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A utility class for creating ActiveMQ Artemis client-side JMS managed resources.
|
* A utility class for creating ActiveMQ Artemis client-side JMS managed resources.
|
||||||
*/
|
*/
|
||||||
public class ActiveMQJMSClient {
|
public class ActiveMQJMSClient {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ActiveMQJMSClient.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final boolean DEFAULT_ENABLE_1X_PREFIXES;
|
public static final boolean DEFAULT_ENABLE_1X_PREFIXES;
|
||||||
|
|
||||||
|
|
|
@ -46,13 +46,14 @@ import org.apache.activemq.artemis.utils.UUID;
|
||||||
import org.apache.activemq.artemis.utils.UUIDGenerator;
|
import org.apache.activemq.artemis.utils.UUIDGenerator;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ActiveMQ Artemis implementation of a JMS MessageProducer.
|
* ActiveMQ Artemis implementation of a JMS MessageProducer.
|
||||||
*/
|
*/
|
||||||
public class ActiveMQMessageProducer implements MessageProducer, QueueSender, TopicPublisher {
|
public class ActiveMQMessageProducer implements MessageProducer, QueueSender, TopicPublisher {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ActiveMQMessageProducer.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final ConnectionFactoryOptions options;
|
private final ConnectionFactoryOptions options;
|
||||||
|
|
||||||
|
|
|
@ -32,10 +32,11 @@ import org.apache.activemq.artemis.utils.uri.BeanSupport;
|
||||||
import org.apache.activemq.artemis.utils.uri.SchemaConstants;
|
import org.apache.activemq.artemis.utils.uri.SchemaConstants;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class TCPSchema extends AbstractCFSchema {
|
public class TCPSchema extends AbstractCFSchema {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(TCPSchema.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getSchemaName() {
|
public String getSchemaName() {
|
||||||
|
|
|
@ -53,10 +53,11 @@ import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class ConnectionFactoryURITest {
|
public class ConnectionFactoryURITest {
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(ConnectionFactoryURITest.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
ConnectionFactoryParser parser = new ConnectionFactoryParser();
|
ConnectionFactoryParser parser = new ConnectionFactoryParser();
|
||||||
|
|
||||||
|
|
|
@ -75,10 +75,11 @@ import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConf
|
||||||
import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
|
import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public final class JMSBridgeImpl implements JMSBridge {
|
public final class JMSBridgeImpl implements JMSBridge {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JMSBridgeImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final String[] RESOURCE_RECOVERY_CLASS_NAMES = new String[]{"org.jboss.as.messaging.jms.AS7RecoveryRegistry"};
|
private static final String[] RESOURCE_RECOVERY_CLASS_NAMES = new String[]{"org.jboss.as.messaging.jms.AS7RecoveryRegistry"};
|
||||||
|
|
||||||
|
|
|
@ -39,11 +39,12 @@ import org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
|
||||||
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
|
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
|
||||||
import org.apache.activemq.artemis.utils.ByteUtil;
|
import org.apache.activemq.artemis.utils.ByteUtil;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
public abstract class AbstractSequentialFile implements SequentialFile {
|
public abstract class AbstractSequentialFile implements SequentialFile {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AbstractSequentialFile.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
protected File file;
|
protected File file;
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,7 @@ import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
|
||||||
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
|
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
|
||||||
import org.apache.activemq.artemis.utils.critical.EmptyCriticalAnalyzer;
|
import org.apache.activemq.artemis.utils.critical.EmptyCriticalAnalyzer;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -43,7 +44,7 @@ import org.slf4j.Logger;
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractSequentialFileFactory implements SequentialFileFactory {
|
public abstract class AbstractSequentialFileFactory implements SequentialFileFactory {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AbstractSequentialFileFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
// Timeout used to wait executors to shutdown
|
// Timeout used to wait executors to shutdown
|
||||||
protected static final int EXECUTOR_TIMEOUT = 60;
|
protected static final int EXECUTOR_TIMEOUT = 60;
|
||||||
|
|
|
@ -19,9 +19,10 @@ package org.apache.activemq.artemis.core.io;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class RunnableCallback implements IOCallback {
|
public class RunnableCallback implements IOCallback {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(RunnableCallback.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
Runnable okCallback;
|
Runnable okCallback;
|
||||||
Runnable errorCallback;
|
Runnable errorCallback;
|
||||||
|
|
|
@ -32,12 +32,13 @@ import org.apache.activemq.artemis.core.io.SequentialFile;
|
||||||
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
|
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
|
||||||
import org.apache.activemq.artemis.nativo.jlibaio.LibaioFile;
|
import org.apache.activemq.artemis.nativo.jlibaio.LibaioFile;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
/** This class is implementing Runnable to reuse a callback to close it. */
|
/** This class is implementing Runnable to reuse a callback to close it. */
|
||||||
public class AIOSequentialFile extends AbstractSequentialFile {
|
public class AIOSequentialFile extends AbstractSequentialFile {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AIOSequentialFileFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private boolean opened = false;
|
private boolean opened = false;
|
||||||
|
|
||||||
|
|
|
@ -40,13 +40,14 @@ import org.apache.activemq.artemis.utils.ByteUtil;
|
||||||
import org.apache.activemq.artemis.utils.PowerOf2Util;
|
import org.apache.activemq.artemis.utils.PowerOf2Util;
|
||||||
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
|
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.jctools.queues.MpmcArrayQueue;
|
import org.jctools.queues.MpmcArrayQueue;
|
||||||
import org.jctools.queues.atomic.MpmcAtomicArrayQueue;
|
import org.jctools.queues.atomic.MpmcAtomicArrayQueue;
|
||||||
|
|
||||||
public final class AIOSequentialFileFactory extends AbstractSequentialFileFactory {
|
public final class AIOSequentialFileFactory extends AbstractSequentialFileFactory {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AIOSequentialFileFactory.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
// This is useful in cases where you want to disable loading the native library. (e.g. testsuite)
|
// This is useful in cases where you want to disable loading the native library. (e.g. testsuite)
|
||||||
private static final boolean DISABLED = System.getProperty(AIOSequentialFileFactory.class.getName() + ".DISABLED") != null;
|
private static final boolean DISABLED = System.getProperty(AIOSequentialFileFactory.class.getName() + ".DISABLED") != null;
|
||||||
|
|
|
@ -36,6 +36,7 @@ import org.apache.activemq.artemis.utils.ArtemisCloseable;
|
||||||
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
|
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
|
||||||
import org.apache.activemq.artemis.utils.critical.CriticalComponentImpl;
|
import org.apache.activemq.artemis.utils.critical.CriticalComponentImpl;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
public final class TimedBuffer extends CriticalComponentImpl {
|
public final class TimedBuffer extends CriticalComponentImpl {
|
||||||
|
@ -48,7 +49,7 @@ public final class TimedBuffer extends CriticalComponentImpl {
|
||||||
protected static final int CRITICAL_PATH_ADD_BYTES = 4;
|
protected static final int CRITICAL_PATH_ADD_BYTES = 4;
|
||||||
protected static final int CRITICAL_PATH_SET_OBSERVER = 5;
|
protected static final int CRITICAL_PATH_SET_OBSERVER = 5;
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(TimedBuffer.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final double MAX_TIMEOUT_ERROR_FACTOR = 1.5;
|
private static final double MAX_TIMEOUT_ERROR_FACTOR = 1.5;
|
||||||
|
|
||||||
|
|
|
@ -31,11 +31,12 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
|
||||||
import org.apache.activemq.artemis.utils.PowerOf2Util;
|
import org.apache.activemq.artemis.utils.PowerOf2Util;
|
||||||
import org.apache.activemq.artemis.utils.Env;
|
import org.apache.activemq.artemis.utils.Env;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
final class MappedFile implements AutoCloseable {
|
final class MappedFile implements AutoCloseable {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(MappedFile.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final int OS_PAGE_SIZE = Env.osPageSize();
|
private static final int OS_PAGE_SIZE = Env.osPageSize();
|
||||||
private final MappedByteBuffer buffer;
|
private final MappedByteBuffer buffer;
|
||||||
|
|
|
@ -45,10 +45,11 @@ import org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
|
||||||
import org.apache.activemq.artemis.utils.Env;
|
import org.apache.activemq.artemis.utils.Env;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class NIOSequentialFile extends AbstractSequentialFile {
|
public class NIOSequentialFile extends AbstractSequentialFile {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(NIOSequentialFile.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final boolean DEBUG_OPENS = false;
|
private static final boolean DEBUG_OPENS = false;
|
||||||
|
|
||||||
|
|
|
@ -21,11 +21,12 @@ import java.nio.ByteBuffer;
|
||||||
|
|
||||||
import org.apache.activemq.artemis.core.io.SequentialFile;
|
import org.apache.activemq.artemis.core.io.SequentialFile;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
public class FileIOUtil {
|
public class FileIOUtil {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(FileIOUtil.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static void copyData(SequentialFile from, SequentialFile to, ByteBuffer buffer) throws Exception {
|
public static void copyData(SequentialFile from, SequentialFile to, ByteBuffer buffer) throws Exception {
|
||||||
|
|
||||||
|
|
|
@ -39,11 +39,12 @@ import org.apache.activemq.artemis.utils.RunnableEx;
|
||||||
import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashMap;
|
import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashMap;
|
||||||
import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashSet;
|
import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashSet;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
public class JournalCompactor extends AbstractJournalUpdateTask implements JournalRecordProvider {
|
public class JournalCompactor extends AbstractJournalUpdateTask implements JournalRecordProvider {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JournalCompactor.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
LongObjectHashMap<LinkedList<RunnableEx>> pendingWritesOnTX = new LongObjectHashMap<>();
|
LongObjectHashMap<LinkedList<RunnableEx>> pendingWritesOnTX = new LongObjectHashMap<>();
|
||||||
IntObjectHashMap<LongObjectHashMap<RunnableEx>> pendingUpdates = new IntObjectHashMap<>();
|
IntObjectHashMap<LongObjectHashMap<RunnableEx>> pendingUpdates = new IntObjectHashMap<>();
|
||||||
|
|
|
@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
|
||||||
|
|
||||||
import org.apache.activemq.artemis.core.io.SequentialFile;
|
import org.apache.activemq.artemis.core.io.SequentialFile;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
|
import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
|
||||||
|
@ -65,7 +66,7 @@ public class JournalFileImpl implements JournalFile {
|
||||||
|
|
||||||
private final ConcurrentMap<JournalFile, AtomicInteger> negCounts = new ConcurrentHashMap<>();
|
private final ConcurrentMap<JournalFile, AtomicInteger> negCounts = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JournalFileImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public JournalFileImpl(final SequentialFile file, final long fileID, final int version) {
|
public JournalFileImpl(final SequentialFile file, final long fileID, final int version) {
|
||||||
checkNotNull(file);
|
checkNotNull(file);
|
||||||
|
|
|
@ -42,6 +42,7 @@ import org.apache.activemq.artemis.core.io.SequentialFileFactory;
|
||||||
import org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
|
import org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
|
||||||
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
|
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -50,7 +51,7 @@ import org.slf4j.Logger;
|
||||||
*/
|
*/
|
||||||
public class JournalFilesRepository {
|
public class JournalFilesRepository {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JournalFilesRepository.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to debug the consistency of the journal ordering.
|
* Used to debug the consistency of the journal ordering.
|
||||||
|
|
|
@ -92,6 +92,7 @@ import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashMap;
|
||||||
import org.apache.activemq.artemis.utils.collections.LongHashSet;
|
import org.apache.activemq.artemis.utils.collections.LongHashSet;
|
||||||
import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
|
import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.core.journal.impl.Reclaimer.scan;
|
import static org.apache.activemq.artemis.core.journal.impl.Reclaimer.scan;
|
||||||
|
@ -101,7 +102,7 @@ import static org.apache.activemq.artemis.core.journal.impl.Reclaimer.scan;
|
||||||
* <p>Look at {@link JournalImpl#load(LoaderCallback)} for the file layout
|
* <p>Look at {@link JournalImpl#load(LoaderCallback)} for the file layout
|
||||||
*/
|
*/
|
||||||
public class JournalImpl extends JournalBase implements TestableJournal, JournalRecordProvider {
|
public class JournalImpl extends JournalBase implements TestableJournal, JournalRecordProvider {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JournalImpl.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -29,11 +29,12 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||||
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
|
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
|
||||||
import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalRecord;
|
import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalRecord;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
public class JournalTransaction {
|
public class JournalTransaction {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(JournalTransaction.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private JournalRecordProvider journal;
|
private JournalRecordProvider journal;
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
package org.apache.activemq.artemis.core.journal.impl;
|
package org.apache.activemq.artemis.core.journal.impl;
|
||||||
|
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -35,7 +36,7 @@ import org.slf4j.Logger;
|
||||||
*/
|
*/
|
||||||
public final class Reclaimer {
|
public final class Reclaimer {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(Reclaimer.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private Reclaimer() {
|
private Reclaimer() {
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,7 @@ import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
|
||||||
import org.junit.rules.ExternalResource;
|
import org.junit.rules.ExternalResource;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A JUnit Rule that embeds an ActiveMQ Artemis server into a test.
|
* A JUnit Rule that embeds an ActiveMQ Artemis server into a test.
|
||||||
|
@ -66,11 +67,10 @@ import org.slf4j.LoggerFactory;
|
||||||
* </code></pre>
|
* </code></pre>
|
||||||
*/
|
*/
|
||||||
public class EmbeddedActiveMQResource extends ExternalResource {
|
public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
static final String SERVER_NAME = "embedded-server";
|
static final String SERVER_NAME = "embedded-server";
|
||||||
|
|
||||||
Logger log = LoggerFactory.getLogger(this.getClass());
|
|
||||||
|
|
||||||
boolean useDurableMessage = true;
|
boolean useDurableMessage = true;
|
||||||
boolean useDurableQueue = true;
|
boolean useDurableQueue = true;
|
||||||
long defaultReceiveTimeout = 50;
|
long defaultReceiveTimeout = 50;
|
||||||
|
@ -185,7 +185,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
try {
|
try {
|
||||||
server.stop();
|
server.stop();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
log.warn(String.format("Exception encountered stopping %s: %s", server.getClass().getSimpleName(), this.getServerName()), ex);
|
logger.warn(String.format("Exception encountered stopping %s: %s", server.getClass().getSimpleName(), this.getServerName()), ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -195,7 +195,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void before() throws Throwable {
|
protected void before() throws Throwable {
|
||||||
log.info("Starting {}: {}", this.getClass().getSimpleName(), getServerName());
|
logger.info("Starting {}: {}", this.getClass().getSimpleName(), getServerName());
|
||||||
|
|
||||||
this.start();
|
this.start();
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void after() {
|
protected void after() {
|
||||||
log.info("Stopping {}: {}", this.getClass().getSimpleName(), getServerName());
|
logger.info("Stopping {}: {}", this.getClass().getSimpleName(), getServerName());
|
||||||
|
|
||||||
this.stop();
|
this.stop();
|
||||||
|
|
||||||
|
@ -311,7 +311,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
public long getMessageCount(SimpleString queueName) {
|
public long getMessageCount(SimpleString queueName) {
|
||||||
Queue queue = locateQueue(queueName);
|
Queue queue = locateQueue(queueName);
|
||||||
if (queue == null) {
|
if (queue == null) {
|
||||||
log.warn("getMessageCount(queueName) - queue {} not found; returning -1", queueName.toString());
|
logger.warn("getMessageCount(queueName) - queue {} not found; returning -1", queueName.toString());
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -728,7 +728,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
|
|
||||||
private InternalClient getInternalClient() {
|
private InternalClient getInternalClient() {
|
||||||
if (internalClient == null) {
|
if (internalClient == null) {
|
||||||
log.info("Creating Internal Client");
|
logger.info("Creating Internal Client");
|
||||||
internalClient = new InternalClient();
|
internalClient = new InternalClient();
|
||||||
internalClient.start();
|
internalClient.start();
|
||||||
}
|
}
|
||||||
|
@ -758,7 +758,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
}
|
}
|
||||||
|
|
||||||
void start() {
|
void start() {
|
||||||
log.info("Starting {}", this.getClass().getSimpleName());
|
logger.info("Starting {}", this.getClass().getSimpleName());
|
||||||
try {
|
try {
|
||||||
serverLocator = ActiveMQClient.createServerLocator(getVmURL());
|
serverLocator = ActiveMQClient.createServerLocator(getVmURL());
|
||||||
sessionFactory = serverLocator.createSessionFactory();
|
sessionFactory = serverLocator.createSessionFactory();
|
||||||
|
@ -782,7 +782,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
try {
|
try {
|
||||||
producer.close();
|
producer.close();
|
||||||
} catch (ActiveMQException amqEx) {
|
} catch (ActiveMQException amqEx) {
|
||||||
log.warn("ActiveMQException encountered closing InternalClient ClientProducer - ignoring", amqEx);
|
logger.warn("ActiveMQException encountered closing InternalClient ClientProducer - ignoring", amqEx);
|
||||||
} finally {
|
} finally {
|
||||||
producer = null;
|
producer = null;
|
||||||
}
|
}
|
||||||
|
@ -791,7 +791,7 @@ public class EmbeddedActiveMQResource extends ExternalResource {
|
||||||
try {
|
try {
|
||||||
session.close();
|
session.close();
|
||||||
} catch (ActiveMQException amqEx) {
|
} catch (ActiveMQException amqEx) {
|
||||||
log.warn("ActiveMQException encountered closing InternalClient ClientSession - ignoring", amqEx);
|
logger.warn("ActiveMQException encountered closing InternalClient ClientSession - ignoring", amqEx);
|
||||||
} finally {
|
} finally {
|
||||||
session = null;
|
session = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,6 +54,7 @@ import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS;
|
||||||
import org.junit.rules.ExternalResource;
|
import org.junit.rules.ExternalResource;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Deprecated in favor of EmbeddedActiveMQResource. Since Artemis 2.0 all JMS specific broker management classes,
|
* Deprecated in favor of EmbeddedActiveMQResource. Since Artemis 2.0 all JMS specific broker management classes,
|
||||||
|
@ -78,6 +79,7 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class EmbeddedJMSResource extends ExternalResource {
|
public class EmbeddedJMSResource extends ExternalResource {
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
static final String SERVER_NAME = "embedded-jms-server";
|
static final String SERVER_NAME = "embedded-jms-server";
|
||||||
|
|
||||||
|
|
|
@ -54,12 +54,13 @@ import org.apache.qpid.proton.amqp.Symbol;
|
||||||
import org.apache.qpid.proton.amqp.transport.AmqpError;
|
import org.apache.qpid.proton.amqp.transport.AmqpError;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
|
|
||||||
public class AMQPConnectionCallback implements FailureListener, CloseListener {
|
public class AMQPConnectionCallback implements FailureListener, CloseListener {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AMQPConnectionCallback.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final ConcurrentMap<Binary, Transaction> transactions = new ConcurrentHashMap<>();
|
private final ConcurrentMap<Binary, Transaction> transactions = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,7 @@ import org.apache.qpid.proton.message.Message;
|
||||||
import org.apache.qpid.proton.message.impl.MessageImpl;
|
import org.apache.qpid.proton.message.impl.MessageImpl;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.protocol.amqp.converter.AMQPMessageSupport.getCharsetForTextualContent;
|
import static org.apache.activemq.artemis.protocol.amqp.converter.AMQPMessageSupport.getCharsetForTextualContent;
|
||||||
|
|
||||||
|
@ -119,7 +120,7 @@ public abstract class AMQPMessage extends RefCountMessage implements org.apache.
|
||||||
|
|
||||||
private static final SimpleString ANNOTATION_AREA_PREFIX = SimpleString.toSimpleString("m.");
|
private static final SimpleString ANNOTATION_AREA_PREFIX = SimpleString.toSimpleString("m.");
|
||||||
|
|
||||||
protected static final Logger logger = LoggerFactory.getLogger(AMQPMessage.class);
|
protected static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final SimpleString ADDRESS_PROPERTY = SimpleString.toSimpleString("_AMQ_AD");
|
public static final SimpleString ADDRESS_PROPERTY = SimpleString.toSimpleString("_AMQ_AD");
|
||||||
// used to perform quick search
|
// used to perform quick search
|
||||||
|
|
|
@ -79,10 +79,11 @@ import org.apache.qpid.proton.engine.EndpointState;
|
||||||
import org.apache.qpid.proton.engine.Receiver;
|
import org.apache.qpid.proton.engine.Receiver;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class AMQPSessionCallback implements SessionCallback {
|
public class AMQPSessionCallback implements SessionCallback {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AMQPSessionCallback.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final Symbol PRIORITY = Symbol.getSymbol("priority");
|
private static final Symbol PRIORITY = Symbol.getSymbol("priority");
|
||||||
|
|
||||||
|
|
|
@ -51,13 +51,14 @@ import io.netty.channel.ChannelPipeline;
|
||||||
import org.apache.activemq.artemis.utils.DestinationUtil;
|
import org.apache.activemq.artemis.utils.DestinationUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A proton protocol manager, basically reads the Proton Input and maps proton resources to ActiveMQ Artemis resources
|
* A proton protocol manager, basically reads the Proton Input and maps proton resources to ActiveMQ Artemis resources
|
||||||
*/
|
*/
|
||||||
public class ProtonProtocolManager extends AbstractProtocolManager<AMQPMessage, AmqpInterceptor, ActiveMQProtonRemotingConnection, AMQPRoutingHandler> implements NotificationListener {
|
public class ProtonProtocolManager extends AbstractProtocolManager<AMQPMessage, AmqpInterceptor, ActiveMQProtonRemotingConnection, AMQPRoutingHandler> implements NotificationListener {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(ProtonProtocolManager.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private static final List<String> websocketRegistryNames = Arrays.asList("amqp");
|
private static final List<String> websocketRegistryNames = Arrays.asList("amqp");
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ import org.apache.activemq.artemis.spi.core.remoting.BufferHandler;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.Connection;
|
import org.apache.activemq.artemis.spi.core.remoting.Connection;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
@ -40,7 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||||
*/
|
*/
|
||||||
public class ProtonClientConnectionManager implements BaseConnectionLifeCycleListener<ProtonProtocolManager>, BufferHandler {
|
public class ProtonClientConnectionManager implements BaseConnectionLifeCycleListener<ProtonProtocolManager>, BufferHandler {
|
||||||
private final Map<Object, ActiveMQProtonRemotingConnection> connectionMap = new ConcurrentHashMap<>();
|
private final Map<Object, ActiveMQProtonRemotingConnection> connectionMap = new ConcurrentHashMap<>();
|
||||||
private static final Logger log = LoggerFactory.getLogger(ProtonClientConnectionManager.class);
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
private final AMQPClientConnectionFactory connectionFactory;
|
private final AMQPClientConnectionFactory connectionFactory;
|
||||||
private final Optional<EventHandler> eventHandler;
|
private final Optional<EventHandler> eventHandler;
|
||||||
private final ClientSASLFactory clientSASLFactory;
|
private final ClientSASLFactory clientSASLFactory;
|
||||||
|
|
|
@ -87,10 +87,11 @@ import org.apache.qpid.proton.engine.Sender;
|
||||||
import org.apache.qpid.proton.engine.Session;
|
import org.apache.qpid.proton.engine.Session;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener, ActiveMQServerQueuePlugin, BrokerConnection {
|
public class AMQPBrokerConnection implements ClientConnectionLifeCycleListener, ActiveMQServerQueuePlugin, BrokerConnection {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AMQPBrokerConnection.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final AMQPBrokerConnectConfiguration brokerConnectConfiguration;
|
private final AMQPBrokerConnectConfiguration brokerConnectConfiguration;
|
||||||
private final ProtonProtocolManager protonProtocolManager;
|
private final ProtonProtocolManager protonProtocolManager;
|
||||||
|
|
|
@ -42,9 +42,10 @@ import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
|
||||||
import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
|
import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
public class AMQPBrokerConnectionManager implements ActiveMQComponent, ClientConnectionLifeCycleListener {
|
public class AMQPBrokerConnectionManager implements ActiveMQComponent, ClientConnectionLifeCycleListener {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AMQPBrokerConnectionManager.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
private final ProtonProtocolManagerFactory protonProtocolManagerFactory;
|
private final ProtonProtocolManagerFactory protonProtocolManagerFactory;
|
||||||
private final ActiveMQServer server;
|
private final ActiveMQServer server;
|
||||||
|
|
|
@ -44,12 +44,13 @@ import org.apache.qpid.proton.amqp.messaging.Properties;
|
||||||
import org.apache.qpid.proton.engine.Sender;
|
import org.apache.qpid.proton.engine.Sender;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
|
||||||
import static org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.getControllerInUse;
|
import static org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget.getControllerInUse;
|
||||||
|
|
||||||
public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> implements MirrorController, ActiveMQComponent {
|
public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> implements MirrorController, ActiveMQComponent {
|
||||||
|
|
||||||
private static final Logger logger = LoggerFactory.getLogger(AMQPMirrorControllerSource.class);
|
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
|
|
||||||
public static final Symbol EVENT_TYPE = Symbol.getSymbol("x-opt-amq-mr-ev-type");
|
public static final Symbol EVENT_TYPE = Symbol.getSymbol("x-opt-amq-mr-ev-type");
|
||||||
public static final Symbol ACK_REASON = Symbol.getSymbol("x-opt-amq-mr-ack-reason");
|
public static final Symbol ACK_REASON = Symbol.getSymbol("x-opt-amq-mr-ack-reason");
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue