From 48bf00b8efe7d58f91e21094904854fa8381a34b Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Wed, 28 Aug 2024 10:51:47 -0400 Subject: [PATCH] regression: org.slf4j used instead of internal logging abstraction In 3.36.0 we created a runtime dependency on org.slf4j that was not there before. We now use our own logging abstraction instead. We intend to switch wholesale to slf4j in 4.x but we shouldn't be adding new dependencies without bumping the major version number. --- .../asteriskjava/manager/internal/ResponseBuilderImpl.java | 7 +++---- .../asteriskjava/manager/util/EventAttributesHelper.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java index 577843f08..c0a0b9371 100644 --- a/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java +++ b/src/main/java/org/asteriskjava/manager/internal/ResponseBuilderImpl.java @@ -19,12 +19,11 @@ import org.asteriskjava.manager.response.ManagerError; import org.asteriskjava.manager.response.ManagerResponse; import org.asteriskjava.manager.util.EventAttributesHelper; -import org.slf4j.Logger; +import org.asteriskjava.util.Log; +import org.asteriskjava.util.LogFactory; import java.util.*; -import static org.slf4j.LoggerFactory.getLogger; - /** * Default implementation of the ResponseBuilder interface. * @@ -33,7 +32,7 @@ * @see org.asteriskjava.manager.response.ManagerResponse */ class ResponseBuilderImpl implements ResponseBuilder { - private static final Logger logger = getLogger(ResponseBuilderImpl.class); + private static final Log logger = LogFactory.getLog(ResponseBuilderImpl.class); private static final Set ignoredAttributes = new HashSet<>(Arrays.asList( "attributes", "proxyresponse", ManagerReader.COMMAND_RESULT_RESPONSE_KEY)); diff --git a/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java b/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java index e78a4a628..6f8d14907 100644 --- a/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java +++ b/src/main/java/org/asteriskjava/manager/util/EventAttributesHelper.java @@ -19,8 +19,9 @@ import org.asteriskjava.manager.event.UserEvent; import org.asteriskjava.manager.response.ManagerResponse; import org.asteriskjava.util.AstUtil; +import org.asteriskjava.util.Log; +import org.asteriskjava.util.LogFactory; import org.asteriskjava.util.ReflectionUtil; -import org.slf4j.Logger; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -29,13 +30,11 @@ import java.util.Map; import java.util.Set; -import static org.slf4j.LoggerFactory.getLogger; - /** * @author Piotr Olaszewski */ public class EventAttributesHelper { - private static final Logger logger = getLogger(EventAttributesHelper.class); + private static final Log logger = LogFactory.getLog(EventAttributesHelper.class); private EventAttributesHelper() { }