From 84d48ad537633198cb9f723d852ab4bcf4d501cf Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 11 Nov 2022 22:17:30 +0100 Subject: [PATCH] Hide NetconfDevice.LOG Remove suppression by making DeviceSourcesResolver use its own logger. Change-Id: I6e5646ee6d69a3dc697b7feef3bd7a13ca929c01 Signed-off-by: Robert Varga --- .../netconf/sal/connect/netconf/DeviceSourcesResolver.java | 5 ++++- .../netconf/sal/connect/netconf/NetconfDevice.java | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java index b7080c6a44..5ef616f790 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceSourcesResolver.java @@ -8,7 +8,6 @@ package org.opendaylight.netconf.sal.connect.netconf; import static java.util.Objects.requireNonNull; -import static org.opendaylight.netconf.sal.connect.netconf.NetconfDevice.LOG; import com.google.common.collect.Sets; import java.util.Set; @@ -24,11 +23,15 @@ import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Schema building callable. */ final class DeviceSourcesResolver implements Callable { + private static final Logger LOG = LoggerFactory.getLogger(DeviceSourcesResolver.class); + private final NetconfSessionPreferences remoteSessionCapabilities; private final NetconfDeviceSchemasResolver stateSchemasResolver; private final NetconfDeviceRpc deviceRpc; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java index 4ffafe55b2..5d9f573177 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java @@ -20,7 +20,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.netty.util.concurrent.EventExecutor; import java.util.ArrayList; import java.util.Arrays; @@ -88,10 +87,7 @@ import org.slf4j.LoggerFactory; */ public class NetconfDevice implements RemoteDevice { - - @SuppressFBWarnings(value = "SLF4J_LOGGER_SHOULD_BE_PRIVATE", - justification = "Needed for common logging of related classes") - static final Logger LOG = LoggerFactory.getLogger(NetconfDevice.class); + private static final Logger LOG = LoggerFactory.getLogger(NetconfDevice.class); private static final QName RFC8528_SCHEMA_MOUNTS_QNAME = QName.create( SchemaMountConstants.RFC8528_MODULE, "schema-mounts").intern(); -- 2.36.6