use LOG.isInfoEnabled() in (expensive!) NeutronLogger

and add @SuppressFBWarnings("SLF4J_FORMAT_SHOULD_BE_CONST")
to prepare for enabling SpotBugs for all of Neutron.

Change-Id: Ic548ddcdfe65bc7aa40b4fd53716aef5a8d8bc7c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java b/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
index 1ef6513b5b37bab6a41e8bdec71f5f45b941e0f5..bbc2ef2dc1cf272cbee85dde23ffb19f1dc859a9 100644 (file)
--- a/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
+++ b/neutron-logger/src/main/java/org/opendaylight/neutron/logger/NeutronLogger.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.logger;
 
 import com.google.common.base.Preconditions;
-
 import java.util.Collection;
 import javax.annotation.Nonnull;
 import javax.annotation.PostConstruct;
@@ -33,7 +32,7 @@ import org.slf4j.LoggerFactory;
 public final class NeutronLogger {
     private static final Logger LOG = LoggerFactory.getLogger(NeutronLogger.class);
 
-    private DataBroker db;
+    private final DataBroker db;
     private ClusteredDataTreeChangeListener<Neutron> configurationDataTreeChangeListener;
     private ListenerRegistration<? extends ClusteredDataTreeChangeListener<Neutron>> configurationRegisteredListener;
     private ClusteredDataTreeChangeListener<Neutron> operationalDataTreeChangeListener;
@@ -91,10 +90,11 @@ public final class NeutronLogger {
     }
 
     private void logChanges(String prefix, @Nonnull Collection<DataTreeModification<Neutron>> changes) {
-        final StringBuilder messageBuilder = new StringBuilder();
-        messageBuilder.append(prefix);
-        formatChanges(messageBuilder, changes);
-        LOG.info(messageBuilder.toString());
+        if (LOG.isInfoEnabled()) {
+            final StringBuilder messageBuilder = new StringBuilder(prefix);
+            formatChanges(messageBuilder, changes);
+            LOG.info("{}", messageBuilder.toString());
+        }
     }
 
     @PostConstruct
@@ -104,23 +104,13 @@ public final class NeutronLogger {
 
         DataTreeIdentifier<Neutron> configurationDataTreeId = new DataTreeIdentifier<>(
                 LogicalDatastoreType.CONFIGURATION, instanceId);
-        configurationDataTreeChangeListener = new ClusteredDataTreeChangeListener<Neutron>() {
-            @Override
-            public void onDataTreeChanged(Collection<DataTreeModification<Neutron>> changes) {
-                logChanges("Configuration DataTreeChanged ", changes);
-            }
-        };
+        configurationDataTreeChangeListener = changes -> logChanges("Configuration DataTreeChanged ", changes);
         configurationRegisteredListener = db.registerDataTreeChangeListener(configurationDataTreeId,
                 configurationDataTreeChangeListener);
 
         DataTreeIdentifier<
                 Neutron> operationalDataTreeId = new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, instanceId);
-        operationalDataTreeChangeListener = new ClusteredDataTreeChangeListener<Neutron>() {
-            @Override
-            public void onDataTreeChanged(Collection<DataTreeModification<Neutron>> changes) {
-                logChanges("Operational DataTreeChanged ", changes);
-            }
-        };
+        operationalDataTreeChangeListener = changes -> logChanges("Operational DataTreeChanged ", changes);
         operationalRegisteredListener = db.registerDataTreeChangeListener(operationalDataTreeId,
                 operationalDataTreeChangeListener);
     }