commit 3d8ff287747f23fe347afec0061f26151cf90923
author Jonathan Hart <jono@onlab.us> Tue Sep 06 10:59:41 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Sep 07 18:28:58 2016 +0000
tree 42740e462214a465dddc9a87c5e138afcef8a541
parent 734e1e6ffb11ae2bcac07a69fe6cdda18be4892f

Cleanups for SDN-IP

Change-Id: I2220992e01a0112faaf2ff8d507e012923cad5e9

apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
index 3366d91..201a909 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.sdnip;
 
+import com.google.common.collect.ImmutableList;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -26,12 +27,10 @@
 import org.onosproject.incubator.component.ComponentService;
 import org.onosproject.incubator.net.intf.InterfaceService;
 import org.onosproject.net.config.NetworkConfigService;
-import org.onosproject.routing.IntentSynchronizationAdminService;
 import org.onosproject.routing.IntentSynchronizationService;
 import org.onosproject.routing.RoutingService;
 import org.slf4j.Logger;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.slf4j.LoggerFactory.getLogger;
@@ -61,20 +60,16 @@
     protected IntentSynchronizationService intentSynchronizer;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected IntentSynchronizationAdminService intentSynchronizerAdmin;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ComponentService componentService;
 
     private PeerConnectivityManager peerConnectivity;
 
     private ApplicationId appId;
 
-    private static List<String> components = new ArrayList<>();
-    static {
-        components.add("org.onosproject.routing.bgp.BgpSessionManager");
-        components.add(org.onosproject.sdnip.SdnIpFib.class.getName());
-    }
+    private final List<String> components = ImmutableList.of(
+            "org.onosproject.routing.bgp.BgpSessionManager",
+            org.onosproject.sdnip.SdnIpFib.class.getName()
+    );
 
     @Activate
     protected void activate() {
@@ -89,11 +84,10 @@
                                                        interfaceService);
         peerConnectivity.start();
 
-        applicationService.registerDeactivateHook(appId, () -> {
-            intentSynchronizer.removeIntentsByAppId(appId);
-        });
+        applicationService.registerDeactivateHook(appId,
+                () -> intentSynchronizer.removeIntentsByAppId(appId));
 
-        log.info("SDN-IP started");
+        log.info("Started");
     }
 
     @Deactivate
@@ -102,19 +96,6 @@
 
         peerConnectivity.stop();
 
-        log.info("SDN-IP Stopped");
+        log.info("Stopped");
     }
-
-    /**
-     * Converts DPIDs of the form xx:xx:xx:xx:xx:xx:xx to OpenFlow provider
-     * device URIs.
-     *
-     * @param dpid the DPID string to convert
-     * @return the URI string for this device
-     */
-    static String dpidToUri(String dpid) {
-        return "of:" + dpid.replace(":", "");
-    }
-
-
 }