OPNFLWPLUG-972 : Point to openflowplugin liblldp

[netvirt.git] / vpnservice / natservice / natservice-impl / src / main / java / org / opendaylight / netvirt / natservice / internal / SubnetmapListener.java

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java
index a1364f0ef2ed472d071777b2093ac10a29384f19..5e167ed4eec987b48a07480248b01fbd934b033c 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java
@@ -8,6 +8,9 @@
 
 package org.opendaylight.netvirt.natservice.internal;
 
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
@@ -17,17 +20,22 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Singleton
 public class SubnetmapListener extends AsyncDataTreeChangeListenerBase<Subnetmap, SubnetmapListener> {
     private static final Logger LOG = LoggerFactory.getLogger(SubnetmapListener.class);
     private final DataBroker dataBroker;
     private final ExternalNetworkGroupInstaller externalNetworkGroupInstaller;
 
-    public SubnetmapListener(final DataBroker dataBroker, final ExternalNetworkGroupInstaller externalNetworkGroupInstaller) {
+    @Inject
+    public SubnetmapListener(final DataBroker dataBroker,
+                             final ExternalNetworkGroupInstaller externalNetworkGroupInstaller) {
         super(Subnetmap.class, SubnetmapListener.class);
         this.dataBroker = dataBroker;
         this.externalNetworkGroupInstaller = externalNetworkGroupInstaller;
     }
 
+    @Override
+    @PostConstruct
     public void init() {
         registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
     }
@@ -39,23 +47,24 @@ public class SubnetmapListener extends AsyncDataTreeChangeListenerBase<Subnetmap
 
     @Override
     protected void remove(InstanceIdentifier<Subnetmap> identifier, Subnetmap subnetmap) {
-        LOG.trace("SubnetmapListener remove subnetmap method - key: " + identifier + ", value" + subnetmap);
+        LOG.trace("remove key: {} value: {}", subnetmap.getKey(), subnetmap);
         NatServiceCounters.subnetmap_remove.inc();
-        externalNetworkGroupInstaller.removeExtNetGroupEntires(subnetmap);
+        externalNetworkGroupInstaller.removeExtNetGroupEntries(subnetmap);
     }
 
     @Override
-    protected void update(InstanceIdentifier<Subnetmap> identifier, Subnetmap subnetmapBefore, Subnetmap subnetmapAfter) {
-        LOG.trace("SubnetmapListener update subnetmap method - key: " + identifier + ", original=" + subnetmapBefore + ", update=" + subnetmapAfter);
+    protected void update(InstanceIdentifier<Subnetmap> identifier,
+                          Subnetmap subnetmapBefore, Subnetmap subnetmapAfter) {
+        LOG.trace("update key: {}, original: {}, update: {}", subnetmapAfter.getKey(), subnetmapBefore, subnetmapAfter);
         NatServiceCounters.subnetmap_update.inc();
-        externalNetworkGroupInstaller.installExtNetGroupEntires(subnetmapAfter);
+        externalNetworkGroupInstaller.installExtNetGroupEntries(subnetmapAfter);
     }
 
     @Override
     protected void add(InstanceIdentifier<Subnetmap> identifier, Subnetmap subnetmap) {
-        LOG.trace("SubnetmapListener add subnetmap method - key: " + identifier + ", value=" + subnetmap);
+        LOG.trace("add key: {} value: {}", subnetmap.getKey(), subnetmap);
         NatServiceCounters.subnetmap_add.inc();
-        externalNetworkGroupInstaller.installExtNetGroupEntires(subnetmap);
+        externalNetworkGroupInstaller.installExtNetGroupEntries(subnetmap);
     }
 
     @Override