Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NETVIRT-1630 migrate to md-sal APIs
[netvirt.git]
/
vpnmanager
/
impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
vpnmanager
/
intervpnlink
/
InterVpnLinkStateListener.java
diff --git
a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java
b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java
index 759bc8f38fdf286c9bdc0bad7ad99ae152d858e7..dfac97b24bdd955581cc91a9ad825da2f335e96b 100644
(file)
--- a/
vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java
+++ b/
vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkStateListener.java
@@
-7,16
+7,17
@@
*/
package org.opendaylight.netvirt.vpnmanager.intervpnlink;
*/
package org.opendaylight.netvirt.vpnmanager.intervpnlink;
-import
com.google.common.base
.Optional;
-import javax.annotation.P
ostConstruct
;
+import
java.util
.Optional;
+import javax.annotation.P
reDestroy
;
import javax.inject.Inject;
import javax.inject.Singleton;
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.AsyncDataTreeChangeListenerBas
e;
+import org.opendaylight.
infrautils.utils.concurrent.Executors
;
+import org.opendaylight.
mdsal.binding.api.DataBroker
;
+import org.opendaylight.
mdsal.common.api.LogicalDatastoreTyp
e;
import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.IVpnLinkService;
import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkCache;
import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkDataComposite;
import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.IVpnLinkService;
import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkCache;
import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkDataComposite;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.InterVpnLinkStates;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.InterVpnLinkStates;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@
-28,8
+29,7
@@
import org.slf4j.LoggerFactory;
* specially for when the InterVpnLink becomes active.
*/
@Singleton
* specially for when the InterVpnLink becomes active.
*/
@Singleton
-public class InterVpnLinkStateListener
- extends AsyncDataTreeChangeListenerBase<InterVpnLinkState, InterVpnLinkStateListener> {
+public class InterVpnLinkStateListener extends AbstractAsyncDataTreeChangeListener<InterVpnLinkState> {
private static final Logger LOG = LoggerFactory.getLogger(InterVpnLinkStateListener.class);
private static final Logger LOG = LoggerFactory.getLogger(InterVpnLinkStateListener.class);
@@
-40,34
+40,31
@@
public class InterVpnLinkStateListener
@Inject
public InterVpnLinkStateListener(final DataBroker dataBroker, final IVpnLinkService interVpnLinkService,
final InterVpnLinkCache interVpnLinkCache) {
@Inject
public InterVpnLinkStateListener(final DataBroker dataBroker, final IVpnLinkService interVpnLinkService,
final InterVpnLinkCache interVpnLinkCache) {
+ super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(InterVpnLinkStates.class)
+ .child(InterVpnLinkState.class),
+ Executors.newListeningSingleThreadExecutor("InterVpnLinkStateListener", LOG));
this.dataBroker = dataBroker;
this.ivpnLinkService = interVpnLinkService;
this.interVpnLinkCache = interVpnLinkCache;
}
this.dataBroker = dataBroker;
this.ivpnLinkService = interVpnLinkService;
this.interVpnLinkCache = interVpnLinkCache;
}
- @PostConstruct
public void start() {
LOG.info("{} start", getClass().getSimpleName());
public void start() {
LOG.info("{} start", getClass().getSimpleName());
- registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
}
@Override
}
@Override
- protected InstanceIdentifier<InterVpnLinkState> getWildCardPath() {
- return InstanceIdentifier.create(InterVpnLinkStates.class).child(InterVpnLinkState.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
}
@Override
- protected InterVpnLinkStateListener getDataTreeChangeListener() {
- return InterVpnLinkStateListener.this;
- }
-
-
- @Override
- protected void remove(InstanceIdentifier<InterVpnLinkState> key, InterVpnLinkState dataObjectModification) {
+ public void remove(InstanceIdentifier<InterVpnLinkState> key, InterVpnLinkState dataObjectModification) {
}
@Override
}
@Override
- p
rotected
void update(InstanceIdentifier<InterVpnLinkState> key, InterVpnLinkState before,
+ p
ublic
void update(InstanceIdentifier<InterVpnLinkState> key, InterVpnLinkState before,
InterVpnLinkState after) {
if (before.getState() == InterVpnLinkState.State.Error && after.getState() == InterVpnLinkState.State.Active) {
Optional<InterVpnLinkDataComposite> optIVpnLink =
InterVpnLinkState after) {
if (before.getState() == InterVpnLinkState.State.Error && after.getState() == InterVpnLinkState.State.Active) {
Optional<InterVpnLinkDataComposite> optIVpnLink =
@@
-84,6
+81,6
@@
public class InterVpnLinkStateListener
@Override
@Override
- p
rotected
void add(InstanceIdentifier<InterVpnLinkState> key, InterVpnLinkState dataObjectModification) {
+ p
ublic
void add(InstanceIdentifier<InterVpnLinkState> key, InterVpnLinkState dataObjectModification) {
}
}
}
}