Refactoring addProcessor() calls to use type methods
Change-Id: Ib38cc5122a9d9a8cbaafec593eb3eb32a795a28f
diff --git a/apps/aaa/src/main/java/org/onosproject/aaa/AAA.java b/apps/aaa/src/main/java/org/onosproject/aaa/AAA.java
index f46c2fc..c386365 100644
--- a/apps/aaa/src/main/java/org/onosproject/aaa/AAA.java
+++ b/apps/aaa/src/main/java/org/onosproject/aaa/AAA.java
@@ -204,7 +204,7 @@
// "org.onosproject.aaa" is the FQDN of our app
appId = coreService.registerApplication("org.onosproject.aaa");
// register our event handler
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+ packetService.addProcessor(processor, PacketProcessor.director(2));
requestIntercepts();
// Instantiate the map of the state machines
stateMachineMap = Collections.synchronizedMap(Maps.newHashMap());
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
index e068c94..5e52b15 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
@@ -53,7 +53,7 @@
}
public void start() {
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 4);
+ packetService.addProcessor(processor, PacketProcessor.director(4));
}
public void stop() {
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java
index 39b248c..bc6be2b 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/TunnellingConnectivityManager.java
@@ -84,7 +84,7 @@
}
public void start() {
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 3);
+ packetService.addProcessor(processor, PacketProcessor.director(3));
}
public void stop() {
diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index f63d65d..078a7b1 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -187,7 +187,7 @@
cfgService.registerProperties(getClass());
appId = coreService.registerApplication("org.onosproject.fwd");
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+ packetService.addProcessor(processor, PacketProcessor.director(2));
topologyService.addListener(topologyListener);
readComponentConfiguration(context);
requestIntercepts();
diff --git a/apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java
index 136a418..742d7af 100644
--- a/apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java
+++ b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java
@@ -80,7 +80,7 @@
cfgService.registerProperties(getClass());
appId = coreService.registerApplication("org.onosproject.proxyarp");
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 1);
+ packetService.addProcessor(processor, PacketProcessor.director(1));
readComponentConfiguration(context);
requestPackests();
diff --git a/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java b/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
index e818b41..ad78a1c 100644
--- a/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
+++ b/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
@@ -84,7 +84,7 @@
@Activate
public void activate() {
appId = coreService.registerApplication(APP_NAME);
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+ packetService.addProcessor(processor, PacketProcessor.director(2));
requestIntercepts();
log.info("SDN-IP Reactive Routing Started");
}
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 178723f..874faab 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -204,7 +204,7 @@
policyHandler = new PolicyHandler(appId, deviceConfiguration,
flowObjectiveService, tunnelHandler, policyStore);
- packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
+ packetService.addProcessor(processor, PacketProcessor.director(2));
linkService.addListener(new InternalLinkListener());
deviceService.addListener(new InternalDeviceListener());
diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VirtualPublicHosts.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VirtualPublicHosts.java
index 7fafed3..5ab650b 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VirtualPublicHosts.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VirtualPublicHosts.java
@@ -79,8 +79,7 @@
public void activate() {
appId = coreService.registerApplication(APP_NAME);
- packetService.addProcessor(processor,
- PacketProcessor.ADVISOR_MAX + 6);
+ packetService.addProcessor(processor, PacketProcessor.director(6));
requestIntercepts();
log.info("vBNG virtual public hosts started");
}
diff --git a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
index 10a845f..8da6a99 100644
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
@@ -130,7 +130,7 @@
appId = coreService.registerApplication("org.onosproject.provider.host");
providerService = providerRegistry.register(this);
- packetService.addProcessor(processor, 1);
+ packetService.addProcessor(processor, PacketProcessor.advisor(1));
deviceService.addListener(deviceListener);
readComponentConfiguration(context);
requestIntercepts();
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
index 5c0dde7..0c933162 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
@@ -151,7 +151,7 @@
providerService = providerRegistry.register(this);
deviceService.addListener(listener);
- packetService.addProcessor(listener, 0);
+ packetService.addProcessor(listener, PacketProcessor.advisor(0));
masterService.addListener(roleListener);
LinkDiscovery ld;