Skip to content

Commit

Permalink
ARTEMIS-4020 Using a little trick to create the Loggers
Browse files Browse the repository at this point in the history
Trick provided by Tim Bish
  • Loading branch information
clebertsuconic committed Sep 29, 2022
1 parent 4cfc4cb commit 12cc70c
Show file tree
Hide file tree
Showing 515 changed files with 1,153 additions and 643 deletions.
Expand Up @@ -36,13 +36,14 @@
import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* Abstract class where we can replace the configuration in various places *
*/
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'")
String configuration;
Expand Down
Expand Up @@ -42,11 +42,12 @@
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/** This is an Utility class that will import the outputs in XML format. */
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;

Expand Down
Expand Up @@ -66,11 +66,12 @@
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
import org.slf4j.Logger;
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.")
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;

Expand Down
Expand Up @@ -65,6 +65,7 @@
import org.apache.activemq.artemis.utils.ListUtil;
import org.slf4j.Logger;
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
Expand All @@ -74,7 +75,7 @@
@Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
public final class XmlDataImporter extends ActionAbstract {

private static final Logger logger = LoggerFactory.getLogger(XmlDataImporter.class);
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

private XMLStreamReader reader;

Expand Down
Expand Up @@ -103,6 +103,7 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Expand All @@ -118,7 +119,7 @@
* Test to validate that the CLI doesn't throw improper exceptions when invoked.
*/
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
private ActiveMQServer server;
Expand Down
Expand Up @@ -21,12 +21,13 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class HashUtilTest {
private static final Logger log = LoggerFactory.getLogger(HashUtilTest.class);
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

@Test
public void testDefaultHashFormat() throws Exception {
Expand Down
Expand Up @@ -30,13 +30,14 @@
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* This is for components with a scheduled at a fixed rate.
*/
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;
private boolean startedOwnScheduler;

Expand Down
Expand Up @@ -37,14 +37,15 @@
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* This will use {@link InetAddress#isReachable(int)} to determine if the network is alive.
* It will have a set of addresses, and if any address is reached the network will be considered alive.
*/
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<String> addresses = new ConcurrentHashSet<>();
Expand Down
Expand Up @@ -21,6 +21,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* This class will be used to perform generic class-loader operations,
Expand All @@ -31,7 +32,7 @@

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!";

Expand Down
Expand Up @@ -34,6 +34,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* A DefaultSensitiveDataCodec
Expand All @@ -49,7 +50,7 @@
*/
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 BLOWFISH_KEY = "key";
Expand Down
Expand Up @@ -22,14 +22,15 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

public class SizeAwareMetric {

public interface AddCallback {
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;

Expand Down
Expand Up @@ -21,6 +21,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

import java.io.IOException;
import java.io.PrintWriter;
Expand All @@ -32,7 +33,7 @@
import java.lang.management.ThreadMXBean;

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) {

Expand Down
Expand Up @@ -25,6 +25,7 @@
import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* A UTF8Util
Expand All @@ -33,7 +34,7 @@
*/
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<>();

Expand Down
Expand Up @@ -34,10 +34,11 @@
import org.apache.activemq.artemis.api.core.SimpleString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

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();

Expand Down
Expand Up @@ -22,6 +22,7 @@
import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
import org.slf4j.Logger;
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.
Expand All @@ -35,7 +36,7 @@ public OrderedExecutor(Executor 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;

Expand Down
Expand Up @@ -26,10 +26,11 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

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_RUNNING = 1;
public static final int STATE_FORCED_SHUTDOWN = 2;
Expand Down
Expand Up @@ -23,10 +23,11 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

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 volatile int size = 0;
Expand Down
Expand Up @@ -28,6 +28,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;

Expand All @@ -41,7 +42,7 @@
*/
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 DeletedItem = -2L;
Expand Down
Expand Up @@ -26,10 +26,11 @@
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

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;

Expand Down
Expand Up @@ -22,14 +22,15 @@
import org.apache.activemq.artemis.utils.ArtemisCloseable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

public class CriticalMeasure {

public static boolean isDummy(ArtemisCloseable closeable) {
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
private volatile Exception traceEnter;
Expand Down
Expand Up @@ -28,10 +28,11 @@
import org.apache.commons.beanutils.IntrospectionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

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<>();

Expand Down
Expand Up @@ -29,6 +29,7 @@
import io.netty.util.internal.PlatformDependent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
Expand All @@ -40,7 +41,7 @@

public class ByteUtilTest {

private static final Logger log = LoggerFactory.getLogger(ByteUtilTest.class);
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

@Test
public void testBytesToString() {
Expand Down
Expand Up @@ -18,6 +18,7 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import org.junit.Test;

import java.util.HashMap;
Expand All @@ -30,7 +31,7 @@

public class DefaultSensitiveStringCodecTest {

private static final Logger log = LoggerFactory.getLogger(DefaultSensitiveStringCodecTest.class);
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

@Test
public void testDefaultAlgorithm() throws Exception {
Expand Down
Expand Up @@ -28,11 +28,12 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import org.junit.Assert;
import org.junit.Test;

public class OrderedExecutorSanityTest {
private static final Logger log = LoggerFactory.getLogger(OrderedExecutorSanityTest.class);
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

@Test
public void shouldExecuteTasksInOrder() throws InterruptedException {
Expand Down
Expand Up @@ -29,12 +29,13 @@
import org.apache.activemq.artemis.utils.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
import org.junit.Assert;
import org.junit.Test;

public class MultiThreadCriticalMeasureTest {

private static final Logger logger = LoggerFactory.getLogger(MultiThreadCriticalMeasureTest.class);
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

@Test
public void testMultiThread() throws Throwable {
Expand Down

0 comments on commit 12cc70c

Please sign in to comment.