Little refactor of BNG integration and new bng-api version
Change-Id: Id06008f4f0888e8e81c134a368e3c5ea54291a5d
diff --git a/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java
index ea91c8d..17b7088 100644
--- a/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/BngPppoeKafkaIntegration.java
@@ -40,6 +40,16 @@
@Component(immediate = true)
public class BngPppoeKafkaIntegration extends AbstractKafkaIntegration {
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected EventBusService eventBusService;
+
+ @Reference(cardinality = ReferenceCardinality.OPTIONAL,
+ policy = ReferencePolicy.DYNAMIC,
+ bind = "bindPppoeBngControl",
+ unbind = "unbindPppoeBngControl")
+ protected volatile PppoeBngControlHandler ignore;
+ private final AtomicReference<PppoeBngControlHandler> pppoeBngControlRef = new AtomicReference<>();
+
private static final String TOPIC_PPPOE = "bng.pppoe";
private static final String TIMESTAMP = "timestamp";
private static final String EVENT_TYPE = "eventType";
@@ -52,17 +62,6 @@
private final PppoeEventListener pppoeEventListener = new InternalPppoeListener();
- private final AtomicReference<PppoeBngControlHandler> pppoeBngControlRef = new AtomicReference<>();
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
- protected EventBusService eventBusService;
-
- @Reference(cardinality = ReferenceCardinality.OPTIONAL,
- policy = ReferencePolicy.DYNAMIC,
- bind = "bindPppoeBngControl",
- unbind = "unbindPppoeBngControl")
- protected volatile PppoeBngControlHandler pppoeBngControlHandler;
-
protected void bindPppoeBngControl(PppoeBngControlHandler incomingService) {
bindAndAddListener(incomingService, pppoeBngControlRef, pppoeEventListener);
}